#4405 - Macro: Switching to Sequence mode causes page freeze (#4616)

- refactored snake layout to work with ChainsCollection - fixed chains sorting to use Y coordinate more than X
epam · May 15, 2024 · bf462b4 · bf462b4
1 parent bb5239a
commit bf462b4
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 359 deletions.
diff --git a/...e-for-view-mode-Copy-paste-selection-with-rectangular-tool-2-chromium-linux.png b/...e-for-view-mode-Copy-paste-selection-with-rectangular-tool-2-chromium-linux.png
diff --git a/...ounters-Peptide-it-is-appears-as-letter-for-natural-analog-1-chromium-linux.png b/...ounters-Peptide-it-is-appears-as-letter-for-natural-analog-1-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Snake-Mode/snake-bond-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Snake-Mode/snake-bond-tool.spec.ts
@@ -17,6 +17,7 @@ import {
   selectPartOfMolecules,
   openFileAndAddToCanvasMacro,
   moveMouseAway,
+  scrollDown,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
@@ -1046,12 +1047,15 @@ test.describe('Snake Bond Tool', () => {
     Test case: Snake Mode
     Description: Bonds connected through R1-R1 and R2-R2 connections should remain straight line. Connected through R2-R1 snake layout.
     */
+    const SCROLL_DELTA = 700;
     await openFileAndAddToCanvasMacro(
       `KET/two-peptide-chains-one-connected-through-r1-r1-and-r2-r2-another-r2-r1.ket`,
       page,
     );
     await takeEditorScreenshot(page);
     await selectSnakeLayoutModeTool(page);
     await takeEditorScreenshot(page);
+    await scrollDown(page, SCROLL_DELTA);
+    await takeEditorScreenshot(page);
   });
 });
diff --git a/...peptides-chains-connected-through-R1-R1-R2-R2-and-R2-to-R1-2-chromium-linux.png b/...peptides-chains-connected-through-R1-R1-R2-R2-and-R2-to-R1-2-chromium-linux.png
diff --git a/...peptides-chains-connected-through-R1-R1-R2-R2-and-R2-to-R1-3-chromium-linux.png b/...peptides-chains-connected-through-R1-R1-R2-R2-and-R2-to-R1-3-chromium-linux.png
diff --git a/...ake-Bond-Tool-Create-snake-bond-for-chain-with-side-chains-2-chromium-linux.png b/...ake-Bond-Tool-Create-snake-bond-for-chain-with-side-chains-2-chromium-linux.png
diff --git a/packages/ketcher-core/src/domain/entities/BaseMonomer.ts b/packages/ketcher-core/src/domain/entities/BaseMonomer.ts
@@ -483,4 +483,14 @@ export abstract class BaseMonomer extends DrawingEntity {
   public get isModification() {
     return this.monomerItem.props.MonomerNaturalAnalogCode !== this.label;
   }
+
+  public get sideConnections() {
+    const sideConnections: PolymerBond[] = [];
+    this.forEachBond((bond) => {
+      if (bond.isSideChainConnection) {
+        sideConnections.push(bond);
+      }
+    });
+    return sideConnections;
+  }
 }