@modusoperandi/licit 0.14.2 → 0.14.10

package/dist/client/Licit.js

@@ -240,6 +240,13 @@ class Licit extends React.Component {
         }
       });
     });
+    _defineProperty(this, "goToEnd", () => {
+      // Return focus to the editor with cursor at end of document.
+      const view = this.editorView;
+      const tr = view.state.tr;
+      view.dispatch(tr.setSelection(_prosemirrorState.TextSelection.atEnd(view.state.doc)).scrollIntoView());
+      view.focus();
+    });
     this.initialize(_props);
   }
   initialize(props) {

package/dist/client/Licit.js.flow

@@ -696,6 +696,15 @@ class Licit extends React.Component<any, any> {
       }
     });
   };
+
+  goToEnd = (): void => {
+    // Return focus to the editor with cursor at end of document.
+    const view: EditorView = this.editorView;
+    const tr = view.state.tr;
+    view.dispatch(tr.setSelection(TextSelection.atEnd(view.state.doc)).scrollIntoView());
+    view.focus();
+  };
+
 }
 
 export default Licit;

package/dist/ui/TableCellMenu.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _prosemirrorState = require("prosemirror-state");
 var _prosemirrorView = require("prosemirror-view");
+var _prosemirrorModel = require("prosemirror-model");
 var React = _interopRequireWildcard(require("react"));
 var _CommandMenuButton = _interopRequireDefault(require("./CommandMenuButton"));
 var _EditorToolbarConfig = require("./EditorToolbarConfig");
