ketcher-react 2.26.0-rc.6 → 2.26.0-rc.7

package/dist/index.js

@@ -3798,7 +3798,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.26.0-rc.6\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
+  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.26.0-rc.7\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -16215,22 +16215,34 @@ function getElementsInRectangle(restruct, p0, p1) {
   var bottomLeftPosition = new ketcherCore.Vec2(x0, y1);
   var polygon = [topLeftPosition, topRightPosition, bottomRightPosition, bottomLeftPosition];
   restruct.bonds.forEach(function (bond, bid) {
-    if (struct.isBondFromMacromolecule(bid)) {
+    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
       return;
     }
-    var centre = ketcherCore.Vec2.lc2(
-    restruct.atoms.get(bond.b.begin).a.pp, 0.5,
-    restruct.atoms.get(bond.b.end).a.pp, 0.5);
-    if (centre.x > x0 && centre.x < x1 && centre.y > y0 && centre.y < y1 && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
+    var center;
+    if (bond.b.isExternalBondBetweenMonomers(struct)) {
+      var firstMonomer = struct.getGroupFromAtomId(bond.b.begin);
+      var secondMonomer = struct.getGroupFromAtomId(bond.b.end);
+      assert_1(firstMonomer);
+      assert_1(secondMonomer);
+      center = firstMonomer.pp && secondMonomer.pp ? ketcherCore.Vec2.centre(firstMonomer.pp, secondMonomer.pp) : bond.b.center;
+    } else {
+      center = bond.b.center;
+    }
+    if (center.x > x0 && center.x < x1 && center.y > y0 && center.y < y1) {
       bondList.push(bid);
     }
   });
   restruct.atoms.forEach(function (atom, aid) {
     var relatedFGId = ketcherCore.FunctionalGroup.findFunctionalGroupByAtom(functionalGroups, aid);
-    var reSGroup = restruct.sgroups.get(relatedFGId);
-    if (atom.a.pp.x > x0 && atom.a.pp.x < x1 && atom.a.pp.y > y0 && atom.a.pp.y < y1 && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) ||
-    aid === reSGroup.item.atoms[0])) {
-      atomList.push(aid);
+    var sGroup = struct.sgroups.get(relatedFGId);
+    if (struct.isAtomFromMacromolecule(aid)) {
+      if (sGroup && sGroup.pp && sGroup.pp.x > x0 && sGroup.pp.x < x1 && sGroup.pp.y > y0 && sGroup.pp.y < y1) {
+        atomList.push(aid);
+      }
+    } else {
+      if (atom.a.pp.x > x0 && atom.a.pp.x < x1 && atom.a.pp.y > y0 && atom.a.pp.y < y1 && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) || aid === (sGroup === null || sGroup === void 0 ? void 0 : sGroup.atoms[0]))) {
+        atomList.push(aid);
+      }
     }
   });
   var rxnArrowsList = [];
@@ -16325,22 +16337,34 @@ function getElementsInPolygon(restruct, rr) {
     r[i] = new ketcherCore.Vec2(rr[i].x, rr[i].y);
   }
   restruct.bonds.forEach(function (bond, bid) {
-    if (struct.isAtomFromMacromolecule(bond.b.begin) || struct.isAtomFromMacromolecule(bond.b.end)) {
+    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
       return;
     }
-    var centre = ketcherCore.Vec2.lc2(
-    restruct.atoms.get(bond.b.begin).a.pp, 0.5,
-    restruct.atoms.get(bond.b.end).a.pp, 0.5);
-    if (isPointInPolygon(r, centre) && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
+    var center;
+    if (bond.b.isExternalBondBetweenMonomers(struct)) {
+      var firstMonomer = struct.getGroupFromAtomId(bond.b.begin);
+      var secondMonomer = struct.getGroupFromAtomId(bond.b.end);
+      assert_1(firstMonomer);
+      assert_1(secondMonomer);
+      center = firstMonomer !== null && firstMonomer !== void 0 && firstMonomer.pp && secondMonomer !== null && secondMonomer !== void 0 && secondMonomer.pp ? ketcherCore.Vec2.centre(firstMonomer.pp, secondMonomer.pp) : bond.b.center;
+    } else {
+      center = bond.b.center;
+    }
+    if (isPointInPolygon(r, center)) {
       bondList.push(bid);
     }
   });
   restruct.atoms.forEach(function (atom, aid) {
     var relatedFGId = ketcherCore.FunctionalGroup.findFunctionalGroupByAtom(functionalGroups, aid);
-    var reSGroup = restruct.sgroups.get(relatedFGId);
-    if (isPointInPolygon(r, atom.a.pp) && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) ||
-    aid === reSGroup.item.atoms[0])) {
-      atomList.push(aid);
+    var sGroup = struct.sgroups.get(relatedFGId);
+    if (struct.isAtomFromMacromolecule(aid)) {
+      if (sGroup && sGroup.pp && isPointInPolygon(r, sGroup.pp)) {
+        atomList.push(aid);
+      }
+    } else {
+      if (isPointInPolygon(r, atom.a.pp) && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) || aid === (sGroup === null || sGroup === void 0 ? void 0 : sGroup.atoms[0]))) {
+        atomList.push(aid);
+      }
     }
   });
   var rxnArrowsList = [];
