@modusoperandi/licit 1.0.4 → 1.0.7

package/splitListItem.js.flow

@@ -1,191 +1,191 @@
-// @flow
-
-import uuid from './ui/uuid.js';
-import { Fragment, Schema } from 'prosemirror-model';
-import { TextSelection } from 'prosemirror-state';
-import { Transform, canSplit } from 'prosemirror-transform';
-import { LIST_ITEM, ORDERED_LIST, BULLET_LIST, PARAGRAPH } from './NodeNames.js';
-import { findParentNodeOfType } from 'prosemirror-utils';
-
-// Splits a list item by the current cursor's position.
-// Some examples:
-//
-// - split before item's text:
-//   - before:
-//     1. <cursor>AA
-//     2. BB
-//     3. CC
-//   - after:
-//     1. <cursor>
-//     2. AA
-//     3. BB
-//     4. CC
-//
-// - split between item's text:
-//   - before:
-//     1. AA
-//     2. B<cursor>B
-//     3. CC
-//   - after:
-//     1. AA
-//     2. B
-//     3. B
-//     4. CC
-//
-// - split after item's text:
-//   - before:
-//     1. AA
-//     2. BB<cursor>
-//     3. CC
-//   - after:
-//     1. AA
-//     2. BB
-//     3. <cursor>
-//     4. CC
-//
-// - split at item with empty content:
-//   - before:
-//     1. AA
-//     2. <cursor>
-//     3. CC
-//   - after:
-//     1. AA
-//     <cursor>
-//     2. BB
-//     3. CC
-//
-export default function splitListItem(
-  tr: Transform,
-  schema: Schema
-): Transform {
-  const nodeType = schema.nodes[LIST_ITEM];
-  if (!nodeType) {
-    return tr;
-  }
-
-  const { selection } = tr;
-  if (!selection) {
-    return tr;
-  }
-
-  const { $from, $to, node } = selection;
-  if ((node && node.isBlock) || $from.depth < 2 || !$from.sameParent($to)) {
-    return tr;
-  }
-
-  const grandParent = $from.node(-1);
-  if (grandParent.type !== nodeType) {
-    return tr;
-  }
-
-  if ($from.parent.content.size == 0) {
-    // In an empty list item.
-    return splitEmptyListItem(tr, schema);
-  }
-
-  const nextType =
-    $to.pos == $from.end()
-      ? grandParent.contentMatchAt($from.indexAfter(-1)).defaultType
-      : null;
-
-  tr = tr.delete($from.pos, $to.pos);
-  const types = nextType && [null, { type: nextType }];
-  if (!canSplit(tr.doc, $from.pos, 2, types)) {
-    return tr;
-  }
-
-  return tr.split($from.pos, 2, types);
-}
-
-// Splits an item with empty content:
-//   - before:
-//     1. AA
-//     2. <cursor>
-//     3. CC
-//   - after:
-//     1. AA
-//     <cursor>
-//     2. BB
-//     3. CC
-function splitEmptyListItem(tr: Transform, schema: Schema): Transform {
-  const listItemType = schema.nodes[LIST_ITEM];
-  const orderedListType = schema.nodes[ORDERED_LIST];
-  const bulletListType = schema.nodes[BULLET_LIST];
-  const paragraphType = schema.nodes[PARAGRAPH];
-  if (!listItemType || !paragraphType) {
-    // Schema does not support the nodes expected.
-    return tr;
-  }
-  const listItemFound = findParentNodeOfType(listItemType)(tr.selection);
-  if (!listItemFound || listItemFound.node.textContent !== '') {
-    // Cursor is not inside an empty list item.
-    return tr;
-  }
-
-  const listFound =
-    (orderedListType && findParentNodeOfType(orderedListType)(tr.selection)) ||
-    (bulletListType && findParentNodeOfType(bulletListType)(tr.selection));
-
-  if (!listFound) {
-    // Cursor isn't inside an list.
-    return tr;
-  }
-
-  const $listItemPos = tr.doc.resolve(listItemFound.pos);
-  const listItemIndex = $listItemPos.index($listItemPos.depth);
-  const listFoundNode = listFound.node;
-  if (
-    listFoundNode.childCount < 3 ||
-    listItemIndex < 1 ||
-    listItemIndex >= listFoundNode.childCount - 1
-  ) {
-    // - The list must have at least three list items
-    // - The cursor must be after the first list item and before the last list
-    //   item.
-    // If both conditions don't match, bails out, which will remove the empty
-    // item.
-    return tr;
-  }
-
-  // Find the name of the current list to split. If the name isn't available,
-  // assigns a new name.
-  let { name } = listFoundNode.attrs;
-  if (!name) {
-    name = uuid();
-    tr = tr.setNodeMarkup(
-      listFound.pos,
-      listFoundNode.type,
-      {
-        ...listFoundNode.attrs,
-        name,
-      },
-      listFoundNode.marks
-    );
-  }
-
-  // We'll split the list into two lists.
-  // the first list contains the items before the cursor, and the second
-  // list contains the items after the cursor and the second list will "follow"
-  // the first list by sharing the same counter variable.
-  const sliceFrom = listItemFound.pos + listItemFound.node.nodeSize;
-  const sliceTo = listFound.pos + listFound.node.nodeSize - 1;
-  const slicedItems = tr.doc.slice(sliceFrom, sliceTo, false);
-
-  const deleteFrom = listItemFound.pos;
-  const deleteTo = listFound.pos + listFound.node.nodeSize;
-  tr = tr.delete(deleteFrom, deleteTo);
-  const sourceListNode = listFound.node;
-  const listAttrs = { ...sourceListNode.attrs };
-  if (orderedListType === sourceListNode.type) {
-    listAttrs.counterReset = 'none';
-    listAttrs.following = name;
-  }
-
-  const insertFrom = deleteFrom + 1;
-  const listNode = sourceListNode.type.create(listAttrs, slicedItems.content);
-  tr = tr.insert(insertFrom, listNode);
-  const paragraph = paragraphType.create({}, Fragment.empty);
-  tr = tr.insert(insertFrom, paragraph);
-  tr = tr.setSelection(TextSelection.create(tr.doc, insertFrom));
-  return tr;
-}
+// @flow
+
+import uuid from './ui/uuid.js';
+import { Fragment, Schema } from 'prosemirror-model';
+import { TextSelection } from 'prosemirror-state';
+import { Transform, canSplit } from 'prosemirror-transform';
+import { LIST_ITEM, ORDERED_LIST, BULLET_LIST, PARAGRAPH } from './NodeNames.js';
+import { findParentNodeOfType } from 'prosemirror-utils';
+
+// Splits a list item by the current cursor's position.
+// Some examples:
+//
+// - split before item's text:
+//   - before:
+//     1. <cursor>AA
+//     2. BB
+//     3. CC
+//   - after:
+//     1. <cursor>
+//     2. AA
+//     3. BB
+//     4. CC
+//
+// - split between item's text:
+//   - before:
+//     1. AA
+//     2. B<cursor>B
+//     3. CC
+//   - after:
+//     1. AA
+//     2. B
+//     3. B
+//     4. CC
+//
+// - split after item's text:
+//   - before:
+//     1. AA
+//     2. BB<cursor>
+//     3. CC
+//   - after:
+//     1. AA
+//     2. BB
+//     3. <cursor>
+//     4. CC
+//
+// - split at item with empty content:
+//   - before:
+//     1. AA
+//     2. <cursor>
+//     3. CC
+//   - after:
+//     1. AA
+//     <cursor>
+//     2. BB
+//     3. CC
+//
+export default function splitListItem(
+  tr: Transform,
+  schema: Schema
+): Transform {
+  const nodeType = schema.nodes[LIST_ITEM];
+  if (!nodeType) {
+    return tr;
+  }
+
+  const { selection } = tr;
+  if (!selection) {
+    return tr;
+  }
+
+  const { $from, $to, node } = selection;
+  if ((node?.isBlock) || $from.depth < 2 || !$from.sameParent($to)) {
+    return tr;
+  }
+
+  const grandParent = $from.node(-1);
+  if (grandParent.type !== nodeType) {
+    return tr;
+  }
+
+  if ($from.parent.content.size == 0) {
+    // In an empty list item.
+    return splitEmptyListItem(tr, schema);
+  }
+
+  const nextType =
+    $to.pos == $from.end()
+      ? grandParent.contentMatchAt($from.indexAfter(-1)).defaultType
+      : null;
+
+  tr = tr.delete($from.pos, $to.pos);
+  const types = nextType && [null, { type: nextType }];
+  if (!canSplit(tr.doc, $from.pos, 2, types)) {
+    return tr;
+  }
+
+  return tr.split($from.pos, 2, types);
+}
+
+// Splits an item with empty content:
+//   - before:
+//     1. AA
+//     2. <cursor>
+//     3. CC
+//   - after:
+//     1. AA
+//     <cursor>
+//     2. BB
+//     3. CC
+function splitEmptyListItem(tr: Transform, schema: Schema): Transform {
+  const listItemType = schema.nodes[LIST_ITEM];
+  const orderedListType = schema.nodes[ORDERED_LIST];
+  const bulletListType = schema.nodes[BULLET_LIST];
+  const paragraphType = schema.nodes[PARAGRAPH];
+  if (!listItemType || !paragraphType) {
+    // Schema does not support the nodes expected.
+    return tr;
+  }
+  const listItemFound = findParentNodeOfType(listItemType)(tr.selection);
+  if (!listItemFound || listItemFound.node.textContent !== '') {
+    // Cursor is not inside an empty list item.
+    return tr;
+  }
+
+  const listFound =
+    (orderedListType && findParentNodeOfType(orderedListType)(tr.selection)) ||
+    (bulletListType && findParentNodeOfType(bulletListType)(tr.selection));
+
+  if (!listFound) {
+    // Cursor isn't inside an list.
+    return tr;
+  }
+
+  const $listItemPos = tr.doc.resolve(listItemFound.pos);
+  const listItemIndex = $listItemPos.index($listItemPos.depth);
+  const listFoundNode = listFound.node;
+  if (
+    listFoundNode.childCount < 3 ||
+    listItemIndex < 1 ||
+    listItemIndex >= listFoundNode.childCount - 1
+  ) {
+    // - The list must have at least three list items
+    // - The cursor must be after the first list item and before the last list
+    //   item.
+    // If both conditions don't match, bails out, which will remove the empty
+    // item.
+    return tr;
+  }
+
+  // Find the name of the current list to split. If the name isn't available,
+  // assigns a new name.
+  let { name } = listFoundNode.attrs;
+  if (!name) {
+    name = uuid();
+    tr = tr.setNodeMarkup(
+      listFound.pos,
+      listFoundNode.type,
+      {
+        ...listFoundNode.attrs,
+        name,
+      },
+      listFoundNode.marks
+    );
+  }
+
+  // We'll split the list into two lists.
+  // the first list contains the items before the cursor, and the second
+  // list contains the items after the cursor and the second list will "follow"
+  // the first list by sharing the same counter variable.
+  const sliceFrom = listItemFound.pos + listItemFound.node.nodeSize;
+  const sliceTo = listFound.pos + listFound.node.nodeSize - 1;
+  const slicedItems = tr.doc.slice(sliceFrom, sliceTo, false);
+
+  const deleteFrom = listItemFound.pos;
+  const deleteTo = listFound.pos + listFound.node.nodeSize;
+  tr = tr.delete(deleteFrom, deleteTo);
+  const sourceListNode = listFound.node;
+  const listAttrs = { ...sourceListNode.attrs };
+  if (orderedListType === sourceListNode.type) {
+    listAttrs.counterReset = 'none';
+    listAttrs.following = name;
+  }
+
+  const insertFrom = deleteFrom + 1;
+  const listNode = sourceListNode.type.create(listAttrs, slicedItems.content);
+  tr = tr.insert(insertFrom, listNode);
+  const paragraph = paragraphType.create({}, Fragment.empty);
+  tr = tr.insert(insertFrom, paragraph);
+  tr = tr.setSelection(TextSelection.create(tr.doc, insertFrom));
+  return tr;
+}

