@atlaskit/editor-core 187.18.0 → 187.18.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 187.18.2
+
+### Patch Changes
+
+- [`079e7748c62`](https://bitbucket.org/atlassian/atlassian-frontend/commits/079e7748c62) - Extracted `editor-plugin-image-upload` from `editor-core`.
+- Updated dependencies
+
+## 187.18.1
+
+### Patch Changes
+
+- [`7e77fe6f2ed`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7e77fe6f2ed) - ED-19330 Decouple list plugin from editor-core
+- Updated dependencies
+
 ## 187.18.0
 
 ### Minor Changes

package/dist/cjs/labs/next/presets/universal.js

@@ -9,6 +9,7 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _api = require("../../../selection-api/api");
 var _plugins = require("../../../plugins");
+var _editorPluginImageUpload = require("@atlaskit/editor-plugin-image-upload");
 var _editorPluginGuideline = require("@atlaskit/editor-plugin-guideline");
 var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
 var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
@@ -183,7 +184,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add([plugin, props.onSave]);
     }
     return builder;
-  }).maybeAdd(_plugins.imageUploadPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginImageUpload.imageUploadPlugin, function (plugin, builder) {
     if (props.legacyImageUploadProvider) {
       return builder.add(plugin);
     }

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

@@ -25,11 +25,10 @@ var _styles = require("./styles");
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton"));
 var _messages = require("@atlaskit/editor-common/messages");
-var _messages2 = require("../../list/messages");
-var _messages3 = require("../../insert-block/ui/ToolbarInsertBlock/messages");
-var _messages4 = require("../../block-type/messages");
-var _messages5 = require("../../undo-redo/messages");
-var _messages6 = require("../../../ui/Alignment/messages");
+var _messages2 = require("../../insert-block/ui/ToolbarInsertBlock/messages");
+var _messages3 = require("../../block-type/messages");
+var _messages4 = require("../../undo-redo/messages");
+var _messages5 = require("../../../ui/Alignment/messages");
 var _commands = require("../commands");
 var _toolbar = require("../../annotation/toolbar");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -149,7 +148,7 @@ var formatting = function formatting(_ref2) {
       return keymaps.toggleSuperscript;
     }
   }, {
-    name: formatMessage(_messages4.messages.heading1),
+    name: formatMessage(_messages3.messages.heading1),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading1;
@@ -162,7 +161,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.heading2),
+    name: formatMessage(_messages3.messages.heading2),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading2;
@@ -175,7 +174,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.heading3),
+    name: formatMessage(_messages3.messages.heading3),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading3;
@@ -188,7 +187,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.heading4),
+    name: formatMessage(_messages3.messages.heading4),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading4;
@@ -201,7 +200,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.heading5),
+    name: formatMessage(_messages3.messages.heading5),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading5;
@@ -214,7 +213,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.heading6),
+    name: formatMessage(_messages3.messages.heading6),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading6;
@@ -227,13 +226,13 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.normal),
+    name: formatMessage(_messages3.messages.normal),
     type: 'paragraph',
     keymap: function keymap() {
       return keymaps.setNormalText;
     }
   }, {
-    name: formatMessage(_messages2.messages.orderedList),
+    name: formatMessage(_messages.listMessages.orderedList),
     type: 'orderedList',
     keymap: function keymap() {
       return keymaps.toggleOrderedList;
@@ -246,7 +245,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages2.messages.unorderedList),
+    name: formatMessage(_messages.listMessages.unorderedList),
     type: 'bulletList',
     keymap: function keymap() {
       return keymaps.toggleBulletList;
@@ -259,7 +258,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.blockquote),
+    name: formatMessage(_messages3.messages.blockquote),
     type: 'blockquote',
     keymap: function keymap() {
       return keymaps.toggleBlockQuote;
@@ -272,7 +271,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages4.messages.codeblock),
+    name: formatMessage(_messages3.messages.codeblock),
     type: 'codeBlock',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -280,7 +279,7 @@ var formatting = function formatting(_ref2) {
       }, "```"));
     }
   }, {
-    name: formatMessage(_messages3.messages.horizontalRule),
+    name: formatMessage(_messages2.messages.horizontalRule),
     type: 'rule',
     keymap: function keymap() {
       return keymaps.insertRule;
@@ -291,7 +290,7 @@ var formatting = function formatting(_ref2) {
       }, "---"));
     }
   }, {
-    name: formatMessage(_messages3.messages.link),
+    name: formatMessage(_messages2.messages.link),
     type: 'link',
     keymap: function keymap() {
       return keymaps.addLink;
@@ -299,7 +298,7 @@ var formatting = function formatting(_ref2) {
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
         css: _styles.codeLg
-      }, "[", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.messages.link), "](http://a.com)"));
+      }, "[", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages2.messages.link), "](http://a.com)"));
     }
   }, {
     name: formatMessage(_messages.toolbarMessages.code),
@@ -313,7 +312,7 @@ var formatting = function formatting(_ref2) {
       }, "`", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.code), "`"));
     }
   }, {
-    name: formatMessage(_messages3.messages.action),
+    name: formatMessage(_messages2.messages.action),
     type: 'taskItem',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -323,7 +322,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.decision),
+    name: formatMessage(_messages2.messages.decision),
     type: 'decisionItem',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -333,7 +332,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.emoji),
+    name: formatMessage(_messages2.messages.emoji),
     type: 'emoji',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -341,7 +340,7 @@ var formatting = function formatting(_ref2) {
       }, ":"));
     }
   }, {
-    name: formatMessage(_messages3.messages.mention),
+    name: formatMessage(_messages2.messages.mention),
     type: 'mention',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -349,13 +348,13 @@ var formatting = function formatting(_ref2) {
       }, "@"));
     }
   }, {
-    name: formatMessage(_messages6.alignmentMessages.alignLeft),
+    name: formatMessage(_messages5.alignmentMessages.alignLeft),
     type: 'alignment',
     keymap: function keymap() {
       return keymaps.alignLeft;
     }
   }, {
-    name: formatMessage(_messages6.alignmentMessages.alignRight),
+    name: formatMessage(_messages5.alignmentMessages.alignRight),
     type: 'alignment'
   }];
 };
@@ -370,13 +369,13 @@ var otherFormatting = function otherFormatting(_ref3) {
       return keymaps.clearFormatting;
     }
   }, {
-    name: formatMessage(_messages5.messages.undo),
+    name: formatMessage(_messages4.messages.undo),
     type: 'undo',
     keymap: function keymap() {
       return keymaps.undo;
     }
   }, {
-    name: formatMessage(_messages5.messages.redo),
+    name: formatMessage(_messages4.messages.redo),
     type: 'redo',
     keymap: function keymap() {
       return keymaps.redo;

package/dist/cjs/plugins/index.js

@@ -191,12 +191,6 @@ Object.defineProperty(exports, "historyPlugin", {
     return _history.default;
   }
 });
-Object.defineProperty(exports, "imageUploadPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _imageUpload.default;
-  }
-});
 Object.defineProperty(exports, "indentationPlugin", {
   enumerable: true,
   get: function get() {
@@ -388,7 +382,6 @@ var _emoji = _interopRequireDefault(require("./emoji"));
 var _extension = _interopRequireDefault(require("./extension"));
 var _fakeTextCursor = _interopRequireDefault(require("./fake-text-cursor"));
 var _helpDialog = _interopRequireDefault(require("./help-dialog"));
-var _imageUpload = _interopRequireDefault(require("./image-upload"));
 var _insertBlock = _interopRequireDefault(require("./insert-block"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _layout = _interopRequireDefault(require("./layout"));

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

@@ -10,7 +10,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _main = require("./pm-plugins/main");
 var _inputRules = _interopRequireDefault(require("./pm-plugins/input-rules"));
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
-var _messages = require("./messages");
+var _messages = require("@atlaskit/editor-common/messages");
 var _analytics = require("../analytics");
 var _keymaps = require("../../keymaps");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
@@ -63,8 +63,8 @@ var listPlugin = function listPlugin(options, api) {
         var formatMessage = _ref3.formatMessage;
         return [{
           id: 'unorderedList',
-          title: formatMessage(_messages.messages.unorderedList),
-          description: formatMessage(_messages.messages.unorderedListDescription),
+          title: formatMessage(_messages.listMessages.unorderedList),
+          description: formatMessage(_messages.listMessages.unorderedListDescription),
           keywords: ['ul', 'unordered'],
           priority: 1100,
           keyshortcut: (0, _keymaps.tooltip)(_keymaps.toggleBulletList),
@@ -86,8 +86,8 @@ var listPlugin = function listPlugin(options, api) {
           }
         }, {
           id: 'orderedList',
-          title: formatMessage(_messages.messages.orderedList),
-          description: formatMessage(_messages.messages.orderedListDescription),
+          title: formatMessage(_messages.listMessages.orderedList),
+          description: formatMessage(_messages.listMessages.orderedListDescription),
           keywords: ['ol', 'ordered'],
           priority: 1200,
           keyshortcut: (0, _keymaps.tooltip)(_keymaps.toggleOrderedList),

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

@@ -1,21 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.liftFollowingList = liftFollowingList;
 exports.liftNodeSelectionList = liftNodeSelectionList;
 exports.liftTextSelectionList = liftTextSelectionList;
-exports.upgradeTextToLists = exports.splitParagraphs = exports.splitIntoParagraphs = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _commands = require("@atlaskit/editor-prosemirror/commands");
-var _utils = require("@atlaskit/editor-common/utils");
-var _slice = require("../../utils/slice");
 var _indentation = require("./utils/indentation");
 function liftListItem(selection, tr) {
   var $from = selection.$from,
@@ -104,219 +97,4 @@ 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 = (0, _slice.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 = (0, _slicedToArray2.default)(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(_model.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 = _state.EditorState.create({
-    schema: schema
-  });
-  var joinedListsTr;
-  var mockDispatch = function mockDispatch(tr) {
-    joinedListsTr = tr;
-  };
-  (0, _commands.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 (0, _utils.isListNode)(before) && (0, _utils.isListNode)(after);
-  })(mockState, mockDispatch);
-  var fragment = joinedListsTr ? joinedListsTr.doc.content : _model.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 _model.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.
- */
-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(_model.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, (0, _toConsumableArray2.default)(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, (0, _toConsumableArray2.default)(blockMarks)));
-      curChildren = [];
-      return;
-    }
-
-    // add to this paragraph
-    curChildren.push(node);
-    lastNode = node;
-  });
-  if (curChildren.length) {
-    paragraphs.push(paragraph.createChecked(undefined, curChildren, (0, _toConsumableArray2.default)(blockMarks)));
-  }
-  return _model.Fragment.from(paragraphs.length ? paragraphs : [paragraph.createAndFill(undefined, undefined, (0, _toConsumableArray2.default)(blockMarks))]);
-};
-exports.splitIntoParagraphs = splitIntoParagraphs;
-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 _model.Slice(replSlice, slice.openStart + 1, slice.openEnd + 1);
-  }
-  return (0, _slice.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
-exports.splitParagraphs = splitParagraphs;
-var upgradeTextToLists = function upgradeTextToLists(slice, schema) {
-  return (0, _slice.mapSlice)(slice, function (node, parent) {
-    if (node.type === schema.nodes.paragraph) {
-      return extractListFromParagraph(node, parent, schema);
-    }
-    return node;
-  });
-};
-exports.upgradeTextToLists = upgradeTextToLists;
+}