epam · tmrr13 · Feb 14, 2024 · Feb 19, 2024 · Feb 19, 2024 · Feb 20, 2024
diff --git a/example/src/ModeControl/ModeControl.tsx b/example/src/ModeControl/ModeControl.tsx
@@ -17,11 +17,8 @@
 import { useState, useRef } from 'react';
 import styled from '@emotion/styled';
 import { Button, Popover } from '@mui/material';
-import {
-  Icon,
-  KETCHER_ROOT_NODE_CSS_SELECTOR,
-  KETCHER_MACROMOLECULES_ROOT_NODE_SELECTOR,
-} from 'ketcher-react';
+import { Icon, KETCHER_ROOT_NODE_CSS_SELECTOR } from 'ketcher-react';
+import { KETCHER_MACROMOLECULES_ROOT_NODE_SELECTOR } from 'ketcher-macromolecules';
 
 interface IStyledIconProps {
   expanded?: boolean;

diff --git a/...ry.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png b/...ry.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-1-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-1-chromium-linux.png
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-2-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-2-chromium-linux.png
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-3-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-3-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving.spec.ts
@@ -18,7 +18,6 @@ import {
   takeEditorScreenshot,
   waitForPageInit,
   waitForRender,
-  selectSnakeLayoutModeTool,
 } from '@utils';
 
 test.describe('Import-Saving-Files', () => {
@@ -328,7 +327,7 @@ test.describe('Import-Saving-Files', () => {
     Description: Sequence of Peptides displaying according to snake view mockup.
     */
     await openFileAndAddToCanvas('KET/snake-mode-peptides.ket', page);
-    await selectSnakeLayoutModeTool(page);
+    await page.getByTestId('snake-mode').click();
     await takeEditorScreenshot(page);
   });
 
@@ -343,7 +342,7 @@ test.describe('Import-Saving-Files', () => {
       'Molfiles-V3000/snake-mode-peptides.mol',
       page,
     );
-    await selectSnakeLayoutModeTool(page);
+    await page.getByTestId('snake-mode').click();
     await takeEditorScreenshot(page);
   });
 
@@ -358,7 +357,7 @@ test.describe('Import-Saving-Files', () => {
       'Molfiles-V3000/snake-mode-peptides.mol',
       page,
     );
-    await selectSnakeLayoutModeTool(page);
+    await page.getByTestId('snake-mode').click();
     const expectedFile = await getMolfile(page);
     await saveToFile(
       'Molfiles-V3000/snake-mode-peptides-expected.mol',

diff --git a/...ding-L-ec903-acro-mode-possible-to-see-Show-Library-button-1-chromium-linux.png b/...ding-L-ec903-acro-mode-possible-to-see-Show-Library-button-1-chromium-linux.png
diff --git a/...ke-full-screen-mode-in-micro-mode-and-switch-to-macro-mode-1-chromium-linux.png b/...ke-full-screen-mode-in-micro-mode-and-switch-to-macro-mode-1-chromium-linux.png
diff --git a/...hots/Peptide-library-testing-Placing-betaAlanine-on-canvas-1-chromium-linux.png b/...hots/Peptide-library-testing-Placing-betaAlanine-on-canvas-1-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/snake-bond-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/snake-bond-tool.spec.ts
@@ -5,12 +5,10 @@ import {
   clickRedo,
   clickUndo,
   selectSingleBondTool,
-  selectSnakeLayoutModeTool,
+  selectSnakeBondTool,
   takeEditorScreenshot,
   waitForPageInit,
   addBondedMonomersToCanvas,
-  selectFlexLayoutModeTool,
-  waitForRender,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
@@ -72,7 +70,7 @@ test.describe('Snake Bond Tool', () => {
     Description: Snake bond tool
     */
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     const [, peptide2] = await addBondedMonomersToCanvas(
       page,
       MONOMER_NAME_TZA,
@@ -125,7 +123,7 @@ test.describe('Snake Bond Tool', () => {
       12,
     );
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
 
     await takeEditorScreenshot(page);
   });
@@ -139,33 +137,28 @@ test.describe('Snake Bond Tool', () => {
     */
     await createBondedMonomers(page);
     await takeEditorScreenshot(page);
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
   });
 
-  test('Mode returns back/forth after undo/redo', async ({ page }) => {
-    const flexModeButton = page.getByTestId('flex-layout-mode');
-    const snakeModeButton = page.getByTestId('snake-layout-mode');
+  test('Button is not active after undo', async ({ page }) => {
+    const snakeModeButton = page.getByTestId('snake-mode');
     await createBondedMonomers(page);
-    await expect(flexModeButton).toHaveClass(/active/);
+    await expect(snakeModeButton).not.toHaveClass(/active/);
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await expect(snakeModeButton).toHaveClass(/active/);
 
     await clickUndo(page);
-    await waitForRender(page);
-    await expect(snakeModeButton).not.toBeVisible();
-    await expect(flexModeButton).toHaveClass(/active/);
+    await expect(snakeModeButton).not.toHaveClass(/active/);
 
     await clickRedo(page);
-    await waitForRender(page);
-    await expect(flexModeButton).not.toBeVisible();
     await expect(snakeModeButton).toHaveClass(/active/);
   });
 
   test('Create snake bond between RNA nucleotides', async ({ page }) => {
     await page.getByText('RNA').click();
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
 
     const { phosphate } = await addRnaPresetOnCanvas(
       page,
@@ -251,7 +244,7 @@ test.describe('Snake Bond Tool', () => {
     await bondTwoMonomers(page, phosphate2, sugar3);
     await bondTwoMonomers(page, phosphate3, sugar4);
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
   });
 
@@ -314,16 +307,16 @@ test.describe('Snake Bond Tool', () => {
 
     await takeEditorScreenshot(page);
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
 
-    await selectFlexLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
   });
 
   test('Create snake bond for chain with nucleoside', async ({ page }) => {
     await page.getByText('RNA').click();
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
 
     const { phosphate } = await addRnaPresetOnCanvas(
       page,
@@ -368,10 +361,10 @@ test.describe('Snake Bond Tool', () => {
 
     await takeEditorScreenshot(page);
 
-    await selectFlexLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
   });
 
@@ -475,7 +468,7 @@ test.describe('Snake Bond Tool', () => {
     await bondTwoMonomers(page, hcyPeptide1, balPeptide1, undefined, 'R1');
     await takeEditorScreenshot(page);
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
   });
 
@@ -515,7 +508,7 @@ test.describe('Snake Bond Tool', () => {
 
     await takeEditorScreenshot(page);
 
-    await selectSnakeLayoutModeTool(page);
+    await selectSnakeBondTool(page);
     await takeEditorScreenshot(page);
   });
 });
diff --git a/...te-snake-bond-for-mix-chains-with-nucleotides-and-peptides-2-chromium-linux.png b/...te-snake-bond-for-mix-chains-with-nucleotides-and-peptides-2-chromium-linux.png
diff --git a/...te-snake-bond-for-mix-chains-with-nucleotides-and-peptides-3-chromium-linux.png b/...te-snake-bond-for-mix-chains-with-nucleotides-and-peptides-3-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/zoom-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/zoom-tool.spec.ts
@@ -11,7 +11,7 @@ import {
   moveMouseToTheMiddleOfTheScreen,
 } from '@utils';
 import {
-  zoomWithMouseWheel,
+  scrollWithMouseWheel,
   turnOnMacromoleculesEditor,
 } from '@utils/macromolecules';
 
@@ -187,7 +187,7 @@ test.describe('Zoom Tool', () => {
   }) => {
     const selectionStart = { x: 200, y: 200 };
     const selectionEnd = { x: 800, y: 800 };
-    await zoomWithMouseWheel(page, ZOOM_STEP);
+    await scrollWithMouseWheel(page, ZOOM_STEP);
     await selectRectangleSelectionTool(page);
     await selectRectangleArea(
       page,
@@ -198,10 +198,10 @@ test.describe('Zoom Tool', () => {
     );
     await takeEditorScreenshot(page);
 
-    await zoomWithMouseWheel(page, -ZOOM_STEP);
+    await scrollWithMouseWheel(page, -ZOOM_STEP);
     await takeEditorScreenshot(page);
 
-    await zoomWithMouseWheel(page, -ZOOM_STEP);
+    await scrollWithMouseWheel(page, -ZOOM_STEP);
   });
 
   test('Scroll canvas by mouse wheel', async ({ page }) => {

diff --git a/...molecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png b/...molecules-default-presets-Check-Guanine-in-default-presets-1-chromium-linux.png
diff --git a/...-to-Favorites-Should-have-star-when-hover-over-RNA-presets-1-chromium-linux.png b/...-to-Favorites-Should-have-star-when-hover-over-RNA-presets-1-chromium-linux.png
diff --git a/...sphate-and-sugar-Open-file-and-connect-phosphate-and-sugar-1-chromium-linux.png b/...sphate-and-sugar-Open-file-and-connect-phosphate-and-sugar-1-chromium-linux.png
diff --git a/...es-delete-RNA-presets-Should-not-delete-default-RNA-preset-1-chromium-linux.png b/...es-delete-RNA-presets-Should-not-delete-default-RNA-preset-1-chromium-linux.png
diff --git a/...ayout.spec.ts-snapshots/RNA-layout-Each-panel-is-collapsed-1-chromium-linux.png b/...ayout.spec.ts-snapshots/RNA-layout-Each-panel-is-collapsed-1-chromium-linux.png
diff --git a/...pec.ts-snapshots/RNA-layout-RNA-Builder-panel-is-collapsed-1-chromium-linux.png b/...pec.ts-snapshots/RNA-layout-RNA-Builder-panel-is-collapsed-1-chromium-linux.png
diff --git a/...Library-Check-presence-of-Clear-canvas-button-in-left-menu-1-chromium-linux.png b/...Library-Check-presence-of-Clear-canvas-button-in-left-menu-1-chromium-linux.png
diff --git a/...ch-between-Macro-and-Micro-mode-does-not-crash-application-1-chromium-linux.png b/...ch-between-Macro-and-Micro-mode-does-not-crash-application-1-chromium-linux.png
diff --git a/...hosphate-and-Base-in-Library-once-it-chosen-in-RNA-Builder-2-chromium-linux.png b/...hosphate-and-Base-in-Library-once-it-chosen-in-RNA-Builder-2-chromium-linux.png
diff --git a/...ests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts b/...ests/tests/Macromolecule-editor/Rectangle-Selection-Tool/rectangle-selection-tool.spec.ts
@@ -12,7 +12,6 @@ import {
   selectSingleBondTool,
   takeEditorScreenshot,
   waitForPageInit,
-  selectSnakeLayoutModeTool,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
@@ -398,7 +397,7 @@ test.describe('Rectangle Selection Tool', () => {
     const x = 900;
     const y = 500;
     await openFileAndAddToCanvas('KET/snake-mode-peptides.ket', page);
-    await selectSnakeLayoutModeTool(page);
+    await page.getByTestId('snake-mode').click();
     await page.keyboard.press('Control+a');
     await page.getByText('Hhs').locator('..').first().hover();
     await dragMouseTo(x, y, page);

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Sequence-Mode/sequence-mode.spec.ts
diff --git a/...ence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-1-chromium-linux.png b/...ence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-1-chromium-linux.png
diff --git a/...ence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-2-chromium-linux.png b/...ence-Mode-Open-monomers-chains-and-switch-to-sequence-mode-2-chromium-linux.png