ketcher-react 2.8.0-rc.4 → 2.8.0-rc.5

package/dist/index.js

@@ -3070,7 +3070,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.8.0-rc.4\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.8.0-rc.5\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -10913,7 +10913,7 @@ var BondTool = function () {
                 existingBondId = _this$getExistingBond2[0],
                 bond = _this$getExistingBond2[1];
             dragCtx.action = ketcherCore.fromBondAddition(rnd.ctab, this.bondProps, beginAtom, endAtom, beginPos, endPos)[0];
-            if (existingBondId) {
+            if (existingBondId !== null) {
               this.dragCtx.existedBond = bond;
               this.dragCtx.action.mergeWith(ketcherCore.fromOneBondDeletion(rnd.ctab, existingBondId));
             }
@@ -11347,7 +11347,7 @@ function getElementsInRectangle(restruct, p0, p1) {
   var y1 = Math.max(p0.y, p1.y);
   restruct.bonds.forEach(function (bond, bid) {
     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, true)) {
+    if (centre.x > x0 && centre.x < x1 && centre.y > y0 && centre.y < y1 && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
       bondList.push(bid);
     }
   });
@@ -11425,7 +11425,7 @@ function getElementsInPolygon(restruct, rr) {
   }
   restruct.bonds.forEach(function (bond, bid) {
     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, true)) {
+    if (isPointInPolygon(r, centre) && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
       bondList.push(bid);
     }
   });
@@ -11749,7 +11749,7 @@ var SGroupTool = function () {
         var _struct$bonds$get;
         var bondId = ketcherCore.FunctionalGroup.bondsInFunctionalGroup(molecule, functionalGroups, ci.id);
         var bondFromStruct = bondId !== null && ((_struct$bonds$get = struct.bonds.get(bondId)) === null || _struct$bonds$get === void 0 ? void 0 : _struct$bonds$get.b);
-        if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bondFromStruct, sgroups, functionalGroups, true)) {
+        if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bondFromStruct, sgroups, functionalGroups)) {
           bondResult.push(bondId);
         }
       }
@@ -12537,8 +12537,8 @@ var SelectTool = function () {
         var _struct$bonds$get;
         var bondId = ketcherCore.FunctionalGroup.bondsInFunctionalGroup(molecule, functionalGroups, ci.id);
         var bondFromStruct = bondId !== null && ((_struct$bonds$get = struct.bonds.get(bondId)) === null || _struct$bonds$get === void 0 ? void 0 : _struct$bonds$get.b);
-        if (bondId !== null && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(
-        bondFromStruct, sgroups, functionalGroups, true)) bondResult.push(bondId);
+        if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(
+        bondFromStruct, sgroups, functionalGroups)) bondResult.push(bondId);
       }
       if (atomResult.length > 0) {
         var _iterator7 = _createForOfIteratorHelper$9(atomResult),
@@ -12814,7 +12814,7 @@ var EraserTool = function () {
             var bond = _step3.value;
             var bondId = ketcherCore.FunctionalGroup.bondsInFunctionalGroup(molecule, functionalGroups, bond);
             var bondFromStruct = bondId !== null && ((_struct$bonds$get = struct.bonds.get(bondId)) === null || _struct$bonds$get === void 0 ? void 0 : _struct$bonds$get.b);
-            if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bondFromStruct, sgroups, functionalGroups, true)) {
+            if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bondFromStruct, sgroups, functionalGroups)) {
               bondsResult.push(bondId);
             }
           }
@@ -12906,7 +12906,7 @@ var EraserTool = function () {
         var _restruct$bonds$get;
         var bondId = ketcherCore.FunctionalGroup.bondsInFunctionalGroup(molecule, functionalGroups, ci.id);
         var bondFromStruct = bondId !== null && ((_restruct$bonds$get = restruct.bonds.get(bondId)) === null || _restruct$bonds$get === void 0 ? void 0 : _restruct$bonds$get.b);
-        if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bondFromStruct, sgroups, functionalGroups, true)) {
+        if (bondFromStruct && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bondFromStruct, sgroups, functionalGroups)) {
           bondResult.push(bondId);
         }
       }
@@ -14320,32 +14320,19 @@ var TemplateTool = function () {
         addSaltsAndSolventsOnCanvasWithoutMerge(restruct, this.template, dragCtx, this.editor);
         return true;
       } else if (((_ci = ci) === null || _ci === void 0 ? void 0 : _ci.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(ci.id, functionalGroups) && this.mode === 'fg') {
-        var closestGroup = this.editor.struct().sgroups.get(ci.id);
-        var isClosestGroupAttached = closestGroup && closestGroup.isGroupAttached(this.editor.struct());
-        if (isClosestGroupAttached) {
-          var groupAttachmentAtomId = this.editor.struct().atoms.find(function (atomId) {
-            var _this$editor$struct$a;
-            return !!((_this$editor$struct$a = _this.editor.struct().atomGetNeighbors(atomId)) !== null && _this$editor$struct$a !== void 0 && _this$editor$struct$a.find(function (neighbor) {
-              return neighbor.aid === closestGroup.getAttAtomId(_this.editor.struct());
-            }));
-          });
-          if (groupAttachmentAtomId !== null) {
-            var _this$editor$struct$a2;
-            var targetPos = ((_this$editor$struct$a2 = this.editor.struct().atoms.get(groupAttachmentAtomId)) === null || _this$editor$struct$a2 === void 0 ? void 0 : _this$editor$struct$a2.pp) || dragCtx.xy0;
-            var eventPos = this.editor.render.page2obj(event);
-            var dist = ketcherCore.Vec2.dist(targetPos, eventPos);
-            ci = {
-              map: 'atoms',
-              dist: dist,
-              id: groupAttachmentAtomId
-            };
-          }
-        }
+        var _struct = this.editor.struct();
+        var closestGroup = _struct.sgroups.get(ci.id);
+        var attachmentAtomId = closestGroup.getAttAtomId(_struct);
+        ci = {
+          map: 'atoms',
+          id: attachmentAtomId
+        };
         this.editor.update(ketcherCore.fromFragmentDeletion(this.editor.render.ctab, {
-          atoms: _toConsumableArray__default["default"](ketcherCore.SGroup.getAtoms(struct, closestGroup)),
-          bonds: _toConsumableArray__default["default"](ketcherCore.SGroup.getBonds(struct, closestGroup))
+          atoms: _toConsumableArray__default["default"](ketcherCore.SGroup.getAtoms(_struct, closestGroup)).filter(function (atomId) {
+            return atomId !== attachmentAtomId;
+          }),
+          bonds: _toConsumableArray__default["default"](ketcherCore.SGroup.getBonds(_struct, closestGroup))
         }));
-        if (!isClosestGroupAttached) ci = null;
       }
       if (!dragCtx.action) {
         if (!ci) {
@@ -15298,7 +15285,7 @@ function findClosestBond(restruct, pos, skip, minDist, scale) {
     if (bid === skipId) return;
     var a1 = restruct.atoms.get(bond.b.begin).a;
     var a2 = restruct.atoms.get(bond.b.end).a;
-    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups, true)) return null;
+    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) return null;
     var mid = ketcherCore.Vec2.lc2(a1.pp, 0.5, a2.pp, 0.5);
     var cdist = ketcherCore.Vec2.dist(pos, mid);
     if (cdist < minCDist) {
@@ -15308,7 +15295,7 @@ function findClosestBond(restruct, pos, skip, minDist, scale) {
   });
   restruct.bonds.forEach(function (bond, bid) {
     if (bid === skipId) return;
-    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups, true)) return null;
+    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) return null;
     var hb = restruct.molecule.halfBonds.get(bond.b.hb1);
     var dir = hb.dir;
     var norm = hb.norm;
@@ -22857,7 +22844,7 @@ var TemplateDialog = function TemplateDialog(props) {
     }), jsxRuntime.jsxs("div", {
       className: classes$8.tabsContent,
       children: [jsxRuntime.jsx(TabPanel, {
-        value: tab,
+        value: thisInitialTab !== null ? initialTab : tab,
         index: TemplateTabs.TemplateLibrary,
         children: jsxRuntime.jsx("div", {
           children: Object.keys(filteredTemplateLib).length ? Object.keys(filteredTemplateLib).map(function (groupName) {
@@ -23724,8 +23711,8 @@ var KetcherBuilder = function () {
                   initApp(element, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.8.0-rc.4" ,
-                    buildDate: "2023-02-22T09:16:14" ,
+                    version: "2.8.0-rc.5" ,
+                    buildDate: "2023-03-02T12:40:56" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });