@modusoperandi/licit 0.13.1 → 0.13.2

package/src/toggleBlockquote.js

@@ -1,91 +1,91 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { Transform } from 'prosemirror-transform';
-
-import { BLOCKQUOTE, HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
-import compareNumber from './compareNumber';
-import isInsideListItem from './isInsideListItem';
-import isListNode from './isListNode';
-import { unwrapNodesFromList } from './toggleList';
-
-export default function toggleBlockquote(
-  tr: Transform,
-  schema: Schema
-): Transform {
-  const { nodes } = schema;
-  const { selection, doc } = tr;
-  const heading = nodes[HEADING];
-  const blockquote = nodes[BLOCKQUOTE];
-  const paragraph = nodes[PARAGRAPH];
-  const listItem = nodes[LIST_ITEM];
-
-  if (!selection || !doc || !heading || !paragraph || !listItem) {
-    return tr;
-  }
-
-  const { from, to } = tr.selection;
-  let startWithBlockQuote = null;
-  const poses = [];
-  doc.nodesBetween(from, to, (node, pos, parentNode) => {
-    const nodeType = node.type;
-    const parentNodeType = parentNode.type;
-
-    if (startWithBlockQuote === null) {
-      startWithBlockQuote = nodeType === blockquote;
-    }
-
-    if (parentNodeType !== listItem) {
-      poses.push(pos);
-    }
-    return !isListNode(node);
-  });
-  // Update from the bottom to avoid disruptive changes in pos.
-  poses
-    .sort(compareNumber)
-    .reverse()
-    .forEach((pos) => {
-      tr = setBlockquoteNode(tr, schema, pos);
-    });
-  return tr;
-}
-
-function setBlockquoteNode(
-  tr: Transform,
-  schema: Schema,
-  pos: number
-): Transform {
-  const { nodes } = schema;
-  const heading = nodes[HEADING];
-  const paragraph = nodes[PARAGRAPH];
-  const blockquote = nodes[BLOCKQUOTE];
-
-  if (pos >= tr.doc.content.size) {
-    // Workaround to handle the edge case that pos was shifted caused by `toggleList`.
-    return tr;
-  }
-  const node = tr.doc.nodeAt(pos);
-
-  if (!node || !heading || !paragraph) {
-    return tr;
-  }
-
-  const nodeType = node.type;
-  if (isInsideListItem(tr.doc, pos)) {
-    return tr;
-  } else if (isListNode(node)) {
-    // Toggle list
-    if (blockquote) {
-      tr = unwrapNodesFromList(tr, schema, pos, (paragraphNode) => {
-        const { content, marks, attrs } = paragraphNode;
-        return blockquote.create(attrs, content, marks);
-      });
-    }
-  } else if (nodeType === blockquote) {
-    // Toggle heading
-    tr = tr.setNodeMarkup(pos, paragraph, node.attrs, node.marks);
-  } else if (nodeType === paragraph || nodeType === heading) {
-    tr = tr.setNodeMarkup(pos, blockquote, node.attrs, node.marks);
-  }
-  return tr;
-}
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { Transform } from 'prosemirror-transform';
+
+import { BLOCKQUOTE, HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
+import { compareNumber } from '@modusoperandi/licit-ui-commands';
+import { isInsideListItem } from '@modusoperandi/licit-ui-commands';
+import { isListNode } from '@modusoperandi/licit-ui-commands';
+import { unwrapNodesFromList } from '@modusoperandi/licit-ui-commands';
+
+export default function toggleBlockquote(
+  tr: Transform,
+  schema: Schema
+): Transform {
+  const { nodes } = schema;
+  const { selection, doc } = tr;
+  const heading = nodes[HEADING];
+  const blockquote = nodes[BLOCKQUOTE];
+  const paragraph = nodes[PARAGRAPH];
+  const listItem = nodes[LIST_ITEM];
+
+  if (!selection || !doc || !heading || !paragraph || !listItem) {
+    return tr;
+  }
+
+  const { from, to } = tr.selection;
+  let startWithBlockQuote = null;
+  const poses = [];
+  doc.nodesBetween(from, to, (node, pos, parentNode) => {
+    const nodeType = node.type;
+    const parentNodeType = parentNode.type;
+
+    if (startWithBlockQuote === null) {
+      startWithBlockQuote = nodeType === blockquote;
+    }
+
+    if (parentNodeType !== listItem) {
+      poses.push(pos);
+    }
+    return !isListNode(node);
+  });
+  // Update from the bottom to avoid disruptive changes in pos.
+  poses
+    .sort(compareNumber)
+    .reverse()
+    .forEach((pos) => {
+      tr = setBlockquoteNode(tr, schema, pos);
+    });
+  return tr;
+}
+
+function setBlockquoteNode(
+  tr: Transform,
+  schema: Schema,
+  pos: number
+): Transform {
+  const { nodes } = schema;
+  const heading = nodes[HEADING];
+  const paragraph = nodes[PARAGRAPH];
+  const blockquote = nodes[BLOCKQUOTE];
+
+  if (pos >= tr.doc.content.size) {
+    // Workaround to handle the edge case that pos was shifted caused by `toggleList`.
+    return tr;
+  }
+  const node = tr.doc.nodeAt(pos);
+
+  if (!node || !heading || !paragraph) {
+    return tr;
+  }
+
+  const nodeType = node.type;
+  if (isInsideListItem(tr.doc, pos)) {
+    return tr;
+  } else if (isListNode(node)) {
+    // Toggle list
+    if (blockquote) {
+      tr = unwrapNodesFromList(tr, schema, pos, (paragraphNode) => {
+        const { content, marks, attrs } = paragraphNode;
+        return blockquote.create(attrs, content, marks);
+      });
+    }
+  } else if (nodeType === blockquote) {
+    // Toggle heading
+    tr = tr.setNodeMarkup(pos, paragraph, node.attrs, node.marks);
+  } else if (nodeType === paragraph || nodeType === heading) {
+    tr = tr.setNodeMarkup(pos, blockquote, node.attrs, node.marks);
+  }
+  return tr;
+}

package/src/toggleCodeBlock.js

@@ -1,102 +1,102 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-
-import { MARK_LINK } from './MarkNames';
-import { BLOCKQUOTE, CODE_BLOCK, HEADING, PARAGRAPH } from './NodeNames';
-import { clearMarks } from './clearMarks';
-import compareNumber from './compareNumber';
-import isListNode from './isListNode';
-
-export default function toggleCodeBlock(
-  tr: Transform,
-  schema: Schema
-): Transform {
-  const { nodes } = schema;
-  const { selection, doc } = tr;
-  const codeBlock = nodes[CODE_BLOCK];
-  const paragraph = nodes[PARAGRAPH];
-  const heading = nodes[HEADING];
-  const blockquote = nodes[BLOCKQUOTE];
-  if (!selection || !doc || !codeBlock || !paragraph) {
-    return tr;
-  }
-
-  const poses = [];
-  const { from, to } = tr.selection;
-  let allowed = true;
-  let startWithCodeBlock = null;
-  doc.nodesBetween(from, to, (node, pos) => {
-    const nodeType = node.type;
-    if (startWithCodeBlock === null) {
-      startWithCodeBlock = nodeType === codeBlock;
-    }
-    const { type, isBlock } = node;
-    if (isBlock) {
-      allowed =
-        allowed &&
-        (type === paragraph ||
-          type === codeBlock ||
-          type === heading ||
-          type === blockquote);
-      allowed && poses.push(pos);
-    }
-
-    return isBlock;
-  });
-
-  // Update from the bottom to avoid disruptive changes in pos.
-  allowed &&
-    poses
-      .sort(compareNumber)
-      .reverse()
-      .forEach((pos) => {
-        tr = setCodeBlockNodeEnabled(
-          tr,
-          schema,
-          pos,
-          startWithCodeBlock ? false : true
-        );
-      });
-  return tr;
-}
-
-function setCodeBlockNodeEnabled(
-  tr: Transform,
-  schema: Schema,
-  pos: number,
-  enabled: boolean
-): Transform {
-  const { doc } = tr;
-  if (!doc) {
-    return tr;
-  }
-
-  const node = doc.nodeAt(pos);
-  if (!node) {
-    return tr;
-  }
-  if (isListNode(node)) {
-    return tr;
-  }
-
-  const { nodes } = schema;
-  const codeBlock = nodes[CODE_BLOCK];
-  const paragraph = nodes[PARAGRAPH];
-
-  if (codeBlock && !enabled && node.type === codeBlock) {
-    tr = tr.setNodeMarkup(pos, paragraph, node.attrs, node.marks);
-  } else if (enabled && node.type !== codeBlock) {
-    const { selection } = tr;
-    tr = tr.setSelection(
-      TextSelection.create(tr.doc, pos, pos + node.nodeSize)
-    );
-    tr = clearMarks(tr, schema);
-    tr = tr.removeMark(pos, pos + node.nodeSize, schema.marks[MARK_LINK]);
-    tr = tr.setSelection(selection);
-    tr = tr.setNodeMarkup(pos, codeBlock, node.attrs, node.marks);
-  }
-  return tr;
-}
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+
+import { MARK_LINK } from './MarkNames';
+import { BLOCKQUOTE, CODE_BLOCK, HEADING, PARAGRAPH } from './NodeNames';
+import { clearMarks } from '@modusoperandi/licit-ui-commands';
+import { compareNumber } from '@modusoperandi/licit-ui-commands';
+import { isListNode } from '@modusoperandi/licit-ui-commands';
+
+export default function toggleCodeBlock(
+  tr: Transform,
+  schema: Schema
+): Transform {
+  const { nodes } = schema;
+  const { selection, doc } = tr;
+  const codeBlock = nodes[CODE_BLOCK];
+  const paragraph = nodes[PARAGRAPH];
+  const heading = nodes[HEADING];
+  const blockquote = nodes[BLOCKQUOTE];
+  if (!selection || !doc || !codeBlock || !paragraph) {
+    return tr;
+  }
+
+  const poses = [];
+  const { from, to } = tr.selection;
+  let allowed = true;
+  let startWithCodeBlock = null;
+  doc.nodesBetween(from, to, (node, pos) => {
+    const nodeType = node.type;
+    if (startWithCodeBlock === null) {
+      startWithCodeBlock = nodeType === codeBlock;
+    }
+    const { type, isBlock } = node;
+    if (isBlock) {
+      allowed =
+        allowed &&
+        (type === paragraph ||
+          type === codeBlock ||
+          type === heading ||
+          type === blockquote);
+      allowed && poses.push(pos);
+    }
+
+    return isBlock;
+  });
+
+  // Update from the bottom to avoid disruptive changes in pos.
+  allowed &&
+    poses
+      .sort(compareNumber)
+      .reverse()
+      .forEach((pos) => {
+        tr = setCodeBlockNodeEnabled(
+          tr,
+          schema,
+          pos,
+          startWithCodeBlock ? false : true
+        );
+      });
+  return tr;
+}
+
+function setCodeBlockNodeEnabled(
+  tr: Transform,
+  schema: Schema,
+  pos: number,
+  enabled: boolean
+): Transform {
+  const { doc } = tr;
+  if (!doc) {
+    return tr;
+  }
+
+  const node = doc.nodeAt(pos);
+  if (!node) {
+    return tr;
+  }
+  if (isListNode(node)) {
+    return tr;
+  }
+
+  const { nodes } = schema;
+  const codeBlock = nodes[CODE_BLOCK];
+  const paragraph = nodes[PARAGRAPH];
+
+  if (codeBlock && !enabled && node.type === codeBlock) {
+    tr = tr.setNodeMarkup(pos, paragraph, node.attrs, node.marks);
+  } else if (enabled && node.type !== codeBlock) {
+    const { selection } = tr;
+    tr = tr.setSelection(
+      TextSelection.create(tr.doc, pos, pos + node.nodeSize)
+    );
+    tr = clearMarks(tr, schema);
+    tr = tr.removeMark(pos, pos + node.nodeSize, schema.marks[MARK_LINK]);
+    tr = tr.setSelection(selection);
+    tr = tr.setNodeMarkup(pos, codeBlock, node.attrs, node.marks);
+  }
+  return tr;
+}

package/src/ui/AlertInfo.js

@@ -1,64 +1,64 @@
-// @flow
-
-import * as React from 'react';
-import PropTypes from 'prop-types';
-import './czi-form.css';
-
-class AlertInfo extends React.PureComponent<any, any> {
-  _unmounted = false;
-
-  constructor(props: any) {
-    super(props);
-  }
-
-  // [FS] IRAD-1005 2020-07-07
-  // Upgrade outdated packages.
-  // To take care of the property type declaration.
-  static propsTypes = {
-    initialValue: PropTypes.object,
-    close: function (props: any, propName: string) {
-      const fn = props[propName];
-      if (
-        !fn.prototype ||
-        (typeof fn.prototype.constructor !== 'function' &&
-          fn.prototype.constructor.length !== 1)
-      ) {
-        return new Error(
-          propName + ' must be a function with 1 arg of type ImageLike'
-        );
-      }
-      return null;
-    },
-  };
-
-  state = {
-    ...(this.props.initialValue || {}),
-    validValue: null,
-  };
-
-  componentWillUnmount(): void {
-    this._unmounted = true;
-  }
-
-  render(): React.Element<any> {
-    const title = this.props.title || 'Document Error!';
-    const content =
-      this.props.content ||
-      'Unable to load the document. Have issues in Json format, please verify...';
-    return (
-      <div className="licit-alert">
-        <span className="closebtn" onClick={this._cancel}>
-          &times;
-        </span>
-        <strong>{title}</strong>
-        <span>{content}</span>
-      </div>
-    );
-  }
-
-  _cancel = (): void => {
-    this.props.close();
-  };
-}
-
-export default AlertInfo;
+// @flow
+
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import './czi-form.css';
+
+class AlertInfo extends React.PureComponent<any, any> {
+  _unmounted = false;
+
+  constructor(props: any) {
+    super(props);
+  }
+
+  // [FS] IRAD-1005 2020-07-07
+  // Upgrade outdated packages.
+  // To take care of the property type declaration.
+  static propsTypes = {
+    initialValue: PropTypes.object,
+    close: function (props: any, propName: string) {
+      const fn = props[propName];
+      if (
+        !fn.prototype ||
+        (typeof fn.prototype.constructor !== 'function' &&
+          fn.prototype.constructor.length !== 1)
+      ) {
+        return new Error(
+          propName + ' must be a function with 1 arg of type ImageLike'
+        );
+      }
+      return null;
+    },
+  };
+
+  state = {
+    ...(this.props.initialValue || {}),
+    validValue: null,
+  };
+
+  componentWillUnmount(): void {
+    this._unmounted = true;
+  }
+
+  render(): React.Element<any> {
+    const title = this.props.title || 'Document Error!';
+    const content =
+      this.props.content ||
+      'Unable to load the document. Have issues in Json format, please verify...';
+    return (
+      <div className="licit-alert">
+        <span className="closebtn" onClick={this._cancel}>
+          &times;
+        </span>
+        <strong>{title}</strong>
+        <span>{content}</span>
+      </div>
+    );
+  }
+
+  _cancel = (): void => {
+    this.props.close();
+  };
+}
+
+export default AlertInfo;

package/src/ui/BookmarkNodeView.js

@@ -1,66 +1,66 @@
-// @flow
-
-import { Node } from 'prosemirror-model';
-import { Decoration } from 'prosemirror-view';
-import * as React from 'react';
-
-import {
-  ATTRIBUTE_BOOKMARK_ID,
-  ATTRIBUTE_BOOKMARK_VISIBLE,
-} from './../BookmarkNodeSpec';
-import CustomNodeView from './CustomNodeView';
-import Icon from './Icon';
-
-import './czi-bookmark-view.css';
-
-import type { NodeViewProps } from './CustomNodeView';
-
-class BookmarkViewBody extends React.PureComponent<any, any> {
-  props: NodeViewProps;
-
-  render(): React.Element<any> {
-    const { id, visible } = this.props.node.attrs;
-    const icon = id && visible ? Icon.get('bookmark') : null;
-    return <span onClick={this._onClick}>{icon}</span>;
-  }
-
-  _onClick = (e: SyntheticEvent<>): void => {
-    e.preventDefault();
-    const { id } = this.props.node.attrs;
-    const hash = '#' + id;
-    if (window.location.hash !== hash) {
-      window.location.hash = hash;
-    }
-  };
-}
-
-class BookmarkNodeView extends CustomNodeView {
-  // @override
-  createDOMElement(): HTMLElement {
-    const el = document.createElement('a');
-    el.className = 'czi-bookmark-view';
-    this._updateDOM(el);
-    return el;
-  }
-
-  // @override
-  update(node: Node, decorations: Array<Decoration>): boolean {
-    super.update(node, decorations);
-    return true;
-  }
-
-  // @override
-  renderReactComponent(): React.Element<any> {
-    return <BookmarkViewBody {...this.props} />;
-  }
-
-  _updateDOM(el: HTMLElement): void {
-    const { id, visible } = this.props.node.attrs;
-    el.setAttribute('id', id);
-    el.setAttribute('title', id);
-    el.setAttribute(ATTRIBUTE_BOOKMARK_ID, id);
-    visible && el.setAttribute(ATTRIBUTE_BOOKMARK_VISIBLE, 'true');
-  }
-}
-
-export default BookmarkNodeView;
+// @flow
+
+import { Node } from 'prosemirror-model';
+import { Decoration } from 'prosemirror-view';
+import * as React from 'react';
+
+import {
+  ATTRIBUTE_BOOKMARK_ID,
+  ATTRIBUTE_BOOKMARK_VISIBLE,
+} from './../BookmarkNodeSpec';
+import CustomNodeView from './CustomNodeView';
+import Icon from './Icon';
+
+import './czi-bookmark-view.css';
+
+import type { NodeViewProps } from './CustomNodeView';
+
+class BookmarkViewBody extends React.PureComponent<any, any> {
+  props: NodeViewProps;
+
+  render(): React.Element<any> {
+    const { id, visible } = this.props.node.attrs;
+    const icon = id && visible ? Icon.get('bookmark') : null;
+    return <span onClick={this._onClick}>{icon}</span>;
+  }
+
+  _onClick = (e: SyntheticEvent<>): void => {
+    e.preventDefault();
+    const { id } = this.props.node.attrs;
+    const hash = '#' + id;
+    if (window.location.hash !== hash) {
+      window.location.hash = hash;
+    }
+  };
+}
+
+class BookmarkNodeView extends CustomNodeView {
+  // @override
+  createDOMElement(): HTMLElement {
+    const el = document.createElement('a');
+    el.className = 'czi-bookmark-view';
+    this._updateDOM(el);
+    return el;
+  }
+
+  // @override
+  update(node: Node, decorations: Array<Decoration>): boolean {
+    super.update(node, decorations);
+    return true;
+  }
+
+  // @override
+  renderReactComponent(): React.Element<any> {
+    return <BookmarkViewBody {...this.props} />;
+  }
+
+  _updateDOM(el: HTMLElement): void {
+    const { id, visible } = this.props.node.attrs;
+    el.setAttribute('id', id);
+    el.setAttribute('title', id);
+    el.setAttribute(ATTRIBUTE_BOOKMARK_ID, id);
+    visible && el.setAttribute(ATTRIBUTE_BOOKMARK_VISIBLE, 'true');
+  }
+}
+
+export default BookmarkNodeView;