@modusoperandi/licit 1.0.4 → 1.0.7

package/TableMergeCellsCommand.js.flow

@@ -1,112 +1,113 @@
-// @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, 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();
+  const reversedParagraphPoses = paragraphPoses;
+  reversedParagraphPoses.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;

package/TableNodesSpecs.js

@@ -21,7 +21,8 @@ var TableNodesSpecs = tableNodes({
       },
       setDOMAttr: function setDOMAttr(value, attrs) {
         if (value) {
-          attrs.style = (attrs.style || '') + ";border-color: ".concat(value, ";");
+          var colorValue = String(value);
+          attrs.style = (attrs.style || '') + ";border-color: ".concat(colorValue, ";");
         }
       }
     },
@@ -33,7 +34,8 @@ var TableNodesSpecs = tableNodes({
       },
       setDOMAttr: function setDOMAttr(value, attrs) {
         if (value) {
-          attrs.style = (attrs.style || '') + ";background-color: ".concat(value, ";");
+          var colorValue = String(value);
+          attrs.style = (attrs.style || '') + ";background-color: ".concat(colorValue, ";");
         }
       }
     }

package/TableNodesSpecs.js.flow

@@ -1,78 +1,80 @@
-// @flow
-
-import toCSSColor from './ui/toCSSColor.js';
-import { Node } from 'prosemirror-model';
-import { tableNodes } from 'prosemirror-tables';
-
-const NO_VISIBLE_BORDER_WIDTH = new Set(['0pt', '0px']);
-
-// https://github.com/ProseMirror/prosemirror-tables/blob/master/demo.js
-const TableNodesSpecs = tableNodes({
-  tableGroup: 'block',
-  cellContent: 'block+',
-  cellAttributes: {
-    borderColor: {
-      default: null,
-      getFromDOM(dom) {
-        const { borderColor, borderWidth } = dom.style;
-
-        if (NO_VISIBLE_BORDER_WIDTH.has(borderWidth)) {
-          return 'transparent';
-        }
-
-        return (borderColor && toCSSColor(borderColor)) || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.style = (attrs.style || '') + `;border-color: ${value};`;
-        }
-      },
-    },
-    background: {
-      default: null,
-      // TODO: Move these to a table helper.
-      getFromDOM(dom) {
-        return dom.style.backgroundColor || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.style = (attrs.style || '') + `;background-color: ${value};`;
-        }
-      },
-    },
-  },
-});
-
-// Override the default table node spec to support custom attributes.
-const TableNodeSpec = Object.assign({}, TableNodesSpecs.table, {
-  attrs: {
-    marginLeft: { default: null },
-  },
-  parseDOM: [
-    {
-      tag: 'table',
-      getAttrs(dom: HTMLElement): ?Object {
-        const { marginLeft } = dom.style;
-        if (marginLeft && /\d+px/.test(marginLeft)) {
-          return { marginLeft: parseFloat(marginLeft) };
-        }
-        return null;
-      },
-    },
-  ],
-  toDOM(node: Node): Array<any> {
-    // Normally, the DOM structure of the table node is rendered by
-    // `TableNodeView`. This method is only called when user selects a
-    // table node and copies it, which triggers the "serialize to HTML" flow
-    //  that calles this method.
-    const { marginLeft } = node.attrs;
-    const domAttrs = {};
-    if (marginLeft) {
-      domAttrs.style = `margin-left: ${marginLeft}px`;
-    }
-    return ['table', domAttrs, 0];
-  },
-});
-Object.assign(TableNodesSpecs, { table: TableNodeSpec });
-
-export default TableNodesSpecs;
+// @flow
+
+import toCSSColor from './ui/toCSSColor.js';
+import { Node } from 'prosemirror-model';
+import { tableNodes } from 'prosemirror-tables';
+
+const NO_VISIBLE_BORDER_WIDTH = new Set(['0pt', '0px']);
+
+// https://github.com/ProseMirror/prosemirror-tables/blob/master/demo.js
+const TableNodesSpecs = tableNodes({
+  tableGroup: 'block',
+  cellContent: 'block+',
+  cellAttributes: {
+    borderColor: {
+      default: null,
+      getFromDOM(dom) {
+        const { borderColor, borderWidth } = dom.style;
+
+        if (NO_VISIBLE_BORDER_WIDTH.has(borderWidth)) {
+          return 'transparent';
+        }
+
+        return (borderColor && toCSSColor(borderColor)) || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          const colorValue = String(value);
+          attrs.style = (attrs.style || '') + `;border-color: ${colorValue};`;
+        }
+      },
+    },
+    background: {
+      default: null,
+      // TODO: Move these to a table helper.
+      getFromDOM(dom) {
+        return dom.style.backgroundColor || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          const colorValue = String(value);
+          attrs.style = (attrs.style || '') + `;background-color: ${colorValue};`;
+        }
+      },
+    },
+  },
+});
+
+// Override the default table node spec to support custom attributes.
+const TableNodeSpec = Object.assign({}, TableNodesSpecs.table, {
+  attrs: {
+    marginLeft: { default: null },
+  },
+  parseDOM: [
+    {
+      tag: 'table',
+      getAttrs(dom: HTMLElement): ?Object {
+        const { marginLeft } = dom.style;
+        if (marginLeft && /\d+px/.test(marginLeft)) {
+          return { marginLeft: parseFloat(marginLeft) };
+        }
+        return null;
+      },
+    },
+  ],
+  toDOM(node: Node): Array<any> {
+    // Normally, the DOM structure of the table node is rendered by
+    // `TableNodeView`. This method is only called when user selects a
+    // table node and copies it, which triggers the "serialize to HTML" flow
+    //  that calles this method.
+    const { marginLeft } = node.attrs;
+    const domAttrs = {};
+    if (marginLeft) {
+      domAttrs.style = `margin-left: ${marginLeft}px`;
+    }
+    return ['table', domAttrs, 0];
+  },
+});
+Object.assign(TableNodesSpecs, { table: TableNodeSpec });
+
+export default TableNodesSpecs;

