@atlaskit/editor-core 187.7.2 → 187.8.3

package/dist/cjs/plugins/panel/pm-plugins/keymaps.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
-var _prosemirrorUtils = require("prosemirror-utils");
-var _utils = require("../../../utils");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("../../../utils");
 function findParentNode(selection, nodeType) {
-  var parentPosition = (0, _prosemirrorUtils.findParentNodeOfType)(nodeType)(selection);
+  var parentPosition = (0, _utils.findParentNodeOfType)(nodeType)(selection);
   if (parentPosition) {
     return parentPosition.node;
   }
@@ -17,7 +17,7 @@ function findParentNode(selection, nodeType) {
 }
 function isInsideAnEmptyNode(selection, nodeType, schema) {
   var parentNode = findParentNode(selection, nodeType);
-  return parentNode && (0, _utils.isEmptyNode)(schema)(parentNode);
+  return parentNode && (0, _utils2.isEmptyNode)(schema)(parentNode);
 }
 
 // Somewhat broken and subverted: https://product-fabric.atlassian.net/browse/ED-6504
@@ -51,12 +51,12 @@ function keymapPlugin() {
 
       // Stops merging panels when deleting empty paragraph in between
       // Stops merging blockquotes with panels when deleting from start of blockquote
-      if (isPreviousNodeAPanel && !isParentNodeAPanel || isInsideAnEmptyNode(selection, panel, state.schema) || (0, _prosemirrorUtils.hasParentNodeOfType)(blockquote)(selection)) {
+      if (isPreviousNodeAPanel && !isParentNodeAPanel || isInsideAnEmptyNode(selection, panel, state.schema) || (0, _utils.hasParentNodeOfType)(blockquote)(selection)) {
         var content = $from.node($from.depth).content;
         var insertPos = previousPos.pos;
         deleteCurrentItem($from, tr).insert(insertPos, content);
         if (dispatch) {
-          dispatch((0, _prosemirrorUtils.setTextSelection)(insertPos)(tr).scrollIntoView());
+          dispatch((0, _utils.setTextSelection)(insertPos)(tr).scrollIntoView());
         }
         return true;
       }
@@ -67,7 +67,7 @@ function keymapPlugin() {
       return true;
     }
   };
-  return (0, _prosemirrorKeymap.keymap)(keymaps);
+  return (0, _keymap.keymap)(keymaps);
 }
 var _default = keymapPlugin;
 exports.default = _default;

package/dist/cjs/plugins/panel/toolbar.js

@@ -18,7 +18,7 @@ var _actions = require("./actions");
 var _panelBackgroundPalette = require("../../ui/ColorPalette/Palettes/panelBackgroundPalette");
 var _panel = require("@atlaskit/editor-common/panel");
 var _utils = require("./utils");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _Palettes = require("../../ui/ColorPalette/Palettes");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("../analytics");
@@ -279,7 +279,7 @@ var getToolbarConfig = function getToolbarConfig(state, intl) {
     var items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, hoverDecoration, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
     var getDomRef = function getDomRef(editorView) {
       var domAtPos = editorView.domAtPos.bind(editorView);
-      var element = (0, _prosemirrorUtils.findDomRefAtPos)(panelObject.pos, domAtPos);
+      var element = (0, _utils2.findDomRefAtPos)(panelObject.pos, domAtPos);
       return element;
     };
     return {

package/dist/cjs/plugins/panel/types.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var pluginKey = new _prosemirrorState.PluginKey('panelPlugin');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('panelPlugin');
 exports.pluginKey = pluginKey;

package/dist/cjs/plugins/panel/utils.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.panelAttrsToDom = exports.findPanel = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _panel = require("@atlaskit/editor-common/panel");
 var _editorPalette = require("@atlaskit/editor-palette");
@@ -14,7 +14,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var findPanel = function findPanel(state, selection) {
   var panel = state.schema.nodes.panel;
-  return (0, _prosemirrorUtils.findSelectedNodeOfType)(panel)(selection || state.selection) || (0, _prosemirrorUtils.findParentNodeOfType)(panel)(selection || state.selection);
+  return (0, _utils.findSelectedNodeOfType)(panel)(selection || state.selection) || (0, _utils.findParentNodeOfType)(panel)(selection || state.selection);
 };
 exports.findPanel = findPanel;
 var panelAttrsToDom = function panelAttrsToDom(attrs, allowCustomPanel) {

package/dist/cjs/plugins/paste/edge-cases/index.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertSliceForLists = insertSliceForLists;
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _lists = require("./lists");
-var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _util = require("../util");
 function insertSliceForLists(_ref) {
   var _slice$content$firstC;
@@ -20,7 +20,7 @@ function insertSliceForLists(_ref) {
   var _ref2 = selection,
     $cursor = _ref2.$cursor;
   var panelNode = (0, _util.isSelectionInsidePanel)(selection);
-  var selectionIsInsideList = $from.blockRange($to, _utils.isListNode);
+  var selectionIsInsideList = $from.blockRange($to, _utils2.isListNode);
   if (!$cursor && selectionIsInsideList) {
     return (0, _lists.insertSliceIntoRangeSelectionInsideList)({
       tr: tr,
@@ -50,8 +50,8 @@ function insertSliceForLists(_ref) {
   // pasting a whole list node directly after the action/decision item. (But we still preserve the
   // existing "insert at" node edge" behaviour if dealing with a list with more than one item, so that
   // it still inserts whole list node after the action/decision item).
-  var pastingIntoActionOrDecision = Boolean((0, _prosemirrorUtils.findParentNodeOfType)([schema.nodes.taskList, schema.nodes.decisionList])(selection));
-  var oneListItem = slice.content.childCount === 1 && (0, _utils.isListNode)(slice.content.firstChild) && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.childCount) === 1;
+  var pastingIntoActionOrDecision = Boolean((0, _utils.findParentNodeOfType)([schema.nodes.taskList, schema.nodes.decisionList])(selection));
+  var oneListItem = slice.content.childCount === 1 && (0, _utils2.isListNode)(slice.content.firstChild) && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.childCount) === 1;
   if (!(pastingIntoActionOrDecision && oneListItem) && (0, _util.isCursorSelectionAtTextStartOrEnd)(selection)) {
     return (0, _lists.insertSliceAtNodeEdge)({
       tr: tr,

package/dist/cjs/plugins/paste/edge-cases/lists.js

@@ -7,9 +7,9 @@ exports.insertSliceAtNodeEdge = insertSliceAtNodeEdge;
 exports.insertSliceInsideOfPanelNodeSelected = insertSliceInsideOfPanelNodeSelected;
 exports.insertSliceIntoEmptyNode = insertSliceIntoEmptyNode;
 exports.insertSliceIntoRangeSelectionInsideList = insertSliceIntoRangeSelectionInsideList;
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorTransform = require("prosemirror-transform");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-common/utils");
 function insertSliceIntoEmptyNode(_ref) {
   var tr = _ref.tr,
@@ -29,7 +29,7 @@ function insertSliceAtNodeEdge(_ref2) {
   tr.replaceRange(position, position, slice);
   var startSlicePosition = tr.doc.resolve(Math.min(position + slice.content.size - slice.openEnd, tr.doc.content.size));
   var direction = -1;
-  tr.setSelection(_prosemirrorState.TextSelection.near(startSlicePosition, direction));
+  tr.setSelection(_state.TextSelection.near(startSlicePosition, direction));
 }
 function insertSliceIntoRangeSelectionInsideList(_ref4) {
   var tr = _ref4.tr,
@@ -60,11 +60,11 @@ function insertSliceIntoRangeSelectionInsideList(_ref4) {
   if (newSlice.size <= 0) {
     return;
   }
-  var newSelection = _prosemirrorState.TextSelection.near(tr.doc.resolve(tr.mapping.map(mapped)), -1);
+  var newSelection = _state.TextSelection.near(tr.doc.resolve(tr.mapping.map(mapped)), -1);
   // @ts-ignore - [unblock prosemirror bump] assigning to readonly prop
   newSlice.openEnd = newSlice.openStart;
   tr.replaceRange(newSelection.from, newSelection.from, newSlice);
-  tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(newSelection.from), -1));
+  tr.setSelection(_state.TextSelection.near(tr.doc.resolve(newSelection.from), -1));
 }
 function insertSliceInsideOfPanelNodeSelected(panelNode) {
   return function (_ref5) {
@@ -77,7 +77,7 @@ function insertSliceInsideOfPanelNodeSelected(panelNode) {
     var panelPosition = selection.from;
 
     // if content of slice isn't valid for a panel node, insert the invalid node and following content after
-    if (panelNode && !panelNode.type.validContent(_prosemirrorModel.Fragment.from(slice.content))) {
+    if (panelNode && !panelNode.type.validContent(_model.Fragment.from(slice.content))) {
       var _parentNode$firstChil;
       var insertPosition = $to.pos + 1;
       tr.replaceRange(insertPosition, insertPosition, slice);
@@ -91,17 +91,17 @@ function insertSliceInsideOfPanelNodeSelected(panelNode) {
           tr.delete(startPosDelete, endPosDelete);
         }
       }
-      tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(insertPosition + slice.content.size - slice.openStart - slice.openEnd + 1)));
+      tr.setSelection(_state.TextSelection.near(tr.doc.resolve(insertPosition + slice.content.size - slice.openStart - slice.openEnd + 1)));
       return;
     }
-    var temporaryDoc = new _prosemirrorTransform.Transform(tr.doc.type.createAndFill());
+    var temporaryDoc = new _transform.Transform(tr.doc.type.createAndFill());
     temporaryDoc.replaceRange(0, temporaryDoc.doc.content.size, slice);
     var sliceWithoutInvalidListSurrounding = temporaryDoc.doc.slice(0);
     var newPanel = panelNode.copy(sliceWithoutInvalidListSurrounding.content);
-    var panelNodeSelected = selection instanceof _prosemirrorState.NodeSelection ? selection.node : null;
+    var panelNodeSelected = selection instanceof _state.NodeSelection ? selection.node : null;
     var replaceFrom = panelNodeSelected ? panelPosition : tr.doc.resolve(panelPosition).start();
     var replaceTo = panelNodeSelected ? panelPosition + panelNodeSelected.nodeSize : replaceFrom;
     tr.replaceRangeWith(replaceFrom, replaceTo, newPanel);
-    tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve($from.pos + newPanel.content.size), -1));
+    tr.setSelection(_state.TextSelection.near(tr.doc.resolve($from.pos + newPanel.content.size), -1));
   };
 }

package/dist/cjs/plugins/paste/handlers.js

@@ -24,17 +24,17 @@ exports.handleSelectedTable = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorHistory = require("prosemirror-history");
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _history = require("@atlaskit/editor-prosemirror/history");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _v = _interopRequireDefault(require("uuid/v4"));
-var _utils = require("@atlaskit/editor-tables/utils");
-var _utils2 = require("../../utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils3 = require("../../utils");
 var _slice = require("../../utils/slice");
 var _analytics = require("../analytics");
 var _gapCursorSelection = require("../selection/gap-cursor-selection");
-var _utils3 = require("@atlaskit/editor-common/utils");
+var _utils4 = require("@atlaskit/editor-common/utils");
 var _macro = require("../macro");
 var _mediaSingle = require("../media/utils/media-single");
 var _main = require("../text-formatting/pm-plugins/main");
@@ -82,9 +82,9 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
       listItem = _schema$nodes.listItem,
       expand = _schema$nodes.expand,
       heading = _schema$nodes.heading;
-    var selectionIsValidNode = state.selection instanceof _prosemirrorState.NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
-    var selectionHasValidParentNode = (0, _prosemirrorUtils.hasParentNodeOfType)([decisionItem, taskItem, panel])(state.selection);
-    var selectionIsPanel = (0, _prosemirrorUtils.hasParentNodeOfType)([panel])(state.selection);
+    var selectionIsValidNode = state.selection instanceof _state.NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
+    var selectionHasValidParentNode = (0, _utils.hasParentNodeOfType)([decisionItem, taskItem, panel])(state.selection);
+    var selectionIsPanel = (0, _utils.hasParentNodeOfType)([panel])(state.selection);
 
     // Some types of content should be handled by the default handler, not this function.
     // Check through slice content to see if it contains an invalid node.
@@ -106,16 +106,16 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     if (sliceIsInvalid || sliceIsAPanelReceivingLowDepthText || !selectionIsValidNode && !selectionHasValidParentNode) {
       return false;
     }
-    var filters = [(0, _utils3.linkifyContent)(schema)];
+    var filters = [(0, _utils4.linkifyContent)(schema)];
     var selectionMarks = selection.$head.marks();
     var textFormattingState = _main.pluginKey.getState(state);
-    if (selection instanceof _prosemirrorState.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeActive) // for codeMarks let's make sure mark is active
+    if (selection instanceof _state.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeActive) // for codeMarks let's make sure mark is active
     ) {
       filters.push((0, _util.applyTextMarksToSlice)(schema, selection.$head.marks()));
     }
-    var transformedSlice = _utils2.compose.apply(null, filters)(slice);
-    var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
-    var transformedSliceIsValidNode = transformedSlice.content.firstChild.type.inlineContent || ['decisionList', 'decisionItem', 'taskList', 'taskItem', 'panel'].includes(transformedSlice.content.firstChild.type.name) && !(0, _utils2.isInListItem)(state);
+    var transformedSlice = _utils3.compose.apply(null, filters)(slice);
+    var tr = (0, _history.closeHistory)(state.tr);
+    var transformedSliceIsValidNode = transformedSlice.content.firstChild.type.inlineContent || ['decisionList', 'decisionItem', 'taskList', 'taskItem', 'panel'].includes(transformedSlice.content.firstChild.type.name) && !(0, _utils3.isInListItem)(state);
     // If the slice or the selection are valid nodes to handle,
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
     // or the slice's first node is a paragraph,
@@ -126,7 +126,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
       tr.replaceSelection(transformedSlice).scrollIntoView();
     } else {
       // This maintains both the selection (destination) and the slice (paste content).
-      (0, _prosemirrorUtils.safeInsert)(transformedSlice.content)(tr).scrollIntoView();
+      (0, _utils.safeInsert)(transformedSlice.content)(tr).scrollIntoView();
     }
     queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
@@ -150,13 +150,13 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
       listItem = _state$schema$nodes.listItem;
 
     // Selected nodes
-    var selectionParentListItemNode = (0, _prosemirrorUtils.findParentNodeOfType)(listItem)(selection);
-    var selectionParentListNodeWithPos = (0, _prosemirrorUtils.findParentNodeOfType)([bulletList, orderedList])(selection);
+    var selectionParentListItemNode = (0, _utils.findParentNodeOfType)(listItem)(selection);
+    var selectionParentListNodeWithPos = (0, _utils.findParentNodeOfType)([bulletList, orderedList])(selection);
     var selectionParentListNode = selectionParentListNodeWithPos === null || selectionParentListNodeWithPos === void 0 ? void 0 : selectionParentListNodeWithPos.node;
 
     // Slice info
     var sliceContent = slice.content;
-    var sliceIsListItems = (0, _utils3.isListNode)(sliceContent.firstChild) && (0, _utils3.isListNode)(sliceContent.lastChild);
+    var sliceIsListItems = (0, _utils4.isListNode)(sliceContent.firstChild) && (0, _utils4.isListNode)(sliceContent.lastChild);
 
     // Find case of slices that can be inserted into a list item
     // (eg. paragraphs, list items, code blocks, media single)
@@ -168,7 +168,7 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
         sliceContainsBlockNodesOtherThanThoseAllowedInListItem = true;
       }
     });
-    if (!selectionParentListItemNode || !sliceContent || (0, _prosemirrorUtils.canInsert)($from, sliceContent) ||
+    if (!selectionParentListItemNode || !sliceContent || (0, _utils.canInsert)($from, sliceContent) ||
     // eg. inline nodes that can be inserted in a list item
     !sliceContainsBlockNodesOtherThanThoseAllowedInListItem || sliceIsListItems || !selectionParentListNodeWithPos) {
       return false;
@@ -179,11 +179,11 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
     var listItemWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth; // difference in depth between to position and list item node
 
     // Anything to do with nested lists should safeInsert and not be handled here
-    var grandParentListNode = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+    var grandParentListNode = (0, _utils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
     var selectionIsInNestedList = !!grandParentListNode;
     var selectedListItemHasNestedList = false;
     selectionParentListItemNode.node.content.forEach(function (child) {
-      if ((0, _utils3.isListNode)(child)) {
+      if ((0, _utils4.isListNode)(child)) {
         selectedListItemHasNestedList = true;
       }
     });
@@ -225,11 +225,11 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
     if (mappedPositionOfNextListItem > tr.doc.nodeSize) {
       return false;
     }
-    var nodeAfterPastedContentResolvedPos = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(mappedPositionOfNextListItem), [orderedList]);
+    var nodeAfterPastedContentResolvedPos = (0, _utils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(mappedPositionOfNextListItem), [orderedList]);
 
     // Work out the new split out lists 'order' (the number it starts from)
     var originalParentOrderedListNodeOrder = selectionParentListNode === null || selectionParentListNode === void 0 ? void 0 : selectionParentListNode.attrs.order;
-    var numOfListItemsInOriginalList = (_findParentNodeOfType = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(from - 1), [orderedList])) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node.childCount;
+    var numOfListItemsInOriginalList = (_findParentNodeOfType = (0, _utils.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(from - 1), [orderedList])) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node.childCount;
 
     // Set the new split out lists order attribute
     if (typeof originalParentOrderedListNodeOrder === 'number' && numOfListItemsInOriginalList && nodeAfterPastedContentResolvedPos) {
@@ -283,9 +283,9 @@ function handlePasteLinkOnSelectedText(slice) {
     var linkMark;
 
     // check if we have a link on the clipboard
-    if (slice.content.childCount === 1 && (0, _utils2.isParagraph)(slice.content.child(0), schema)) {
+    if (slice.content.childCount === 1 && (0, _utils3.isParagraph)(slice.content.child(0), schema)) {
       var paragraph = slice.content.child(0);
-      if (paragraph.content.childCount === 1 && (0, _utils2.isText)(paragraph.content.child(0), schema)) {
+      if (paragraph.content.childCount === 1 && (0, _utils3.isText)(paragraph.content.child(0), schema)) {
         var text = paragraph.content.child(0);
 
         // If pasteType is plain text, then
@@ -298,13 +298,13 @@ function handlePasteLinkOnSelectedText(slice) {
         // However, if pasteType is richText, that means url in text.text
         //  and href in marks, both won't be decoded.
         linkMark = text.marks.find(function (mark) {
-          return (0, _utils2.isLinkMark)(mark, schema) && (mark.attrs.href === text.text || decodeURI(mark.attrs.href) === text.text);
+          return (0, _utils3.isLinkMark)(mark, schema) && (mark.attrs.href === text.text || decodeURI(mark.attrs.href) === text.text);
         });
       }
     }
 
     // if we have a link, apply it to the selected text if we have any and it's allowed
-    if (linkMark && selection instanceof _prosemirrorState.TextSelection && !selection.empty && (0, _utils3.canLinkBeCreatedInRange)(from, to)(state)) {
+    if (linkMark && selection instanceof _state.TextSelection && !selection.empty && (0, _utils4.canLinkBeCreatedInRange)(from, to)(state)) {
       tr.addMark(from, to, linkMark);
       if (dispatch) {
         dispatch(tr);
@@ -323,14 +323,14 @@ function handlePasteAsPlainText(slice, _event) {
     // @see prosemirror-view/src/clipboard.js:parseFromClipboard()).
     // @see prosemirror-view/src/input.js:doPaste().
     if (view && view.shiftKey) {
-      var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
+      var tr = (0, _history.closeHistory)(state.tr);
       var _tr = tr,
         selection = _tr.selection;
 
       // <- using the same internal flag that prosemirror-view is using
 
       // if user has selected table we need custom logic to replace the table
-      tr = (0, _utils.replaceSelectedTable)(state, slice);
+      tr = (0, _utils2.replaceSelectedTable)(state, slice);
 
       // add analytics after replacing selected table
       tr = (0, _util.addReplaceSelectedTableAnalytics)(state, tr);
@@ -368,7 +368,7 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
       orderedList = _schema$nodes2.orderedList,
       paragraph = _schema$nodes2.paragraph,
       text = _schema$nodes2.text;
-    if (!(selection instanceof _prosemirrorState.TextSelection)) {
+    if (!(selection instanceof _state.TextSelection)) {
       return false;
     }
     var selectionMarks = selection.$head.marks();
@@ -386,7 +386,7 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
 
     // special case for plainTextSlice & linkMark: merge into existing link
     if (isPlainTextSlice && linkMark.isInSet(selectionMarks) && selectionMarks.length === 1) {
-      var tr = (0, _prosemirrorHistory.closeHistory)(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
+      var tr = (0, _history.closeHistory)(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
       queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
         dispatch(tr);
@@ -398,7 +398,7 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
     // we apply current selection marks to the pasted slice
     if ((0, _util.hasOnlyNodesOfType)(bulletList, hardBreak, heading, listItem, paragraph, text, emoji, mention, orderedList)(slice)) {
       var transformedSlice = (0, _util.applyTextMarksToSlice)(schema, selectionMarks)(slice);
-      var _tr2 = (0, _prosemirrorHistory.closeHistory)(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
+      var _tr2 = (0, _history.closeHistory)(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
       queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, _tr2, _analytics.INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
         dispatch(_tr2);
@@ -456,7 +456,7 @@ function insertAutoMacro(slice, macro, view, from, to) {
 
     // replace the text with the macro as a separate transaction
     // so the autoconversion generates 2 undo steps
-    view.dispatch((0, _prosemirrorHistory.closeHistory)(view.state.tr).replaceRangeWith(before, before + slice.size, macro).scrollIntoView());
+    view.dispatch((0, _history.closeHistory)(view.state.tr).replaceRangeWith(before, before + slice.size, macro).scrollIntoView());
     return true;
   }
   return false;
@@ -469,7 +469,7 @@ function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptio
     if (extensionAutoConverter) {
       var extension = extensionAutoConverter(text);
       if (extension) {
-        macro = _prosemirrorModel.Node.fromJSON(state.schema, extension);
+        macro = _model.Node.fromJSON(state.schema, extension);
       }
     }
 
@@ -518,8 +518,8 @@ function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptio
 function handleCodeBlock(text) {
   return function (state, dispatch) {
     var codeBlock = state.schema.nodes.codeBlock;
-    if (text && (0, _prosemirrorUtils.hasParentNodeOfType)(codeBlock)(state.selection)) {
-      var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
+    if (text && (0, _utils.hasParentNodeOfType)(codeBlock)(state.selection)) {
+      var tr = (0, _history.closeHistory)(state.tr);
       tr.scrollIntoView();
       if (dispatch) {
         dispatch(tr.insertText(text));
@@ -544,7 +544,7 @@ function handleMediaSingle(inputMethod) {
         if (isOnlyMedia(state, slice)) {
           return (0, _mediaSingle.insertMediaAsMediaSingle)(view, slice.content.firstChild, inputMethod);
         }
-        if ((0, _utils2.insideTable)(state) && isOnlyMediaSingle(state, slice)) {
+        if ((0, _utils3.insideTable)(state) && isOnlyMediaSingle(state, slice)) {
           var tr = state.tr.replaceSelection(slice);
           var nextPos = tr.doc.resolve(tr.mapping.map(state.selection.$from.pos));
           if (dispatch) {
@@ -570,7 +570,7 @@ function handleExpandPasteInTable(slice) {
   return function (state, dispatch) {
     // Do not handle expand if it's not being pasted into a table
     // OR if it's nested within another node when being pasted into a table
-    if (!(0, _utils2.insideTable)(state) || !checkExpand(slice)) {
+    if (!(0, _utils3.insideTable)(state) || !checkExpand(slice)) {
       return false;
     }
     var _state$schema$nodes2 = state.schema.nodes,
@@ -584,8 +584,8 @@ function handleExpandPasteInTable(slice) {
         try {
           return nestedExpand.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);
         } catch (e) {
-          tr = (0, _prosemirrorUtils.safeInsert)(maybeNode, tr.selection.$to.pos)(tr);
-          return _prosemirrorModel.Fragment.empty;
+          tr = (0, _utils.safeInsert)(maybeNode, tr.selection.$to.pos)(tr);
+          return _model.Fragment.empty;
         }
       }
       return maybeNode;
@@ -598,7 +598,7 @@ function handleExpandPasteInTable(slice) {
       if (slice.openStart > 1 && slice.openEnd > 1) {
         dispatch(tr.replaceSelection(newSlice));
       } else {
-        dispatch((0, _prosemirrorUtils.safeInsert)(newSlice.content)(tr));
+        dispatch((0, _utils.safeInsert)(newSlice.content)(tr));
       }
       return true;
     }
@@ -607,14 +607,14 @@ function handleExpandPasteInTable(slice) {
 }
 function handleMarkdown(markdownSlice, queueCardsFromChangedTr, from, to) {
   return function (state, dispatch) {
-    var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
+    var tr = (0, _history.closeHistory)(state.tr);
     var pastesFrom = typeof from === 'number' ? from : tr.selection.from;
     if (typeof from === 'number' && typeof to === 'number') {
       tr.replaceRange(from, to, markdownSlice);
     } else {
       tr.replaceSelection(markdownSlice);
     }
-    tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(pastesFrom + markdownSlice.size), -1));
+    tr.setSelection(_state.TextSelection.near(tr.doc.resolve(pastesFrom + markdownSlice.size), -1));
     queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, _analytics.INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
       dispatch(tr.scrollIntoView());
@@ -637,7 +637,7 @@ function hasInlineCode(state, slice) {
 }
 function rollupLeafListItems(list, leafListItems) {
   list.content.forEach(function (child) {
-    if ((0, _utils3.isListNode)(child) || (0, _utils3.isListItemNode)(child) && (0, _utils3.isListNode)(child.firstChild)) {
+    if ((0, _utils4.isListNode)(child) || (0, _utils4.isListItemNode)(child) && (0, _utils4.isListNode)(child.firstChild)) {
       rollupLeafListItems(child, leafListItems);
     } else {
       leafListItems.push(child);
@@ -646,7 +646,7 @@ function rollupLeafListItems(list, leafListItems) {
 }
 function shouldFlattenList(state, slice) {
   var node = slice.content.firstChild;
-  return node && (0, _utils2.insideTable)(state) && (0, _utils3.isListNode)(node) && slice.openStart > slice.openEnd;
+  return node && (0, _utils3.insideTable)(state) && (0, _utils4.isListNode)(node) && slice.openStart > slice.openEnd;
 }
 function sliceHasTopLevelMarks(slice) {
   var hasTopLevelMarks = false;
@@ -715,7 +715,7 @@ function handleParagraphBlockMarks(state, slice) {
     // marks applied to it. We only care about the depth at the start of the selection so
     // there's no need to change openEnd - the rest of the slice gets pasted correctly.
     var openStart = Math.max(0, slice.openStart - 1);
-    return new _prosemirrorModel.Slice(slice.content, openStart, slice.openEnd);
+    return new _model.Slice(slice.content, openStart, slice.openEnd);
   }
 
   // If the paragraph contains marks forbidden by the parent node (e.g. alignment/indentation),
@@ -765,7 +765,7 @@ function flattenNestedListInSlice(slice) {
   var leafListItems = [];
   rollupLeafListItems(listToFlatten, leafListItems);
   var contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
-  return new _prosemirrorModel.Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
+  return new _model.Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
 function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
@@ -789,9 +789,9 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     if (shouldFlattenList(state, slice)) {
       slice = flattenNestedListInSlice(slice);
     }
-    (0, _prosemirrorHistory.closeHistory)(tr);
-    var isFirstChildListNode = (0, _utils3.isListNode)(firstChildOfSlice);
-    var isLastChildListNode = (0, _utils3.isListNode)(lastChildOfSlice);
+    (0, _history.closeHistory)(tr);
+    var isFirstChildListNode = (0, _utils4.isListNode)(firstChildOfSlice);
+    var isLastChildListNode = (0, _utils4.isListNode)(lastChildOfSlice);
     var isSliceContentListNodes = isFirstChildListNode || isLastChildListNode;
     var isFirstChildTaskListNode = (firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$ty = firstChildOfSlice.type) === null || _firstChildOfSlice$ty === void 0 ? void 0 : _firstChildOfSlice$ty.name) === 'taskList';
     var isLastChildTaskListNode = (lastChildOfSlice === null || lastChildOfSlice === void 0 ? void 0 : (_lastChildOfSlice$typ = lastChildOfSlice.type) === null || _lastChildOfSlice$typ === void 0 ? void 0 : _lastChildOfSlice$typ.name) === 'taskList';
@@ -803,7 +803,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     var textNodes = [heading, paragraph];
     var selectionParent = selection.$to.node(selection.$to.depth - 1);
     var noNeedForSafeInsert = selection.$to.node().type.validContent(slice.content) || textNodes.includes(selection.$to.node().type) && selectionParent.type.validContent(slice.content);
-    var panelParentOverCurrentSelection = (0, _prosemirrorUtils.findParentNodeOfType)(panel)(tr.selection);
+    var panelParentOverCurrentSelection = (0, _utils.findParentNodeOfType)(panel)(tr.selection);
     var isTargetPanelEmpty = panelParentOverCurrentSelection && ((_panelParentOverCurre = panelParentOverCurrentSelection.node) === null || _panelParentOverCurre === void 0 ? void 0 : _panelParentOverCurre.content.size) === 2;
     if (!isSliceContentTaskListNodes && (isSliceContentListNodes || isTargetPanelEmpty)) {
       (0, _edgeCases.insertSliceForLists)({
@@ -818,7 +818,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       // need to make sure the cursor position is is right after the panel, expand, or decisionList
       // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
       var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
-      if ((0, _utils2.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
+      if ((0, _utils3.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
         var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
         tr.setSelection(new _gapCursorSelection.GapCursorSelection(nextPos, _gapCursorSelection.Side.RIGHT));
       }
@@ -835,17 +835,17 @@ function handleRichText(slice, queueCardsFromChangedTr) {
           return false;
         }
       });
-      if ((0, _utils2.insideTableCell)(state) && (!doesBlockNodeExist || (0, _utils2.isInListItem)(state) && (0, _prosemirrorUtils.canInsert)(selection.$from, slice.content) && (0, _prosemirrorUtils.canInsert)(selection.$to, slice.content)) || sliceHasList) {
+      if ((0, _utils3.insideTableCell)(state) && (!doesBlockNodeExist || (0, _utils3.isInListItem)(state) && (0, _utils.canInsert)(selection.$from, slice.content) && (0, _utils.canInsert)(selection.$to, slice.content)) || sliceHasList) {
         tr.replaceSelection(slice);
       } else {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
-        tr = (0, _prosemirrorUtils.safeInsert)(slice.content, tr.selection.$to.pos)(tr);
+        tr = (0, _utils.safeInsert)(slice.content, tr.selection.$to.pos)(tr);
       }
     }
     tr.setStoredMarks([]);
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
-      tr.setSelection(_prosemirrorState.TextSelection.near(tr.selection.$from, 1));
+      tr.setSelection(_state.TextSelection.near(tr.selection.$from, 1));
     }
     tr.scrollIntoView();
 
@@ -861,7 +861,7 @@ function handlePasteIntoCaption(slice) {
   return function (state, dispatch) {
     var caption = state.schema.nodes.caption;
     var tr = state.tr;
-    if ((0, _prosemirrorUtils.hasParentNodeOfType)(caption)(state.selection)) {
+    if ((0, _utils.hasParentNodeOfType)(caption)(state.selection)) {
       // We let PM replace the selection and it will insert as text where it can't place the node
       // This is totally fine as caption is just a simple block that only contains inline contents
       // And it is more in line with WYSIWYG expectations
@@ -876,7 +876,7 @@ function handlePasteIntoCaption(slice) {
 }
 var handleSelectedTable = function handleSelectedTable(slice) {
   return function (state, dispatch) {
-    var tr = (0, _utils.replaceSelectedTable)(state, slice);
+    var tr = (0, _utils2.replaceSelectedTable)(state, slice);
 
     // add analytics after replacing selected table
     tr = (0, _util.addReplaceSelectedTableAnalytics)(state, tr);

package/dist/cjs/plugins/paste/pm-plugins/analytics.js

@@ -17,9 +17,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _analytics = require("../../analytics");
 var _util = require("../util");
 var _handlers = require("../handlers");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _slice = require("../../../utils/slice");
-var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var contentToPasteContent = {
@@ -118,7 +118,7 @@ function getActionSubjectId(_ref2) {
     listItem = _schema$nodes.listItem,
     taskItem = _schema$nodes.taskItem,
     decisionItem = _schema$nodes.decisionItem;
-  var parent = (0, _prosemirrorUtils.findParentNode)(function (node) {
+  var parent = (0, _utils.findParentNode)(function (node) {
     if (node.type !== paragraph && node.type !== listItem && node.type !== taskItem && node.type !== decisionItem) {
       return true;
     }
@@ -202,7 +202,7 @@ function createPasteAnalyticsPayloadBySelection(event, slice, pasteContext) {
         pasteSplitList: pasteContext.pasteSplitList
       });
     }
-    var linkDomains = linkUrls.map(_utils.getLinkDomain);
+    var linkDomains = linkUrls.map(_utils2.getLinkDomain);
     return createPastePayload(actionSubjectId, {
       type: pasteContext.type,
       pasteSize: pasteSize,