package/styles.css

@@ -1,19 +1,19 @@
-@import './styles0.css';
-@import './ui/czi-loading-indicator.css';
-@import './ui/czi-math-view.css';
-@import '@modusoperandi/licit-ui-commands/ui/czi-pop-up.css';
-@import './ui/czi-selection-placeholder.css';
-@import './ui/czi-table-cell-menu.css';
-@import './ui/czi-table-grid-size-editor.css';
-@import '@modusoperandi/licit-ui-commands/ui/czi-tooltip-surface.css';
-@import './ui/mathquill-editor/czi-mathquill-editor.css';
-@import './ui/mathquill-editor/czi-mathquill-editor-symbols-panel.css';
-@import './client/licit.css';
-
-/* [FS] IRAD-1061 2020-09-19 */
-
-/* Now loaded locally, so that it work in closed network as well. */
-@import './ui/fonts.css';
-@import './ui/icon-font.css';
-@import '~node-mathquill/build/mathquill.css';
-@import '~katex/dist/katex.min.css';
+@import './styles0.css';
+@import './ui/czi-loading-indicator.css';
+@import './ui/czi-math-view.css';
+@import '@modusoperandi/licit-ui-commands/ui/czi-pop-up.css';
+@import './ui/czi-selection-placeholder.css';
+@import './ui/czi-table-cell-menu.css';
+@import './ui/czi-table-grid-size-editor.css';
+@import '@modusoperandi/licit-ui-commands/ui/czi-tooltip-surface.css';
+@import './ui/mathquill-editor/czi-mathquill-editor.css';
+@import './ui/mathquill-editor/czi-mathquill-editor-symbols-panel.css';
+@import './client/licit.css';
+
+/* [FS] IRAD-1061 2020-09-19 */
+
+/* Now loaded locally, so that it work in closed network as well. */
+@import './ui/fonts.css';
+@import './ui/icon-font.css';
+@import '~node-mathquill/build/mathquill.css';
+@import '~katex/dist/katex.min.css';

package/styles0.css

@@ -1,29 +1,29 @@
-@import './ui/czi-vars.css';
-@import './ui/czi-heading.css';
-@import './ui/czi-indent.css';
-@import './ui/czi-list.css';
-@import './ui/czi-table.css';
-@import '@modusoperandi/licit-ui-commands/ui/czi-custom-button.css';
-@import '@modusoperandi/licit-ui-commands/ui/czi-animations.css';
-@import '@modusoperandi/licit-ui-commands/ui/czi-color-editor.css';
-@import './ui/czi-bookmark-view.css';
-@import './ui/czi-body-layout-editor.css';
-@import './ui/czi-cursor-placeholder.css';
-@import './ui/czi-custom-menu.css';
-@import './ui/czi-custom-menu-button.css';
-@import './ui/czi-custom-menu-item.css';
-@import './ui/czi-custom-radio-button.css';
-@import './ui/czi-custom-scrollbar.css';
-@import './ui/czi-editor.css';
-@import './ui/czi-editor-frameset.css';
-@import './ui/czi-editor-toolbar.css';
-@import './ui/czi-form.css';
-@import './ui/czi-frag.css';
-@import './ui/czi-icon.css';
-@import './ui/czi-image-resize-box.css';
-@import './ui/czi-image-upload-editor.css';
-@import './ui/czi-image-upload-placeholder.css';
-@import './ui/czi-image-url-editor.css';
-@import './ui/czi-image-view.css';
-@import './ui/czi-inline-editor.css';
-@import './ui/czi-link-tooltip.css';
+@import './ui/czi-vars.css';
+@import './ui/czi-heading.css';
+@import './ui/czi-indent.css';
+@import './ui/czi-list.css';
+@import './ui/czi-table.css';
+@import '@modusoperandi/licit-ui-commands/ui/czi-custom-button.css';
+@import '@modusoperandi/licit-ui-commands/ui/czi-animations.css';
+@import '@modusoperandi/licit-ui-commands/ui/czi-color-editor.css';
+@import './ui/czi-bookmark-view.css';
+@import './ui/czi-body-layout-editor.css';
+@import './ui/czi-cursor-placeholder.css';
+@import './ui/czi-custom-menu.css';
+@import './ui/czi-custom-menu-button.css';
+@import './ui/czi-custom-menu-item.css';
+@import './ui/czi-custom-radio-button.css';
+@import './ui/czi-custom-scrollbar.css';
+@import './ui/czi-editor.css';
+@import './ui/czi-editor-frameset.css';
+@import './ui/czi-editor-toolbar.css';
+@import './ui/czi-form.css';
+@import './ui/czi-frag.css';
+@import './ui/czi-icon.css';
+@import './ui/czi-image-resize-box.css';
+@import './ui/czi-image-upload-editor.css';
+@import './ui/czi-image-upload-placeholder.css';
+@import './ui/czi-image-url-editor.css';
+@import './ui/czi-image-view.css';
+@import './ui/czi-inline-editor.css';
+@import './ui/czi-link-tooltip.css';

package/toClosestFontPtSize.js.flow

@@ -1,22 +1,22 @@
-// [FS-SEA][24-02-2020]
-// overrided the method form 'convertToCSSPTValue.js' file to avoid the compiling issue .
-// [FS][28-02-2020]
-// IRAD-893 - Copy Paste From External Source Not Working
-// removed {} from import, because convertToCSSPTValue is a default export function.
-import convertToCSSPTValue from './convertToCSSPTValue.js';
-
-export function toClosestFontPtSize(styleValue: string): number {
-  // duplicated FONT_PT_SIZES(available in ./ui/FontSizeCommandMenuButton)
-  const FONT_PT_SIZES = [8, 9, 10, 11, 12, 14, 18, 24, 30, 36, 48, 60, 72, 90];
-  const originalPTValue = convertToCSSPTValue(styleValue);
-
-  if (FONT_PT_SIZES.includes(originalPTValue)) {
-    return originalPTValue;
-  }
-
-  return FONT_PT_SIZES.reduce((prev, curr) => {
-    return Math.abs(curr - originalPTValue) < Math.abs(prev - originalPTValue)
-      ? curr
-      : prev;
-  }, Number.NEGATIVE_INFINITY);
-}
+// [FS-SEA][24-02-2020]
+// overrided the method form 'convertToCSSPTValue.js' file to avoid the compiling issue .
+// [FS][28-02-2020]
+// IRAD-893 - Copy Paste From External Source Not Working
+// removed {} from import, because convertToCSSPTValue is a default export function.
+import convertToCSSPTValue from './convertToCSSPTValue.js';
+
+export function toClosestFontPtSize(styleValue: string): number {
+  // duplicated FONT_PT_SIZES(available in ./ui/FontSizeCommandMenuButton)
+  const FONT_PT_SIZES = [8, 9, 10, 11, 12, 14, 18, 24, 30, 36, 48, 60, 72, 90];
+  const originalPTValue = convertToCSSPTValue(styleValue);
+
+  if (FONT_PT_SIZES.includes(originalPTValue)) {
+    return originalPTValue;
+  }
+
+  return FONT_PT_SIZES.reduce((prev, curr) => {
+    return Math.abs(curr - originalPTValue) < Math.abs(prev - originalPTValue)
+      ? curr
+      : prev;
+  }, Number.NEGATIVE_INFINITY);
+}

