ketcher-react 2.18.0-rc.5 → 2.18.0-rc.7

package/dist/index.modern.js

@@ -3595,7 +3595,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.18.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("v2.18.0-rc.7\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -3619,6 +3619,8 @@ var STRUCT_TYPE = {
 };
 var KETCHER_ROOT_NODE_CLASS_NAME = 'Ketcher-root';
 var KETCHER_ROOT_NODE_CSS_SELECTOR = ".".concat(KETCHER_ROOT_NODE_CLASS_NAME);
+var EditorClassName = 'Ketcher-polymer-editor-root';
+var KETCHER_MACROMOLECULES_ROOT_NODE_SELECTOR = ".".concat(EditorClassName);
 
 var functionalGroupsLib = {
   'functional-groups': {
@@ -9014,9 +9016,11 @@ function throughFileReader(file) {
           cfb.FullPaths.forEach(function (path) {
             if (path.endsWith('.bin')) {
               var ole = CFB.find(cfb, path);
-              var sdf = CFB.find(CFB.parse(ole.content), 'CONTENTS');
-              var base64String = arrayBufferToBase64(sdf.content);
-              structures.push(base64String);
+              var sdf = CFB.find(CFB.parse(ole === null || ole === void 0 ? void 0 : ole.content), 'CONTENTS');
+              var base64String = arrayBufferToBase64(sdf === null || sdf === void 0 ? void 0 : sdf.content);
+              if (base64String.startsWith('VmpDRDAxMDAEAw')) {
+                structures.push(base64String);
+              }
             }
           });
           content = {
@@ -14808,6 +14812,7 @@ var ZoomInput = function ZoomInput(_ref) {
   }, [inputRef]);
   return jsx(StyledInput, {
     ref: inputRef,
+    "data-testid": "zoom-value",
     onFocus: onFocusHandler,
     onKeyDown: onKeyDown
   });
@@ -14896,14 +14901,13 @@ var ZoomControls = function ZoomControls(_ref) {
       open: isExpanded,
       onClose: onClose,
       anchorEl: containerRef.current,
-      container: containerRef.current,
+      container: document.querySelector(KETCHER_ROOT_NODE_CSS_SELECTOR) || document.querySelector(KETCHER_MACROMOLECULES_ROOT_NODE_SELECTOR),
       anchorOrigin: {
         vertical: 'bottom',
         horizontal: 'left'
       },
       children: jsxs(DropDownContent, {
         children: [jsx(ZoomInput, {
-          "data-testid": "zoom-value",
           onZoomSubmit: onZoomSubmit,
           inputRef: inputRef,
           currentZoom: currentZoom,
@@ -25135,6 +25139,8 @@ function setupEditor(editor, props) {
       }
     }
   });
+  editor.render.unobserveCanvasResize();
+  editor.render.observeCanvasResize();
 }
 function removeEditorHandlers(editor, props) {
   Object.keys(editor.event).forEach(function (name) {
@@ -25303,7 +25309,6 @@ var StructEditor = function (_Component) {
         info: JSON.stringify(this.props.toolOpts)
       });
       this.editorRef.current.addEventListener('wheel', this.handleWheel);
-      this.editor.render.observeCanvasResize();
     }
   }, {
     key: "componentWillUnmount",
@@ -28608,7 +28613,7 @@ var mapStateToProps$6 = function mapStateToProps(state) {
 };
 var RgroupLogicContainer = connect(mapStateToProps$6)(RgroupLogic);
 
-var classes$n = {"button-common-styles":"Open-module_button-common-styles__NBSQP","scrollbar":"Open-module_scrollbar__sRvYM","open":"Open-module_open__m8V9g","textareaEditor":"Open-module_textareaEditor__ZbEVj","footerContent":"Open-module_footerContent__Q0hTw","buttonsContainer":"Open-module_buttonsContainer__L1HqU","openButton":"Open-module_openButton__cj3oU","cancelButton":"Open-module_cancelButton__0TQzA","copyButton":"Open-module_copyButton__KlXKd"};
+var classes$n = {"button-common-styles":"Open-module_button-common-styles__NBSQP","scrollbar":"Open-module_scrollbar__sRvYM","open":"Open-module_open__m8V9g","textareaEditor":"Open-module_textareaEditor__ZbEVj","footerContent":"Open-module_footerContent__Q0hTw","buttonsContainer":"Open-module_buttonsContainer__L1HqU","openButton":"Open-module_openButton__cj3oU","cancelButton":"Open-module_cancelButton__0TQzA","copyButton":"Open-module_copyButton__KlXKd","loadingContainer":"Open-module_loadingContainer__Y354t"};
 
 var styles$b = {"analyzingFileWrapper":"AnalyzingFile-module_analyzingFileWrapper__j0Ltf","fileBox":"AnalyzingFile-module_fileBox__ywFIh"};
 
@@ -28794,37 +28799,40 @@ var CDXStructuresViewer = function CDXStructuresViewer(_ref) {
       inputHandler(itemsMap[selectedIndex].base64struct);
     }
   }, [inputHandler, itemsMap, selectedIndex]);
-  var getImages = useCallback(function () {
-    var itemsList = {};
+  var getImage = function getImage(str, index) {
     setLoading(true);
-    var promises = structList.map(function (str) {
-      return parseStruct(str, server).then(function (struct) {
-        return {
-          base64struct: str,
-          struct: struct
-        };
-      })["catch"](function (error) {
-        return {
-          base64struct: str,
-          error: error.message || error
-        };
+    parseStruct(str, server).then(function (struct) {
+      var object = {
+        base64struct: str,
+        struct: struct
+      };
+      setItemsMap(function (state) {
+        return _objectSpread$p(_objectSpread$p({}, state), {}, _defineProperty$1({}, index, object));
       });
-    });
-    Promise.allSettled(promises).then(function (values) {
-      values.forEach(function (el, index) {
-        if (el.status === 'fulfilled') {
-          itemsList[index] = el.value;
-        }
+    })["catch"](function (error) {
+      var object = {
+        base64struct: str,
+        error: error.message || error
+      };
+      setItemsMap(function (state) {
+        return _objectSpread$p(_objectSpread$p({}, state), {}, _defineProperty$1({}, index, object));
       });
-      setItemsMap(itemsList);
+    })["finally"](function () {
       setLoading(false);
-      setSelectedIndex(0);
     });
-  }, [server, structList]);
+  };
   useEffect(function () {
-    getImages();
-  }, [getImages]);
+    if (structList[selectedIndex] && !itemsMap[selectedIndex]) {
+      getImage(structList[selectedIndex], selectedIndex);
+    }
+  }, [itemsMap, selectedIndex]);
   var renderStructure = function renderStructure(structure) {
+    if (loading) {
+      return jsx("div", {
+        className: styles$8.centerWrapper,
+        children: jsx(LoadingCircles, {})
+      });
+    }
     if (structure !== null && structure !== void 0 && structure.error) {
       var _itemsMap$selectedInd;
       return jsxs("div", {
@@ -28852,7 +28860,6 @@ var CDXStructuresViewer = function CDXStructuresViewer(_ref) {
         })
       });
     }
-    var menuList = Object.values(itemsMap) || [];
     return jsxs("div", {
       className: styles$8.structuresWrapper,
       children: [jsxs("div", {
@@ -28861,16 +28868,17 @@ var CDXStructuresViewer = function CDXStructuresViewer(_ref) {
           className: styles$8.header,
           children: "Select structure"
         }), jsx(MenuList, {
-          children: menuList.map(function (value, index) {
+          children: structList.map(function (value, index) {
+            var _itemsMap$index;
             return jsxs(MenuItem, {
               selected: index === selectedIndex,
               onClick: function onClick() {
                 return setSelectedIndex(index);
               },
-              children: ["Structure ".concat(index + 1), value.error && jsx(Icon, {
+              children: ["Structure ".concat(index + 1), ((_itemsMap$index = itemsMap[index]) === null || _itemsMap$index === void 0 ? void 0 : _itemsMap$index.error) && jsx(Icon, {
                 name: "error"
               })]
-            }, value.base64struct + index);
+            }, value + index);
           })
         })]
       }), jsx("div", {
@@ -28886,10 +28894,7 @@ var CDXStructuresViewer = function CDXStructuresViewer(_ref) {
         className: styles$8.fileName,
         children: fileName
       })]
-    }), loading ? jsx("div", {
-      className: styles$8.centerWrapper,
-      children: jsx(LoadingCircles, {})
-    }) : renderStructures()]
+    }), renderStructures()]
   });
 };
 
@@ -28979,6 +28984,10 @@ var Open = function Open(props) {
     _useState10 = _slicedToArray$1(_useState9, 2),
     currentState = _useState10[0],
     setCurrentState = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray$1(_useState11, 2),
+    isLoading = _useState12[0],
+    setIsLoading = _useState12[1];
   useEffect(function () {
     if (server) {
       fileOpener(server).then(function (chosenOpener) {
@@ -28989,6 +28998,7 @@ var Open = function Open(props) {
     }
   }, [server]);
   var onFileLoad = function onFileLoad(files) {
+    setIsLoading(true);
     var onLoad = function onLoad(fileContent) {
       if (fileContent.isPPTX) {
         setStructStr('');
@@ -28998,9 +29008,11 @@ var Open = function Open(props) {
         setStructStr(fileContent);
         setCurrentState(MODAL_STATES.textEditor);
       }
+      setIsLoading(false);
     };
     var onError = function onError() {
-      return errorHandler('Error processing file');
+      setIsLoading(false);
+      errorHandler('Error processing file');
     };
     setFileName(files[0].name);
     opener.chosenOpener(files[0]).then(onLoad, onError);
@@ -29028,7 +29040,7 @@ var Open = function Open(props) {
   if (currentState === MODAL_STATES.imageRec) {
     return jsx(Recognize, _objectSpread$n({}, rest));
   }
-  return jsx(Dialog, {
+  return jsxs(Dialog, {
     title: "Open structure",
     className: classes$n.open,
     params: rest,
@@ -29044,7 +29056,7 @@ var Open = function Open(props) {
     }) : undefined,
     buttons: [],
     withDivider: true,
-    children: jsx(ViewSwitcher, {
+    children: [jsx(ViewSwitcher, {
       isAnalyzingFile: isAnalyzingFile,
       fileName: fileName,
       currentState: currentState,
@@ -29060,7 +29072,10 @@ var Open = function Open(props) {
       inputHandler: setStructStr,
       autoFocus: true,
       structList: structList
-    })
+    }), isLoading && jsx("div", {
+      className: classes$n.loadingContainer,
+      children: jsx(LoadingCircles, {})
+    })]
   });
 };
 
@@ -32766,8 +32781,8 @@ var KetcherBuilder = function () {
                 initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.18.0-rc.5" ,
-                  buildDate: "2024-02-09T16:22:25" ,
+                  version: "2.18.0-rc.7" ,
+                  buildDate: "2024-02-16T18:39:46" ,
                   buildNumber: ''
                 }, structService, resolve, togglerComponent);
               });
@@ -32883,5 +32898,5 @@ function Editor(props) {
   });
 }
 
-export { Accordion$1 as Accordion, Button, Dialog, Editor, Icon, IconButton, IndigoProvider, InfoModal$1 as InfoModal, Input$2 as Input, KETCHER_INIT_EVENT_NAME, KETCHER_ROOT_NODE_CLASS_NAME, KETCHER_ROOT_NODE_CSS_SELECTOR, MODES, STRUCT_TYPE, StructRender, getIconName };
+export { Accordion$1 as Accordion, Button, Dialog, Editor, EditorClassName, Icon, IconButton, IndigoProvider, InfoModal$1 as InfoModal, Input$2 as Input, KETCHER_INIT_EVENT_NAME, KETCHER_MACROMOLECULES_ROOT_NODE_SELECTOR, KETCHER_ROOT_NODE_CLASS_NAME, KETCHER_ROOT_NODE_CSS_SELECTOR, MODES, STRUCT_TYPE, StructRender, getIconName };
 //# sourceMappingURL=index.modern.js.map