@modusoperandi/licit 0.1.10 → 0.13.3

package/dist/ListItemMergeCommand.js.flow

@@ -1,177 +1,177 @@
-// @flow
-
-import nullthrows from 'nullthrows';
-import { Fragment, Schema } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { findParentNodeOfType } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
-import { HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
-import nodeAt from './nodeAt';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-
-function mergeListItemUp(tr: Transform, schema: Schema): Transform {
-  // This merge a list item to is previous list item of the selection is at the
-  // beginning of the list item.
-  const { selection } = tr;
-  if (!selection) {
-    return tr;
-  }
-  const nodeType = schema.nodes[LIST_ITEM];
-  if (!nodeType) {
-    return tr;
-  }
-  const { from, empty } = selection;
-  if (!empty) {
-    // Selection is collapsed.
-    return tr;
-  }
-  const result = findParentNodeOfType(nodeType)(selection);
-  if (!result) {
-    return tr;
-  }
-  const { pos, node } = result;
-  if (from !== pos + 2) {
-    // Selection is not at the begining of the list item.
-    return tr;
-  }
-  const $pos = tr.doc.resolve(pos);
-  const prevNode = $pos.nodeBefore;
-  if (!prevNode || prevNode.type !== nodeType) {
-    return tr;
-  }
-  if (node.childCount !== 1) {
-    // list item should only have one child (paragraph).
-    return tr;
-  }
-
-  const paragraphNode = node.firstChild;
-  const textNode = schema.text(' ');
-
-  // Delete the list item
-  tr = tr.delete(pos - 2, pos + node.nodeSize);
-  // Append extra space character to its previous list item.
-  tr = tr.insert(pos - 2, Fragment.from(textNode));
-  // Move the content to its previous list item.
-  tr = tr.insert(pos - 1, Fragment.from(paragraphNode.content));
-  tr = tr.setSelection(TextSelection.create(tr.doc, pos - 1, pos - 1));
-  return tr;
-}
-
-function mergeListItemDown(tr: Transform, schema: Schema): Transform {
-  // This merge a list item to is next list item of the selection is at the
-  // beginning of the list item.
-  const { selection } = tr;
-  if (!selection) {
-    return tr;
-  }
-  const listItem = schema.nodes[LIST_ITEM];
-  if (!listItem) {
-    return tr;
-  }
-  const { from, empty } = selection;
-  if (!empty) {
-    // Selection is collapsed.
-    return tr;
-  }
-  const result = findParentNodeOfType(listItem)(selection);
-  if (!result) {
-    return tr;
-  }
-  const { pos, node } = result;
-  if (from !== pos + node.content.size) {
-    // Selection is not at the begining of the list item.
-    return tr;
-  }
-
-  const $pos = tr.doc.resolve(pos);
-  const list = $pos.parent.type;
-  const listResult = findParentNodeOfType(list)(selection);
-  if (!listResult) {
-    return tr;
-  }
-  const nextFrom = pos + node.nodeSize;
-  let nextNode = nodeAt(tr.doc, nextFrom);
-  let deleteFrom = nextFrom;
-  if (listResult.start + listResult.node.content.size === nextFrom) {
-    // It's at the end of the last list item. It shall bring the content of the
-    // block after the list.
-    nextNode = nodeAt(tr.doc, nextFrom + 1);
-    deleteFrom += 1;
-  }
-
-  if (!nextNode) {
-    return tr;
-  }
-
-  let nextContent;
-
-  switch (nextNode.type) {
-    case listItem:
-      // List item should only have one child (paragraph).
-      const paragraphNode = nullthrows(nextNode.firstChild);
-      nextContent = Fragment.from(paragraphNode.content);
-      break;
-
-    case schema.nodes[HEADING]:
-    case schema.nodes[PARAGRAPH]:
-      // Will bring in the content of the next block.
-      nextContent = Fragment.from(nextNode.content);
-      break;
-  }
-
-  if (!nextContent) {
-    return tr;
-  }
-
-  const textNode = schema.text(' ');
-  // Delete the next node.
-  tr = tr.delete(deleteFrom, deleteFrom + nextNode.nodeSize);
-  // Append extra space character to its previous list item.
-  tr = tr.insert(nextFrom - 2, nextContent);
-  // Move the content to the list item.
-  tr = tr.insert(nextFrom - 2, Fragment.from(textNode));
-  tr = tr.setSelection(
-    TextSelection.create(tr.doc, nextFrom - 2, nextFrom - 2)
-  );
-  return tr;
-}
-
-class ListItemMergeCommand extends UICommand {
-  _direction = '';
-
-  constructor(direction: string) {
-    super();
-    this._direction = direction;
-  }
-
-  isActive = (state: EditorState): boolean => {
-    return false;
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { selection, schema } = state;
-    let { tr } = state;
-    const direction = this._direction;
-    if (direction === 'down') {
-      tr = mergeListItemDown(tr.setSelection(selection), schema);
-    } else if (direction === 'up') {
-      tr = mergeListItemUp(tr.setSelection(selection), schema);
-    }
-
-    if (tr.docChanged) {
-      dispatch && dispatch(tr);
-      return true;
-    } else {
-      return false;
-    }
-  };
-}
-
-export default ListItemMergeCommand;
+// @flow
+
+import nullthrows from 'nullthrows';
+import { Fragment, Schema } from 'prosemirror-model';
+import { EditorState } from 'prosemirror-state';
+import { TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { findParentNodeOfType } from 'prosemirror-utils';
+import { EditorView } from 'prosemirror-view';
+
+import { HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
+import nodeAt from './nodeAt';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+function mergeListItemUp(tr: Transform, schema: Schema): Transform {
+  // This merge a list item to is previous list item of the selection is at the
+  // beginning of the list item.
+  const { selection } = tr;
+  if (!selection) {
+    return tr;
+  }
+  const nodeType = schema.nodes[LIST_ITEM];
+  if (!nodeType) {
+    return tr;
+  }
+  const { from, empty } = selection;
+  if (!empty) {
+    // Selection is collapsed.
+    return tr;
+  }
+  const result = findParentNodeOfType(nodeType)(selection);
+  if (!result) {
+    return tr;
+  }
+  const { pos, node } = result;
+  if (from !== pos + 2) {
+    // Selection is not at the begining of the list item.
+    return tr;
+  }
+  const $pos = tr.doc.resolve(pos);
+  const prevNode = $pos.nodeBefore;
+  if (!prevNode || prevNode.type !== nodeType) {
+    return tr;
+  }
+  if (node.childCount !== 1) {
+    // list item should only have one child (paragraph).
+    return tr;
+  }
+
+  const paragraphNode = node.firstChild;
+  const textNode = schema.text(' ');
+
+  // Delete the list item
+  tr = tr.delete(pos - 2, pos + node.nodeSize);
+  // Append extra space character to its previous list item.
+  tr = tr.insert(pos - 2, Fragment.from(textNode));
+  // Move the content to its previous list item.
+  tr = tr.insert(pos - 1, Fragment.from(paragraphNode.content));
+  tr = tr.setSelection(TextSelection.create(tr.doc, pos - 1, pos - 1));
+  return tr;
+}
+
+function mergeListItemDown(tr: Transform, schema: Schema): Transform {
+  // This merge a list item to is next list item of the selection is at the
+  // beginning of the list item.
+  const { selection } = tr;
+  if (!selection) {
+    return tr;
+  }
+  const listItem = schema.nodes[LIST_ITEM];
+  if (!listItem) {
+    return tr;
+  }
+  const { from, empty } = selection;
+  if (!empty) {
+    // Selection is collapsed.
+    return tr;
+  }
+  const result = findParentNodeOfType(listItem)(selection);
+  if (!result) {
+    return tr;
+  }
+  const { pos, node } = result;
+  if (from !== pos + node.content.size) {
+    // Selection is not at the begining of the list item.
+    return tr;
+  }
+
+  const $pos = tr.doc.resolve(pos);
+  const list = $pos.parent.type;
+  const listResult = findParentNodeOfType(list)(selection);
+  if (!listResult) {
+    return tr;
+  }
+  const nextFrom = pos + node.nodeSize;
+  let nextNode = nodeAt(tr.doc, nextFrom);
+  let deleteFrom = nextFrom;
+  if (listResult.start + listResult.node.content.size === nextFrom) {
+    // It's at the end of the last list item. It shall bring the content of the
+    // block after the list.
+    nextNode = nodeAt(tr.doc, nextFrom + 1);
+    deleteFrom += 1;
+  }
+
+  if (!nextNode) {
+    return tr;
+  }
+
+  let nextContent;
+
+  switch (nextNode.type) {
+    case listItem:
+      // List item should only have one child (paragraph).
+      const paragraphNode = nullthrows(nextNode.firstChild);
+      nextContent = Fragment.from(paragraphNode.content);
+      break;
+
+    case schema.nodes[HEADING]:
+    case schema.nodes[PARAGRAPH]:
+      // Will bring in the content of the next block.
+      nextContent = Fragment.from(nextNode.content);
+      break;
+  }
+
+  if (!nextContent) {
+    return tr;
+  }
+
+  const textNode = schema.text(' ');
+  // Delete the next node.
+  tr = tr.delete(deleteFrom, deleteFrom + nextNode.nodeSize);
+  // Append extra space character to its previous list item.
+  tr = tr.insert(nextFrom - 2, nextContent);
+  // Move the content to the list item.
+  tr = tr.insert(nextFrom - 2, Fragment.from(textNode));
+  tr = tr.setSelection(
+    TextSelection.create(tr.doc, nextFrom - 2, nextFrom - 2)
+  );
+  return tr;
+}
+
+class ListItemMergeCommand extends UICommand {
+  _direction = '';
+
+  constructor(direction: string) {
+    super();
+    this._direction = direction;
+  }
+
+  isActive = (state: EditorState): boolean => {
+    return false;
+  };
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { selection, schema } = state;
+    let { tr } = state;
+    const direction = this._direction;
+    if (direction === 'down') {
+      tr = mergeListItemDown(tr.setSelection(selection), schema);
+    } else if (direction === 'up') {
+      tr = mergeListItemUp(tr.setSelection(selection), schema);
+    }
+
+    if (tr.docChanged) {
+      dispatch && dispatch(tr);
+      return true;
+    } else {
+      return false;
+    }
+  };
+}
+
+export default ListItemMergeCommand;

package/dist/ListItemNodeSpec.js.flow

@@ -1,51 +1,51 @@
-// @flow
-
-import { Node } from 'prosemirror-model';
-
-import type { NodeSpec } from './Types';
-
-export const ATTRIBUTE_LIST_STYLE_TYPE = 'data-list-style-type';
-
-const ALIGN_PATTERN = /(left|right|center|justify)/;
-
-function getAttrs(dom: HTMLElement) {
-  const attrs = {};
-  const { textAlign } = dom.style;
-  let align = dom.getAttribute('data-align') || textAlign || '';
-  align = ALIGN_PATTERN.test(align) ? align : null;
-
-  if (align) {
-    attrs.align = align;
-  }
-  return attrs;
-}
-
-const ListItemNodeSpec: NodeSpec = {
-  attrs: {
-    align: { default: null },
-  },
-
-  // NOTE:
-  // This spec does not support nested lists (e.g. `'paragraph block*'`)
-  // as content because of the complexity of dealing with indentation
-  // (context: https://github.com/ProseMirror/prosemirror/issues/92).
-  content: 'paragraph',
-
-  parseDOM: [{ tag: 'li', getAttrs }],
-
-  // NOTE:
-  // This method only defines the minimum HTML attributes needed when the node
-  // is serialized to HTML string. Usually this is called when user copies
-  // the node to clipboard.
-  // The actual DOM rendering logic is defined at `src/ui/ListItemNodeView.js`.
-  toDOM(node: Node): Array<any> {
-    const attrs = {};
-    const { align } = node.attrs;
-    if (align) {
-      attrs['data-align'] = align;
-    }
-    return ['li', attrs, 0];
-  },
-};
-
-export default ListItemNodeSpec;
+// @flow
+
+import { Node } from 'prosemirror-model';
+
+import type { NodeSpec } from './Types';
+
+export const ATTRIBUTE_LIST_STYLE_TYPE = 'data-list-style-type';
+
+const ALIGN_PATTERN = /(left|right|center|justify)/;
+
+function getAttrs(dom: HTMLElement) {
+  const attrs = {};
+  const { textAlign } = dom.style;
+  let align = dom.getAttribute('data-align') || textAlign || '';
+  align = ALIGN_PATTERN.test(align) ? align : null;
+
+  if (align) {
+    attrs.align = align;
+  }
+  return attrs;
+}
+
+const ListItemNodeSpec: NodeSpec = {
+  attrs: {
+    align: { default: null },
+  },
+
+  // NOTE:
+  // This spec does not support nested lists (e.g. `'paragraph block*'`)
+  // as content because of the complexity of dealing with indentation
+  // (context: https://github.com/ProseMirror/prosemirror/issues/92).
+  content: 'paragraph',
+
+  parseDOM: [{ tag: 'li', getAttrs }],
+
+  // NOTE:
+  // This method only defines the minimum HTML attributes needed when the node
+  // is serialized to HTML string. Usually this is called when user copies
+  // the node to clipboard.
+  // The actual DOM rendering logic is defined at `src/ui/ListItemNodeView.js`.
+  toDOM(node: Node): Array<any> {
+    const attrs = {};
+    const { align } = node.attrs;
+    if (align) {
+      attrs['data-align'] = align;
+    }
+    return ['li', attrs, 0];
+  },
+};
+
+export default ListItemNodeSpec;

package/dist/ListSplitCommand.js.flow

@@ -1,32 +1,32 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-
-import splitListItem from './splitListItem';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-
-class ListSplitCommand extends UICommand {
-  constructor(schema: Schema) {
-    super();
-  }
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { selection, schema } = state;
-    const tr = splitListItem(state.tr.setSelection(selection), schema);
-    if (tr.docChanged) {
-      dispatch && dispatch(tr);
-      return true;
-    } else {
-      return false;
-    }
-  };
-}
-
-export default ListSplitCommand;
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { EditorState } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+
+import splitListItem from './splitListItem';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+class ListSplitCommand extends UICommand {
+  constructor(schema: Schema) {
+    super();
+  }
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { selection, schema } = state;
+    const tr = splitListItem(state.tr.setSelection(selection), schema);
+    if (tr.docChanged) {
+      dispatch && dispatch(tr);
+      return true;
+    } else {
+      return false;
+    }
+  };
+}
+
+export default ListSplitCommand;

package/dist/ListToggleCommand.js

@@ -16,16 +16,10 @@ var _prosemirrorView = require("prosemirror-view");
 
 var _NodeNames = require("./NodeNames");
 
-var _noop = _interopRequireDefault(require("./noop"));
-
-var _toggleList = _interopRequireDefault(require("./toggleList"));
+var _licitUiCommands = require("@modusoperandi/licit-ui-commands");
 
 var _licitDocAttrsStep = require("@modusoperandi/licit-doc-attrs-step");
 
-var _isNodeSelectionForNodeType = _interopRequireDefault(require("./isNodeSelectionForNodeType"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class ListToggleCommand extends _licitDocAttrsStep.UICommand {
@@ -69,7 +63,7 @@ class ListToggleCommand extends _licitDocAttrsStep.UICommand {
         return tr;
       }
 
-      tr = (0, _toggleList.default)(tr, schema, nodeType, this._orderedListType);
+      tr = (0, _licitUiCommands.toggleList)(tr, schema, nodeType, this._orderedListType);
 
       if (tr.docChanged) {
         dispatch && dispatch(tr);
@@ -88,7 +82,7 @@ class ListToggleCommand extends _licitDocAttrsStep.UICommand {
       nodes
     } = state.schema;
     const list = nodes[type];
-    const findList = list ? (0, _prosemirrorUtils.findParentNodeOfType)(list) : _noop.default;
+    const findList = list ? (0, _prosemirrorUtils.findParentNodeOfType)(list) : _licitUiCommands.noop;
     return findList(state.selection);
   }
 
@@ -104,5 +98,5 @@ function hasImageNode(state) {
     schema
   } = state;
   const imageNodeType = schema.nodes[_NodeNames.IMAGE];
-  return imageNodeType && (0, _isNodeSelectionForNodeType.default)(selection, imageNodeType);
+  return imageNodeType && (0, _licitUiCommands.isNodeSelectionForNodeType)(selection, imageNodeType);
 }