package/toSafeHTMLDocument.js.flow

@@ -1,9 +1,9 @@
-// @flow
-
-// Parses HTML in a detached document to help with avoiding XSS
-// https://developer.mozilla.org/en-US/docs/Archive/Add-ons/Code_snippets/HTML_to_DOM
-// https://github.com/ProseMirror/prosemirror/issues/473#issuecomment-255727531
-export default function toSafeHTMLDocument(html: string): ?Document {
-  const parser = new window.DOMParser();
-  return parser.parseFromString(html, 'text/html');
-}
+// @flow
+
+// Parses HTML in a detached document to help with avoiding XSS
+// https://developer.mozilla.org/en-US/docs/Archive/Add-ons/Code_snippets/HTML_to_DOM
+// https://github.com/ProseMirror/prosemirror/issues/473#issuecomment-255727531
+export default function toSafeHTMLDocument(html: string): ?Document {
+  const parser = new window.DOMParser();
+  return parser.parseFromString(html, 'text/html');
+}

package/toggleBlockquote.js

@@ -1,10 +1,7 @@
 import { Schema } from 'prosemirror-model';
 import { Transform } from 'prosemirror-transform';
 import { BLOCKQUOTE, HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames.js';
-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';
+import { compareNumber, isInsideListItem, isListNode, unwrapNodesFromList } from '@modusoperandi/licit-ui-commands';
 export default function toggleBlockquote(tr, schema) {
   var nodes = schema.nodes;
   var _tr = tr,
@@ -34,7 +31,9 @@ export default function toggleBlockquote(tr, schema) {
     return !isListNode(node);
   });
   // Update from the bottom to avoid disruptive changes in pos.
-  poses.sort(compareNumber).reverse().forEach(function (pos) {
+  var sortedPoses = [].concat(poses); // Create a shallow copy of poses
+  sortedPoses.sort(compareNumber);
+  sortedPoses.sort(compareNumber).reverse().forEach(function (pos) {
     tr = setBlockquoteNode(tr, schema, pos);
   });
   return tr;