epam · Nitvex · Dec 13, 2023 · Dec 6, 2023 · Dec 7, 2023 · Dec 8, 2023
diff --git a/...as.spec.ts-snapshots/Peptide-Add-monomer-preview-on-canvas-1-chromium-linux.png b/...as.spec.ts-snapshots/Peptide-Add-monomer-preview-on-canvas-1-chromium-linux.png
diff --git a/...omer-b-29ea5--another-monomers-and-check-attachment-points-2-chromium-linux.png b/...omer-b-29ea5--another-monomers-and-check-attachment-points-2-chromium-linux.png
diff --git a/...omer-b-c144d--another-monomers-and-check-attachment-points-1-chromium-linux.png b/...omer-b-c144d--another-monomers-and-check-attachment-points-1-chromium-linux.png
diff --git a/...t-rotation-Select-monomer-and-bonds-and-then-hover-monomer-1-chromium-linux.png b/...t-rotation-Select-monomer-and-bonds-and-then-hover-monomer-1-chromium-linux.png
diff --git a/...t-rotation-Select-monomer-and-bonds-and-then-hover-monomer-2-chromium-linux.png b/...t-rotation-Select-monomer-and-bonds-and-then-hover-monomer-2-chromium-linux.png
diff --git a/...-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-1-chromium-linux.png b/...-snapshots/Polymer-Bond-Tool-Create-bond-between-two-chems-1-chromium-linux.png
diff --git a/.../Zoom-Tool-Zoom-In-Out-attachment-points-with-menu-buttons-1-chromium-linux.png b/.../Zoom-Tool-Zoom-In-Out-attachment-points-with-menu-buttons-1-chromium-linux.png
diff --git a/.../Zoom-Tool-Zoom-In-Out-attachment-points-with-menu-buttons-2-chromium-linux.png b/.../Zoom-Tool-Zoom-In-Out-attachment-points-with-menu-buttons-2-chromium-linux.png
diff --git a/.../Zoom-Tool-Zoom-In-Out-attachment-points-with-menu-buttons-3-chromium-linux.png b/.../Zoom-Tool-Zoom-In-Out-attachment-points-with-menu-buttons-3-chromium-linux.png
diff --git a/...ol-Zoom-In-Out-attachment-points-with-mouse-wheel-and-CTRL-1-chromium-linux.png b/...ol-Zoom-In-Out-attachment-points-with-mouse-wheel-and-CTRL-1-chromium-linux.png
diff --git a/...ol-Zoom-In-Out-attachment-points-with-mouse-wheel-and-CTRL-2-chromium-linux.png b/...ol-Zoom-In-Out-attachment-points-with-mouse-wheel-and-CTRL-2-chromium-linux.png
diff --git a/...ol-Zoom-In-Out-attachment-points-with-mouse-wheel-and-CTRL-3-chromium-linux.png b/...ol-Zoom-In-Out-attachment-points-with-mouse-wheel-and-CTRL-3-chromium-linux.png
diff --git a/....ts-snapshots/Zoom-Tool-Zoom-In-Out-bond-with-menu-buttons-1-chromium-linux.png b/....ts-snapshots/Zoom-Tool-Zoom-In-Out-bond-with-menu-buttons-1-chromium-linux.png
diff --git a/....ts-snapshots/Zoom-Tool-Zoom-In-Out-bond-with-menu-buttons-2-chromium-linux.png b/....ts-snapshots/Zoom-Tool-Zoom-In-Out-bond-with-menu-buttons-2-chromium-linux.png
diff --git a/....ts-snapshots/Zoom-Tool-Zoom-In-Out-bond-with-menu-buttons-3-chromium-linux.png b/....ts-snapshots/Zoom-Tool-Zoom-In-Out-bond-with-menu-buttons-3-chromium-linux.png
diff --git a/...shots/Zoom-Tool-Zoom-In-Out-bond-with-mouse-wheel-and-CTRL-1-chromium-linux.png b/...shots/Zoom-Tool-Zoom-In-Out-bond-with-mouse-wheel-and-CTRL-1-chromium-linux.png
diff --git a/...shots/Zoom-Tool-Zoom-In-Out-bond-with-mouse-wheel-and-CTRL-2-chromium-linux.png b/...shots/Zoom-Tool-Zoom-In-Out-bond-with-mouse-wheel-and-CTRL-2-chromium-linux.png
diff --git a/...shots/Zoom-Tool-Zoom-In-Out-bond-with-mouse-wheel-and-CTRL-3-chromium-linux.png b/...shots/Zoom-Tool-Zoom-In-Out-bond-with-mouse-wheel-and-CTRL-3-chromium-linux.png
diff --git a/...-and-Phosphate-Combination-to-Canvas-and-connect-with-bond-1-chromium-linux.png b/...-and-Phosphate-Combination-to-Canvas-and-connect-with-bond-1-chromium-linux.png
diff --git a/...-and-Phosphate-Combination-to-Canvas-and-connect-with-bond-1-chromium-linux.png b/...-and-Phosphate-Combination-to-Canvas-and-connect-with-bond-1-chromium-linux.png
diff --git a/...sphate-and-try-to-attach-bond-to-occupied-attachment-point-1-chromium-linux.png b/...sphate-and-try-to-attach-bond-to-occupied-attachment-point-1-chromium-linux.png
diff --git a/packages/ketcher-core/src/domain/helpers/attachmentPointCalculations.ts b/packages/ketcher-core/src/domain/helpers/attachmentPointCalculations.ts
@@ -130,16 +130,22 @@ export function getSearchFunction(
       x: Math.round(zoomedCoordinateOfSecondPoint.x) + canvasOffset.x,
       y: Math.round(zoomedCoordinateOfSecondPoint.y) + canvasOffset.y,
     };
-    const newPoint = document.elementFromPoint(
-      newPointCoord.x,
-      newPointCoord.y,
-    ) as Element;
-
-    let newAngle;
-    if (newPoint === monomer.renderer?.bodyElement?.node()) {
-      newAngle = initialAngle;
-    } else {
-      newAngle = initialAngle - 180;
+    let newAngle: number = initialAngle;
+
+    if (monomer.renderer?.bodyElement) {
+      const elementsAtPoint = document.elementsFromPoint(
+        newPointCoord.x,
+        newPointCoord.y,
+      );
+
+      const isCurrentMonomerAtNewPoint = elementsAtPoint.some(
+        (element) => element === monomer.renderer?.bodyElement?.node(),
+      );
+      if (isCurrentMonomerAtNewPoint) {
+        newAngle = initialAngle;
+      } else {
+        newAngle = initialAngle - 180;
+      }
     }
 
     return findPointOnMonomerBorder(newCoordStart, newLength, newAngle);