#2213 - added hight priority for sgroup data

epam · Apr 27, 2023 · c8c751b · c8c751b
1 parent a6960cc
commit c8c751b
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/packages/ketcher-react/src/script/editor/shared/closest.js b/packages/ketcher-react/src/script/editor/shared/closest.js
@@ -454,22 +454,29 @@ function findClosestItem(restruct, pos, maps, skip, scale) {
   // eslint-disable-line max-params
   maps = maps || Object.keys(findMaps)
 
-  return maps.reduce((res, mp) => {
+  let priorityItem = null
+
+  const closestItem = maps.reduce((res, mp) => {
     const minDist = res ? res.dist : null
     const item = findMaps[mp](restruct, pos, skip, minDist, scale)
 
-    if (item !== null && (res === null || item.dist < res.dist)) {
-      const { id, dist, ...other } = item
-      return {
+    if (item !== null) {
+      const enrichedItem = {
         map: mp,
-        id: id,
-        dist: dist,
-        ...other
+        ...item
+      }
+
+      if (mp === 'sgroupData') {
+        priorityItem = enrichedItem
+      } else if (res === null || item.dist < res.dist) {
+        return enrichedItem
       }
     }
 
     return res
   }, null)
+
+  return priorityItem || closestItem
 }
 
 /**