#2471 – fix the paste tool issue with attachment point

epam · May 22, 2023 · 0822365 · 0822365
1 parent c8f9479
commit 0822365
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/packages/ketcher-react/src/script/editor/tool/helper/getMergeItems.ts b/packages/ketcher-react/src/script/editor/tool/helper/getMergeItems.ts
diff --git a/packages/ketcher-react/src/script/editor/tool/paste.ts b/packages/ketcher-react/src/script/editor/tool/paste.ts
@@ -29,13 +29,12 @@ import {
 import Editor from '../Editor'
 import { dropAndMerge } from './helper/dropAndMerge'
 import { getGroupIdsFromItemArrays } from './helper/getGroupIdsFromItems'
-import { getMergeItems } from './helper/getMergeItems'
 import utils from '../shared/utils'
+
 class PasteTool {
   editor: Editor
   struct: Struct
   action: any
-  templateAction: any
   dragCtx: any
   findItems: string[]
   mergeItems: any
@@ -182,7 +181,7 @@ class PasteTool {
       this.action = action
       this.editor.update(this.action, true, { resizeCanvas: false })
 
-      this.mergeItems = getMergeItems(this.editor, pasteItems)
+      this.mergeItems = getItemsToFuse(this.editor, pasteItems)
       this.editor.hover(getHoverToFuse(this.mergeItems))
     }
   }

diff --git a/packages/ketcher-react/src/script/editor/tool/select.ts b/packages/ketcher-react/src/script/editor/tool/select.ts
@@ -33,7 +33,8 @@ import {
   isCloseToEdgeOfCanvas,
   isCloseToEdgeOfScreen,
   scrollByVector,
-  shiftAndExtendCanvasByVector
+  shiftAndExtendCanvasByVector,
+  getItemsToFuse
 } from 'ketcher-core'
 
 import LassoHelper from './helper/lasso'
@@ -44,7 +45,6 @@ import { xor } from 'lodash/fp'
 import { Editor } from '../Editor'
 import { dropAndMerge } from './helper/dropAndMerge'
 import { getGroupIdsFromItemArrays } from './helper/getGroupIdsFromItems'
-import { getMergeItems } from './helper/getMergeItems'
 import { updateSelectedAtoms } from 'src/script/ui/state/modal/atoms'
 import { updateSelectedBonds } from 'src/script/ui/state/modal/bonds'
 import { hasAtomsOutsideCanvas } from './helper/isAtomOutSideCanvas'
@@ -207,7 +207,7 @@ class SelectTool {
         editor.render.page2obj(event).sub(dragCtx.xy0)
       )
 
-      dragCtx.mergeItems = getMergeItems(editor, expSel)
+      dragCtx.mergeItems = getItemsToFuse(editor, expSel)
       editor.hover(getHoverToFuse(dragCtx.mergeItems))
 
       resizeCanvas(rnd, event)