ketcher-react 2.7.0-rc.2 → 2.7.0-rc.3

package/dist/index.modern.js

@@ -24,7 +24,7 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import { KetSerializer, MolSerializer, Ketcher, FormatterFactory, StereLabelStyleType, StereoColoringType, Bond as Bond$2, Elements, AtomList, StereoLabel, findStereoAtoms, RxnArrowMode, SimpleObjectMode, SGroup, Pile, getStereoAtomsMap, identifyStructFormat, ChemicalMimeType, SdfSerializer, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, formatProperties, fromAtomsAttrs, Vec2, FunctionalGroup, Fragment as Fragment$1, OperationType, fracAngle, Action, fromSgroupDeletion, fromFragmentDeletion, fromAtomAddition, fromBondAddition, Atom as Atom$2, bondChangingAction, fromBondsAttrs, fromChain, getItemsToFuse, getHoverToFuse, fromItemsFuse, fromStereoFlagUpdate, Scale, checkOverlapping, fromSeveralSgroupAddition, SgContexts, fromSgroupAction, fromSimpleObjectResizing, fromArrowResizing, fromMultipleMove, fromTextDeletion, fromTextUpdating, fromOneAtomDeletion, fromOneBondDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromPaste, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromBondAlign, fromSimpleObjectAddition, fromTemplateOnBondAction, fromTemplateOnCanvas, fromTemplateOnAtom, fromTextCreation, fromHighlightCreate, fromHighlightClear, fromNewCanvas, Struct, Render, fromDescriptorsAlign, setExpandSGroup, SupportedFormat, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, Generics, TextCommand } from 'ketcher-core';
+import { KetSerializer, MolSerializer, Ketcher, FormatterFactory, StereLabelStyleType, StereoColoringType, Bond as Bond$2, Elements, AtomList, StereoLabel, findStereoAtoms, RxnArrowMode, SimpleObjectMode, SGroup, Pile, getStereoAtomsMap, identifyStructFormat, SupportedFormat, ChemicalMimeType, SdfSerializer, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, formatProperties, fromAtomsAttrs, Vec2, FunctionalGroup, Fragment as Fragment$1, OperationType, fracAngle, Action, fromSgroupDeletion, fromFragmentDeletion, fromAtomAddition, fromBondAddition, Atom as Atom$2, bondChangingAction, fromBondsAttrs, fromChain, getItemsToFuse, getHoverToFuse, fromItemsFuse, fromStereoFlagUpdate, Scale, checkOverlapping, fromSeveralSgroupAddition, SgContexts, fromSgroupAction, fromSimpleObjectResizing, fromArrowResizing, fromMultipleMove, fromTextDeletion, fromTextUpdating, fromOneAtomDeletion, fromOneBondDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromPaste, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromBondAlign, fromSimpleObjectAddition, fromTemplateOnBondAction, fromTemplateOnCanvas, fromTemplateOnAtom, fromTextCreation, fromHighlightCreate, fromHighlightClear, fromNewCanvas, Struct, Render, fromDescriptorsAlign, setExpandSGroup, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, Generics, TextCommand } from 'ketcher-core';
 import * as React from 'react';
 import React__default, { createRef, Component, useState, useEffect, useRef, useMemo, createElement, forwardRef, useCallback, useLayoutEffect, Fragment as Fragment$2 } from 'react';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
@@ -40,7 +40,7 @@ import ReactDOM from 'react-dom';
 import { connect, useDispatch, useSelector, Provider } from 'react-redux';
 import { combineReducers, createStore as createStore$1, applyMiddleware } from 'redux';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
-import 'redux-logger';
+import { logger } from 'redux-logger';
 import thunk from 'redux-thunk';
 import { throttle as throttle$1, inRange, isEqual as isEqual$1, range as range$1 } from 'lodash';
 import useResizeObserver from 'use-resize-observer/polyfilled';
@@ -366,6 +366,7 @@ function _copy(cb, data) {
         cb.setData(fmt, data[fmt]);
       });
     } catch (ex) {
+      console.info("Could not write exact type ".concat(curFmt));
     }
   }
 }
