@atlaskit/editor-core 187.18.0 → 187.18.1

package/dist/es2019/plugins/paste/commands.js

@@ -1,6 +1,9 @@
 import { createCommand } from './pm-plugins/plugin-factory';
 import { PastePluginActionTypes as ActionTypes } from './actions';
-
+import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { isListNode, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
 /**
  * Use this to register macro link positions during a paste operation, that you
  * want to track in a document over time, through any document changes.
@@ -24,4 +27,209 @@ export const stopTrackingPastedMacroPositions = pastedMacroPositionKeys => creat
     type: ActionTypes.STOP_TRACKING_PASTED_MACRO_POSITIONS,
     pastedMacroPositionKeys
   };
-});
+});
+
+// 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
+  } = schema.nodes;
+  return [{
+    node: bulletList,
+    matcher: bullets
+  }, {
+    node: orderedList,
+    matcher: numbers
+  }].reduce((lastMatch, listType) => {
+    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,
+    bulletList,
+    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 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
+    if (prevChild && prevChild.type !== hardBreak) {
+      return child;
+    }
+    if (!listMatch || !child.text) {
+      return child;
+    }
+    const [nodeType, length] = listMatch;
+
+    // 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,
+    // 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
+  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
+    // 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 {
+    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
+  return fragment;
+};
+
+// 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;
+  });
+};
+export const splitParagraphs = (slice, schema) => {
+  // exclude Text nodes with a code mark, since we transform those later
+  // into a codeblock
+  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
+  if (schema.nodes.paragraph.validContent(slice.content) && !hasCodeMark) {
+    const replSlice = splitIntoParagraphs({
+      fragment: slice.content,
+      schema
+    });
+    return new Slice(replSlice, slice.openStart + 1, slice.openEnd + 1);
+  }
+  return mapSlice(slice, node => {
+    if (node.type === schema.nodes.paragraph) {
+      return splitIntoParagraphs({
+        fragment: node.content,
+        blockMarks: node.marks,
+        schema
+      });
+    }
+    return node;
+  });
+};
+
+/**
+ * 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 = [],
+  schema
+}) => {
+  const paragraphs = [];
+  let curChildren = [];
+  let lastNode = null;
+  const {
+    hardBreak,
+    paragraph
+  } = 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
+    // 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
+      paragraphs.push(paragraph.createChecked(undefined, curChildren, [...blockMarks]));
+      curChildren = [];
+      return;
+    }
+
+    // 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])]);
+};

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

@@ -17,7 +17,7 @@ import { ACTION, analyticsPluginKey, INPUT_METHOD, PasteTypes } from '../../anal
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
 import { measureRender } from '@atlaskit/editor-common/utils';
 import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
-import { upgradeTextToLists, splitParagraphs } from '../../list/transforms';
+import { upgradeTextToLists, splitParagraphs } from '../commands';
 import { md } from '@atlaskit/editor-common/paste';
 import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
 import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';

package/dist/es2019/plugins/toolbar-lists-indentation/ui/Toolbar.js

@@ -7,7 +7,7 @@ import IndentIcon from '@atlaskit/icon/glyph/editor/indent';
 import OutdentIcon from '@atlaskit/icon/glyph/editor/outdent';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, indent as toggleIndentKeymap, outdent as toggleOutdentKeymap, ToolTipContent, tooltip } from '../../../keymaps';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../ui/ToolbarButton';
-import { messages } from '../../list/messages';
+import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { messages as indentationMessages } from '../../indentation/messages';
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';

package/dist/es2019/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -9,7 +9,7 @@ import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/ed
 import ToolbarButton from '../../../ui/ToolbarButton';
 import { expandIconWrapperStyle, shortcutStyle } from '../../../ui/styles';
 import { wrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
-import { messages as listMessages } from '../../list/messages';
+import { listMessages } from '@atlaskit/editor-common/messages';
 import { messages as indentationMessages } from '../../indentation/messages';
 export function ToolbarDropdown(props) {
   const {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.18.0";
+export const version = "187.18.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.18.0",
+	"version": "187.18.1",
 	"sideEffects": false
 }

package/dist/esm/plugins/help-dialog/ui/index.js

@@ -19,8 +19,7 @@ import AkModalDialog, { ModalTransition, useModal } from '@atlaskit/modal-dialog
 import { header, footer, contentWrapper, line, content, row, codeSm, codeMd, codeLg, title, column, dialogHeader } from './styles';
 import * as keymaps from '../../../keymaps';
 import ToolbarButton from '../../../ui/ToolbarButton';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { messages as listMessages } from '../../list/messages';
+import { toolbarMessages, listMessages } from '@atlaskit/editor-common/messages';
 import { messages as insertBlockMessages } from '../../insert-block/ui/ToolbarInsertBlock/messages';
 import { messages as blockTypeMessages } from '../../block-type/messages';
 import { messages as undoRedoMessages } from '../../undo-redo/messages';

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

@@ -3,7 +3,7 @@ import { orderedList, orderedListWithOrder, bulletList, listItem } from '@atlask
 import { createPlugin } from './pm-plugins/main';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymapPlugin from './pm-plugins/keymap';
-import { messages } from './messages';
+import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { ACTION, EVENT_TYPE, INPUT_METHOD, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { tooltip, toggleBulletList, toggleOrderedList } from '../../keymaps';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';

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

@@ -1,11 +1,6 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { Fragment, NodeRange, Slice } from '@atlaskit/editor-prosemirror/model';
-import { EditorState, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
-import { autoJoin } from '@atlaskit/editor-prosemirror/commands';
-import { isListNode } from '@atlaskit/editor-common/utils';
-import { mapSlice, mapChildren } from '../../utils/slice';
 import { getListLiftTarget } from './utils/indentation';
 function liftListItem(selection, tr) {
   var $from = selection.$from,
@@ -94,216 +89,4 @@ export function liftTextSelectionList(selection, tr) {
     }
   }
   return tr;
-}
-
-// matchers for text lists
-var bullets = /^\s*[\*\-\u2022](\s+|\s+$)/;
-var numbers = /^\s*\d[\.\)](\s+|$)/;
-var getListType = function getListType(node, schema) {
-  if (!node.text) {
-    return null;
-  }
-  var _schema$nodes = schema.nodes,
-    bulletList = _schema$nodes.bulletList,
-    orderedList = _schema$nodes.orderedList;
-  return [{
-    node: bulletList,
-    matcher: bullets
-  }, {
-    node: orderedList,
-    matcher: numbers
-  }].reduce(function (lastMatch, listType) {
-    if (lastMatch) {
-      return lastMatch;
-    }
-    var match = node.text.match(listType.matcher);
-    return match ? [listType.node, match[0].length] : lastMatch;
-  }, null);
-};
-var extractListFromParagraph = function extractListFromParagraph(node, parent, schema) {
-  var _schema$nodes2 = schema.nodes,
-    hardBreak = _schema$nodes2.hardBreak,
-    bulletList = _schema$nodes2.bulletList,
-    orderedList = _schema$nodes2.orderedList;
-  var content = mapChildren(node.content, function (node) {
-    return node;
-  });
-  var listTypes = [bulletList, orderedList];
-
-  // wrap each line into a listItem and a containing list
-  var listified = content.map(function (child, index) {
-    var listMatch = getListType(child, schema);
-    var 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;
-    }
-    var _listMatch = _slicedToArray(listMatch, 2),
-      nodeType = _listMatch[0],
-      length = _listMatch[1];
-
-    // convert to list item
-    var newText = child.text.substr(length);
-    var listItemNode = schema.nodes.listItem.createAndFill(undefined, schema.nodes.paragraph.createChecked(undefined, newText.length ? schema.text(newText) : undefined));
-    if (!listItemNode) {
-      return child;
-    }
-    var 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(function (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
-  var mockState = EditorState.create({
-    schema: schema
-  });
-  var joinedListsTr;
-  var mockDispatch = function mockDispatch(tr) {
-    joinedListsTr = tr;
-  };
-  autoJoin(function (state, dispatch) {
-    if (!dispatch) {
-      return false;
-    }
-
-    // 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
-    var containsList = listified.some(function (node) {
-      return node.type === bulletList || node.type === orderedList;
-    });
-    if (listified.some(function (node) {
-      return node.isText;
-    }) && !containsList) {
-      return false;
-    }
-    dispatch(state.tr.replaceWith(0, 2, listified));
-    return true;
-  }, function (before, after) {
-    return isListNode(before) && isListNode(after);
-  })(mockState, mockDispatch);
-  var fragment = joinedListsTr ? joinedListsTr.doc.content : Fragment.from(listified);
-
-  // try to re-wrap fragment in paragraph (which is the original node we unwrapped)
-  var paragraph = schema.nodes.paragraph;
-  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
-  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 var splitIntoParagraphs = function splitIntoParagraphs(_ref) {
-  var fragment = _ref.fragment,
-    _ref$blockMarks = _ref.blockMarks,
-    blockMarks = _ref$blockMarks === void 0 ? [] : _ref$blockMarks,
-    schema = _ref.schema;
-  var paragraphs = [];
-  var curChildren = [];
-  var lastNode = null;
-  var _schema$nodes3 = schema.nodes,
-    hardBreak = _schema$nodes3.hardBreak,
-    paragraph = _schema$nodes3.paragraph;
-  fragment.forEach(function (node, i) {
-    var isNodeValidContentForParagraph = schema.nodes.paragraph.validContent(Fragment.from(node));
-    if (!isNodeValidContentForParagraph) {
-      paragraphs.push(node);
-      return;
-    }
-    // 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, _toConsumableArray(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
-      paragraphs.push(paragraph.createChecked(undefined, curChildren, _toConsumableArray(blockMarks)));
-      curChildren = [];
-      return;
-    }
-
-    // add to this paragraph
-    curChildren.push(node);
-    lastNode = node;
-  });
-  if (curChildren.length) {
-    paragraphs.push(paragraph.createChecked(undefined, curChildren, _toConsumableArray(blockMarks)));
-  }
-  return Fragment.from(paragraphs.length ? paragraphs : [paragraph.createAndFill(undefined, undefined, _toConsumableArray(blockMarks))]);
-};
-export var splitParagraphs = function splitParagraphs(slice, schema) {
-  // exclude Text nodes with a code mark, since we transform those later
-  // into a codeblock
-  var hasCodeMark = false;
-  slice.content.forEach(function (child) {
-    hasCodeMark = hasCodeMark || child.marks.some(function (mark) {
-      return mark.type === schema.marks.code;
-    });
-  });
-
-  // slice might just be a raw text string
-  if (schema.nodes.paragraph.validContent(slice.content) && !hasCodeMark) {
-    var replSlice = splitIntoParagraphs({
-      fragment: slice.content,
-      schema: schema
-    });
-    return new Slice(replSlice, slice.openStart + 1, slice.openEnd + 1);
-  }
-  return mapSlice(slice, function (node) {
-    if (node.type === schema.nodes.paragraph) {
-      return splitIntoParagraphs({
-        fragment: node.content,
-        blockMarks: node.marks,
-        schema: schema
-      });
-    }
-    return node;
-  });
-};
-
-// above will wrap everything in paragraphs for us
-export var upgradeTextToLists = function upgradeTextToLists(slice, schema) {
-  return mapSlice(slice, function (node, parent) {
-    if (node.type === schema.nodes.paragraph) {
-      return extractListFromParagraph(node, parent, schema);
-    }
-    return node;
-  });
-};
+}