ketcher-react 2.7.0-rc.8 → 2.7.0-rc.9

package/dist/index.modern.js

@@ -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 { logger } from 'redux-logger';
+import '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,7 +366,6 @@ function _copy(cb, data) {
         cb.setData(fmt, data[fmt]);
       });
     } catch (ex) {
-      console.info("Could not write exact type ".concat(curFmt));
     }
   }
 }
@@ -692,7 +691,6 @@ var storage = {
     try {
       item = JSON.parse(localStorage.getItem(key));
     } catch (ex) {
-      console.info('LocalStorage:', ex.name);
     }
     return item;
   },
@@ -702,7 +700,6 @@ var storage = {
       localStorage.setItem(key, JSON.stringify(data));
       isSet = true;
     } catch (ex) {
-      console.info('LocalStorage:', ex.name);
       isSet = false;
     }
     return isSet;
@@ -837,7 +834,6 @@ 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;
@@ -2877,7 +2873,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.6.0\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.9\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -7646,9 +7642,7 @@ function execute(activeTool, _ref) {
     }
   } else if (typeof action === 'function') {
     action(editor, server, options);
-  } else {
-    console.info('no action');
-  }
+  } else ;
   return activeTool;
 }
 function selected(actObj, activeTool, _ref2) {
@@ -7887,7 +7881,6 @@ 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) {
@@ -7898,7 +7891,6 @@ 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) {
@@ -8183,9 +8175,6 @@ 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));
 }
@@ -9772,7 +9761,6 @@ var TopToolbar = function TopToolbar(_ref) {
       isCollapsed: width < collapseLimit
     }), jsx(SystemControls, {
       onHistoryClick: function onHistoryClick() {
-        console.log('History button clicked');
       },
       onSettingsOpen: onSettingsOpen,
       onFullscreen: onFullscreen,
@@ -10135,6 +10123,7 @@ var AtomTool = function () {
       stereo: Bond$2.PATTERN.STEREO.NONE
     });
     this.editor.hoverIcon.show().attr('text', "".concat(atomProps.label)).attr('fill', "".concat(ElementColor[atomProps.label]));
+    this.editor.updateHoverIconPosition();
     if (editor.selection()) {
       var _editor$selection;
       if ((_editor$selection = editor.selection()) !== null && _editor$selection !== void 0 && _editor$selection.atoms) {
@@ -10227,6 +10216,7 @@ var AtomTool = function () {
     key: "mouseover",
     value: function mouseover() {
       this.editor.hoverIcon.show();
+      this.editor.updateHoverIconPosition();
     }
   }, {
     key: "mousemove",
@@ -11702,7 +11692,6 @@ var SGroupTool = function () {
       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;
@@ -12584,7 +12573,6 @@ 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);
@@ -15392,7 +15380,11 @@ var Editor$3 = function () {
     this.highlights = new Highlighter(this);
     this.renderAndRecoordinateStruct = this.renderAndRecoordinateStruct.bind(this);
     this.setOptions = this.setOptions.bind(this);
-    this.hoverIcon = this.render.paper.text(0, 0, '').attr('font-size', options.fontsz).attr('opacity', HOVER_ICON_OPACITY);
+    this.lastCursorPosition = {
+      x: 0,
+      y: 0
+    };
+    this.createHoverIcon();
     this.event = {
       message: new Subscription(),
       elementEdit: new PipelineSubscription(),
@@ -15450,6 +15442,26 @@ var Editor$3 = function () {
       this._tool = tool;
       return this._tool;
     }
+  }, {
+    key: "updateHoverIconPosition",
+    value: function updateHoverIconPosition() {
+      var _this$lastCursorPosit = this.lastCursorPosition,
+          x = _this$lastCursorPosit.x,
+          y = _this$lastCursorPosit.y;
+      var _this$hoverIcon$getBB = this.hoverIcon.getBBox(),
+          height = _this$hoverIcon$getBB.height,
+          width = _this$hoverIcon$getBB.width;
+      this.hoverIcon.attr({
+        x: x - width / 2,
+        y: y - height / 2
+      });
+    }
+  }, {
+    key: "createHoverIcon",
+    value: function createHoverIcon() {
+      this.hoverIcon = this.render.paper.text(0, 0, '').attr('font-size', this.options().fontsz).attr('opacity', HOVER_ICON_OPACITY);
+      this.updateHoverIconPosition();
+    }
   }, {
     key: "clear",
     value: function clear() {
@@ -15472,7 +15484,9 @@ var Editor$3 = function () {
       }
       this.selection(null);
       var struct = value || new Struct();
-      return this.renderAndRecoordinateStruct(struct);
+      var molecule = this.renderAndRecoordinateStruct(struct);
+      this.createHoverIcon();
+      return molecule;
     }
   }, {
     key: "structToAddFragment",
@@ -15748,12 +15762,27 @@ var Editor$3 = function () {
 function isMouseRight(event) {
   return event.which && event.which === 3 || event.button && event.button === 2;
 }
+function resetSelectionOnCanvasClick(editor, eventName) {
+  if (eventName === 'mouseup') {
+    editor.selection(null);
+  }
+}
+function updateLastCursorPosition(editor, event) {
+  var events = ['mousemove', 'click', 'mousedown', 'mouseup', 'mouseover'];
+  if (events.includes(event.type)) {
+    editor.lastCursorPosition = {
+      x: event.layerX,
+      y: event.layerY
+    };
+  }
+}
 function domEventSetup(editor, clientArea) {
   ['click', 'dblclick', 'mousedown', 'mousemove', 'mouseup', 'mouseleave', 'mouseover'].forEach(function (eventName) {
     editor.event[eventName] = new DOMSubscription();
     var subs = editor.event[eventName];
     clientArea.addEventListener(eventName, subs.dispatch.bind(subs));
     subs.add(function (event) {
+      updateLastCursorPosition(editor, event);
       if (eventName !== 'mouseup' && eventName !== 'mouseleave') {
         if (isMouseRight(event) || !event.target || event.target.nodeName === 'DIV') {
           editor.hover(null);
@@ -15766,16 +15795,13 @@ function domEventSetup(editor, clientArea) {
         EditorTool[eventName](event);
         return true;
       }
-      if (eventName === 'mouseup') {
-        editor.selection(null);
-      }
+      resetSelectionOnCanvasClick(editor, eventName);
       return true;
     }, -1);
   });
 }
 function recoordinate(editor, rp
 ) {
-  console.assert(rp, 'Reference point not specified');
   if (rp) {
     editor.render.setScrollOffset(rp.x, rp.y);
   } else {
@@ -17995,7 +18021,6 @@ var mapDispatchToProps$b = function mapDispatchToProps(dispatch, ownProps) {
           result: JSON.parse(newOpts)
         }));
       } catch (ex) {
-        console.info('Bad file');
       }
     },
     onReset: function onReset() {
@@ -18699,7 +18724,7 @@ var MiewDialog = function MiewDialog(_ref) {
     }).then(function () {
       return miew.setOptions(miewOpts);
     })["catch"](function (ex) {
-      return console.error(ex.message);
+      return (void 0);
     });
   }, [miewOpts, server, struct]);
   var exportCML = useCallback(function () {
@@ -22576,8 +22601,8 @@ var KetcherBuilder = function () {
                   initApp(element, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.6.4" ,
-                    buildDate: "2022-12-28T14:55:11" ,
+                    version: "2.7.0-rc.9" ,
+                    buildDate: "2023-01-13T09:07:01" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });