ketcher-react 2.17.0-rc.2 → 2.17.0-rc.3

package/dist/index.js

@@ -3665,7 +3665,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.17.0-rc.2\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.17.0-rc.3\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -21307,28 +21307,17 @@ var TemplatePreview = function () {
           this.previousPosition = this.position;
           this.editor.render.update(false, null);
         } else {
-          this.moveFloatingPreview(previewTarget, event);
+          this.moveFloatingPreview();
         }
       }
     }
   }, {
     key: "moveFloatingPreview",
-    value: function moveFloatingPreview(previewTarget, event) {
+    value: function moveFloatingPreview() {
       var dist = this.position.sub(this.previousPosition);
       this.previousPosition = this.position;
       ketcherCore.fromMultipleMove(this.restruct, this.floatingPreview, dist);
       this.editor.render.update(false, null);
-      this.hoverFusedItems(previewTarget, event);
-    }
-  }, {
-    key: "hoverFusedItems",
-    value: function hoverFusedItems(closestItem, event) {
-      if (this.mode === 'fg') {
-        this.editor.hover(closestItem, null, event);
-      } else {
-        var mergeItems = ketcherCore.getItemsToFuse(this.editor, this.floatingPreview);
-        this.editor.hover(ketcherCore.getHoverToFuse(mergeItems));
-      }
     }
   }, {
     key: "showFloatingPreview",
@@ -21645,10 +21634,10 @@ var TemplateTool = function () {
           var _fromTemplateOnBondAc = ketcherCore.fromTemplateOnBondAction(this.editor.render.ctab, this.template, ci.id, this.editor.event, dragCtx.sign1 * dragCtx.sign2 > 0, false),
             _fromTemplateOnBondAc2 = _slicedToArray__default["default"](_fromTemplateOnBondAc, 2),
             _action = _fromTemplateOnBondAc2[0],
-            _pasteItems = _fromTemplateOnBondAc2[1];
+            pasteItems = _fromTemplateOnBondAc2[1];
           dragCtx.action = _action;
           this.editor.update(dragCtx.action, true);
-          dragCtx.mergeItems = ketcherCore.getItemsToFuse(this.editor, _pasteItems);
+          dragCtx.mergeItems = ketcherCore.getItemsToFuse(this.editor, pasteItems);
           this.editor.hover(ketcherCore.getHoverToFuse(dragCtx.mergeItems));
         }
         return true;
@@ -21687,7 +21676,6 @@ var TemplateTool = function () {
       }
       dragCtx.angle = degrees;
       var action = null;
-      var pasteItems;
       if (!ci) {
         var _this$template;
         var isAddingFunctionalGroup = (_this$template = this.template) === null || _this$template === void 0 || (_this$template = _this$template.molecule) === null || _this$template === void 0 ? void 0 : _this$template.sgroups.size;
@@ -21695,23 +21683,17 @@ var TemplateTool = function () {
           return true;
         }
         var _fromTemplateOnCanvas = ketcherCore.fromTemplateOnCanvas(this.editor.render.ctab, this.template, targetPos, angle);
-        var _fromTemplateOnCanvas2 = _slicedToArray__default["default"](_fromTemplateOnCanvas, 2);
+        var _fromTemplateOnCanvas2 = _slicedToArray__default["default"](_fromTemplateOnCanvas, 1);
         action = _fromTemplateOnCanvas2[0];
-        pasteItems = _fromTemplateOnCanvas2[1];
       } else if ((ci === null || ci === void 0 ? void 0 : ci.map) === 'atoms' || (ci === null || ci === void 0 ? void 0 : ci.map) === 'functionalGroups') {
         var _atomId = getTargetAtomId(this.struct, ci);
         var _fromTemplateOnAtom = ketcherCore.fromTemplateOnAtom(this.editor.render.ctab, this.template, _atomId, angle, extraBond);
-        var _fromTemplateOnAtom2 = _slicedToArray__default["default"](_fromTemplateOnAtom, 2);
+        var _fromTemplateOnAtom2 = _slicedToArray__default["default"](_fromTemplateOnAtom, 1);
         action = _fromTemplateOnAtom2[0];
-        pasteItems = _fromTemplateOnAtom2[1];
         dragCtx.extra_bond = extraBond;
       }
       dragCtx.action = action;
       this.editor.update(dragCtx.action, true);
-      if (!this.isModeFunctionalGroup) {
-        dragCtx.mergeItems = ketcherCore.getItemsToFuse(this.editor, pasteItems);
-        this.editor.hover(ketcherCore.getHoverToFuse(dragCtx.mergeItems));
-      }
       if (this.targetGroupsIds.length) this.targetGroupsIds.length = 0;
       return true;
     }
@@ -21741,12 +21723,17 @@ var TemplateTool = function () {
         return true;
       }
       var action, functionalGroupRemoveAction;
-      var pasteItems = null;
       if (((_ci = ci) === null || _ci === void 0 ? void 0 : _ci.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(ci.id, this.functionalGroups) && this.isModeFunctionalGroup && this.targetGroupsIds.length) {
         var _restruct = this.editor.render.ctab;
         var functionalGroupToReplace = this.struct.sgroups.get(ci.id);
         if (this.isSaltOrSolvent && functionalGroupToReplace.isGroupAttached(this.struct)) {
-          addSaltsAndSolventsOnCanvasWithoutMerge(_restruct, this.template, dragCtx, this.editor);
+          addOnCanvasWithoutMerge({
+            restruct: _restruct,
+            template: this.template,
+            dragCtx: dragCtx,
+            editor: this.editor,
+            event: event
+          });
           return true;
         }
         functionalGroupRemoveAction = new ketcherCore.Action();
@@ -21766,24 +21753,31 @@ var TemplateTool = function () {
       }
       if (!dragCtx.action) {
         if (!ci) {
-          var _fromTemplateOnCanvas3 = ketcherCore.fromTemplateOnCanvas(restruct, this.template, dragCtx.xy0, 0);
-          var _fromTemplateOnCanvas4 = _slicedToArray__default["default"](_fromTemplateOnCanvas3, 2);
-          action = _fromTemplateOnCanvas4[0];
-          pasteItems = _fromTemplateOnCanvas4[1];
-          dragCtx.action = action;
-          this.editor.update(action, true);
+          addOnCanvasWithoutMerge({
+            restruct: restruct,
+            template: this.template,
+            dragCtx: dragCtx,
+            editor: this.editor,
+            event: event
+          });
+          return true;
         } else if (ci.map === 'atoms') {
           var _restruct$atoms$get2;
           var degree = (_restruct$atoms$get2 = restruct.atoms.get(ci.id)) === null || _restruct$atoms$get2 === void 0 ? void 0 : _restruct$atoms$get2.a.neighbors.length;
           if (degree && degree >= 1 && this.isSaltOrSolvent) {
-            addSaltsAndSolventsOnCanvasWithoutMerge(restruct, this.template, dragCtx, this.editor);
+            addOnCanvasWithoutMerge({
+              restruct: restruct,
+              template: this.template,
+              dragCtx: dragCtx,
+              editor: this.editor,
+              event: event
+            });
             return true;
           }
           var angle = getAngleFromEvent(event, ci, restruct);
           var _fromTemplateOnAtom3 = ketcherCore.fromTemplateOnAtom(restruct, this.template, ci.id, angle, false);
-          var _fromTemplateOnAtom4 = _slicedToArray__default["default"](_fromTemplateOnAtom3, 2);
+          var _fromTemplateOnAtom4 = _slicedToArray__default["default"](_fromTemplateOnAtom3, 1);
           action = _fromTemplateOnAtom4[0];
-          pasteItems = _fromTemplateOnAtom4[1];
           if (functionalGroupRemoveAction) {
             action = functionalGroupRemoveAction.mergeWith(action);
           }
@@ -21803,11 +21797,6 @@ var TemplateTool = function () {
           return true;
         }
       }
-      this.editor.selection(null);
-      if (!dragCtx.mergeItems && pasteItems && !this.isModeFunctionalGroup) {
-        dragCtx.mergeItems = ketcherCore.getItemsToFuse(this.editor, pasteItems);
-      }
-      dragCtx.action = dragCtx.action ? ketcherCore.fromItemsFuse(restruct, dragCtx.mergeItems).mergeWith(dragCtx.action) : ketcherCore.fromItemsFuse(restruct, dragCtx.mergeItems);
       var _iterator = _createForOfIteratorHelper$1(restruct.molecule.bonds.keys()),
         _step;
       try {
@@ -21836,11 +21825,7 @@ var TemplateTool = function () {
       if (completeAction && !completeAction.isDummy()) {
         this.editor.update(completeAction);
       }
-      this.editor.hover(this.editor.findItem(event, this.findItems), null, event);
-      this.editor.event.showInfo.dispatch(null);
-      this.editor.event.message.dispatch({
-        info: false
-      });
+      this.editor.hover(this.editor.findItem(event, null), null, event);
       return true;
     }
   }, {
@@ -21864,13 +21849,18 @@ var TemplateTool = function () {
   }]);
   return TemplateTool;
 }();
-function addSaltsAndSolventsOnCanvasWithoutMerge(restruct, template, dragCtx, editor) {
-  var _fromTemplateOnCanvas5 = ketcherCore.fromTemplateOnCanvas(restruct, template, dragCtx.xy0, 0),
-    _fromTemplateOnCanvas6 = _slicedToArray__default["default"](_fromTemplateOnCanvas5, 1),
-    action = _fromTemplateOnCanvas6[0];
+function addOnCanvasWithoutMerge(_ref5) {
+  var restruct = _ref5.restruct,
+    template = _ref5.template,
+    dragCtx = _ref5.dragCtx,
+    editor = _ref5.editor,
+    event = _ref5.event;
+  var _fromTemplateOnCanvas3 = ketcherCore.fromTemplateOnCanvas(restruct, template, dragCtx.xy0, 0, false),
+    _fromTemplateOnCanvas4 = _slicedToArray__default["default"](_fromTemplateOnCanvas3, 1),
+    action = _fromTemplateOnCanvas4[0];
   editor.update(action);
   editor.selection(null);
-  editor.hover(null);
+  editor.hover(editor.findItem(event, null), null, event);
   editor.event.message.dispatch({
     info: false
   });
@@ -32444,8 +32434,8 @@ var KetcherBuilder = function () {
                 initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.17.0-rc.2" ,
-                  buildDate: "2023-12-14T08:19:09" ,
+                  version: "2.17.0-rc.3" ,
+                  buildDate: "2023-12-25T13:38:31" ,
                   buildNumber: ''
                 }, structService, resolve, togglerComponent);
               });