ketcher-react 3.2.0-rc.1 → 3.2.0-rc.2

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

@@ -51,6 +51,7 @@ declare class Editor implements KetcherEditor {
         elementEdit: PipelineSubscription;
         zoomIn: PipelineSubscription;
         zoomOut: PipelineSubscription;
+        zoomChanged: PipelineSubscription;
         bondEdit: PipelineSubscription;
         rgroupEdit: PipelineSubscription;
         sgroupEdit: PipelineSubscription;
@@ -80,7 +81,7 @@ declare class Editor implements KetcherEditor {
     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, x?: number, y?: number): Struct;
-    structToAddFragment(value: Struct, x?: number, y?: number): Struct;
+    structToAddFragment(struct: 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,8 +89,9 @@ declare class Editor implements KetcherEditor {
     private updateToolAfterOptionsChange;
     zoom(value?: any, event?: WheelEvent): number;
     centerStruct(): void;
+    centerViewportAccordingToStruct(struct?: Struct): void;
     positionStruct(x: number, y: number): void;
-    zoomAccordingContent(struct: Struct): void;
+    zoomAccordingContent(struct: Struct): boolean;
     selection(ci?: any): Selection | null;
     hover(ci: {
         id: number;

package/dist/cjs/script/ui/state/editor/index.d.ts

@@ -24,5 +24,6 @@ export default function initEditor(dispatch: any, getState: any): {
     onUpdateFloatingTools: (...args: any[]) => void;
     onZoomIn: import("lodash").DebouncedFunc<() => any>;
     onZoomOut: import("lodash").DebouncedFunc<() => any>;
+    onZoomChanged: import("lodash").DebouncedFunc<() => any>;
     onShowMacromoleculesErrorMessage: (payload: any) => any;
 };

package/dist/index.js

@@ -27,7 +27,7 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _classCallCheck$2 from '@babel/runtime/helpers/classCallCheck';
 import _createClass$2 from '@babel/runtime/helpers/createClass';
-import { KetSerializer, MolSerializer, KetcherLogger, Ketcher, defaultBondThickness, FormatterFactory, isClipboardAPIAvailable, notifyCopyCut, notifyRequestCompleted, isControlKey, StereLabelStyleType, StereoColoringType, ShowHydrogenLabels, ShowHydrogenLabelNames, SettingsManager, SdfSerializer, KETCHER_SAVED_OPTIONS_KEY, Bond as Bond$2, Elements, AtomList, getAtomType, StereoLabel, isAttachmentBond, Atom as Atom$2, findStereoAtoms, RxnArrowMode, MULTITAIL_ARROW_TOOL_NAME, SimpleObjectMode, IMAGE_KEY, SGroup as SGroup$1, Pile, identifyStructFormat, SupportedFormat, MULTITAIL_ARROW_KEY, ChemicalMimeType, RenderStruct, Struct, ZoomTool, shortcutStr, MonomerMicromolecule, UnresolvedMonomer, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, ketcherProvider, generateMenuShortcuts, Vec2, Scale, fromMultipleMove, FunctionalGroup, mergeMapOfItemsToSet, fromSgroupDeletion, fromFragmentDeletion, vectorUtils, fromBondAddition, Action, fromAtomAddition, fromAtomsAttrs, checkOverlapping, fromSeveralSgroupAddition, expandSGroupWithMultipleAttachmentPoint, SgContexts, fromSgroupAction, fromItemsFuse, ReBond, setExpandSGroup, fromBondsAttrs, OperationType, ReStruct, imageReferencePositionToCursor, multitailArrowReferenceLinesToCursor, multitailReferencePositionToCursor, CoordinateTransformation, MultitailArrowRefName, fromMultitailArrowHeadTailMove, fromMultitailArrowHeadTailsResize, fromMultitailArrowMove, fromArrowResizing, fromPaste, fromImageResize, fromSimpleObjectResizing, getItemsToFuse, getHoverToFuse, fromTextDeletion, fromTextUpdating, fromTemplateOnCanvas, fromTemplateOnBondAction, fromTemplateOnAtom, BondAttr, AtomAttr, formatProperties, runAsyncAction, getStructStringFromClipboardData, getStructure, initHotKeys, keyNorm, Fragment as Fragment$1, fromRGroupAttachmentPointUpdate, fromOneBondDeletion, bondChangingAction, fromChain, removeInfoLabelFromAtoms, fromStereoFlagUpdate, fromOneAtomDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromRGroupAttachmentPointDeletion, fromImageDeletion, fromMultitailArrowDeletion, notifyItemsToMergeInitializationComplete, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromMultitailArrowCreation, fromPlusAddition, fromRotate, fromFlip, fromSimpleObjectAddition, fromTextCreation, fromImageMove, fromImageCreation, fromHighlightCreate, fromHighlightClear, getOptionsWithConvertedUnits, provideEditorSettings, fromNewCanvas, Render, fromDescriptorsAlign, fromSgroupAttachmentPointAddition, SGroupAttachmentPoint, fromSgroupAddition, atomGetAttr, fromBondFlipping, setExpandMonomerSGroup, fromMultitailArrowTailAdd, MultitailArrow, fromMultitailArrowTailRemove, AmbiguousMonomer, genericsList, getAtomCustomQuery, getFormatMimeTypeByFileName, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, legacyCopy as legacyCopy$1, b64toBlob, Generics, TextCommand, DefaultStructServiceOptions } from 'ketcher-core';
+import { KetSerializer, MolSerializer, KetcherLogger, Ketcher, defaultBondThickness, FormatterFactory, isClipboardAPIAvailable, notifyCopyCut, notifyRequestCompleted, isControlKey, StereLabelStyleType, StereoColoringType, ShowHydrogenLabels, ShowHydrogenLabelNames, SettingsManager, SdfSerializer, KETCHER_SAVED_OPTIONS_KEY, Bond as Bond$2, Elements, AtomList, getAtomType, StereoLabel, isAttachmentBond, Atom as Atom$2, findStereoAtoms, RxnArrowMode, MULTITAIL_ARROW_TOOL_NAME, SimpleObjectMode, IMAGE_KEY, SGroup as SGroup$1, Pile, identifyStructFormat, SupportedFormat, MULTITAIL_ARROW_KEY, ChemicalMimeType, RenderStruct, Struct, ZoomTool, shortcutStr, MonomerMicromolecule, UnresolvedMonomer, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, ketcherProvider, generateMenuShortcuts, Vec2, Scale, fromMultipleMove, FunctionalGroup, mergeMapOfItemsToSet, fromSgroupDeletion, fromFragmentDeletion, vectorUtils, fromBondAddition, Action, fromAtomAddition, fromAtomsAttrs, checkOverlapping, fromSeveralSgroupAddition, expandSGroupWithMultipleAttachmentPoint, SgContexts, fromSgroupAction, fromItemsFuse, ReBond, setExpandSGroup, fromBondsAttrs, OperationType, ReStruct, imageReferencePositionToCursor, multitailArrowReferenceLinesToCursor, multitailReferencePositionToCursor, CoordinateTransformation, MultitailArrowRefName, fromMultitailArrowHeadTailMove, fromMultitailArrowHeadTailsResize, fromMultitailArrowMove, fromArrowResizing, fromPaste, fromImageResize, fromSimpleObjectResizing, getItemsToFuse, getHoverToFuse, fromTextDeletion, fromTextUpdating, fromTemplateOnCanvas, fromTemplateOnBondAction, fromTemplateOnAtom, BondAttr, AtomAttr, formatProperties, runAsyncAction, getStructStringFromClipboardData, getStructure, initHotKeys, keyNorm, Fragment as Fragment$1, fromRGroupAttachmentPointUpdate, fromOneBondDeletion, bondChangingAction, fromChain, removeInfoLabelFromAtoms, fromStereoFlagUpdate, fromOneAtomDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromRGroupAttachmentPointDeletion, fromImageDeletion, fromMultitailArrowDeletion, notifyItemsToMergeInitializationComplete, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromMultitailArrowCreation, fromPlusAddition, fromRotate, fromFlip, fromSimpleObjectAddition, fromTextCreation, fromImageMove, fromImageCreation, fromHighlightCreate, fromHighlightClear, getOptionsWithConvertedUnits, provideEditorSettings, fromNewCanvas, Render, Coordinates, fromDescriptorsAlign, fromSgroupAttachmentPointAddition, SGroupAttachmentPoint, fromSgroupAddition, atomGetAttr, fromBondFlipping, setExpandMonomerSGroup, fromMultitailArrowTailAdd, MultitailArrow, fromMultitailArrowTailRemove, AmbiguousMonomer, genericsList, getAtomCustomQuery, getFormatMimeTypeByFileName, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, legacyCopy as legacyCopy$1, b64toBlob, Generics, TextCommand, DefaultStructServiceOptions } from 'ketcher-core';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _possibleConstructorReturn$2 from '@babel/runtime/helpers/possibleConstructorReturn';
 import _getPrototypeOf$2 from '@babel/runtime/helpers/getPrototypeOf';
@@ -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.2.0-rc.1\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.2\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -24483,6 +24483,7 @@ var Editor$3 = function () {
       bondEdit: new PipelineSubscription(),
       zoomIn: new PipelineSubscription(),
       zoomOut: new PipelineSubscription(),
+      zoomChanged: new PipelineSubscription(),
       rgroupEdit: new PipelineSubscription(),
       sgroupEdit: new PipelineSubscription(),
       sdataEdit: new PipelineSubscription(),
@@ -24583,18 +24584,19 @@ var Editor$3 = function () {
     }
   }, {
     key: "structToAddFragment",
-    value: function structToAddFragment(value, x, y) {
+    value: function structToAddFragment(struct, x, y) {
       if (x != null && y != null) {
         var position = new Vec2(x, y);
-        var _fromPaste = fromPaste(this.render.ctab, value, position, 0),
+        var _fromPaste = fromPaste(this.render.ctab, struct, position, 0, false, true),
           _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);
+        var superStruct = struct.mergeInto(this.render.ctab.molecule.clone());
+        this.renderAndRecoordinateStruct(superStruct);
       }
+      this.centerViewportAccordingToStruct();
+      return this.render.ctab.molecule;
     }
   }, {
     key: "setOptions",
@@ -24664,16 +24666,31 @@ var Editor$3 = function () {
       var action = fromMultipleMove(structure, structureToMove, shiftVector);
       this.update(action, true);
     }
+  }, {
+    key: "centerViewportAccordingToStruct",
+    value: function centerViewportAccordingToStruct() {
+      var struct = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.struct();
+      var isFitMinZoom = this.zoomAccordingContent(struct);
+      var structBbox = struct.getCoordBoundingBox();
+      var newScrollCoordinates = Coordinates.modelToCanvas(isFitMinZoom ? new Vec2(structBbox.min.x + (structBbox.max.x - structBbox.min.x) / 2, structBbox.min.y + (structBbox.max.y - structBbox.min.y) / 2) : new Vec2(structBbox.min.x, structBbox.min.y)).sub(new Vec2(this.render.viewBox.width / 2, this.render.viewBox.height / 2));
+      this.render.setViewBox(function (viewBox) {
+        return _objectSpread$Q(_objectSpread$Q({}, viewBox), {}, {
+          minX: newScrollCoordinates.x,
+          minY: newScrollCoordinates.y
+        });
+      });
+    }
   }, {
     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);
+      var struct = this.struct();
+      var reStruct = this.render.ctab;
+      var structBbox = struct.getCoordBoundingBox();
+      var shiftVector = new Vec2(x, y).sub(structBbox.min);
+      var structureToMove = getSelectionMap(reStruct);
+      var action = fromMultipleMove(reStruct, structureToMove, shiftVector);
       this.update(action, true);
+      this.centerViewportAccordingToStruct();
     }
   }, {
     key: "zoomAccordingContent",
@@ -24689,15 +24706,17 @@ var Editor$3 = function () {
       };
       var clientAreaBoundingBox = this.render.clientArea.getBoundingClientRect();
       if (parsedStructSizeInPixels.width + MARGIN_IN_PIXELS < clientAreaBoundingBox.width && parsedStructSizeInPixels.height + MARGIN_IN_PIXELS < clientAreaBoundingBox.height) {
-        return;
+        return true;
       }
       var newZoomValue = this.render.options.zoom / (parsedStructSizeInPixels.height - clientAreaBoundingBox.height > parsedStructSizeInPixels.width - clientAreaBoundingBox.width ? parsedStructSizeInPixels.height / clientAreaBoundingBox.height : parsedStructSizeInPixels.width / clientAreaBoundingBox.width);
       if (newZoomValue >= MAX_ZOOM_VALUE) {
         this.zoom(MAX_ZOOM_VALUE);
-        return;
+        return true;
       }
       newZoomValue -= MARGIN_IN_PIXELS / clientAreaBoundingBox.width;
       this.zoom(newZoomValue < MIN_ZOOM_VALUE ? MIN_ZOOM_VALUE : Number(newZoomValue.toFixed(2)));
+      this.event.zoomChanged.dispatch();
+      return newZoomValue > MIN_ZOOM_VALUE;
     }
   }, {
     key: "selection",
@@ -27152,7 +27171,7 @@ var InfoTooltip$1 = connect(function (store) {
   };
 })(InfoTooltip);
 
-var _excluded$o = ["Tag", "className", "indigoVerification", "struct", "tool", "toolOpts", "options", "onInit", "onSelectionChange", "onElementEdit", "onEnhancedStereoEdit", "onQuickEdit", "onBondEdit", "onZoomIn", "onZoomOut", "onRgroupEdit", "onSgroupEdit", "onRemoveFG", "onMessage", "onAromatizeStruct", "onDearomatizeStruct", "onAttachEdit", "onCipChange", "onConfirm", "onShowInfo", "onApiSettings", "showAttachmentPoints", "onUpdateFloatingTools", "onShowMacromoleculesErrorMessage", "serverSettings"];
+var _excluded$o = ["Tag", "className", "indigoVerification", "struct", "tool", "toolOpts", "options", "onInit", "onSelectionChange", "onElementEdit", "onEnhancedStereoEdit", "onQuickEdit", "onBondEdit", "onZoomIn", "onZoomOut", "onZoomChanged", "onRgroupEdit", "onSgroupEdit", "onRemoveFG", "onMessage", "onAromatizeStruct", "onDearomatizeStruct", "onAttachEdit", "onCipChange", "onConfirm", "onShowInfo", "onApiSettings", "showAttachmentPoints", "onUpdateFloatingTools", "onShowMacromoleculesErrorMessage", "serverSettings"];
 function ownKeys$G(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$G(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$G(Object(t), !0).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$G(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper$9(t, o, e) { return o = _getPrototypeOf$2(o), _possibleConstructorReturn$2(t, _isNativeReflectConstruct$9() ? Reflect.construct(o, e || [], _getPrototypeOf$2(t).constructor) : o.apply(t, e)); }
@@ -27385,6 +27404,7 @@ var StructEditor = function (_Component) {
         _this$props.onBondEdit;
         _this$props.onZoomIn;
         _this$props.onZoomOut;
+        _this$props.onZoomChanged;
         _this$props.onRgroupEdit;
         _this$props.onSgroupEdit;
         _this$props.onRemoveFG;
@@ -34494,6 +34514,7 @@ function initEditor(dispatch, getState) {
     }),
     onZoomIn: updateAction,
     onZoomOut: updateAction,
+    onZoomChanged: updateAction,
     onShowMacromoleculesErrorMessage: function onShowMacromoleculesErrorMessage(payload) {
       return dispatch(openInfoModalWithCustomMessage(payload));
     }
@@ -35045,8 +35066,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "3.2.0-rc.1" ,
-                  buildDate: "2025-03-04T14:36:10" ,
+                  version: "3.2.0-rc.2" ,
+                  buildDate: "2025-03-17T18:47:38" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);
@@ -35338,7 +35359,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-17b0bd64.js');
+  return import('./index.modern-ef6b0e2f.js');
 });
 var Editor = function Editor(props) {
   var _useState = useState(false),