ketcher-react 2.27.0-rc.2 → 2.28.0-rc.1

package/dist/index.js

@@ -1248,6 +1248,9 @@ var initOptionsState = {
     version: null
   },
   settings: Object.assign(getDefaultOptions(), validation(storage.getItem(ketcherCore.KETCHER_SAVED_OPTIONS_KEY))),
+  getSettings: function getSettings() {
+    this.settings = Object.assign(getDefaultOptions(), validation(storage.getItem(ketcherCore.KETCHER_SAVED_OPTIONS_KEY)));
+  },
   getServerSettings: function getServerSettings() {
     var seriliazedServerOptions = getSerilizedServerOptions(this.settings);
     var defaultServerOptions = fp.pick(SERVER_OPTIONS, this.settings);
@@ -1296,6 +1299,7 @@ function appUpdate(data) {
 function saveSettings(newSettings) {
   storage.setItem(ketcherCore.KETCHER_SAVED_OPTIONS_KEY, newSettings);
   reinitializeTemplateLibrary();
+  initOptionsState.getSettings();
   return {
     type: 'SAVE_SETTINGS',
     data: newSettings
@@ -3798,7 +3802,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.27.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.28.0-rc.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -17790,145 +17794,159 @@ function updateSelectedBonds(_ref) {
 
 function customOnChangeHandler(action, handler) {
   var data = [];
-  action.operations.reverse().forEach(function (operation) {
-    var op = operation._inverted;
-    switch (op.type) {
-      case ketcherCore.OperationType.ATOM_ADD:
-      case ketcherCore.OperationType.ATOM_DELETE:
-        data.push({
-          operation: op.type,
-          id: op.data.aid,
-          label: op.data.atom.label ? op.data.atom.label : '',
-          position: {
-            x: +op.data.pos.x.toFixed(2),
-            y: +op.data.pos.y.toFixed(2)
-          }
-        });
-        break;
-      case ketcherCore.OperationType.ATOM_ATTR:
-        data.push({
-          operation: operation.type,
-          id: operation.data.aid,
-          attribute: operation.data.attribute,
-          from: operation.data.value,
-          to: operation.data2.value
-        });
-        break;
-      case ketcherCore.OperationType.ATOM_MOVE:
-        data.push({
-          operation: op.type,
-          id: op.data.aid,
-          position: {
-            x: +op.data.d.x.toFixed(2),
-            y: +op.data.d.y.toFixed(2)
-          }
-        });
-        break;
-      case ketcherCore.OperationType.BOND_ADD:
-      case ketcherCore.OperationType.BOND_DELETE:
-        data.push({
-          operation: op.type,
-          id: op.data.bid
-        });
-        break;
-      case ketcherCore.OperationType.FRAGMENT_ADD:
-      case ketcherCore.OperationType.FRAGMENT_DELETE:
-        data.push({
-          operation: op.type,
-          id: op.frid
-        });
-        break;
-      case ketcherCore.OperationType.FRAGMENT_ADD_STEREO_ATOM:
-      case ketcherCore.OperationType.FRAGMENT_DELETE_STEREO_ATOM:
-        data.push({
-          operation: op.type,
-          atomId: op.data.aid,
-          fragId: op.data.frid
-        });
-        break;
-      case ketcherCore.OperationType.S_GROUP_ATOM_ADD:
-      case ketcherCore.OperationType.S_GROUP_ATOM_REMOVE:
-        data.push({
-          operation: op.type,
-          atomId: op.data.aid,
-          sGroupId: op.data.sgid
-        });
-        break;
-      case ketcherCore.OperationType.S_GROUP_CREATE:
-      case ketcherCore.OperationType.S_GROUP_DELETE:
-        data.push({
-          operation: op.type,
-          type: op.data.type,
-          sGroupId: op.data.sgid
-        });
-        break;
-      case ketcherCore.OperationType.RXN_ARROW_ADD:
-      case ketcherCore.OperationType.RXN_ARROW_DELETE:
-        data.push({
-          operation: op.type,
-          id: op.data.id,
-          mode: op.data.mode,
-          position: op.data.pos.map(function (pos) {
-            return {
-              x: +pos.x.toFixed(2),
-              y: +pos.y.toFixed(2)
-            };
-          })
-        });
-        break;
-      case ketcherCore.OperationType.RXN_ARROW_RESIZE:
-        data.push({
-          operation: op.type,
-          id: op.data.id
-        });
-        break;
-      case ketcherCore.OperationType.RXN_ARROW_MOVE:
-        data.push({
-          operation: op.type,
-          id: op.data.id,
-          position: {
-            x: +op.data.d.x.toFixed(2),
-            y: +op.data.d.y.toFixed(2)
-          }
-        });
-        break;
-      case ketcherCore.OperationType.R_GROUP_FRAGMENT:
-        data.push({
-          operation: operation.type,
-          id: op.frid
-        });
-        break;
-      case ketcherCore.OperationType.SIMPLE_OBJECT_ADD:
-      case ketcherCore.OperationType.SIMPLE_OBJECT_DELETE:
-        data.push({
-          operation: op.type,
-          id: op.data.id,
-          mode: op.data.mode
-        });
-        break;
-      case ketcherCore.OperationType.SIMPLE_OBJECT_RESIZE:
-        data.push({
-          operation: op.type,
-          id: op.data.id
-        });
-        break;
-      case ketcherCore.OperationType.SIMPLE_OBJECT_MOVE:
-        data.push({
-          operation: operation.type,
-          id: operation.data.id,
-          position: {
-            x: +operation.data.d.x.toFixed(2),
-            y: +operation.data.d.y.toFixed(2)
-          }
-        });
-        break;
-      default:
-        data.push({
-          operation: op.type
-        });
-    }
-  });
-  return handler(data);
+  if (action === undefined) {
+    return handler();
+  } else {
+    if (window.isPolymerEditorTurnedOn) {
+      return handleMacroChanges(handler);
+    } else {
+      return handleMicroChanges(action, handler);
+    }
+  }
+  function handleMacroChanges(handler) {
+    return handler();
+  }
+  function handleMicroChanges(action, handler) {
+    action.operations.reverse().forEach(function (operation) {
+      var op = operation._inverted;
+      switch (op.type) {
+        case ketcherCore.OperationType.ATOM_ADD:
+        case ketcherCore.OperationType.ATOM_DELETE:
+          data.push({
+            operation: op.type,
+            id: op.data.aid,
+            label: op.data.atom.label ? op.data.atom.label : '',
+            position: {
+              x: +op.data.pos.x.toFixed(2),
+              y: +op.data.pos.y.toFixed(2)
+            }
+          });
+          break;
+        case ketcherCore.OperationType.ATOM_ATTR:
+          data.push({
+            operation: operation.type,
+            id: operation.data.aid,
+            attribute: operation.data.attribute,
+            from: operation.data.value,
+            to: operation.data2.value
+          });
+          break;
+        case ketcherCore.OperationType.ATOM_MOVE:
+          data.push({
+            operation: op.type,
+            id: op.data.aid,
+            position: {
+              x: +op.data.d.x.toFixed(2),
+              y: +op.data.d.y.toFixed(2)
+            }
+          });
+          break;
+        case ketcherCore.OperationType.BOND_ADD:
+        case ketcherCore.OperationType.BOND_DELETE:
+          data.push({
+            operation: op.type,
+            id: op.data.bid
+          });
+          break;
+        case ketcherCore.OperationType.FRAGMENT_ADD:
+        case ketcherCore.OperationType.FRAGMENT_DELETE:
+          data.push({
+            operation: op.type,
+            id: op.frid
+          });
+          break;
+        case ketcherCore.OperationType.FRAGMENT_ADD_STEREO_ATOM:
+        case ketcherCore.OperationType.FRAGMENT_DELETE_STEREO_ATOM:
+          data.push({
+            operation: op.type,
+            atomId: op.data.aid,
+            fragId: op.data.frid
+          });
+          break;
+        case ketcherCore.OperationType.S_GROUP_ATOM_ADD:
+        case ketcherCore.OperationType.S_GROUP_ATOM_REMOVE:
+          data.push({
+            operation: op.type,
+            atomId: op.data.aid,
+            sGroupId: op.data.sgid
+          });
+          break;
+        case ketcherCore.OperationType.S_GROUP_CREATE:
+        case ketcherCore.OperationType.S_GROUP_DELETE:
+          data.push({
+            operation: op.type,
+            type: op.data.type,
+            sGroupId: op.data.sgid
+          });
+          break;
+        case ketcherCore.OperationType.RXN_ARROW_ADD:
+        case ketcherCore.OperationType.RXN_ARROW_DELETE:
+          data.push({
+            operation: op.type,
+            id: op.data.id,
+            mode: op.data.mode,
+            position: op.data.pos.map(function (pos) {
+              return {
+                x: +pos.x.toFixed(2),
+                y: +pos.y.toFixed(2)
+              };
+            })
+          });
+          break;
+        case ketcherCore.OperationType.RXN_ARROW_RESIZE:
+          data.push({
+            operation: op.type,
+            id: op.data.id
+          });
+          break;
+        case ketcherCore.OperationType.RXN_ARROW_MOVE:
+          data.push({
+            operation: op.type,
+            id: op.data.id,
+            position: {
+              x: +op.data.d.x.toFixed(2),
+              y: +op.data.d.y.toFixed(2)
+            }
+          });
+          break;
+        case ketcherCore.OperationType.R_GROUP_FRAGMENT:
+          data.push({
+            operation: operation.type,
+            id: op.frid
+          });
+          break;
+        case ketcherCore.OperationType.SIMPLE_OBJECT_ADD:
+        case ketcherCore.OperationType.SIMPLE_OBJECT_DELETE:
+          data.push({
+            operation: op.type,
+            id: op.data.id,
+            mode: op.data.mode
+          });
+          break;
+        case ketcherCore.OperationType.SIMPLE_OBJECT_RESIZE:
+          data.push({
+            operation: op.type,
+            id: op.data.id
+          });
+          break;
+        case ketcherCore.OperationType.SIMPLE_OBJECT_MOVE:
+          data.push({
+            operation: operation.type,
+            id: operation.data.id,
+            position: {
+              x: +operation.data.d.x.toFixed(2),
+              y: +operation.data.d.y.toFixed(2)
+            }
+          });
+          break;
+        default:
+          data.push({
+            operation: op.type
+          });
+      }
+    });
+    return handler(data);
+  }
 }
 
 function getSelectionMap(structure) {
@@ -24632,6 +24650,7 @@ var Editor$3 = function () {
       if (!wasViewOnlyEnabled && isViewOnlyEnabled === true || wasViewOnlyEnabled && isViewOnlyEnabled === false) {
         this.tool('select');
         this.event.change.dispatch('force');
+        ketcherCore.ketcherProvider.getKetcher().changeEvent.dispatch('force');
       }
     }
   }, {
@@ -24760,6 +24779,7 @@ var Editor$3 = function () {
           }
           this.historyPtr = this.historyStack.length;
           this.event.change.dispatch(action);
+          ketcherCore.ketcherProvider.getKetcher().changeEvent.dispatch(action);
         }
         this.render.update(false, null);
       }
@@ -24775,6 +24795,7 @@ var Editor$3 = function () {
   }, {
     key: "undo",
     value: function undo() {
+      var ketcherChangeEvent = ketcherCore.ketcherProvider.getKetcher().changeEvent;
       if (this.historyPtr === 0) {
         throw new Error('Undo stack is empty');
       }
@@ -24788,14 +24809,17 @@ var Editor$3 = function () {
       this.historyStack[this.historyPtr] = action;
       if (this._tool instanceof toolsMap.paste) {
         this.event.change.dispatch();
+        ketcherChangeEvent.dispatch();
       } else {
         this.event.change.dispatch(action);
+        ketcherChangeEvent.dispatch(action);
       }
       this.render.update();
     }
   }, {
     key: "redo",
     value: function redo() {
+      var ketcherChangeEvent = ketcherCore.ketcherProvider.getKetcher().changeEvent;
       if (this.historyPtr === this.historyStack.length) {
         throw new Error('Redo stack is empty');
       }
@@ -24808,8 +24832,10 @@ var Editor$3 = function () {
       this.historyPtr++;
       if (this._tool instanceof toolsMap.paste) {
         this.event.change.dispatch();
+        ketcherChangeEvent.dispatch();
       } else {
         this.event.change.dispatch(action);
+        ketcherChangeEvent.dispatch(action);
       }
       this.render.update();
     }
@@ -24826,7 +24852,7 @@ var Editor$3 = function () {
               return customOnChangeHandler(action, handler);
             };
             subscriber.handler = subscribeFuncWrapper;
-            this.event[eventName].add(subscribeFuncWrapper);
+            ketcherCore.ketcherProvider.getKetcher().changeEvent.add(subscribeFuncWrapper);
             break;
           }
         default:
@@ -27961,7 +27987,7 @@ var Select = function Select(_ref2) {
   });
 };
 
-var classes$B = {"button-common-styles":"form-module_button-common-styles__BvKSn","scrollbar":"form-module_scrollbar__MgLtc","inputWithExtraLabel":"form-module_inputWithExtraLabel__Y--OH","extraLabel":"form-module_extraLabel__2IE13","dataError":"form-module_dataError__IXK1h","inputWrapper":"form-module_inputWrapper__sIDHH","inputWithEditButtonWrapper":"form-module_inputWithEditButtonWrapper__hM70e","editButton":"form-module_editButton__zLQI5"};
+var classes$B = {"button-common-styles":"form-module_button-common-styles__BvKSn","scrollbar":"form-module_scrollbar__MgLtc","inputWithExtraLabel":"form-module_inputWithExtraLabel__Y--OH","extraLabel":"form-module_extraLabel__2IE13","dataError":"form-module_dataError__IXK1h","inputWrapper":"form-module_inputWrapper__sIDHH","inputWithEditButtonWrapper":"form-module_inputWithEditButtonWrapper__hM70e","editButton":"form-module_editButton__zLQI5","divWithTooltipAndAboutIcon":"form-module_divWithTooltipAndAboutIcon__rnNIB"};
 
 var _excluded$m = ["schema", "result"],
   _excluded2$3 = ["labelPos", "title", "children"],
@@ -28088,11 +28114,33 @@ function Label(_ref) {
     props = _objectWithoutProperties__default["default"](_ref, _excluded2$3);
   var tooltip = props.tooltip ? props.tooltip : null;
   return jsxRuntime.jsxs("label", _objectSpread$D(_objectSpread$D({}, props), {}, {
-    children: [title && labelPos !== 'after' ? jsxRuntime.jsx("span", {
-      title: tooltip,
+    children: [title && labelPos !== 'after' ? tooltip ? jsxRuntime.jsxs("div", {
+      className: clsx__default["default"](_defineProperty__default["default"]({}, classes$B.divWithTooltipAndAboutIcon, true)),
+      children: [jsxRuntime.jsx("span", {
+        children: title
+      }), jsxRuntime.jsx(material.Tooltip, {
+        title: tooltip,
+        children: jsxRuntime.jsx("div", {
+          children: jsxRuntime.jsx(Icon, {
+            name: "about"
+          })
+        })
+      })]
+    }) : jsxRuntime.jsx("span", {
       children: title
-    }) : '', children, title && labelPos === 'after' ? jsxRuntime.jsx("span", {
-      title: tooltip,
+    }) : '', children, title && labelPos === 'after' ? tooltip ? jsxRuntime.jsxs("div", {
+      className: clsx__default["default"](_defineProperty__default["default"]({}, classes$B.divWithTooltipAndAboutIcon, true)),
+      children: [jsxRuntime.jsx(material.Tooltip, {
+        title: tooltip,
+        children: jsxRuntime.jsx("div", {
+          children: jsxRuntime.jsx(Icon, {
+            name: "about"
+          })
+        })
+      }), jsxRuntime.jsx("span", {
+        children: title
+      })]
+    }) : jsxRuntime.jsx("span", {
       children: title
     }) : '']
   }));
@@ -29172,7 +29220,7 @@ var SettingsDialog = function SettingsDialog(props) {
   return jsxRuntime.jsx(Dialog, {
     className: classes$x.settings,
     result: function result() {
-      return formState.result;
+      return [formState.result, initState];
     },
     valid: function valid() {
       return formState.valid;
@@ -29226,8 +29274,20 @@ var mapDispatchToProps$d = function mapDispatchToProps(dispatch, ownProps) {
       return dispatch(setDefaultSettings());
     },
     onOk: function onOk(res) {
-      dispatch(saveSettings(res));
-      ownProps.onOk(res);
+      var _res = _slicedToArray__default["default"](res, 2),
+        result = _res[0],
+        initState = _res[1];
+      dispatch(saveSettings(result));
+      ownProps.onOk(result);
+      var showNotification = initState.reactionComponentMarginSize !== result.reactionComponentMarginSize;
+      showNotification && dispatch(onAction({
+        dialog: 'info-modal',
+        prop: {
+          title: '',
+          customText: 'To fully apply these changes, you need to apply the layout.',
+          button: 'OK'
+        }
+      }));
     },
     onACSStyle: function onACSStyle(result) {
       dispatch(updateFormState({
@@ -31235,7 +31295,7 @@ function couldBeSaved(struct, format) {
     if (hasRxnArrow) {
       var arrayOfArrows = Array.from(struct.rxnArrows.values());
       var rxnArrowMode = arrayOfArrows[0].mode;
-      if (rxnArrowMode !== ketcherCore.RxnArrowMode.OpenAngle) {
+      if (![ketcherCore.RxnArrowMode.OpenAngle, ketcherCore.RxnArrowMode.Retrosynthetic].includes(rxnArrowMode)) {
         warnings.push("The ".concat(formatName, " format does not support drawn elements: the reaction ").concat(rxnArrowMode, " arrow will be replaced with the reaction arrow"));
       }
     }
@@ -31557,6 +31617,22 @@ var SaveDialog = function (_Component) {
         })]
       });
     });
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "handleCopy", function (event) {
+      var structStr = _this.state.structStr;
+      try {
+        if (ketcherCore.isClipboardAPIAvailable()) {
+          navigator.clipboard.writeText(structStr);
+        } else {
+          ketcherCore.legacyCopy(event.clipboardData, {
+            'text/plain': structStr
+          });
+          event.preventDefault();
+        }
+      } catch (e) {
+        ketcherCore.KetcherLogger.error('copyAs.js::copyAs', e);
+        _this.props.editor.errorHandler('This feature is not available in your browser');
+      }
+    });
     _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "renderSaveFile", function () {
       var formState = Object.assign({}, _this.props.formState);
       delete formState.moleculeErrors;
@@ -31595,15 +31671,20 @@ var SaveDialog = function (_Component) {
       };
       var PreviewContent = function PreviewContent(_ref3) {
         var format = _ref3.format;
-        return jsxRuntime.jsx("div", {
+        return jsxRuntime.jsxs("div", {
           className: classes$l.previewBackground,
-          children: jsxRuntime.jsx("textarea", {
+          children: [jsxRuntime.jsx("textarea", {
             value: structStr,
             className: classes$l.previewArea,
             readOnly: true,
             ref: _this.textAreaRef,
             "data-testid": "".concat(format, "-preview-area-text")
-          })
+          }), jsxRuntime.jsx(IconButton, {
+            onClick: _this.handleCopy,
+            iconName: "copy",
+            title: "Copy to clipboard",
+            testId: "copy-to-clipboard"
+          })]
         });
       };
       if (isLoading) {
@@ -34050,12 +34131,12 @@ var PasteErrorModalBody = function PasteErrorModalBody() {
 var styles = {"infoModal":"InfoModal-module_infoModal__0Vza1","ok":"InfoModal-module_ok__BZ1ar"};
 
 function ErrorInfoModal(props) {
-  var _config$paste$title;
+  var _config$paste$title, _props$title;
   var paste = (_config$paste$title = configWithNonViewOnlyActionsDisabled.paste.title) !== null && _config$paste$title !== void 0 ? _config$paste$title : 'Paste';
   var isPasteError = props.message === paste;
   var defaultCutCopyMessage = "This action is unavailable via menu. Instead, use shortcut to ".concat(props.message, ".");
   var headerContent = jsxRuntime.jsx("div", {
-    children: error.message
+    children: (_props$title = props.title) !== null && _props$title !== void 0 ? _props$title : error.message
   });
   return jsxRuntime.jsx(Dialog, {
     className: styles.infoModal,
@@ -34063,7 +34144,7 @@ function ErrorInfoModal(props) {
     buttons: [jsxRuntime.jsx("button", {
       onClick: props.onOk,
       className: styles.ok,
-      children: "Close"
+      children: props.button || 'Close'
     }, "ok")],
     headerContent: headerContent,
     children: jsxRuntime.jsx("div", {
@@ -34733,7 +34814,6 @@ var App = function App(props) {
     checkServer();
     dispatch(initFGTemplates());
     dispatch(initSaltsAndSolventsTemplates());
-    window.scrollTo(0, 0);
     return function () {
       dispatch(initLib([]));
       dispatch(initSaltsAndSolvents([]));
@@ -34949,8 +35029,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.27.0-rc.2" ,
-                  buildDate: "2024-11-12T19:33:40" ,
+                  version: "2.28.0-rc.1" ,
+                  buildDate: "2024-12-03T17:11:53" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);