@@ -26,11 +27,20 @@ class TableCellMenu extends React.PureComponent {
   render() {
     const {
       editorState,
-      editorView
+      editorView,
+      pluginView,
+      actionNode
     } = this.props;
+    let cmdGrps = null;
+    if (pluginView.getMenu) {
+      cmdGrps = pluginView.getMenu(editorState, actionNode, _EditorToolbarConfig.TABLE_COMMANDS_GROUP);
+    }
+    if (!cmdGrps) {
+      cmdGrps = _EditorToolbarConfig.TABLE_COMMANDS_GROUP;
+    }
     return /*#__PURE__*/React.createElement(_CommandMenuButton.default, {
       className: "czi-table-cell-menu",
-      commandGroups: _EditorToolbarConfig.TABLE_COMMANDS_GROUP,
+      commandGroups: cmdGrps,
       dispatch: editorView.dispatch,
       editorState: editorState,
       editorView: editorView,

package/dist/ui/TableCellMenu.js.flow

@@ -1,6 +1,7 @@
 // @flow
-import { EditorState } from 'prosemirror-state';
+import { EditorState, PluginView } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
+import { Node } from 'prosemirror-model';
 import * as React from 'react';
 
 import CommandMenuButton from './CommandMenuButton';
@@ -12,6 +13,8 @@ import './czi-table-cell-menu.css';
 type Props = {
   editorState: EditorState,
   editorView: EditorView,
+  pluginView: PluginView,
+  actionNode: Node,
 };
 
 class TableCellMenu extends React.PureComponent<any, any> {
@@ -20,11 +23,21 @@ class TableCellMenu extends React.PureComponent<any, any> {
   props: Props;
 
   render(): React.Element<any> {
-    const { editorState, editorView } = this.props;
+    const { editorState, editorView, pluginView, actionNode } = this.props;
+    let cmdGrps = null;
+
+    if (pluginView.getMenu) {
+      cmdGrps = pluginView.getMenu(editorState, actionNode, TABLE_COMMANDS_GROUP);
+    }
+
+    if (!cmdGrps) {
+      cmdGrps = TABLE_COMMANDS_GROUP;
+    }
+
     return (
       <CommandMenuButton
         className="czi-table-cell-menu"
-        commandGroups={TABLE_COMMANDS_GROUP}
+        commandGroups={cmdGrps}
         dispatch={editorView.dispatch}
         editorState={editorState}
         editorView={editorView}

package/dist/ui/isElementFullyVisible.js

@@ -12,8 +12,10 @@ function isElementFullyVisible(el) {
     w,
     h
   } = (0, _licitUiCommands.fromHTMlElement)(el);
+  // to handle the rounded border scenario.
+  const factor = '10px' === el.style.borderRadius ? 3 : 1;
   // Only checks the top-left point.
-  const nwEl = w && h ? el.ownerDocument.elementFromPoint(x + 1, y + 1) : null;
+  const nwEl = w && h ? el.ownerDocument.elementFromPoint(x + factor, y + factor) : null;
   if (!nwEl) {
     return false;
   }

package/dist/ui/isElementFullyVisible.js.flow

@@ -4,8 +4,11 @@ import { fromHTMlElement } from '@modusoperandi/licit-ui-commands';
 
 export default function isElementFullyVisible(el: HTMLElement): boolean {
   const { x, y, w, h } = fromHTMlElement(el);
+  // to handle the rounded border scenario.
+  const factor = '10px' === el.style.borderRadius ? 3 : 1;
   // Only checks the top-left point.
-  const nwEl = w && h ? el.ownerDocument.elementFromPoint(x + 1, y + 1) : null;
+  const nwEl =
+    w && h ? el.ownerDocument.elementFromPoint(x + factor, y + factor) : null;
 
   if (!nwEl) {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit",
-  "version": "0.14.2",
+  "version": "0.14.10",
   "subversion": "1",
   "description": "Rich text editor built with React and ProseMirror",
   "main": "dist/index.js",
@@ -56,7 +56,7 @@
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "clean-webpack-plugin": "4.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "3.6.0",
+    "css-loader": "6.7.3",
     "enzyme": "^3.11.0",
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
@@ -70,7 +70,7 @@
     "flow-webpack-plugin": "1.2.0",
     "html-loader": "1.1.0",
     "html-webpack-inline-source-plugin": "1.0.0-beta.2",
-    "html-webpack-plugin": "^4.5.0",
+    "html-webpack-plugin": "^5.5.0",
     "husky": "^8.0.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.2.0",
@@ -90,13 +90,9 @@
     "write-file-webpack-plugin": "4.5.1"
   },
   "dependencies": {
-    "@modusoperandi/licit-doc-attrs-step": "^0.1.4",
-    "@modusoperandi/licit-ui-commands": "^0.1.12",
+    "@modusoperandi/licit-ui-commands": "^0.1.13",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
     "body-parser": "^1.19.0",
-    "browserkeymap": "2.0.2",
-    "classnames": "2.3.2",
-    "color": "^4.2.3",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "flatted": "^3.1.0",
@@ -107,17 +103,15 @@
     "katex": "0.11.1",
     "mv": "^2.1.1",
     "node-mathquill": "0.10.2",
-    "nullthrows": "1.1.1",
+    "prosemirror-collab": "1.2.2",
+    "prosemirror-dev-tools": "3.0.2",
     "prosemirror-model": "~1.16.0",
-    "prosemirror-view": "1.27.0",
     "prosemirror-tables": "1.2.5",
-    "prosemirror-dev-tools": "3.0.2",
-    "prosemirror-collab": "1.2.2",
+    "prosemirror-view": "1.27.0",
     "query-string": "6.13.1",
     "resize-observer-polyfill": "1.5.1",
     "smooth-scroll-into-view-if-needed": "1.1.28",
-    "url": "^0.11.0",
-    "uuid": "9.0.0"
+    "url": "^0.11.0"
   },
   "importSort": {
     ".js": {

package/src/TableCellMenuPlugin.js

@@ -13,6 +13,7 @@ import { createPopUp } from '@modusoperandi/licit-ui-commands';
 import isElementFullyVisible from './ui/isElementFullyVisible';
 
 import '@modusoperandi/licit-ui-commands/dist/ui/czi-pop-up.css';
+import { CellSelection } from 'prosemirror-tables';
 
 class TableCellTooltipView {
   _cellElement: null;
@@ -41,9 +42,15 @@ class TableCellTooltipView {
 
     let cellEl = domFound.node;
     const popUp = this._popUp;
+    let actionNode = null;
+    if (result && state.selection instanceof CellSelection) {
+      actionNode = state.selection.$anchorCell.node(-1);
+    }
     const viewPops = {
       editorState: state,
       editorView: view,
+      pluginView: this,
+      actionNode,
     };
 
     if (cellEl && !isElementFullyVisible(cellEl)) {

package/src/TableResizePlugin.js

@@ -595,9 +595,10 @@ export default class TableResizePlugin extends Plugin {
       key: PLUGIN_KEY,
       state: {
         init(_: any, state: EditorState): ResizeState {
-          this.spec.props.nodeViews[
-            tableNodeTypes(state.schema).table.name
-          ] = createTableView;
+          if (!this.spec.props.nodeViews['table']) {
+            this.spec.props.nodeViews[tableNodeTypes(state.schema).table.name] =
+              createTableView;
+          }
           return new ResizeState(-1, null);
         },
         apply(tr: Transform, prev: EditorState): EditorState {

package/src/client/Licit.js

@@ -696,6 +696,15 @@ class Licit extends React.Component<any, any> {
       }
     });
   };
+
+  goToEnd = (): void => {
+    // Return focus to the editor with cursor at end of document.
+    const view: EditorView = this.editorView;
+    const tr = view.state.tr;
+    view.dispatch(tr.setSelection(TextSelection.atEnd(view.state.doc)).scrollIntoView());
+    view.focus();
+  };
+
 }
 
 export default Licit;

package/src/ui/TableCellMenu.js

@@ -1,6 +1,7 @@
 // @flow
-import { EditorState } from 'prosemirror-state';
+import { EditorState, PluginView } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
+import { Node } from 'prosemirror-model';
 import * as React from 'react';
 
 import CommandMenuButton from './CommandMenuButton';
@@ -12,6 +13,8 @@ import './czi-table-cell-menu.css';
 type Props = {
   editorState: EditorState,
   editorView: EditorView,
+  pluginView: PluginView,
+  actionNode: Node,
 };
 
 class TableCellMenu extends React.PureComponent<any, any> {
@@ -20,11 +23,21 @@ class TableCellMenu extends React.PureComponent<any, any> {
   props: Props;
 
   render(): React.Element<any> {
-    const { editorState, editorView } = this.props;
+    const { editorState, editorView, pluginView, actionNode } = this.props;
+    let cmdGrps = null;
+
+    if (pluginView.getMenu) {
+      cmdGrps = pluginView.getMenu(editorState, actionNode, TABLE_COMMANDS_GROUP);
+    }
+
+    if (!cmdGrps) {
+      cmdGrps = TABLE_COMMANDS_GROUP;
+    }
+
     return (
       <CommandMenuButton
         className="czi-table-cell-menu"
-        commandGroups={TABLE_COMMANDS_GROUP}
+        commandGroups={cmdGrps}
         dispatch={editorView.dispatch}
         editorState={editorState}
         editorView={editorView}

package/src/ui/isElementFullyVisible.js

@@ -4,8 +4,11 @@ import { fromHTMlElement } from '@modusoperandi/licit-ui-commands';
 
 export default function isElementFullyVisible(el: HTMLElement): boolean {
   const { x, y, w, h } = fromHTMlElement(el);
+  // to handle the rounded border scenario.
+  const factor = '10px' === el.style.borderRadius ? 3 : 1;
   // Only checks the top-left point.
-  const nwEl = w && h ? el.ownerDocument.elementFromPoint(x + 1, y + 1) : null;
+  const nwEl =
+    w && h ? el.ownerDocument.elementFromPoint(x + factor, y + factor) : null;
 
   if (!nwEl) {
     return false;