package/TablePlugins.js.flow

@@ -1,14 +1,14 @@
-// @flow
-
-import { tableEditing } from 'prosemirror-tables';
-
-import TableCellMenuPlugin from './TableCellMenuPlugin.js';
-import TableResizePlugin from './TableResizePlugin.js';
-
-// Tables
-// https://github.com/ProseMirror/prosemirror-tables/blob/master/demo.js
-export default [
-  new TableCellMenuPlugin(),
-  new TableResizePlugin(),
-  tableEditing(),
-];
+// @flow
+
+import { tableEditing } from 'prosemirror-tables';
+
+import TableCellMenuPlugin from './TableCellMenuPlugin.js';
+import TableResizePlugin from './TableResizePlugin.js';
+
+// Tables
+// https://github.com/ProseMirror/prosemirror-tables/blob/master/demo.js
+export default [
+  new TableCellMenuPlugin(),
+  new TableResizePlugin(),
+  tableEditing(),
+];

package/TableResizePlugin.js

@@ -1,18 +1,18 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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 _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
 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 _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 _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-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 _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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+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); }
 // Copyright (C) 2015-2016 by Marijn Haverbeke <marijnh@gmail.com> and others
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -70,7 +70,7 @@ var ResizeState = /*#__PURE__*/function () {
     this.draggingInfo = draggingInfo;
     this.forMarginLeft = forMarginLeft;
   }
-  _createClass(ResizeState, [{
+  return _createClass(ResizeState, [{
     key: "apply",
     value: function apply(tr) {
       var state = this;
@@ -91,7 +91,6 @@ var ResizeState = /*#__PURE__*/function () {
       return state;
     }
   }]);
-  return ResizeState;
 }(); // Function that handles the mousemove event inside table cell.
 function handleMouseMove(view, event) {
   var resizeState = PLUGIN_KEY.getState(view.state);
@@ -144,19 +143,20 @@ function handleMouseLeave(view) {
 
 // Function that handles the mousedown event from the table cell.
 function handleMouseDown(view, event) {
-  var _this = this;
+  var _cancelDrag,
+    _this = this;
   // It's possible that the resize action that happened earlier was inturrupted
   // while its dependent mouse events were stopped or prevented by others.
   // We need to stop the previous resize action if it did not finish.
-  cancelDrag && cancelDrag(event);
+  (_cancelDrag = cancelDrag) === null || _cancelDrag === void 0 || _cancelDrag(event);
   var resizeState = PLUGIN_KEY.getState(view.state);
   if (resizeState.cellPos === -1 || resizeState.draggingInfo) {
     return false;
   }
   var dragStarted = false;
   var dragMoveHandler = null;
-  var finish = function finish(event) {
-    window.removeEventListener('mouseup', finish, true);
+  var _finish = function finish(event) {
+    window.removeEventListener('mouseup', _finish, true);
     window.removeEventListener('mousemove', _this.move, true);
     dragStarted && handleDragEnd(view, event);
     cancelDrag = null;
@@ -172,11 +172,11 @@ function handleMouseDown(view, event) {
       dragMoveHandler = dragMoveHandler || batchMouseHandler(handleDragMove);
       dragMoveHandler(view, event);
     } else {
-      finish(event);
+      _finish(event);
     }
   };
-  cancelDrag = finish;
-  window.addEventListener('mouseup', finish, true);
+  cancelDrag = _finish;
+  window.addEventListener('mouseup', _finish, true);
   window.addEventListener('mousemove', move, true);
   event.preventDefault();
   return true;
@@ -494,7 +494,6 @@ function compareNumbersList(one, two) {
 
 // Plugin that supports table columns resizing.
 var TableResizePlugin = /*#__PURE__*/function (_Plugin) {
-  _inherits(TableResizePlugin, _Plugin);
   // [FS] IRAD-1005 2020-07-07
   // Upgrade outdated packages.
   //spec: Object;
@@ -538,6 +537,7 @@ var TableResizePlugin = /*#__PURE__*/function (_Plugin) {
       }
     }]);
   }
+  _inherits(TableResizePlugin, _Plugin);
   return _createClass(TableResizePlugin);
 }(Plugin);
 export { TableResizePlugin as default };