ketcher-react 2.13.0-rc.1 → 2.13.0-rc.3

package/dist/index.js

@@ -2576,7 +2576,8 @@ var SettingsManager = function () {
   return SettingsManager;
 }();
 
-var _excluded$y = ["rescale", "fragment"];
+var _excluded$y = ["rescale", "fragment"],
+  _excluded2$6 = ["isPaste"];
 function ownKeys$1b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$1c(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1b(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function onAction(action) {
@@ -2622,7 +2623,7 @@ function removeStructAction() {
 function load(struct, options) {
   return function () {
     var _ref = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee(dispatch, getState) {
-      var state, editor, server, errorHandler, parsedStruct, _options2, fragment, hasUnsupportedGroups, oldStruct, stereAtomsMap;
+      var state, editor, server, errorHandler, _options2, isPaste, otherOptions, parsedStruct, _otherOptions, fragment, hasUnsupportedGroups, oldStruct, stereAtomsMap;
       return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -2632,31 +2633,32 @@ function load(struct, options) {
               server = state.server;
               errorHandler = editor.errorHandler;
               options = options || {};
-              options = _objectSpread$1c(_objectSpread$1c({}, options), {}, {
+              _options2 = options, isPaste = _options2.isPaste, otherOptions = _objectWithoutProperties__default["default"](_options2, _excluded2$6);
+              otherOptions = _objectSpread$1c(_objectSpread$1c({}, otherOptions), {}, {
                 'dearomatize-on-load': editor.options()['dearomatize-on-load'],
                 ignoreChiralFlag: editor.options().ignoreChiralFlag
               });
               dispatch(setAnalyzingFile(true));
-              _context.prev = 7;
-              _context.next = 10;
-              return parseStruct(struct, server, options);
-            case 10:
+              _context.prev = 8;
+              _context.next = 11;
+              return parseStruct(struct, server, otherOptions);
+            case 11:
               parsedStruct = _context.sent;
-              _options2 = options, fragment = _options2.fragment;
+              _otherOptions = otherOptions, fragment = _otherOptions.fragment;
               hasUnsupportedGroups = parsedStruct.sgroups.some(function (sGroup) {
                 return !supportedSGroupTypes[sGroup.type];
               });
               if (!hasUnsupportedGroups) {
-                _context.next = 17;
+                _context.next = 18;
                 break;
               }
-              _context.next = 16;
+              _context.next = 17;
               return editor.event.confirm.dispatch();
-            case 16:
+            case 17:
               parsedStruct.sgroups = parsedStruct.sgroups.filter(function (_key, sGroup) {
                 return supportedSGroupTypes[sGroup.type];
               });
-            case 17:
+            case 18:
               parsedStruct.rescale();
               if (editor.struct().atoms.size) {
                 oldStruct = editor.struct().clone();
@@ -2701,29 +2703,31 @@ function load(struct, options) {
               } else {
                 editor.struct(parsedStruct);
               }
-              editor.zoomAccordingContent();
-              editor.centerStruct();
+              editor.zoomAccordingContent(parsedStruct);
+              if (!isPaste) {
+                editor.centerStruct();
+              }
               dispatch(setAnalyzingFile(false));
               dispatch({
                 type: 'MODAL_CLOSE'
               });
-              _context.next = 35;
+              _context.next = 36;
               break;
-            case 31:
-              _context.prev = 31;
-              _context.t0 = _context["catch"](7);
+            case 32:
+              _context.prev = 32;
+              _context.t0 = _context["catch"](8);
               dispatch(setAnalyzingFile(false));
               _context.t0 && errorHandler && errorHandler(_context.t0.message);
-            case 35:
-              _context.prev = 35;
+            case 36:
+              _context.prev = 36;
               ketcherCore.emitEventRequestIsFinished();
-              return _context.finish(35);
-            case 38:
+              return _context.finish(36);
+            case 39:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[7, 31, 35, 38]]);
+      }, _callee, null, [[8, 32, 36, 39]]);
     }));
     return function (_x, _x2) {
       return _ref.apply(this, arguments);
@@ -2853,6 +2857,11 @@ function serverTransform(method, data, struct) {
     });
   };
 }
+function resetStereoFlagsPosition(struct) {
+  struct.frags.forEach(function (fragment) {
+    return fragment.stereoFlagPosition = undefined;
+  });
+}
 function serverCall(editor, server, method, options, struct) {
   var selection = editor.selection();
   var selectedAtoms = [];
@@ -2863,6 +2872,9 @@ function serverCall(editor, server, method, options, struct) {
       return aidMap.get(aid);
     });
   }
+  if (method === 'layout') {
+    resetStereoFlagsPosition(currentStruct);
+  }
   var ketSerializer = new ketcherCore.KetSerializer();
   return server.then(function () {
     return server[method](Object.assign({
@@ -3090,7 +3102,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.13.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("v2.13.0-rc.3\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -7069,6 +7081,16 @@ var Button = function Button(_ref) {
 var _templateObject$9;
 var Container$1 = styled__default["default"].div(_templateObject$9 || (_templateObject$9 = _taggedTemplateLiteral__default["default"](["\n  > svg {\n    height: 100%;\n    width: 100%;\n  }\n"])));
 
+var normalizeStruct = function normalizeStruct(molV2000StringOrStruct) {
+  if (molV2000StringOrStruct instanceof ketcherCore.Struct) {
+    return molV2000StringOrStruct;
+  }
+  try {
+    return new ketcherCore.MolSerializer().deserialize(molV2000StringOrStruct);
+  } catch (e) {
+    throw Error('Could not parse Struct');
+  }
+};
 var StructRender = function StructRender(_ref) {
   var struct = _ref.struct,
     options = _ref.options,
@@ -7078,7 +7100,8 @@ var StructRender = function StructRender(_ref) {
     var container = renderRef.current;
     if (container) {
       container.innerHTML = '';
-      ketcherCore.RenderStruct.render(container, struct, options);
+      var normalizedStruct = normalizeStruct(struct);
+      ketcherCore.RenderStruct.render(container, normalizedStruct, options);
     }
   }, [struct, options]);
   return jsxRuntime.jsx(Container$1, {
@@ -12584,7 +12607,8 @@ function initClipboard(dispatch) {
     onPaste: function onPaste(data) {
       var structStr = data[ketcherCore.ChemicalMimeType.KET] || data[ketcherCore.ChemicalMimeType.Mol] || data[ketcherCore.ChemicalMimeType.Rxn] || data['text/plain'];
       if (structStr || !rxnTextPlain.test(data['text/plain'])) loadStruct(structStr, {
-        fragment: true
+        fragment: true,
+        isPaste: true
       });
     }
   };
@@ -21432,6 +21456,8 @@ var Editor$3 = function () {
       message: new subscription.Subscription(),
       elementEdit: new subscription.PipelineSubscription(),
       bondEdit: new subscription.PipelineSubscription(),
+      zoomIn: new subscription.PipelineSubscription(),
+      zoomOut: new subscription.PipelineSubscription(),
       rgroupEdit: new subscription.PipelineSubscription(),
       sgroupEdit: new subscription.PipelineSubscription(),
       sdataEdit: new subscription.PipelineSubscription(),
@@ -21584,18 +21610,27 @@ var Editor$3 = function () {
     }
   }, {
     key: "zoomAccordingContent",
-    value: function zoomAccordingContent() {
-      this.zoom(1);
-      var clientAreaBoundingBox = this.render.clientArea.getBoundingClientRect();
-      var paper = this.render.paper;
+    value: function zoomAccordingContent(struct) {
       var MIN_ZOOM_VALUE = 0.1;
       var MAX_ZOOM_VALUE = 1;
-      var MARGIN = 0.02;
-      var newZoomValue = paper.height - clientAreaBoundingBox.height > paper.width - clientAreaBoundingBox.width ? clientAreaBoundingBox.height / paper.height : clientAreaBoundingBox.width / paper.width;
-      newZoomValue -= MARGIN;
-      if (newZoomValue < MAX_ZOOM_VALUE) {
-        this.zoom(newZoomValue < MIN_ZOOM_VALUE ? MIN_ZOOM_VALUE : Number(newZoomValue.toFixed(2)));
+      var MARGIN_IN_PIXELS = 40;
+      var parsedStructCoordBoundingBox = struct.getCoordBoundingBox();
+      var parsedStructSize = new ketcherCore.Vec2(parsedStructCoordBoundingBox.max.x - parsedStructCoordBoundingBox.min.x, parsedStructCoordBoundingBox.max.y - parsedStructCoordBoundingBox.min.y);
+      var parsedStructSizeInPixels = {
+        width: parsedStructSize.x * this.render.options.scale * this.render.options.zoom,
+        height: parsedStructSize.y * this.render.options.scale * this.render.options.zoom
+      };
+      var clientAreaBoundingBox = this.render.clientArea.getBoundingClientRect();
+      if (parsedStructSizeInPixels.width + MARGIN_IN_PIXELS < clientAreaBoundingBox.width && parsedStructSizeInPixels.height + MARGIN_IN_PIXELS < clientAreaBoundingBox.height) {
+        return;
       }
+      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;
+      }
+      newZoomValue -= MARGIN_IN_PIXELS / clientAreaBoundingBox.width;
+      this.zoom(newZoomValue < MIN_ZOOM_VALUE ? MIN_ZOOM_VALUE : Number(newZoomValue.toFixed(2)));
     }
   }, {
     key: "selection",
@@ -23052,7 +23087,7 @@ var InfoPanel$1 = reactRedux.connect(function (store) {
   };
 })(InfoPanel);
 
-var _excluded$o = ["Tag", "className", "indigoVerification", "struct", "tool", "toolOpts", "options", "onInit", "onSelectionChange", "onElementEdit", "onEnhancedStereoEdit", "onQuickEdit", "onBondEdit", "onRgroupEdit", "onSgroupEdit", "onRemoveFG", "onMessage", "onAromatizeStruct", "onDearomatizeStruct", "onAttachEdit", "onCipChange", "onConfirm", "onShowInfo", "onApiSettings", "showAttachmentPoints", "onUpdateFloatingTools"];
+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"];
 function ownKeys$D(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$D(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$D(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$D(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper$9(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$9(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
@@ -23241,6 +23276,8 @@ var StructEditor = function (_Component) {
         _this$props.onEnhancedStereoEdit;
         _this$props.onQuickEdit;
         _this$props.onBondEdit;
+        _this$props.onZoomIn;
+        _this$props.onZoomOut;
         _this$props.onRgroupEdit;
         _this$props.onSgroupEdit;
         _this$props.onRemoveFG;
@@ -29576,7 +29613,9 @@ function initEditor(dispatch, getState) {
     onUpdateFloatingTools: memoizedDebounce(
     function (payload) {
       dispatch(updateFloatingTools(payload));
-    })
+    }),
+    onZoomIn: updateAction,
+    onZoomOut: updateAction
   };
 }
 
@@ -29592,10 +29631,10 @@ var mapDispatchToProps$1 = function mapDispatchToProps(dispatch) {
   var onZoomOut = function onZoomOut() {
     return dispatchAction(dispatch, 'zoom-out');
   };
-  return _objectSpread$2({
-    onZoomIn: onZoomIn,
-    onZoomOut: onZoomOut
-  }, initEditor(dispatch));
+  return _objectSpread$2(_objectSpread$2({}, dispatch(initEditor)), {}, {
+    onZoomOut: onZoomOut,
+    onZoomIn: onZoomIn
+  });
 };
 var Editor$1 = reactRedux.connect(function (state) {
   return {
@@ -29908,11 +29947,12 @@ var App = function App(props) {
     dispatch(initSaltsAndSolventsTemplates());
     window.scrollTo(0, 0);
   }, []);
+  var Editor = Editor$1;
   return jsxRuntime.jsx(material.ThemeProvider, {
     theme: muiTheme,
     children: jsxRuntime.jsxs("div", {
       className: classes$2.app,
-      children: [jsxRuntime.jsx(AppHiddenContainer, {}), jsxRuntime.jsx(Editor$1, {
+      children: [jsxRuntime.jsx(AppHiddenContainer, {}), jsxRuntime.jsx(Editor, {
         className: classes$2.canvas
       }), jsxRuntime.jsx(TopToolbarContainer, {
         className: classes$2.top
@@ -30036,8 +30076,8 @@ var KetcherBuilder = function () {
                   initApp(element, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.13.0-rc.1" ,
-                    buildDate: "2023-07-19T13:49:49" ,
+                    version: "2.13.0-rc.3" ,
+                    buildDate: "2023-08-04T11:43:37" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });