@modusoperandi/licit 1.0.4 → 1.0.7

package/joinListNode.js.flow

@@ -1,55 +1,55 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-
-import { isListNode } from '@modusoperandi/licit-ui-commands';
-import joinDown from './joinDown';
-import joinUp from './joinUp';
-
-export default function joinListNode(
-  tr: Transform,
-  schema: Schema,
-  listNodePos: number
-): Transform {
-  if (!tr.doc || !tr.selection) {
-    return tr;
-  }
-  const node = tr.doc.nodeAt(listNodePos);
-  if (!isListNode(node)) {
-    return tr;
-  }
-  const initialSelection = tr.selection;
-  const listFromPos = listNodePos;
-  const listToPos = listFromPos + node.nodeSize;
-  const $fromPos = tr.doc.resolve(listFromPos);
-  const $toPos = tr.doc.resolve(listToPos);
-
-  let selectionOffset = 0;
-  if (
-    $toPos.nodeAfter &&
-    $toPos.nodeAfter.type === node.type &&
-    $toPos.nodeAfter.attrs.level === node.attrs.level
-  ) {
-    tr = joinDown(tr);
-  }
-
-  if (
-    $fromPos.nodeBefore &&
-    $fromPos.nodeBefore.type === node.type &&
-    $fromPos.nodeBefore.attrs.level === node.attrs.level
-  ) {
-    selectionOffset -= 2;
-    tr = joinUp(tr);
-  }
-
-  const selection = TextSelection.create(
-    tr.doc,
-    initialSelection.from + selectionOffset,
-    initialSelection.to + selectionOffset
-  );
-
-  tr = tr.setSelection(selection);
-  return tr;
-}
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+
+import { isListNode } from '@modusoperandi/licit-ui-commands';
+import joinDown from './joinDown';
+import joinUp from './joinUp';
+
+export default function joinListNode(
+  tr: Transform,
+  schema: Schema,
+  listNodePos: number
+): Transform {
+  if (!tr.doc || !tr.selection) {
+    return tr;
+  }
+  const node = tr.doc.nodeAt(listNodePos);
+  if (!isListNode(node)) {
+    return tr;
+  }
+  const initialSelection = tr.selection;
+  const listFromPos = listNodePos;
+  const listToPos = listFromPos + node.nodeSize;
+  const $fromPos = tr.doc.resolve(listFromPos);
+  const $toPos = tr.doc.resolve(listToPos);
+
+  let selectionOffset = 0;
+  if (
+    $toPos.nodeAfter &&
+    $toPos.nodeAfter.type === node.type &&
+    $toPos.nodeAfter.attrs.level === node.attrs.level
+  ) {
+    tr = joinDown(tr);
+  }
+
+  if (
+    $fromPos.nodeBefore &&
+    $fromPos.nodeBefore.type === node.type &&
+    $fromPos.nodeBefore.attrs.level === node.attrs.level
+  ) {
+    selectionOffset -= 2;
+    tr = joinUp(tr);
+  }
+
+  const selection = TextSelection.create(
+    tr.doc,
+    initialSelection.from + selectionOffset,
+    initialSelection.to + selectionOffset
+  );
+
+  tr = tr.setSelection(selection);
+  return tr;
+}

package/joinUp.js