@@ -691,6 +692,7 @@ var storage = {
     try {
       item = JSON.parse(localStorage.getItem(key));
     } catch (ex) {
+      console.info('LocalStorage:', ex.name);
     }
     return item;
   },
@@ -700,6 +702,7 @@ var storage = {
       localStorage.setItem(key, JSON.stringify(data));
       isSet = true;
     } catch (ex) {
+      console.info('LocalStorage:', ex.name);
       isSet = false;
     }
     return isSet;
@@ -834,6 +837,7 @@ function constant(schema, prop) {
   return desc.constant || desc["enum"][0];
 }
 function mapOf(schema, prop) {
+  console.assert(schema.oneOf);
   return schema.oneOf.reduce(function (res, desc) {
     res[constant(desc, prop)] = desc;
     return res;
@@ -2422,6 +2426,9 @@ function parseStruct(struct, server, options) {
         _options.fragment;
         var formatterOptions = _objectWithoutProperties(_options, _excluded$D);
     var format = identifyStructFormat(struct);
+    if (format === SupportedFormat.cdx) {
+      struct = "base64::".concat(struct.replace(/\s/g, ''));
+    }
     var factory = new FormatterFactory(server);
     var service = factory.create(format, formatterOptions);
     return service.getStructureFromStringAsync(struct);
@@ -2870,7 +2877,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.7.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.7.0-rc.3\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -7640,7 +7647,9 @@ function execute(activeTool, _ref) {
     }
   } else if (typeof action === 'function') {
     action(editor, server, options);
-  } else ;
+  } else {
+    console.info('no action');
+  }
   return activeTool;
 }
 function selected(actObj, activeTool, _ref2) {
@@ -8023,6 +8032,9 @@ function createStore (options, server, setEditor) {
     templates: initTmplsState
   };
   var middleware = [thunk];
+  if (process.env.KETCHER_ENABLE_REDUX_LOGGER === 'true') {
+    middleware.push(logger);
+  }
   var rootReducer = getRootReducer(setEditor);
   return createStore$1(rootReducer, initState, applyMiddleware.apply(void 0, middleware));
 }
@@ -9609,6 +9621,7 @@ var TopToolbar = function TopToolbar(_ref) {
       isCollapsed: width < collapseLimit
     }), jsx(SystemControls, {
       onHistoryClick: function onHistoryClick() {
+        console.log('History button clicked');
       },
       onSettingsOpen: onSettingsOpen,
       onFullscreen: onFullscreen,
@@ -12385,6 +12398,7 @@ function sgroupDialog(editor, id, defaultType) {
   var type = sg ? sg.type : defaultType;
   var eventName = type === 'DAT' ? 'sdataEdit' : 'sgroupEdit';
   if (!selection.atoms && !selection.bonds && !sg) {
+    console.info('There is no selection or sgroup');
     return;
   }
   var attrs;
@@ -13262,6 +13276,7 @@ var EraserTool = function () {
       } else if (ci.map === 'texts') {
         this.editor.update(fromTextDeletion(restruct, ci.id));
       } else {
+        console.error('EraserTool: unable to delete the object ' + ci.map + '[' + ci.id + ']');
         return;
       }
       this.editor.selection(null);
@@ -15337,6 +15352,7 @@ function domEventSetup(editor, clientArea) {
 }
 function recoordinate(editor, rp
 ) {
+  console.assert(rp, 'Reference point not specified');
   if (rp) {
     editor.render.setScrollOffset(rp.x, rp.y);
   } else {
@@ -16572,17 +16588,18 @@ function fileOpener(server) {
   });
 }
 function throughFileReader(file) {
+  var isCDX = file.name.endsWith('cdx');
   return new Promise(function (resolve, reject) {
     var rd = new FileReader();
     rd.onload = function () {
-      var content = rd.result;
+      var content = isCDX ? rd.result.slice(37) : rd.result;
       if (file.msClose) file.msClose();
       resolve(content);
     };
     rd.onerror = function (event) {
       reject(event);
     };
-    rd.readAsText(file, 'UTF-8');
+    isCDX ? rd.readAsDataURL(file) : rd.readAsText(file, 'UTF-8');
   });
 }
 function throughFileSystemObject(fso, file) {
@@ -16607,6 +16624,7 @@ function greekify(str) {
   });
 }
 function filterLib(lib, filter$1) {
+  console.warn('Filter', filter$1);
   var trimmedFilter = filter$1.trim();
   var re = new RegExp(escapeRegExp(greekify(trimmedFilter)), 'i');
   return flow(filter(function (item) {
@@ -16617,6 +16635,7 @@ function filterLib(lib, filter$1) {
   }, {}))(lib);
 }
 function filterFGLib(lib, filter$1) {
+  console.warn('Filter', filter$1);
   var trimmedFilter = filter$1.trim();
   var re = new RegExp(escapeRegExp(greekify(trimmedFilter)), 'i');
   var searchFunction = function searchFunction(item) {
@@ -17672,6 +17691,7 @@ var mapDispatchToProps$b = function mapDispatchToProps(dispatch, ownProps) {
           result: JSON.parse(newOpts)
         }));
       } catch (ex) {
+        console.info('Bad file');
       }
     },
     onReset: function onReset() {
@@ -18375,7 +18395,7 @@ var MiewDialog = function MiewDialog(_ref) {
     }).then(function () {
       return miew.setOptions(miewOpts);
     })["catch"](function (ex) {
-      return (void 0);
+      return console.error(ex.message);
     });
   }, [miewOpts, server, struct]);
   var exportCML = useCallback(function () {
@@ -19606,7 +19626,8 @@ var SaveDialog = function (_Component) {
     _this.isRxn = _this.props.struct.hasRxnArrow();
     _this.textAreaRef = createRef();
     var formats = [_this.isRxn ? 'rxn' : 'mol', 'smiles', 'ket'];
-    if (_this.props.server) formats.push(_this.isRxn ? 'rxnV3000' : 'molV3000', 'smilesExt', 'smarts', 'inChI', 'inChIAuxInfo', 'cml', 'svg', 'png', 'cdxml');
+    if (_this.props.server) formats.push(_this.isRxn ? 'rxnV3000' : 'molV3000', 'smilesExt', 'smarts', 'inChI', 'inChIAuxInfo', 'cml', 'svg', 'png', 'cdxml'
+    );
     _this.saveSchema = saveSchema;
     _this.saveSchema.properties.format = Object.assign(_this.saveSchema.properties.format, {
       "enum": formats,
@@ -20779,6 +20800,7 @@ function SData(_ref) {
       init: init
     }, formState), {}, {
       children: jsxs("fieldset", {
+        className: "sdata",
         children: [jsx(Field, {
           name: "context",
           options: getSelectOptionsFromSchema(formSchema.properties.context),
@@ -21450,6 +21472,16 @@ var TemplateDialog = function TemplateDialog(props) {
     })]
   });
 };
+var selectTemplate = function selectTemplate(template, props, dispatch) {
+  dispatch(selectTmpl(null));
+  if (!template) return;
+  dispatch(selectTmpl(template));
+  dispatch(onAction({
+    tool: 'template',
+    opts: template
+  }));
+  props.onOk(template);
+};
 var TemplatesDialog = connect(function (store) {
   var _store$modal, _store$modal$prop;
   return _objectSpread$4(_objectSpread$4({}, omit(['attach'], store.templates)), {}, {
@@ -21463,12 +21495,7 @@ var TemplatesDialog = connect(function (store) {
       return dispatch(changeFilter(filter));
     },
     onSelect: function onSelect(tmpl) {
-      dispatch(selectTmpl(tmpl));
-      dispatch(onAction({
-        tool: 'template',
-        opts: tmpl
-      }));
-      props.onOk(tmpl);
+      return selectTemplate(tmpl, props, dispatch);
     },
     onChangeGroup: function onChangeGroup(group) {
       return dispatch(changeGroup(group));
@@ -22215,7 +22242,7 @@ var KetcherBuilder = function () {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
                     version: "2.7.0-rc.2" ,
-                    buildDate: "2022-12-15T15:05:13" ,
+                    buildDate: "2022-12-16T15:41:03" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });