@modusoperandi/licit 1.0.4 → 1.0.5

package/TableInsertCommand.js.flow

@@ -1,120 +1,120 @@
-// @flow
-
-import nullthrows from 'nullthrows';
-import { EditorState } from 'prosemirror-state';
-import { TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-import { Fragment } from 'prosemirror-model';
-import insertTable from './insertTable.js';
-import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
-import TableGridSizeEditor from './ui/TableGridSizeEditor.js';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { createPopUp } from '@modusoperandi/licit-ui-commands';
-import {
-  PARAGRAPH
-} from './NodeNames.js';
-import type {
-  TableGridSizeEditorValue
-} from './ui/TableGridSizeEditor.js';
-
-class TableInsertCommand extends UICommand {
-  _popUp = null;
-
-  shouldRespondToUIEvent = (e: SyntheticEvent<> | MouseEvent): boolean => {
-    return e.type === UICommand.EventType.MOUSEENTER;
-  };
-
-  isEnabled = (state: EditorState): boolean => {
-    const tr = state;
-    let bOK = false;
-    const { selection } = tr;
-    if (selection instanceof TextSelection) {
-      bOK = selection.from === selection.to;
-      // [FS] IRAD-1065 2020-09-18
-      // Disable create table menu if the selection is inside a table.
-      if (bOK) {
-        const $head = selection.$head;
-        for (let d = $head.depth; d > 0; d--) {
-          if ($head.node(d).type.spec.tableRole == 'row') {
-            return false;
-          }
-        }
-      }
-      return bOK;
-    }
-    return bOK;
-  };
-
-  waitForUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): Promise<any> => {
-    if (this._popUp) {
-      return Promise.resolve(undefined);
-    }
-    const target = nullthrows(event).currentTarget;
-    if (!(target instanceof HTMLElement)) {
-      return Promise.resolve(undefined);
-    }
-
-    const anchor = event ? event.currentTarget : null;
-    return new Promise((resolve) => {
-      this._popUp = createPopUp(TableGridSizeEditor, null, {
-        anchor,
-        position: atAnchorRight,
-        onClose: (val) => {
-          if (this._popUp) {
-            this._popUp = null;
-            resolve(val);
-          }
-        },
-      });
-    });
-  };
-
-  executeWithUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    inputs: ?TableGridSizeEditorValue
-  ): boolean => {
-    if (dispatch) {
-      const { selection, schema } = state;
-      let { tr } = state;
-      if (inputs) {
-        const { rows, cols } = inputs;
-        tr = tr.setSelection(selection);
-        tr = insertTable(tr, schema, rows, cols);
-        tr = insertParagraph(state, tr);
-      }
-      dispatch(tr);
-    }
-    return false;
-  };
-
-  cancel(): void {
-    return null;
-  }
-}
-
-// [FS] 2021-04-01
-// Add empty line after table drop
-// To make easier to enter a line after table
-function insertParagraph(state, tr) {
-  const paragraph = state.schema.nodes[PARAGRAPH];
-  const textNode = state.schema.text(' ');
-  const { from, to } = tr.selection;
-  if (from !== to) {
-    return tr;
-  }
-  const paragraphNode = paragraph.create({}, textNode, null);
-  tr = tr.insert(
-    from + tr.selection.$head.node(1).nodeSize - 4,
-    Fragment.from(paragraphNode)
-  );
-  return tr;
-}
-export default TableInsertCommand;
+// @flow
+
+import nullthrows from 'nullthrows';
+import { EditorState } from 'prosemirror-state';
+import { TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+import { Fragment } from 'prosemirror-model';
+import insertTable from './insertTable.js';
+import { atAnchorRight } from '@modusoperandi/licit-ui-commands';
+import TableGridSizeEditor from './ui/TableGridSizeEditor.js';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import { createPopUp } from '@modusoperandi/licit-ui-commands';
+import {
+  PARAGRAPH
+} from './NodeNames.js';
+import type {
+  TableGridSizeEditorValue
+} from './ui/TableGridSizeEditor.js';
+
+class TableInsertCommand extends UICommand {
+  _popUp = null;
+
+  shouldRespondToUIEvent = (e: SyntheticEvent<> | MouseEvent): boolean => {
+    return e.type === UICommand.EventType.MOUSEENTER;
+  };
+
+  isEnabled = (state: EditorState): boolean => {
+    const tr = state;
+    let bOK = false;
+    const { selection } = tr;
+    if (selection instanceof TextSelection) {
+      bOK = selection.from === selection.to;
+      // [FS] IRAD-1065 2020-09-18
+      // Disable create table menu if the selection is inside a table.
+      if (bOK) {
+        const $head = selection.$head;
+        for (let d = $head.depth; d > 0; d--) {
+          if ($head.node(d).type.spec.tableRole == 'row') {
+            return false;
+          }
+        }
+      }
+      return bOK;
+    }
+    return bOK;
+  };
+
+  waitForUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): Promise<any> => {
+    if (this._popUp) {
+      return Promise.resolve(undefined);
+    }
+    const target = nullthrows(event).currentTarget;
+    if (!(target instanceof HTMLElement)) {
+      return Promise.resolve(undefined);
+    }
+
+    const anchor = event ? event.currentTarget : null;
+    return new Promise((resolve) => {
+      this._popUp = createPopUp(TableGridSizeEditor, null, {
+        anchor,
+        position: atAnchorRight,
+        onClose: (val) => {
+          if (this._popUp) {
+            this._popUp = null;
+            resolve(val);
+          }
+        },
+      });
+    });
+  };
+
+  executeWithUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    inputs: ?TableGridSizeEditorValue
+  ): boolean => {
+    if (dispatch) {
+      const { selection, schema } = state;
+      let { tr } = state;
+      if (inputs) {
+        const { rows, cols } = inputs;
+        tr = tr.setSelection(selection);
+        tr = insertTable(tr, schema, rows, cols);
+        tr = insertParagraph(state, tr);
+      }
+      dispatch(tr);
+    }
+    return false;
+  };
+
+  cancel(): void {
+    return null;
+  }
+}
+
+// [FS] 2021-04-01
+// Add empty line after table drop
+// To make easier to enter a line after table
+function insertParagraph(state, tr) {
+  const paragraph = state.schema.nodes[PARAGRAPH];
+  const textNode = state.schema.text(' ');
+  const { from, to } = tr.selection;
+  if (from !== to) {
+    return tr;
+  }
+  const paragraphNode = paragraph.create({}, textNode, null);
+  tr = tr.insert(
+    from + tr.selection.$head.node(1).nodeSize - 4,
+    Fragment.from(paragraphNode)
+  );
+  return tr;
+}
+export default TableInsertCommand;

package/TableMergeCellsCommand.js

@@ -4,13 +4,13 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Schema } from 'prosemirror-model';
 import { Node } from 'prosemirror-model';
@@ -73,7 +73,6 @@ function purgeConsecutiveBlankParagraphNodes(tr, schema) {
   return tr;
 }
 var TableMergeCellsCommand = /*#__PURE__*/function (_UICommand) {
-  _inherits(TableMergeCellsCommand, _UICommand);
   function TableMergeCellsCommand() {
     var _this;
     _classCallCheck(this, TableMergeCellsCommand);
@@ -81,7 +80,7 @@ var TableMergeCellsCommand = /*#__PURE__*/function (_UICommand) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, TableMergeCellsCommand, [].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "execute", function (state, dispatch, view) {
+    _defineProperty(_this, "execute", function (state, dispatch, view) {
       var tr = state.tr,
         schema = state.schema,
         selection = state.selection;
@@ -97,20 +96,20 @@ var TableMergeCellsCommand = /*#__PURE__*/function (_UICommand) {
       changed && dispatch && dispatch(endTr);
       return changed;
     });
-    _defineProperty(_assertThisInitialized(_this), "waitForUserInput", function (_state, _dispatch, _view, _event) {
+    _defineProperty(_this, "waitForUserInput", function (_state, _dispatch, _view, _event) {
       return Promise.resolve(undefined);
     });
-    _defineProperty(_assertThisInitialized(_this), "executeWithUserInput", function (_state, _dispatch, _view, _inputs) {
+    _defineProperty(_this, "executeWithUserInput", function (_state, _dispatch, _view, _inputs) {
       return false;
     });
     return _this;
   }
-  _createClass(TableMergeCellsCommand, [{
+  _inherits(TableMergeCellsCommand, _UICommand);
+  return _createClass(TableMergeCellsCommand, [{
     key: "cancel",
     value: function cancel() {
       return null;
     }
   }]);
-  return TableMergeCellsCommand;
 }(UICommand);
 export default TableMergeCellsCommand;

package/TableMergeCellsCommand.js.flow

@@ -1,112 +1,112 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { Node } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { CellSelection, mergeCells } from 'prosemirror-tables';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-import * as React from 'react';
-import { PARAGRAPH, TABLE_CELL, TEXT } from './NodeNames.js';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-
-function isBlankParagraphNode(node: ?Node): boolean {
-  if (!node) {
-    return false;
-  }
-  if (node.type.name !== PARAGRAPH) {
-    return false;
-  }
-  const { firstChild, lastChild } = node;
-  if (!firstChild) {
-    return true;
-  }
-  if (firstChild !== lastChild) {
-    return false;
-  }
-  return firstChild.type.name === TEXT && firstChild.text === ' ';
-}
-
-function purgeConsecutiveBlankParagraphNodes(
-  tr: Transform,
-  schema: Schema
-): Transform {
-  const paragraph = schema.nodes[PARAGRAPH];
-  const cell = schema.nodes[TABLE_CELL];
-  if (!paragraph || !cell) {
-    return tr;
-  }
-  const { doc, selection } = tr;
-  if (!(selection instanceof CellSelection)) {
-    return tr;
-  }
-  const { from, to } = selection;
-  const paragraphPoses = [];
-  doc.nodesBetween(from, to, (node, pos, parentNode) => {
-    if (node.type === paragraph && parentNode.type === cell) {
-      if (isBlankParagraphNode(node)) {
-        const $pos = tr.doc.resolve(pos);
-        if (isBlankParagraphNode($pos.nodeBefore)) {
-          paragraphPoses.push(pos);
-        }
-      }
-      return false;
-    } else {
-      return true;
-    }
-  });
-  paragraphPoses.reverse().forEach((pos) => {
-    const cell = tr.doc.nodeAt(pos);
-    tr = tr.delete(pos, pos + cell.nodeSize);
-  });
-  return tr;
-}
-
-class TableMergeCellsCommand extends UICommand {
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { tr, schema, selection } = state;
-    let endTr = tr;
-    if (selection instanceof CellSelection) {
-      mergeCells(
-        state,
-        (nextTr) => {
-          endTr = nextTr;
-        },
-        view
-      );
-      // Also merge onsecutive blank paragraphs into one.
-      endTr = purgeConsecutiveBlankParagraphNodes(endTr, schema);
-    }
-    const changed = endTr.docChanged || endTr !== tr;
-    changed && dispatch && dispatch(endTr);
-    return changed;
-  };
-
-  waitForUserInput = (
-    _state: EditorState,
-    _dispatch: ?(tr: Transform) => void,
-    _view: ?EditorView,
-    _event: ?React.SyntheticEvent
-  ): Promise<undefined> => {
-    return Promise.resolve(undefined);
-  };
-
-  executeWithUserInput = (
-    _state: EditorState,
-    _dispatch: ?(tr: Transform) => void,
-    _view: ?EditorView,
-    _inputs: ?string
-  ): boolean => {
-    return false;
-  };
-
-  cancel(): void {
-    return null;
-  }
-}
-
-export default TableMergeCellsCommand;
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { Node } from 'prosemirror-model';
+import { EditorState } from 'prosemirror-state';
+import { CellSelection, mergeCells } from 'prosemirror-tables';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+import * as React from 'react';
+import { PARAGRAPH, TABLE_CELL, TEXT } from './NodeNames.js';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+function isBlankParagraphNode(node: ?Node): boolean {
+  if (!node) {
+    return false;
+  }
+  if (node.type.name !== PARAGRAPH) {
+    return false;
+  }
+  const { firstChild, lastChild } = node;
+  if (!firstChild) {
+    return true;
+  }
+  if (firstChild !== lastChild) {
+    return false;
+  }
+  return firstChild.type.name === TEXT && firstChild.text === ' ';
+}
+
+function purgeConsecutiveBlankParagraphNodes(
+  tr: Transform,
+  schema: Schema
+): Transform {
+  const paragraph = schema.nodes[PARAGRAPH];
+  const cell = schema.nodes[TABLE_CELL];
+  if (!paragraph || !cell) {
+    return tr;
+  }
+  const { doc, selection } = tr;
+  if (!(selection instanceof CellSelection)) {
+    return tr;
+  }
+  const { from, to } = selection;
+  const paragraphPoses = [];
+  doc.nodesBetween(from, to, (node, pos, parentNode) => {
+    if (node.type === paragraph && parentNode.type === cell) {
+      if (isBlankParagraphNode(node)) {
+        const $pos = tr.doc.resolve(pos);
+        if (isBlankParagraphNode($pos.nodeBefore)) {
+          paragraphPoses.push(pos);
+        }
+      }
+      return false;
+    } else {
+      return true;
+    }
+  });
+  paragraphPoses.reverse().forEach((pos) => {
+    const cell = tr.doc.nodeAt(pos);
+    tr = tr.delete(pos, pos + cell.nodeSize);
+  });
+  return tr;
+}
+
+class TableMergeCellsCommand extends UICommand {
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { tr, schema, selection } = state;
+    let endTr = tr;
+    if (selection instanceof CellSelection) {
+      mergeCells(
+        state,
+        (nextTr) => {
+          endTr = nextTr;
+        },
+        view
+      );
+      // Also merge onsecutive blank paragraphs into one.
+      endTr = purgeConsecutiveBlankParagraphNodes(endTr, schema);
+    }
+    const changed = endTr.docChanged || endTr !== tr;
+    changed && dispatch && dispatch(endTr);
+    return changed;
+  };
+
+  waitForUserInput = (
+    _state: EditorState,
+    _dispatch: ?(tr: Transform) => void,
+    _view: ?EditorView,
+    _event: ?React.SyntheticEvent
+  ): Promise<undefined> => {
+    return Promise.resolve(undefined);
+  };
+
+  executeWithUserInput = (
+    _state: EditorState,
+    _dispatch: ?(tr: Transform) => void,
+    _view: ?EditorView,
+    _inputs: ?string
+  ): boolean => {
+    return false;
+  };
+
+  cancel(): void {
+    return null;
+  }
+}
+
+export default TableMergeCellsCommand;