@@ -24646,21 +24670,13 @@ var Editor$3 = function () {
       if (arguments.length === 0) {
         return this._selection;
       }
-      var struct = this.struct();
       var ReStruct = this.render.ctab;
       var selectAll = false;
       this._selection = null;
       if (ci === 'all') {
         selectAll = true;
         ci = structObjects.reduce(function (res, key) {
-          var restructItemsIds = Array.from(ReStruct[key].keys());
-          restructItemsIds = restructItemsIds.filter(function (restructItemId) {
-            return !struct.isTargetFromMacromolecule({
-              map: key,
-              id: restructItemId
-            });
-          });
-          res[key] = restructItemsIds;
+          res[key] = Array.from(ReStruct[key].keys());
           return res;
         }, {});
       }
@@ -26474,24 +26490,46 @@ function getMenuPropsForClosestItem(editor, closestItem) {
     case 'bonds':
       {
         var functionalGroup = ketcherCore.FunctionalGroup.findFunctionalGroupByBond(struct, struct.functionalGroups, closestItem.id, true);
-        return functionalGroup === null || functionalGroup !== null && functionalGroup !== void 0 && functionalGroup.relatedSGroup.isSuperatomWithoutLabel ? {
-          id: CONTEXT_MENU_ID.FOR_BONDS,
-          bondIds: [closestItem.id]
-        } : {
-          id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
-          functionalGroups: [functionalGroup]
-        };
+        var noFunctionalGroup = functionalGroup === null || (functionalGroup === null || functionalGroup === void 0 ? void 0 : functionalGroup.relatedSGroup.isSuperatomWithoutLabel);
+        var isMonomer = (functionalGroup === null || functionalGroup === void 0 ? void 0 : functionalGroup.relatedSGroup) instanceof ketcherCore.MonomerMicromolecule;
+        if (noFunctionalGroup) {
+          return {
+            id: CONTEXT_MENU_ID.FOR_BONDS,
+            bondIds: [closestItem.id]
+          };
+        } else if (isMonomer) {
+          return {
+            id: CONTEXT_MENU_ID.FOR_MACROMOLECULE,
+            functionalGroups: [functionalGroup]
+          };
+        } else {
+          return {
+            id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
+            functionalGroups: [functionalGroup]
+          };
+        }
       }
     case 'atoms':
       {
         var _functionalGroup = ketcherCore.FunctionalGroup.findFunctionalGroupByAtom(struct.functionalGroups, closestItem.id, true);
-        return _functionalGroup === null || _functionalGroup !== null && _functionalGroup !== void 0 && _functionalGroup.relatedSGroup.isSuperatomWithoutLabel ? {
-          id: CONTEXT_MENU_ID.FOR_ATOMS,
-          atomIds: [closestItem.id]
-        } : {
-          id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
-          functionalGroups: [_functionalGroup]
-        };
+        var _noFunctionalGroup = _functionalGroup === null || (_functionalGroup === null || _functionalGroup === void 0 ? void 0 : _functionalGroup.relatedSGroup.isSuperatomWithoutLabel);
+        var _isMonomer = (_functionalGroup === null || _functionalGroup === void 0 ? void 0 : _functionalGroup.relatedSGroup) instanceof ketcherCore.MonomerMicromolecule;
+        if (_noFunctionalGroup) {
+          return {
+            id: CONTEXT_MENU_ID.FOR_ATOMS,
+            atomIds: [closestItem.id]
+          };
+        } else if (_isMonomer) {
+          return {
+            id: CONTEXT_MENU_ID.FOR_MACROMOLECULE,
+            functionalGroups: [_functionalGroup]
+          };
+        } else {
+          return {
+            id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
+            functionalGroups: [_functionalGroup]
+          };
+        }
       }
     case 'sgroups':
     case 'functionalGroups':
@@ -34849,8 +34887,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.26.0-rc.6" ,
-                  buildDate: "2024-10-25T09:50:21" ,
+                  version: "2.26.0-rc.7" ,
+                  buildDate: "2024-11-04T09:39:10" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);