@modusoperandi/licit 1.4.3 → 1.4.6

package/TableMergeCellsCommand.js.flow

@@ -1,113 +1,113 @@
-// @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;
+// @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.flow

@@ -1,144 +1,144 @@
-// @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: {
-    className: {
-      default: null,
-      getFromDOM(dom) {
-        return dom.getAttribute('class') || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.class = value;
-        }
-      },
-    },
-    borderTop: {
-      default: null,
-      getFromDOM(dom) {
-        return dom.style.borderTop || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.style = (attrs.style || '') + `;border-top: ${value};`;
-        }
-      },
-    },
-    borderRight: {
-      default: null,
-      getFromDOM(dom) {
-        return dom.style.borderRight || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.style = (attrs.style || '') + `;border-right: ${value};`;
-        }
-      },
-    },
-    borderBottom: {
-      default: null,
-      getFromDOM(dom) {
-        return dom.style.borderBottom || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.style = (attrs.style || '') + `;border-bottom: ${value};`;
-        }
-      },
-    },
-    borderLeft: {
-      default: null,
-      getFromDOM(dom) {
-        return dom.style.borderLeft || null;
-      },
-      setDOMAttr(value, attrs) {
-        if (value) {
-          attrs.style = (attrs.style || '') + `;border-left: ${value};`;
-        }
-      },
-    },
-    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 },
-    dirty: { default: false },
-  },
-  parseDOM: [
-    {
-      tag: 'table',
-      getAttrs(dom: HTMLElement): ?Object {
-        const dirty = dom.getAttribute('dirty') || false;
-        const { marginLeft } = dom.style;
-        const attrs = { dirty };
-
-        if (marginLeft && /\d+px/.test(marginLeft)) {
-          attrs.marginLeft = parseFloat(marginLeft);
-        }
-
-        return attrs;
-      },
-    },
-  ],
-  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, dirty } = node.attrs;
-    const domAttrs = {};
-    if (marginLeft) {
-      domAttrs.style = `margin-left: ${marginLeft}px`;
-    }
-    if (dirty) {
-      domAttrs.dirty = dirty;
-    }
-    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: {
+    className: {
+      default: null,
+      getFromDOM(dom) {
+        return dom.getAttribute('class') || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          attrs.class = value;
+        }
+      },
+    },
+    borderTop: {
+      default: null,
+      getFromDOM(dom) {
+        return dom.style.borderTop || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          attrs.style = (attrs.style || '') + `;border-top: ${value};`;
+        }
+      },
+    },
+    borderRight: {
+      default: null,
+      getFromDOM(dom) {
+        return dom.style.borderRight || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          attrs.style = (attrs.style || '') + `;border-right: ${value};`;
+        }
+      },
+    },
+    borderBottom: {
+      default: null,
+      getFromDOM(dom) {
+        return dom.style.borderBottom || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          attrs.style = (attrs.style || '') + `;border-bottom: ${value};`;
+        }
+      },
+    },
+    borderLeft: {
+      default: null,
+      getFromDOM(dom) {
+        return dom.style.borderLeft || null;
+      },
+      setDOMAttr(value, attrs) {
+        if (value) {
+          attrs.style = (attrs.style || '') + `;border-left: ${value};`;
+        }
+      },
+    },
+    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 },
+    dirty: { default: false },
+  },
+  parseDOM: [
+    {
+      tag: 'table',
+      getAttrs(dom: HTMLElement): ?Object {
+        const dirty = dom.getAttribute('dirty') || false;
+        const { marginLeft } = dom.style;
+        const attrs = { dirty };
+
+        if (marginLeft && /\d+px/.test(marginLeft)) {
+          attrs.marginLeft = parseFloat(marginLeft);
+        }
+
+        return attrs;
+      },
+    },
+  ],
+  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, dirty } = node.attrs;
+    const domAttrs = {};
+    if (marginLeft) {
+      domAttrs.style = `margin-left: ${marginLeft}px`;
+    }
+    if (dirty) {
+      domAttrs.dirty = dirty;
+    }
+    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(),
+];