@atlaskit/editor-core 178.1.1 → 178.1.2

package/dist/es2019/plugins/list/index.js

@@ -7,14 +7,12 @@ import { messages } from './messages';
 import { addAnalytics, ACTION, EVENT_TYPE, INPUT_METHOD, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { tooltip, toggleBulletList, toggleOrderedList } from '../../keymaps';
 import { IconList, IconListNumber } from '../quick-insert/assets';
-
 /*
   Toolbar buttons to bullet and ordered list can be found in
   packages/editor/editor-core/src/plugins/toolbar-lists-indentation/ui/Toolbar.tsx
  */
 const listPlugin = options => ({
   name: 'list',
-
   nodes() {
     return [{
       name: 'bulletList',
@@ -27,7 +25,6 @@ const listPlugin = options => ({
       node: listItem
     }];
   },
-
   pmPlugins() {
     return [{
       name: 'list',
@@ -45,7 +42,6 @@ const listPlugin = options => ({
       plugin: () => keymapPlugin()
     }];
   },
-
   pluginsOptions: {
     quickInsert: ({
       formatMessage
@@ -57,7 +53,6 @@ const listPlugin = options => ({
       priority: 1100,
       keyshortcut: tooltip(toggleBulletList),
       icon: () => /*#__PURE__*/React.createElement(IconList, null),
-
       action(insert, state) {
         const tr = insert(state.schema.nodes.bulletList.createChecked({}, state.schema.nodes.listItem.createChecked({}, state.schema.nodes.paragraph.createChecked())));
         return addAnalytics(state, tr, {
@@ -70,7 +65,6 @@ const listPlugin = options => ({
           }
         });
       }
-
     }, {
       id: 'orderedList',
       title: formatMessage(messages.orderedList),
@@ -79,7 +73,6 @@ const listPlugin = options => ({
       priority: 1200,
       keyshortcut: tooltip(toggleOrderedList),
       icon: () => /*#__PURE__*/React.createElement(IconListNumber, null),
-
       action(insert, state) {
         const tr = insert(state.schema.nodes.orderedList.createChecked({}, state.schema.nodes.listItem.createChecked({}, state.schema.nodes.paragraph.createChecked())));
         return addAnalytics(state, tr, {
@@ -92,9 +85,7 @@ const listPlugin = options => ({
           }
         });
       }
-
     }]
   }
 });
-
 export default listPlugin;

package/dist/es2019/plugins/list/pm-plugins/input-rules/create-list-input-rule.js

@@ -16,11 +16,8 @@ export function createRuleForListType({
       inputMethod: INPUT_METHOD.FORMATTING
     }
   };
-
   const shouldJoinNextNodeWhen = (_, node) => node.type === listType;
-
   let getAttrs = {};
-
   if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
     getAttrs = matchResult => {
       return {
@@ -28,7 +25,6 @@ export function createRuleForListType({
       };
     };
   }
-
   const inputRule = createWrappingJoinRule({
     match: expression,
     nodeType: listType,

package/dist/es2019/plugins/list/pm-plugins/input-rules/index.js

@@ -8,7 +8,6 @@ export default function inputRulePlugin(schema, featureFlags) {
     }
   } = schema;
   const rules = [];
-
   if (bulletList) {
     rules.push(createRuleForListType({
       // Using UTF instead of • character
@@ -18,9 +17,7 @@ export default function inputRulePlugin(schema, featureFlags) {
       listType: bulletList
     }));
   }
-
   const expression = featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists ? /((^[1-9]{1}[0-9]{0,2})|^(0))[\.\)] $/ : /^(1)[\.\)] $/;
-
   if (orderedList) {
     rules.push(createRuleForListType({
       expression,
@@ -28,10 +25,8 @@ export default function inputRulePlugin(schema, featureFlags) {
       featureFlags
     }));
   }
-
   if (rules.length !== 0) {
     return createPlugin('lists', rules);
   }
-
   return;
 }

package/dist/es2019/plugins/list/pm-plugins/keymap.js

@@ -11,8 +11,9 @@ export function keymapPlugin() {
   keymaps.bindKeymapWithCommand(keymaps.outdentList.common, outdentList(INPUT_METHOD.KEYBOARD), list);
   keymaps.bindKeymapWithCommand(keymaps.enter.common, enterKeyCommand, list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspaceKeyCommand, list);
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteKeyCommand, list); // This shortcut is Mac only
+  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteKeyCommand, list);
 
+  // This shortcut is Mac only
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.forwardDelete), deleteKeyCommand, list);
   return keymap(list);
 }

package/dist/es2019/plugins/list/pm-plugins/main.js

@@ -21,25 +21,24 @@ const initialState = {
 };
 export const getDecorations = (doc, state) => {
   const decorations = [];
-  const featureFlags = getFeatureFlags(state); // this stack keeps track of each (nested) list to calculate the indentation level
+  const featureFlags = getFeatureFlags(state);
 
+  // this stack keeps track of each (nested) list to calculate the indentation level
   const processedListsStack = [];
   doc.nodesBetween(0, doc.content.size, (node, currentNodeStartPos) => {
     if (processedListsStack.length > 0) {
       let isOutsideLastList = true;
-
       while (isOutsideLastList && processedListsStack.length > 0) {
         const lastList = processedListsStack[processedListsStack.length - 1];
         const lastListEndPos = lastList.startPos + lastList.node.nodeSize;
-        isOutsideLastList = currentNodeStartPos >= lastListEndPos; // once we finish iterating over each innermost list, pop the stack to
+        isOutsideLastList = currentNodeStartPos >= lastListEndPos;
+        // once we finish iterating over each innermost list, pop the stack to
         // decrease the indent level attribute accordingly
-
         if (isOutsideLastList) {
           processedListsStack.pop();
         }
       }
     }
-
     if (isListNode(node)) {
       processedListsStack.push({
         node,
@@ -51,17 +50,14 @@ export const getDecorations = (doc, state) => {
       decorations.push(Decoration.node(from, to, {
         'data-indent-level': `${depth}`
       }));
-
       if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
         var _node$attrs;
-
         // If a numbered list has item counters numbering >= 100, we'll need to add special
         // spacing to account for the extra digit chars
         const digitsSize = getItemCounterDigitsSize({
           itemsCount: node === null || node === void 0 ? void 0 : node.childCount,
           order: node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order
         });
-
         if (digitsSize) {
           decorations.push(Decoration.node(from, to, {
             style: getOrderedListInlineStyles(digitsSize, 'string')
@@ -78,15 +74,14 @@ export const getDecorations = (doc, state) => {
   });
   return DecorationSet.empty.add(doc, decorations);
 };
-
 const handleDocChanged = (tr, pluginState, editorState) => {
   const nextPluginState = handleSelectionChanged(tr, pluginState);
   const decorationSet = getDecorations(tr.doc, editorState);
-  return { ...nextPluginState,
+  return {
+    ...nextPluginState,
     decorationSet
   };
 };
-
 const handleSelectionChanged = (tr, pluginState) => {
   const {
     bulletList,
@@ -97,9 +92,9 @@ const handleSelectionChanged = (tr, pluginState) => {
   const orderedListActive = !!listParent && listParent.node.type === orderedList;
   const bulletListDisabled = !(bulletListActive || orderedListActive || isWrappingPossible(bulletList, tr.selection));
   const orderedListDisabled = !(bulletListActive || orderedListActive || isWrappingPossible(orderedList, tr.selection));
-
   if (bulletListActive !== pluginState.bulletListActive || orderedListActive !== pluginState.orderedListActive || bulletListDisabled !== pluginState.bulletListDisabled || orderedListDisabled !== pluginState.orderedListDisabled) {
-    const nextPluginState = { ...pluginState,
+    const nextPluginState = {
+      ...pluginState,
       bulletListActive,
       orderedListActive,
       bulletListDisabled,
@@ -107,14 +102,11 @@ const handleSelectionChanged = (tr, pluginState) => {
     };
     return nextPluginState;
   }
-
   return pluginState;
 };
-
 const reducer = () => state => {
   return state;
 };
-
 const {
   getPluginState,
   createPluginState
@@ -122,13 +114,12 @@ const {
   onDocChanged: handleDocChanged,
   onSelectionChanged: handleSelectionChanged
 });
-
 const createInitialState = state => {
-  return { ...initialState,
+  return {
+    ...initialState,
     decorationSet: getDecorations(state.doc, state)
   };
 };
-
 export const createPlugin = eventDispatch => new SafePlugin({
   state: createPluginState(eventDispatch, createInitialState),
   key: listPluginKey,
@@ -139,27 +130,21 @@ export const createPlugin = eventDispatch => new SafePlugin({
       } = getPluginState(state);
       return decorationSet;
     },
-
     handleClick: (view, pos, event) => {
       const {
         state
       } = view;
-
       if (['LI', 'UL'].includes((event === null || event === void 0 ? void 0 : event.target).tagName)) {
         var _nodeAtPos$firstChild;
-
         const nodeAtPos = state.tr.doc.nodeAt(pos);
         const {
           listItem,
           codeBlock
         } = view.state.schema.nodes;
-
         if ((nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) === listItem && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : (_nodeAtPos$firstChild = nodeAtPos.firstChild) === null || _nodeAtPos$firstChild === void 0 ? void 0 : _nodeAtPos$firstChild.type) === codeBlock) {
           var _document, _document$elementFrom;
-
           const bufferPx = 50;
           const isCodeBlockNextToListMarker = Boolean((_document = document) === null || _document === void 0 ? void 0 : (_document$elementFrom = _document.elementFromPoint(event.clientX + (listItemCounterPadding + bufferPx), event.clientY)) === null || _document$elementFrom === void 0 ? void 0 : _document$elementFrom.closest(`.${CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER}`));
-
           if (isCodeBlockNextToListMarker) {
             // +1 needed to put cursor inside li
             // otherwise gap cursor markup will be injected as immediate child of ul resulting in invalid html
@@ -168,7 +153,6 @@ export const createPlugin = eventDispatch => new SafePlugin({
           }
         }
       }
-
       return false;
     }
   }

package/dist/es2019/plugins/list/transforms.js

@@ -5,7 +5,6 @@ import { autoJoin } from 'prosemirror-commands';
 import { isListNode } from './utils/node';
 import { mapSlice, mapChildren } from '../../utils/slice';
 import { getListLiftTarget } from './utils/indentation';
-
 function liftListItem(selection, tr) {
   let {
     $from,
@@ -13,23 +12,19 @@ function liftListItem(selection, tr) {
   } = selection;
   const nodeType = tr.doc.type.schema.nodes.listItem;
   let range = $from.blockRange($to, node => !!node.childCount && !!node.firstChild && node.firstChild.type === nodeType);
-
   if (!range || range.depth < 2 || $from.node(range.depth - 1).type !== nodeType) {
     return tr;
   }
-
   let end = range.end;
   let endOfList = $to.end(range.depth);
-
   if (end < endOfList) {
     tr.step(new ReplaceAroundStep(end - 1, endOfList, end, endOfList, new Slice(Fragment.from(nodeType.create(undefined, range.parent.copy())), 1, 0), 1, true));
     range = new NodeRange(tr.doc.resolve($from.pos), tr.doc.resolve(endOfList), range.depth);
   }
-
   return tr.lift(range, liftTarget(range)).scrollIntoView();
-} // Function will lift list item following selection to level-1.
-
+}
 
+// Function will lift list item following selection to level-1.
 export function liftFollowingList(from, to, rootListDepth, tr) {
   const {
     listItem
@@ -39,7 +34,6 @@ export function liftFollowingList(from, to, rootListDepth, tr) {
     if (!lifted && node.type === listItem && pos > from) {
       lifted = true;
       let listDepth = rootListDepth + 3;
-
       while (listDepth > rootListDepth + 2) {
         const start = tr.doc.resolve(tr.mapping.map(pos));
         listDepth = start.depth;
@@ -61,22 +55,19 @@ export function liftNodeSelectionList(selection, tr) {
   const mappedPosition = tr.mapping.map(from);
   const nodeAtPos = tr.doc.nodeAt(mappedPosition);
   const start = tr.doc.resolve(mappedPosition);
-
   if ((start === null || start === void 0 ? void 0 : start.parent.type) !== listItem) {
     return tr;
   }
-
   const end = tr.doc.resolve(mappedPosition + ((nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.nodeSize) || 1));
   const range = start.blockRange(end);
-
   if (range) {
     const liftTarget = getListLiftTarget(start);
     tr.lift(range, liftTarget);
   }
-
   return tr;
-} // The function will list paragraphs in selection out to level 1 below root list.
+}
 
+// The function will list paragraphs in selection out to level 1 below root list.
 export function liftTextSelectionList(selection, tr) {
   const {
     from,
@@ -94,39 +85,32 @@ export function liftTextSelectionList(selection, tr) {
       });
     }
   });
-
   for (let i = listCol.length - 1; i >= 0; i--) {
     const paragraph = listCol[i];
     const start = tr.doc.resolve(tr.mapping.map(paragraph.pos));
-
     if (start.depth > 0) {
       let end;
-
       if (paragraph.node.textContent && paragraph.node.textContent.length > 0) {
         end = tr.doc.resolve(tr.mapping.map(paragraph.pos + paragraph.node.textContent.length));
       } else {
         end = tr.doc.resolve(tr.mapping.map(paragraph.pos + 1));
       }
-
       const range = start.blockRange(end);
-
       if (range) {
         tr.lift(range, getListLiftTarget(start));
       }
     }
   }
-
   return tr;
-} // matchers for text lists
+}
 
+// matchers for text lists
 const bullets = /^\s*[\*\-\u2022](\s+|\s+$)/;
 const numbers = /^\s*\d[\.\)](\s+|$)/;
-
 const getListType = (node, schema) => {
   if (!node.text) {
     return null;
   }
-
   const {
     bulletList,
     orderedList
@@ -141,12 +125,10 @@ const getListType = (node, schema) => {
     if (lastMatch) {
       return lastMatch;
     }
-
     const match = node.text.match(listType.matcher);
     return match ? [listType.node, match[0].length] : lastMatch;
   }, null);
 };
-
 const extractListFromParagraph = (node, parent, schema) => {
   const {
     hardBreak,
@@ -154,104 +136,96 @@ const extractListFromParagraph = (node, parent, schema) => {
     orderedList
   } = schema.nodes;
   const content = mapChildren(node.content, node => node);
-  const listTypes = [bulletList, orderedList]; // wrap each line into a listItem and a containing list
+  const listTypes = [bulletList, orderedList];
 
+  // wrap each line into a listItem and a containing list
   const listified = content.map((child, index) => {
     const listMatch = getListType(child, schema);
-    const prevChild = index > 0 && content[index - 1]; // only extract list when preceded by a hardbreak
+    const prevChild = index > 0 && content[index - 1];
 
+    // only extract list when preceded by a hardbreak
     if (prevChild && prevChild.type !== hardBreak) {
       return child;
     }
-
     if (!listMatch || !child.text) {
       return child;
     }
+    const [nodeType, length] = listMatch;
 
-    const [nodeType, length] = listMatch; // convert to list item
-
+    // convert to list item
     const newText = child.text.substr(length);
     const listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, newText.length ? schema.text(newText) : undefined));
-
     if (!listItemNode) {
       return child;
     }
-
-    const newList = nodeType.createChecked(undefined, [listItemNode]); // Check whether our new list is valid content in our current structure,
+    const newList = nodeType.createChecked(undefined, [listItemNode]);
+    // Check whether our new list is valid content in our current structure,
     // otherwise dont convert.
-
     if (parent && !parent.type.validContent(Fragment.from(newList))) {
       return child;
     }
-
     return newList;
   }).filter((child, idx, arr) => {
     // remove hardBreaks that have a list node on either side
+
     // wasn't hardBreak, leave as-is
     if (child.type !== hardBreak) {
       return child;
     }
-
     if (idx > 0 && listTypes.indexOf(arr[idx - 1].type) > -1) {
       // list node on the left
       return null;
     }
-
     if (idx < arr.length - 1 && listTypes.indexOf(arr[idx + 1].type) > -1) {
       // list node on the right
       return null;
     }
-
     return child;
-  }); // try to join
+  });
 
+  // try to join
   const mockState = EditorState.create({
     schema
   });
   let joinedListsTr;
-
   const mockDispatch = tr => {
     joinedListsTr = tr;
   };
-
   autoJoin((state, dispatch) => {
     if (!dispatch) {
       return false;
-    } // Return false to prevent replaceWith from wrapping the text node in a paragraph
+    }
+
+    // Return false to prevent replaceWith from wrapping the text node in a paragraph
     // paragraph since that will be done later. If it's done here, it will fail
     // the paragraph.validContent check.
     // Dont return false if there are lists, as they arent validContent for paragraphs
     // and will result in hanging textNodes
-
-
     const containsList = listified.some(node => node.type === bulletList || node.type === orderedList);
-
     if (listified.some(node => node.isText) && !containsList) {
       return false;
     }
-
     dispatch(state.tr.replaceWith(0, 2, listified));
     return true;
   }, (before, after) => isListNode(before) && isListNode(after))(mockState, mockDispatch);
-  const fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(listified); // try to re-wrap fragment in paragraph (which is the original node we unwrapped)
+  const fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(listified);
 
+  // try to re-wrap fragment in paragraph (which is the original node we unwrapped)
   const {
     paragraph
   } = schema.nodes;
-
   if (paragraph.validContent(fragment)) {
     return Fragment.from(paragraph.create(node.attrs, fragment, node.marks));
-  } // fragment now contains other nodes, get Prosemirror to wrap with ContentMatch later
-
+  }
 
+  // fragment now contains other nodes, get Prosemirror to wrap with ContentMatch later
   return fragment;
 };
+
 /**
  * Walks the slice, creating paragraphs that were previously separated by hardbreaks.
  * Returns the original paragraph node (as a fragment), or a fragment containing multiple nodes.
  */
-
-
 export const splitIntoParagraphs = ({
   fragment,
   blockMarks = [],
@@ -266,37 +240,35 @@ export const splitIntoParagraphs = ({
   } = schema.nodes;
   fragment.forEach((node, i) => {
     const isNodeValidContentForParagraph = schema.nodes.paragraph.validContent(Fragment.from(node));
-
     if (!isNodeValidContentForParagraph) {
       paragraphs.push(node);
       return;
-    } // ED-14725 Fixed the issue that it make duplicated line
+    }
+    // ED-14725 Fixed the issue that it make duplicated line
     // when pasting <br /> from google docs.
-
-
     if (i === 0 && node.type === hardBreak) {
       paragraphs.push(paragraph.createChecked(undefined, curChildren, [...blockMarks]));
       lastNode = node;
       return;
     } else if (lastNode && lastNode.type === hardBreak && node.type === hardBreak) {
       // double hardbreak
+
       // backtrack a little; remove the trailing hardbreak we added last loop
-      curChildren.pop(); // create a new paragraph
+      curChildren.pop();
 
+      // create a new paragraph
       paragraphs.push(paragraph.createChecked(undefined, curChildren, [...blockMarks]));
       curChildren = [];
       return;
-    } // add to this paragraph
-
+    }
 
+    // add to this paragraph
     curChildren.push(node);
     lastNode = node;
   });
-
   if (curChildren.length) {
     paragraphs.push(paragraph.createChecked(undefined, curChildren, [...blockMarks]));
   }
-
   return Fragment.from(paragraphs.length ? paragraphs : [paragraph.createAndFill(undefined, undefined, [...blockMarks])]);
 };
 export const splitParagraphs = (slice, schema) => {
@@ -305,8 +277,9 @@ export const splitParagraphs = (slice, schema) => {
   let hasCodeMark = false;
   slice.content.forEach(child => {
     hasCodeMark = hasCodeMark || child.marks.some(mark => mark.type === schema.marks.code);
-  }); // slice might just be a raw text string
+  });
 
+  // slice might just be a raw text string
   if (schema.nodes.paragraph.validContent(slice.content) && !hasCodeMark) {
     const replSlice = splitIntoParagraphs({
       fragment: slice.content,
@@ -314,7 +287,6 @@ export const splitParagraphs = (slice, schema) => {
     });
     return new Slice(replSlice, slice.openStart + 1, slice.openEnd + 1);
   }
-
   return mapSlice(slice, node => {
     if (node.type === schema.nodes.paragraph) {
       return splitIntoParagraphs({
@@ -323,17 +295,16 @@ export const splitParagraphs = (slice, schema) => {
         schema
       });
     }
-
     return node;
   });
-}; // above will wrap everything in paragraphs for us
+};
 
+// above will wrap everything in paragraphs for us
 export const upgradeTextToLists = (slice, schema) => {
   return mapSlice(slice, (node, parent) => {
     if (node.type === schema.nodes.paragraph) {
       return extractListFromParagraph(node, parent, schema);
     }
-
     return node;
   });
 };

package/dist/es2019/plugins/list/utils/analytics.js

@@ -22,11 +22,9 @@ export const countListItemsInSelection = state => {
     from,
     to
   } = state.selection;
-
   if (from === to) {
     return 1;
   }
-
   let count = 0;
   const listSlice = state.doc.cut(from, to);
   listSlice.content.nodesBetween(0, listSlice.content.size, (node, pos, parent, index) => {