@@ -1,8 +1,6 @@
 // https://github.com/ProseMirror/prosemirror-commands/blob/master/src/commands.js
 import { NodeSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { canJoin } from 'prosemirror-transform';
-import { joinPoint } from 'prosemirror-transform';
+import { Transform, canJoin, joinPoint } from 'prosemirror-transform';
 
 // Join the selected block or, if there is a text selection, the
 // closest ancestor block of the selection that can be joined, with

package/joinUp.js.flow

@@ -1,39 +1,37 @@
-// @flow
-// https://github.com/ProseMirror/prosemirror-commands/blob/master/src/commands.js
-
-import { NodeSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { canJoin } from 'prosemirror-transform';
-import { joinPoint } from 'prosemirror-transform';
-
-// Join the selected block or, if there is a text selection, the
-// closest ancestor block of the selection that can be joined, with
-// the sibling above it.
-export default function joinUp(tr: Transform): Transform {
-  const sel = tr.selection;
-  const nodeSel = sel instanceof NodeSelection;
-  let point;
-  if (nodeSel) {
-    if (sel.node.isTextblock || !canJoin(tr.doc, sel.from)) {
-      return tr;
-    }
-    point = sel.from;
-  } else {
-    point = joinPoint(tr.doc, sel.from, -1);
-    if (point === null || point === undefined) {
-      return tr;
-    }
-  }
-
-  tr = tr.join(point);
-  if (nodeSel) {
-    tr = tr.setSelection(
-      NodeSelection.create(
-        tr.doc,
-        point - tr.doc.resolve(point).nodeBefore.nodeSize
-      )
-    );
-  }
-
-  return tr;
-}
+// @flow
+// https://github.com/ProseMirror/prosemirror-commands/blob/master/src/commands.js
+
+import { NodeSelection } from 'prosemirror-state';
+import { Transform, canJoin, joinPoint } from 'prosemirror-transform';
+
+// Join the selected block or, if there is a text selection, the
+// closest ancestor block of the selection that can be joined, with
+// the sibling above it.
+export default function joinUp(tr: Transform): Transform {
+  const sel = tr.selection;
+  const nodeSel = sel instanceof NodeSelection;
+  let point;
+  if (nodeSel) {
+    if (sel.node.isTextblock || !canJoin(tr.doc, sel.from)) {
+      return tr;
+    }
+    point = sel.from;
+  } else {
+    point = joinPoint(tr.doc, sel.from, -1);
+    if (point === null || point === undefined) {
+      return tr;
+    }
+  }
+
+  tr = tr.join(point);
+  if (nodeSel) {
+    tr = tr.setSelection(
+      NodeSelection.create(
+        tr.doc,
+        point - tr.doc.resolve(point).nodeBefore.nodeSize
+      )
+    );
+  }
+
+  return tr;
+}

package/keymaps.js.flow

@@ -1,185 +1,185 @@
-// @flow
-
-import Keymap from 'browserkeymap';
-
-import browser from './browser';
-
-import {
-  makeKeyMap,
-  makeKeyMapWithCommon,
-} from '@modusoperandi/licit-doc-attrs-step';
-
-// https://tinyurl.com/ybwf3wex
-
-export function tooltip(keymap: ?Keymap): ?string {
-  if (keymap) {
-    let shortcut;
-    if (browser.isMac()) {
-      shortcut = keymap.mac
-        .replace(/Cmd/i, '⌘')
-        .replace(/Shift/i, '⇧')
-        .replace(/Ctrl/i, '^')
-        .replace(/Alt/i, '⌥');
-    } else {
-      shortcut = keymap.windows;
-    }
-    return `${keymap.description} (${shortcut})`;
-  }
-  return null;
-}
-
-export const KEY_BACK_DELETE = makeKeyMapWithCommon('', 'Backspace');
-export const KEY_FORWARD_DELETE = makeKeyMapWithCommon('', 'Delete');
-export const KEY_INSERT_HORIZONTAL_RULE = makeKeyMapWithCommon(
-  'Insert horizontal rule',
-  'Mod-Shift--'
-);
-export const KEY_INSERT_NEW_LINE = makeKeyMapWithCommon(
-  'Insert new line',
-  'Shift-Enter'
-);
-export const KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE = makeKeyMapWithCommon(
-  'Insert new line in blockquote',
-  'Shift-Enter'
-);
-export const KEY_INSERT_NEW_LINE_IN_LIST_ITEM = makeKeyMapWithCommon(
-  'Insert new line in list item',
-  'Shift-Enter'
-);
-export const KEY_REDO = makeKeyMapWithCommon('Redo', 'Mod-Shift-z');
-export const KEY_SET_NORMAL_TEXT = makeKeyMap(
-  'Normal text',
-  'Ctrl-0',
-  'Cmd-Alt-0'
-);
-export const KEY_SHIFT_BACKSPACE = makeKeyMapWithCommon(
-  'Shift Backspace',
-  'Shift-Backspace'
-);
-export const KEY_SPLIT_CODEBLOCK = makeKeyMapWithCommon(
-  'Split code block',
-  'Enter'
-);
-export const KEY_SPLIT_LIST_ITEM = makeKeyMapWithCommon(
-  'Split list item',
-  'Enter'
-);
-export const KEY_TAB = makeKeyMapWithCommon('', 'Tab');
-export const KEY_TAB_SHIFT = makeKeyMapWithCommon('', 'Shift-Tab');
-export const KEY_TOGGLE_BLOCK_QUOTE = makeKeyMap(
-  'Block quote',
-  'Ctrl-7',
-  'Cmd-Alt-7'
-);
-export const KEY_TOGGLE_BOLD = makeKeyMapWithCommon('Toggle bold', 'Mod-b');
-export const KEY_TOGGLE_BULLET_LIST = makeKeyMapWithCommon(
-  'Toggle bullet list',
-  'Mod-Shift-b'
-);
-export const KEY_TOGGLE_CODE_BLOCK = makeKeyMap(
-  'Code block',
-  'Ctrl-8',
-  'Cmd-Alt-8'
-);
-export const KEY_TOGGLE_HEADING_1 = makeKeyMap(
-  'Heading 1',
-  'Ctrl-1',
-  'Cmd-Alt-1'
-);
-export const KEY_TOGGLE_HEADING_2 = makeKeyMap(
-  'Heading 2',
-  'Ctrl-2',
-  'Cmd-Alt-2'
-);
-export const KEY_TOGGLE_HEADING_3 = makeKeyMap(
-  'Heading 3',
-  'Ctrl-3',
-  'Cmd-Alt-3'
-);
-export const KEY_TOGGLE_HEADING_4 = makeKeyMap(
-  'Heading 4',
-  'Ctrl-4',
-  'Cmd-Alt-4'
-);
-export const KEY_TOGGLE_HEADING_5 = makeKeyMap(
-  'Heading 5',
-  'Ctrl-5',
-  'Cmd-Alt-5'
-);
-export const KEY_TOGGLE_HEADING_6 = makeKeyMap(
-  'Heading 5',
-  'Ctrl-6',
-  'Cmd-Alt-6'
-);
-export const KEY_TOGGLE_ITALIC = makeKeyMapWithCommon('Toggle italic', 'Mod-i');
-export const KEY_TOGGLE_MONOSPACE = makeKeyMapWithCommon(
-  'Toggle monospace',
-  'Mod-Shift-m'
-);
-export const KEY_TOGGLE_ORDERED_LIST = makeKeyMapWithCommon(
-  'Toggle ordered list',
-  'Mod-Shift-l'
-);
-export const KEY_TOGGLE_STRIKETHROUGH = makeKeyMapWithCommon(
-  'Toggle strikethrough',
-  'Mod-Shift-s'
-);
-export const KEY_TOGGLE_UNDERLINE = makeKeyMapWithCommon(
-  'Toggle underline',
-  'Mod-u'
-);
-export const KEY_UNDO = makeKeyMapWithCommon('Undo', 'Mod-z');
-
-export const ALL_KEYS = [
-  KEY_BACK_DELETE,
-  KEY_FORWARD_DELETE,
-  KEY_INSERT_HORIZONTAL_RULE,
-  KEY_INSERT_NEW_LINE,
-  KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE,
-  KEY_INSERT_NEW_LINE_IN_LIST_ITEM,
-  KEY_SET_NORMAL_TEXT,
-  KEY_SHIFT_BACKSPACE,
-  KEY_SPLIT_LIST_ITEM,
-  KEY_TAB_SHIFT,
-  KEY_TAB,
-  KEY_TOGGLE_BLOCK_QUOTE,
-  KEY_TOGGLE_BOLD,
-  KEY_TOGGLE_BULLET_LIST,
-  KEY_TOGGLE_BULLET_LIST,
-  KEY_TOGGLE_CODE_BLOCK,
-  KEY_TOGGLE_HEADING_1,
-  KEY_TOGGLE_HEADING_2,
-  KEY_TOGGLE_HEADING_3,
-  KEY_TOGGLE_HEADING_4,
-  KEY_TOGGLE_HEADING_5,
-  KEY_TOGGLE_HEADING_6,
-  KEY_TOGGLE_ITALIC,
-  KEY_TOGGLE_MONOSPACE,
-  KEY_TOGGLE_ORDERED_LIST,
-  KEY_TOGGLE_STRIKETHROUGH,
-  KEY_TOGGLE_UNDERLINE,
-  KEY_UNDO,
-];
-
-export function findKeymapByDescription(description: string): ?Keymap {
-  const matches = ALL_KEYS.filter((keymap) => {
-    return keymap.description.toUpperCase() === description.toUpperCase();
-  });
-  return matches[0];
-}
-
-export function findShortcutByDescription(description: string): ?string {
-  const keymap = findKeymapByDescription(description);
-  if (keymap) {
-    return findShortcutByKeymap(keymap);
-  }
-  return null;
-}
-
-export function findShortcutByKeymap(keymap: Keymap): ?string {
-  if (browser.isMac()) {
-    return keymap.mac;
-  }
-
-  return keymap.windows;
-}
+// @flow
+
+import Keymap from 'browserkeymap';
+
+import browser from './browser';
+
+import {
+  makeKeyMap,
+  makeKeyMapWithCommon,
+} from '@modusoperandi/licit-doc-attrs-step';
+
+// https://tinyurl.com/ybwf3wex
+
+export function tooltip(keymap: ?Keymap): ?string {
+  if (keymap) {
+    let shortcut;
+    if (browser.isMac()) {
+      shortcut = keymap.mac
+        .replace(/Cmd/i, '⌘')
+        .replace(/Shift/i, '⇧')
+        .replace(/Ctrl/i, '^')
+        .replace(/Alt/i, '⌥');
+    } else {
+      shortcut = keymap.windows;
+    }
+    return `${keymap.description} (${shortcut})`;
+  }
+  return null;
+}
+
+export const KEY_BACK_DELETE = makeKeyMapWithCommon('', 'Backspace');
+export const KEY_FORWARD_DELETE = makeKeyMapWithCommon('', 'Delete');
+export const KEY_INSERT_HORIZONTAL_RULE = makeKeyMapWithCommon(
+  'Insert horizontal rule',
+  'Mod-Shift--'
+);
+export const KEY_INSERT_NEW_LINE = makeKeyMapWithCommon(
+  'Insert new line',
+  'Shift-Enter'
+);
+export const KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE = makeKeyMapWithCommon(
+  'Insert new line in blockquote',
+  'Shift-Enter'
+);
+export const KEY_INSERT_NEW_LINE_IN_LIST_ITEM = makeKeyMapWithCommon(
+  'Insert new line in list item',
+  'Shift-Enter'
+);
+export const KEY_REDO = makeKeyMapWithCommon('Redo', 'Mod-Shift-z');
+export const KEY_SET_NORMAL_TEXT = makeKeyMap(
+  'Normal text',
+  'Ctrl-0',
+  'Cmd-Alt-0'
+);
+export const KEY_SHIFT_BACKSPACE = makeKeyMapWithCommon(
+  'Shift Backspace',
+  'Shift-Backspace'
+);
+export const KEY_SPLIT_CODEBLOCK = makeKeyMapWithCommon(
+  'Split code block',
+  'Enter'
+);
+export const KEY_SPLIT_LIST_ITEM = makeKeyMapWithCommon(
+  'Split list item',
+  'Enter'
+);
+export const KEY_TAB = makeKeyMapWithCommon('', 'Tab');
+export const KEY_TAB_SHIFT = makeKeyMapWithCommon('', 'Shift-Tab');
+export const KEY_TOGGLE_BLOCK_QUOTE = makeKeyMap(
+  'Block quote',
+  'Ctrl-7',
+  'Cmd-Alt-7'
+);
+export const KEY_TOGGLE_BOLD = makeKeyMapWithCommon('Toggle bold', 'Mod-b');
+export const KEY_TOGGLE_BULLET_LIST = makeKeyMapWithCommon(
+  'Toggle bullet list',
+  'Mod-Shift-b'
+);
+export const KEY_TOGGLE_CODE_BLOCK = makeKeyMap(
+  'Code block',
+  'Ctrl-8',
+  'Cmd-Alt-8'
+);
+export const KEY_TOGGLE_HEADING_1 = makeKeyMap(
+  'Heading 1',
+  'Ctrl-1',
+  'Cmd-Alt-1'
+);
+export const KEY_TOGGLE_HEADING_2 = makeKeyMap(
+  'Heading 2',
+  'Ctrl-2',
+  'Cmd-Alt-2'
+);
+export const KEY_TOGGLE_HEADING_3 = makeKeyMap(
+  'Heading 3',
+  'Ctrl-3',
+  'Cmd-Alt-3'
+);
+export const KEY_TOGGLE_HEADING_4 = makeKeyMap(
+  'Heading 4',
+  'Ctrl-4',
+  'Cmd-Alt-4'
+);
+export const KEY_TOGGLE_HEADING_5 = makeKeyMap(
+  'Heading 5',
+  'Ctrl-5',
+  'Cmd-Alt-5'
+);
+export const KEY_TOGGLE_HEADING_6 = makeKeyMap(
+  'Heading 5',
+  'Ctrl-6',
+  'Cmd-Alt-6'
+);
+export const KEY_TOGGLE_ITALIC = makeKeyMapWithCommon('Toggle italic', 'Mod-i');
+export const KEY_TOGGLE_MONOSPACE = makeKeyMapWithCommon(
+  'Toggle monospace',
+  'Mod-Shift-m'
+);
+export const KEY_TOGGLE_ORDERED_LIST = makeKeyMapWithCommon(
+  'Toggle ordered list',
+  'Mod-Shift-l'
+);
+export const KEY_TOGGLE_STRIKETHROUGH = makeKeyMapWithCommon(
+  'Toggle strikethrough',
+  'Mod-Shift-s'
+);
+export const KEY_TOGGLE_UNDERLINE = makeKeyMapWithCommon(
+  'Toggle underline',
+  'Mod-u'
+);
+export const KEY_UNDO = makeKeyMapWithCommon('Undo', 'Mod-z');
+
+export const ALL_KEYS = [
+  KEY_BACK_DELETE,
+  KEY_FORWARD_DELETE,
+  KEY_INSERT_HORIZONTAL_RULE,
+  KEY_INSERT_NEW_LINE,
+  KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE,
+  KEY_INSERT_NEW_LINE_IN_LIST_ITEM,
+  KEY_SET_NORMAL_TEXT,
+  KEY_SHIFT_BACKSPACE,
+  KEY_SPLIT_LIST_ITEM,
+  KEY_TAB_SHIFT,
+  KEY_TAB,
+  KEY_TOGGLE_BLOCK_QUOTE,
+  KEY_TOGGLE_BOLD,
+  KEY_TOGGLE_BULLET_LIST,
+  KEY_TOGGLE_BULLET_LIST,
+  KEY_TOGGLE_CODE_BLOCK,
+  KEY_TOGGLE_HEADING_1,
+  KEY_TOGGLE_HEADING_2,
+  KEY_TOGGLE_HEADING_3,
+  KEY_TOGGLE_HEADING_4,
+  KEY_TOGGLE_HEADING_5,
+  KEY_TOGGLE_HEADING_6,
+  KEY_TOGGLE_ITALIC,
+  KEY_TOGGLE_MONOSPACE,
+  KEY_TOGGLE_ORDERED_LIST,
+  KEY_TOGGLE_STRIKETHROUGH,
+  KEY_TOGGLE_UNDERLINE,
+  KEY_UNDO,
+];
+
+export function findKeymapByDescription(description: string): ?Keymap {
+  const matches = ALL_KEYS.filter((keymap) => {
+    return keymap.description.toUpperCase() === description.toUpperCase();
+  });
+  return matches[0];
+}
+
+export function findShortcutByDescription(description: string): ?string {
+  const keymap = findKeymapByDescription(description);
+  if (keymap) {
+    return findShortcutByKeymap(keymap);
+  }
+  return null;
+}
+
+export function findShortcutByKeymap(keymap: Keymap): ?string {
+  if (browser.isMac()) {
+    return keymap.mac;
+  }
+
+  return keymap.windows;
+}

package/lookUpElement.js

@@ -1,5 +1,6 @@
 export default function lookUpElement(el, predict) {
-  while (el && el.nodeName) {
+  while ((_el = el) !== null && _el !== void 0 && _el.nodeName) {
+    var _el;
     if (predict(el)) {
       return el;
     }

package/lookUpElement.js.flow

@@ -1,14 +1,14 @@
-// @flow
-
-export default function lookUpElement(
-  el: ?Element,
-  predict: (el: Element) => boolean
-): ?Element {
-  while (el && el.nodeName) {
-    if (predict(el)) {
-      return el;
-    }
-    el = el.parentElement;
-  }
-  return null;
-}
+// @flow
+
+export default function lookUpElement(
+  el: ?Element,
+  predict: (el: Element) => boolean
+): ?Element {
+  while (el?.nodeName) {
+    if (predict(el)) {
+      return el;
+    }
+    el = el.parentElement;
+  }
+  return null;
+}

package/nodeAt.js.flow

@@ -1,12 +1,12 @@
-// @flow
-
-import { Node } from 'prosemirror-model';
-
-export default function nodeAt(doc: Node, pos: number): ?Node {
-  if (pos < 0 || pos > doc.content.size) {
-    // Exit here or error will be thrown:
-    // e.g. RangeError: Position outside of fragment.
-    return null;
-  }
-  return doc.nodeAt(pos);
-}
+// @flow
+
+import { Node } from 'prosemirror-model';
+
+export default function nodeAt(doc: Node, pos: number): ?Node {
+  if (pos < 0 || pos > doc.content.size) {
+    // Exit here or error will be thrown:
+    // e.g. RangeError: Position outside of fragment.
+    return null;
+  }
+  return doc.nodeAt(pos);
+}

package/normalizeHTML.js

@@ -13,7 +13,7 @@ var LONG_UNDERLINE_PATTERN = /_+/g;
 
 // This is a workround to convert "  ...... " into wider tab
 // tab spacers. For every 6 " ", they will be converted into tab spacers.
-var LONG_TAB_SPACE_PATTERN = /(\ ){6}/g;
+var LONG_TAB_SPACE_PATTERN = /( ){6}/g;
 var TAB_SPACER_HTML = new Array(6).join("<span ".concat(DOM_ATTRIBUTE_SIZE, "=\"").concat(SPACER_SIZE_TAB, "\">").concat(HAIR_SPACE_CHAR, "</span>"));
 function replaceNOBR(matched) {
   // This is a workround to convert "_______" into none-wrapped text
@@ -31,6 +31,8 @@ export default function normalizeHTML(html) {
 
   // Convert every two consecutive "&nbsp;" into a spacer tab.
   html = html.replace(LONG_TAB_SPACE_PATTERN, TAB_SPACER_HTML);
+  // fix for jspdf copy paste text, from jspdf its always getting transparent
+  html = html.replace(/color:\s*transparent;/g, 'color: black;');
   var doc = toSafeHTMLDocument(html);
   if (doc) {
     // styles.