ketcher-react 3.1.0-rc.5 → 3.2.0-rc.1

package/dist/cjs/script/editor/Editor.d.ts

@@ -77,10 +77,10 @@ declare class Editor implements KetcherEditor {
     setOrigin(): void;
     tool(name?: any, opts?: any): Tool | null;
     clear(): void;
-    renderAndRecoordinateStruct(struct: Struct, needToCenterStruct?: boolean): Struct;
+    renderAndRecoordinateStruct(struct: Struct, needToCenterStruct?: boolean, x?: number, y?: number): Struct;
     /** Apply {@link value}: {@link Struct} if provided to {@link render} and  */
-    struct(value?: Struct, needToCenterStruct?: boolean): Struct;
-    structToAddFragment(value: Struct): Struct;
+    struct(value?: Struct, needToCenterStruct?: boolean, x?: number, y?: number): Struct;
+    structToAddFragment(value: Struct, x?: number, y?: number): Struct;
     setOptions(opts: string): false | import("ketcher-core").RenderOptions;
     /** Apply options from {@link value} */
     options(value?: any): import("ketcher-core").RenderOptions;
@@ -88,6 +88,7 @@ declare class Editor implements KetcherEditor {
     private updateToolAfterOptionsChange;
     zoom(value?: any, event?: WheelEvent): number;
     centerStruct(): void;
+    positionStruct(x: number, y: number): void;
     zoomAccordingContent(struct: Struct): void;
     selection(ci?: any): Selection | null;
     hover(ci: {

package/dist/index.js

@@ -3743,7 +3743,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v3.1.0-rc.5\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("v3.2.0-rc.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -22971,13 +22971,32 @@ var RotateTool = function () {
     key: "mouseup",
     value:
     function mouseup() {
+      var _dragCtx$mergeItems,
+        _this3 = this;
       if (!this.dragCtx) {
         return true;
       }
       this.reStruct.clearSnappingBonds();
       this.editor.update(true);
       var dragCtx = this.dragCtx;
-      var action = dragCtx.action ? fromItemsFuse(this.reStruct, dragCtx.mergeItems).mergeWith(dragCtx.action) : fromItemsFuse(this.reStruct, dragCtx.mergeItems);
+      var isMergingSGroup = false;
+      var _ref = (_dragCtx$mergeItems = dragCtx.mergeItems) !== null && _dragCtx$mergeItems !== void 0 ? _dragCtx$mergeItems : {},
+        atoms = _ref.atoms,
+        bonds = _ref.bonds;
+      atoms === null || atoms === void 0 || atoms.forEach(function (dst, src) {
+        if (_this3.struct.isAtomFromMacromolecule(src) || _this3.struct.isAtomFromMacromolecule(dst)) {
+          isMergingSGroup = true;
+        }
+      });
+      bonds === null || bonds === void 0 || bonds.forEach(function (dst, src) {
+        if (_this3.struct.isBondFromMacromolecule(src) || _this3.struct.isBondFromMacromolecule(dst)) {
+          isMergingSGroup = true;
+        }
+      });
+      var action = dragCtx.action;
+      if (!isMergingSGroup) {
+        action = action ? fromItemsFuse(this.reStruct, dragCtx.mergeItems).mergeWith(action) : fromItemsFuse(this.reStruct, dragCtx.mergeItems);
+      }
       delete this.dragCtx;
       this.editor.update(action);
       if (dragCtx.mergeItems) {
@@ -23092,18 +23111,18 @@ var RotateTool = function () {
   }, {
     key: "partitionNeighborsBySelection",
     value: function partitionNeighborsBySelection(selection, atom) {
-      var _this3 = this;
+      var _this4 = this;
       var rotatableHalfBondIds = [];
       var rotatableHalfBondAngles = [];
       var fixedHalfBondIds = [];
       var fixedHalfBondAngles = [];
       atom.neighbors.forEach(function (halfBondId) {
         var _selection$atoms;
-        var halfBond = _this3.struct.halfBonds.get(halfBondId);
+        var halfBond = _this4.struct.halfBonds.get(halfBondId);
         assert_1(halfBond != null);
         var neighborAtomId = halfBond.end;
         if (selection !== null && selection !== void 0 && (_selection$atoms = selection.atoms) !== null && _selection$atoms !== void 0 && _selection$atoms.includes(neighborAtomId)) {
-          if (!FunctionalGroup.isHalfBondInContractedFunctionalGroup(halfBond, _this3.struct)) {
+          if (!FunctionalGroup.isHalfBondInContractedFunctionalGroup(halfBond, _this4.struct)) {
             rotatableHalfBondIds.push(halfBondId);
             rotatableHalfBondAngles.push(halfBond.ang);
           }
@@ -23122,7 +23141,7 @@ var RotateTool = function () {
   }, {
     key: "snap",
     value: function snap(mouseMoveAngle) {
-      var _this4 = this;
+      var _this5 = this;
       var isSnapping = false;
       var rotateAngle = 0;
       if (!this.snapInfo) {
@@ -23132,18 +23151,18 @@ var RotateTool = function () {
       this.snapInfo.absoluteSnapAngles.some(function (snapAngle, index) {
         if (Math.abs(newRotatedHalfBondAngle - snapAngle) <= MAX_SNAP_DELTA) {
           isSnapping = true;
-          assert_1(_this4.snapInfo != null);
-          rotateAngle = snapAngle - _this4.snapInfo.rotatableHalfBondAngle;
-          _this4.saveSnappingBonds(snapAngle);
-          _this4.snapInfo.snapAngleDrawingProps = {
+          assert_1(_this5.snapInfo != null);
+          rotateAngle = snapAngle - _this5.snapInfo.rotatableHalfBondAngle;
+          _this5.saveSnappingBonds(snapAngle);
+          _this5.snapInfo.snapAngleDrawingProps = {
             isSnapping: isSnapping,
             absoluteAngle: snapAngle,
             relativeAngle: SNAP_ANGLES_RELATIVE_TO_FIXED_BOND[index]
           };
           return true;
         } else if (Math.abs(newRotatedHalfBondAngle - snapAngle) < ANGLE_INDICATOR_VISIBLE_DELTA) {
-          assert_1(_this4.snapInfo != null);
-          _this4.snapInfo.snapAngleDrawingProps = {
+          assert_1(_this5.snapInfo != null);
+          _this5.snapInfo.snapAngleDrawingProps = {
             isSnapping: isSnapping,
             absoluteAngle: snapAngle,
             relativeAngle: SNAP_ANGLES_RELATIVE_TO_FIXED_BOND[index]
@@ -23158,15 +23177,15 @@ var RotateTool = function () {
     key: "saveSnappingBonds",
     value: function saveSnappingBonds(snapAngle) {
       var _this$snapInfo2,
-        _this5 = this;
+        _this6 = this;
       var halfBondsToBeHighlighted = (_this$snapInfo2 = this.snapInfo) === null || _this$snapInfo2 === void 0 ? void 0 : _this$snapInfo2.snapAngleToHalfBonds.get(snapAngle);
       var bondIds = halfBondsToBeHighlighted === null || halfBondsToBeHighlighted === void 0 ? void 0 : halfBondsToBeHighlighted.map(function (halfBond) {
-        var bondId = _this5.struct.getBondIdByHalfBond(halfBond);
+        var bondId = _this6.struct.getBondIdByHalfBond(halfBond);
         assert_1(bondId != null);
         return bondId;
       });
       bondIds === null || bondIds === void 0 || bondIds.forEach(function (bondId) {
-        _this5.reStruct.addSnappingBonds(bondId);
+        _this6.reStruct.addSnappingBonds(bondId);
       });
     }
   }]);
@@ -24534,10 +24553,14 @@ var Editor$3 = function () {
     key: "renderAndRecoordinateStruct",
     value: function renderAndRecoordinateStruct(struct) {
       var needToCenterStruct = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var x = arguments.length > 2 ? arguments[2] : undefined;
+      var y = arguments.length > 3 ? arguments[3] : undefined;
       var action = fromNewCanvas(this.render.ctab, struct);
       this.update(action);
       if (needToCenterStruct) {
         this.centerStruct();
+      } else if (x != null && y != null) {
+        this.positionStruct(x, y);
       }
       return this.render.ctab.molecule;
     }
@@ -24545,22 +24568,33 @@ var Editor$3 = function () {
     key: "struct",
     value: function struct(value) {
       var needToCenterStruct = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var x = arguments.length > 2 ? arguments[2] : undefined;
+      var y = arguments.length > 3 ? arguments[3] : undefined;
       if (arguments.length === 0) {
         return this.render.ctab.molecule;
       }
       KetcherLogger.log('Editor.struct(), start', value, needToCenterStruct);
       this.selection(null);
       var struct = value || new Struct();
-      var molecule = this.renderAndRecoordinateStruct(struct, needToCenterStruct);
+      var molecule = this.renderAndRecoordinateStruct(struct, needToCenterStruct, x, y);
       this.hoverIcon.create();
       KetcherLogger.log('Editor.struct(), end');
       return molecule;
     }
   }, {
     key: "structToAddFragment",
-    value: function structToAddFragment(value) {
-      var superStruct = value.mergeInto(this.render.ctab.molecule.clone());
-      return this.renderAndRecoordinateStruct(superStruct);
+    value: function structToAddFragment(value, x, y) {
+      if (x != null && y != null) {
+        var position = new Vec2(x, y);
+        var _fromPaste = fromPaste(this.render.ctab, value, position, 0),
+          _fromPaste2 = _slicedToArray$1(_fromPaste, 1),
+          action = _fromPaste2[0];
+        this.update(action, true);
+        return this.render.ctab.molecule;
+      } else {
+        var superStruct = value.mergeInto(this.render.ctab.molecule.clone());
+        return this.renderAndRecoordinateStruct(superStruct);
+      }
     }
   }, {
     key: "setOptions",
@@ -24630,6 +24664,17 @@ var Editor$3 = function () {
       var action = fromMultipleMove(structure, structureToMove, shiftVector);
       this.update(action, true);
     }
+  }, {
+    key: "positionStruct",
+    value: function positionStruct(x, y) {
+      var structure = this.render.ctab;
+      var structCenter = getStructCenter(structure);
+      var viewBoxCenter = new Vec2(this.render.viewBox.minX + x, this.render.viewBox.minY + y);
+      var shiftVector = viewBoxCenter.sub(structCenter);
+      var structureToMove = getSelectionMap(structure);
+      var action = fromMultipleMove(structure, structureToMove, shiftVector);
+      this.update(action, true);
+    }
   }, {
     key: "zoomAccordingContent",
     value: function zoomAccordingContent(struct) {
@@ -35000,8 +35045,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "3.1.0-rc.5" ,
-                  buildDate: "2025-02-20T17:53:33" ,
+                  version: "3.2.0-rc.1" ,
+                  buildDate: "2025-03-04T14:36:10" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);
@@ -35293,7 +35338,7 @@ var ModeControl = function ModeControl(_ref3) {
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MacromoleculesEditor = lazy(function () {
-  return import('./index.modern-f8e2203d.js');
+  return import('./index.modern-17b0bd64.js');
 });
 var Editor = function Editor(props) {
   var _useState = useState(false),