@atlaskit/editor-core 180.0.0 → 180.1.0

package/dist/es2019/plugins/media/commands/helpers.js

@@ -1,5 +1,10 @@
 import { stateKey as mediaPluginKey } from '../pm-plugins/plugin-key';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+/**
+ * Note that Media Inline is inserted like a media single node into the media plugin state.
+ * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
+ *
+ */
 export const findMediaSingleNode = (mediaPluginState, id) => {
   const {
     mediaNodes
@@ -19,51 +24,20 @@ export const findMediaSingleNode = (mediaPluginState, id) => {
     return memo;
   }, null);
 };
-
-/**
- * Finds the media inline node with the given id.
- * Media Inline is inserted like a media single node into the media plugin state.
- * However it is not of type mediaSingle.
- *
- * @param mediaPluginState
- * @param id
- * @param isMediaSingle
- * @returns {MediaNodeWithPosHandler | null}
- */
-export const findMediaInlineNode = (mediaPluginState, id, isMediaSingle) => {
-  if (!isMediaSingle) {
-    return findMediaSingleNode(mediaPluginState, id);
-  }
-  return null;
-};
 export const findAllMediaSingleNodes = (mediaPluginState, id) => {
   const {
     mediaNodes
   } = mediaPluginState;
   return mediaNodes.filter(nodeWithHandler => nodeWithHandler.node.attrs.id === id);
 };
-export const findMediaNode = (mediaPluginState, id, isMediaSingle) => {
-  const mediaNodeWithPos = isMediaSingle ? findMediaSingleNode(mediaPluginState, id) : mediaPluginState.mediaGroupNodes[id];
-
-  // Should attempt to find media inline node if media single node or media group node is not found
-  if (!mediaNodeWithPos) {
-    return findMediaInlineNode(mediaPluginState, id, isMediaSingle);
-  }
-  return mediaNodeWithPos;
-};
 export const isMediaNode = (pos, state) => {
   const node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);
 };
-export const updateAllMediaNodesAttrs = (id, attrs, isMediaSingle) => (state, dispatch) => {
+export const updateAllMediaSingleNodesAttrs = (id, attrs) => (state, dispatch) => {
   const mediaPluginState = mediaPluginKey.getState(state);
   let mediaNodes;
-  if (isMediaSingle) {
-    mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
-  } else {
-    const mediaGroupNode = findMediaNode(mediaPluginState, id, isMediaSingle);
-    mediaNodes = mediaGroupNode ? [mediaGroupNode] : [];
-  }
+  mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
   const validMediaNodePositions = mediaNodes.reduce((acc, {
     getPos
   }) => {
@@ -98,9 +72,9 @@ export const updateCurrentMediaNodeAttrs = (attrs, mediaNode) => (state, dispatc
   }
   return true;
 };
-export const updateMediaNodeAttrs = (id, attrs, isMediaSingle) => (state, dispatch) => {
+export const updateMediaSingleNodeAttrs = (id, attrs) => (state, dispatch) => {
   const mediaPluginState = mediaPluginKey.getState(state);
-  const mediaNodeWithPos = findMediaNode(mediaPluginState, id, isMediaSingle);
+  const mediaNodeWithPos = findMediaSingleNode(mediaPluginState, id);
   if (!mediaNodeWithPos) {
     return false;
   }

package/dist/es2019/plugins/media/commands/index.js

@@ -1 +1 @@
-export { updateMediaNodeAttrs, updateAllMediaNodesAttrs, replaceExternalMedia } from './helpers';
+export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';

package/dist/es2019/plugins/media/nodeviews/mediaGroup.js

@@ -55,7 +55,6 @@ class MediaGroup extends React.Component {
       this.mediaNodes = [];
       node.forEach((item, childOffset) => {
         const getPos = () => props.getPos() + childOffset + 1;
-        this.mediaPluginState.setMediaGroupNode(item, getPos);
         this.mediaNodes.push(item);
         if (updatedAttrs) {
           this.updateNodeAttrs(props, item, getPos);
@@ -157,13 +156,14 @@ class MediaGroup extends React.Component {
         node,
         isMediaSingle: false
       });
+      const getPos = () => this.props.getPos() + 1;
       const contextId = mediaNodeUpdater.getNodeContextId();
       if (!contextId) {
-        await mediaNodeUpdater.updateContextId();
+        await mediaNodeUpdater.updateNodeContextId(getPos);
       }
       const hasDifferentContextId = await mediaNodeUpdater.hasDifferentContextId();
       if (hasDifferentContextId) {
-        await mediaNodeUpdater.copyNode({
+        await mediaNodeUpdater.copyNodeFromPos(getPos, {
           traceId: node.attrs.__mediaTraceId
         });
       }

package/dist/es2019/plugins/media/nodeviews/mediaInline.js

@@ -49,7 +49,7 @@ export const updateMediaNodeAttributes = async props => {
       return;
     }
   }
-  await mediaNodeUpdater.updateFileAttrs();
+  await mediaNodeUpdater.updateMediaSingleFileAttrs();
 };
 export const handleNewNode = props => {
   const {

package/dist/es2019/plugins/media/nodeviews/mediaNodeUpdater.js

@@ -3,7 +3,7 @@ import uuidV4 from 'uuid/v4';
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
 import { getMediaClient, isMediaBlobUrl, getAttrsFromUrl, isImageRepresentationReady } from '@atlaskit/media-client';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../analytics';
-import { replaceExternalMedia, updateAllMediaNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaNodeAttrs } from '../commands/helpers';
+import { replaceExternalMedia, updateAllMediaSingleNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaSingleNodeAttrs } from '../commands/helpers';
 export class MediaNodeUpdater {
   constructor(props) {
     _defineProperty(this, "updateContextId", async () => {
@@ -15,9 +15,22 @@ export class MediaNodeUpdater {
         id
       } = attrs;
       const objectId = await this.getObjectId();
-      updateAllMediaNodesAttrs(id, {
+      updateAllMediaSingleNodesAttrs(id, {
         __contextId: objectId
-      }, this.props.isMediaSingle)(this.props.view.state, this.props.view.dispatch);
+      })(this.props.view.state, this.props.view.dispatch);
+    });
+    _defineProperty(this, "updateNodeContextId", async getPos => {
+      const attrs = this.getAttrs();
+      if ((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file') {
+        return;
+      }
+      const objectId = await this.getObjectId();
+      updateCurrentMediaNodeAttrs({
+        __contextId: objectId
+      }, {
+        node: this.props.node,
+        getPos
+      })(this.props.view.state, this.props.view.dispatch);
     });
     _defineProperty(this, "hasFileAttributesDefined", attrs => {
       return attrs && attrs.type === 'file' && attrs.__fileName && attrs.__fileMimeType && attrs.__fileSize && attrs.__contextId;
@@ -62,13 +75,13 @@ export class MediaNodeUpdater {
       }
       return newAttrs;
     });
-    _defineProperty(this, "updateFileAttrs", async (isMediaSingle = true) => {
+    _defineProperty(this, "updateMediaSingleFileAttrs", async () => {
       const newAttrs = await this.getNewFileAttrsForNode();
       const {
         id
       } = this.getAttrs();
       if (id && newAttrs) {
-        updateAllMediaNodesAttrs(id, newAttrs, isMediaSingle)(this.props.view.state, this.props.view.dispatch);
+        updateAllMediaSingleNodesAttrs(id, newAttrs)(this.props.view.state, this.props.view.dispatch);
       }
     });
     _defineProperty(this, "updateNodeAttrs", async getPos => {
@@ -138,10 +151,10 @@ export class MediaNodeUpdater {
       return attrs.__contextId || null;
     });
     _defineProperty(this, "updateDimensions", dimensions => {
-      updateAllMediaNodesAttrs(dimensions.id, {
+      updateAllMediaSingleNodesAttrs(dimensions.id, {
         height: dimensions.height,
         width: dimensions.width
-      }, true)(this.props.view.state, this.props.view.dispatch);
+      })(this.props.view.state, this.props.view.dispatch);
     });
     _defineProperty(this, "hasDifferentContextId", async () => {
       const nodeContextId = this.getNodeContextId();
@@ -225,44 +238,64 @@ export class MediaNodeUpdater {
         __fileSize: size
       })(this.props.view.state, this.props.view.dispatch);
     });
+    _defineProperty(this, "copyNodeFromPos", async (getPos, traceContext) => {
+      const attrs = this.getAttrs();
+      if ((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file') {
+        return;
+      }
+      const copiedAttrs = await this.copyFile(attrs.id, attrs.collection, traceContext);
+      if (!copiedAttrs) {
+        return;
+      }
+      updateCurrentMediaNodeAttrs(copiedAttrs, {
+        node: this.props.node,
+        getPos
+      })(this.props.view.state, this.props.view.dispatch);
+    });
     _defineProperty(this, "copyNode", async traceContext => {
-      const mediaProvider = await this.props.mediaProvider;
+      const attrs = this.getAttrs();
       const {
-        isMediaSingle,
         view
       } = this.props;
-      const attrs = this.getAttrs();
-      if (!mediaProvider || !mediaProvider.uploadParams || !attrs || attrs.type !== 'file') {
+      if ((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file') {
+        return;
+      }
+      const copiedAttrs = await this.copyFile(attrs.id, attrs.collection, traceContext);
+      if (!copiedAttrs) {
+        return;
+      }
+      updateMediaSingleNodeAttrs(attrs.id, copiedAttrs)(view.state, view.dispatch);
+    });
+    _defineProperty(this, "copyFile", async (id, collection, traceContext) => {
+      const mediaProvider = await this.props.mediaProvider;
+      if (!id || !collection || !(mediaProvider !== null && mediaProvider !== void 0 && mediaProvider.uploadParams)) {
         return;
       }
       const nodeContextId = this.getNodeContextId();
       const uploadMediaClientConfig = mediaProvider.uploadMediaClientConfig;
-      if (uploadMediaClientConfig && uploadMediaClientConfig.getAuthFromContext && nodeContextId) {
-        const mediaClient = getMediaClient(uploadMediaClientConfig);
-        const auth = await uploadMediaClientConfig.getAuthFromContext(nodeContextId);
-        const objectId = await this.getObjectId();
-        const {
-          id,
-          collection
-        } = attrs;
-        const source = {
-          id,
-          collection,
-          authProvider: () => Promise.resolve(auth)
-        };
-        const currentCollectionName = mediaProvider.uploadParams.collection;
-        const destination = {
-          collection: currentCollectionName,
-          authProvider: uploadMediaClientConfig.authProvider,
-          occurrenceKey: uuidV4()
-        };
-        const mediaFile = await mediaClient.file.copyFile(source, destination, undefined, traceContext);
-        updateMediaNodeAttrs(source.id, {
-          id: mediaFile.id,
-          collection: currentCollectionName,
-          __contextId: objectId
-        }, isMediaSingle)(view.state, view.dispatch);
+      if (!(uploadMediaClientConfig !== null && uploadMediaClientConfig !== void 0 && uploadMediaClientConfig.getAuthFromContext) || !nodeContextId) {
+        return;
       }
+      const mediaClient = getMediaClient(uploadMediaClientConfig);
+      const auth = await uploadMediaClientConfig.getAuthFromContext(nodeContextId);
+      const objectId = await this.getObjectId();
+      const source = {
+        id,
+        collection,
+        authProvider: () => Promise.resolve(auth)
+      };
+      const currentCollectionName = mediaProvider.uploadParams.collection;
+      const destination = {
+        collection: currentCollectionName,
+        authProvider: uploadMediaClientConfig.authProvider,
+        occurrenceKey: uuidV4()
+      };
+      const mediaFile = await mediaClient.file.copyFile(source, destination, undefined, traceContext);
+      return {
+        id: mediaFile.id,
+        collection: currentCollectionName,
+        __contextId: objectId
+      };
     });
     this.props = props;
   }
@@ -272,7 +305,7 @@ export class MediaNodeUpdater {
   }
 
   // Updates the node with contextId if it doesn't have one already
-  // TODO [MS-2258]: remove updateContextId in order to only use updateFileAttrs
+  // TODO [MS-2258]: remove updateContextId in order to only use updateMediaSingleFileAttrs
 
   async getRemoteDimensions() {
     const mediaProvider = await this.props.mediaProvider;

package/dist/es2019/plugins/media/nodeviews/mediaSingle.js

@@ -193,7 +193,7 @@ export default class MediaSingleNode extends Component {
 
     // We need to call this method on any prop change since attrs can get removed with collab editing
     // the method internally checks if we already have all attrs
-    this.createMediaNodeUpdater(nextProps).updateFileAttrs();
+    this.createMediaNodeUpdater(nextProps).updateMediaSingleFileAttrs();
   }
   async componentDidMount() {
     const {

package/dist/es2019/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -13,7 +13,7 @@ import * as keymaps from '../../../../../keymaps';
 import { ToolTipContent } from '../../../../../keymaps';
 import { closeMediaAltTextMenu, updateAltText } from '../commands';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
-import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, ACTION } from '../../../../analytics';
+import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, ACTION } from '@atlaskit/editor-common/analytics';
 import { RECENT_SEARCH_WIDTH_IN_PX } from '../../../../../ui/LinkSearch/ToolbarComponents';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { ErrorMessage } from '@atlaskit/editor-common/ui';

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

@@ -13,11 +13,10 @@ import DropPlaceholder from '../ui/Media/DropPlaceholder';
 import { insertMediaGroupNode, insertMediaInlineNode, canInsertMediaInline } from '../utils/media-files';
 import { isInsidePotentialEmptyParagraph, removeMediaNode, splitMediaGroup } from '../utils/media-common';
 import * as helpers from '../commands/helpers';
-import { updateMediaNodeAttrs } from '../commands/helpers';
+import { updateMediaSingleNodeAttrs } from '../commands/helpers';
 import { stateKey } from './plugin-key';
 import PickerFacade from '../picker-facade';
 import { INPUT_METHOD } from '../../analytics/types';
-import { isImage } from '../utils/is-image';
 import { isInEmptyLine } from '../../../utils/document';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { isInListItem } from '../../../utils';
@@ -53,7 +52,6 @@ export class MediaPluginStateImplementation {
     _defineProperty(this, "isFullscreen", false);
     _defineProperty(this, "layout", 'center');
     _defineProperty(this, "mediaNodes", []);
-    _defineProperty(this, "mediaGroupNodes", {});
     _defineProperty(this, "destroyed", false);
     _defineProperty(this, "removeOnCloseListener", () => {});
     _defineProperty(this, "onPopupToggleCallback", () => {});
@@ -300,14 +298,14 @@ export class MediaPluginStateImplementation {
       }
       return;
     });
-    _defineProperty(this, "updateMediaNodeAttrs", (id, attrs, isMediaSingle) => {
+    _defineProperty(this, "updateMediaSingleNodeAttrs", (id, attrs) => {
       const {
         view
       } = this;
       if (!view) {
         return;
       }
-      return updateMediaNodeAttrs(id, attrs, isMediaSingle)(view.state, view.dispatch);
+      return updateMediaSingleNodeAttrs(id, attrs)(view.state, view.dispatch);
     });
     _defineProperty(this, "handleMediaState", state => {
       switch (state.status) {
@@ -319,31 +317,6 @@ export class MediaPluginStateImplementation {
             uploadErrorHandler(state);
           }
           break;
-        case 'mobile-upload-end':
-          const attrs = {
-            id: state.publicId || state.id
-          };
-          if (typeof state.collection === 'string') {
-            attrs.collection = state.collection;
-          }
-          this.updateMediaNodeAttrs(state.id, attrs, isMediaSingle(this.view.state.schema, state.fileMimeType));
-          delete this.mediaGroupNodes[state.id];
-          break;
-      }
-    });
-    _defineProperty(this, "setMediaGroupNode", (node, getPos) => {
-      this.mediaGroupNodes[node.attrs.id] = {
-        node,
-        getPos
-      };
-    });
-    _defineProperty(this, "removeNodeById", state => {
-      const {
-        id
-      } = state;
-      const mediaNodeWithPos = helpers.findMediaNode(this, id, isImage(state.fileMimeType));
-      if (mediaNodeWithPos) {
-        removeMediaNode(this.view, mediaNodeWithPos.node, mediaNodeWithPos.getPos);
       }
     });
     _defineProperty(this, "removeSelectedMediaContainer", () => {

package/dist/es2019/plugins/media/toolbar/filePreviewItem.js

@@ -18,9 +18,6 @@ export const FilePreviewItem = ({
   };
   const renderMediaViewer = () => {
     if (isMediaViewerVisible) {
-      const dataSource = {
-        list: []
-      };
       const selectedNodeAttrs = getSelectedMediaContainerNodeAttrs(mediaPluginState);
       if (selectedNodeAttrs && mediaPluginState.mediaClientConfig) {
         const {
@@ -34,7 +31,7 @@ export const FilePreviewItem = ({
         };
         return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(MediaViewer, {
           collectionName: collection,
-          dataSource: dataSource,
+          items: [],
           mediaClientConfig: mediaPluginState.mediaClientConfig,
           selectedItem: identifier,
           onClose: onMediaViewerClose

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

@@ -1,6 +1,7 @@
 import { findSelectedNodeOfType, findParentNodeOfType } from 'prosemirror-utils';
 import { PanelType } from '@atlaskit/adf-schema';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
+import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 export const findPanel = (state, selection) => {
   const {
     panel
@@ -17,7 +18,9 @@ export const panelAttrsToDom = (attrs, allowCustomPanel) => {
   } = attrs;
   const isCustomPanel = panelType === PanelType.CUSTOM && allowCustomPanel;
   const hasIcon = !isCustomPanel || !!panelIcon || !!panelIconId;
-  const style = [`${panelColor && isCustomPanel ? `background-color: ${panelColor};` : ''}`, `${hasIcon ? '' : 'padding-left: 12px;'}`].join('');
+  const tokenColor = panelColor && hexToEditorBackgroundPaletteColor(panelColor);
+  const panelBackgroundColor = tokenColor || panelColor;
+  const style = [`${panelColor && isCustomPanel ? `background-color: ${panelBackgroundColor};` : ''}`, `${hasIcon ? '' : 'padding-left: 12px;'}`].join('');
   let panelAttrs = {
     class: PanelSharedCssClassName.prefix,
     'data-panel-type': panelType || PanelType.INFO,

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

@@ -1,7 +1,7 @@
 import { closeHistory } from 'prosemirror-history';
 import { Fragment, Node as PMNode, Slice } from 'prosemirror-model';
 import { TextSelection, NodeSelection } from 'prosemirror-state';
-import { canInsert, findParentNodeOfType, hasParentNodeOfType, safeInsert } from 'prosemirror-utils';
+import { canInsert, findParentNodeOfType, findParentNodeOfTypeClosestToPos, hasParentNodeOfType, safeInsert } from 'prosemirror-utils';
 import uuid from 'uuid/v4';
 import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
@@ -112,7 +112,127 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice) {
     return true;
   };
 }
-export function handlePastePanelIntoList(slice) {
+export function handlePasteNonNestableBlockNodesIntoList(slice) {
+  return (state, dispatch) => {
+    var _tr$doc$nodeAt, _sliceContent$firstCh, _findParentNodeOfType;
+    const {
+      tr
+    } = state;
+    const {
+      selection
+    } = tr;
+    const {
+      $from,
+      $to,
+      from,
+      to
+    } = selection;
+    const {
+      orderedList,
+      bulletList,
+      listItem
+    } = state.schema.nodes;
+
+    // Selected nodes
+    const selectionParentListItemNode = findParentNodeOfType(listItem)(selection);
+    const selectionParentListNodeWithPos = findParentNodeOfType([bulletList, orderedList])(selection);
+    const selectionParentListNode = selectionParentListNodeWithPos === null || selectionParentListNodeWithPos === void 0 ? void 0 : selectionParentListNodeWithPos.node;
+
+    // Slice info
+    const sliceContent = slice.content;
+    const sliceIsListItems = isListNode(sliceContent.firstChild) && isListNode(sliceContent.lastChild);
+
+    // Find case of slices that can be inserted into a list item
+    // (eg. paragraphs, list items, code blocks, media single)
+    // These scenarios already get handled elsewhere and don't need to split the list
+    let sliceContainsBlockNodesOtherThanThoseAllowedInListItem = false;
+    slice.content.forEach(child => {
+      if (child.isBlock && !listItem.spec.content.includes(child.type.name)) {
+        sliceContainsBlockNodesOtherThanThoseAllowedInListItem = true;
+      }
+    });
+    if (!selectionParentListItemNode || !sliceContent || canInsert($from, sliceContent) ||
+    // eg. inline nodes that can be inserted in a list item
+    !sliceContainsBlockNodesOtherThanThoseAllowedInListItem || sliceIsListItems || !selectionParentListNodeWithPos) {
+      return false;
+    }
+
+    // Offsets
+    const listWrappingOffset = $to.depth - selectionParentListNodeWithPos.depth + 1; // difference in depth between to position and list node
+    const 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
+    const grandParentListNode = findParentNodeOfTypeClosestToPos(tr.doc.resolve(selectionParentListNodeWithPos.pos), [bulletList, orderedList]);
+    const selectionIsInNestedList = !!grandParentListNode;
+    let selectedListItemHasNestedList = false;
+    selectionParentListItemNode.node.content.forEach(child => {
+      if (isListNode(child)) {
+        selectedListItemHasNestedList = true;
+      }
+    });
+    if (selectedListItemHasNestedList || selectionIsInNestedList) {
+      return false;
+    }
+
+    // Node after the insert position
+    const nodeAfterInsertPositionIsListItem = ((_tr$doc$nodeAt = tr.doc.nodeAt(to + listItemWrappingOffset)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type.name) === 'listItem';
+
+    // Get the next list items position (used later to find the split out ordered list)
+    const indexOfNextListItem = $to.indexAfter($to.depth - listItemWrappingOffset);
+    const positionOfNextListItem = tr.doc.resolve(selectionParentListNodeWithPos.pos + 1).posAtIndex(indexOfNextListItem);
+
+    // These nodes paste as plain text by default so need to be handled differently
+    const sliceContainsNodeThatPastesAsPlainText = sliceContent.firstChild && ['taskItem', 'taskList', 'heading', 'blockquote'].includes(sliceContent.firstChild.type.name);
+
+    // Work out position to replace up to
+    let replaceTo;
+    if (sliceContainsNodeThatPastesAsPlainText && nodeAfterInsertPositionIsListItem) {
+      replaceTo = to + listItemWrappingOffset;
+    } else if (sliceContainsNodeThatPastesAsPlainText || !nodeAfterInsertPositionIsListItem) {
+      replaceTo = to;
+    } else {
+      replaceTo = to + listWrappingOffset;
+    }
+
+    // handle the insertion of the slice
+    if (sliceContainsNodeThatPastesAsPlainText || nodeAfterInsertPositionIsListItem || sliceContent.childCount > 1 && ((_sliceContent$firstCh = sliceContent.firstChild) === null || _sliceContent$firstCh === void 0 ? void 0 : _sliceContent$firstCh.type.name) !== 'paragraph') {
+      tr.replaceWith(from, replaceTo, sliceContent).scrollIntoView();
+    } else {
+      // When the selection is not at the end of a list item
+      // eg. middle of list item, start of list item
+      tr.replaceSelection(slice).scrollIntoView();
+    }
+
+    // Find the ordered list node after the pasted content so we can set it's order
+    const mappedPositionOfNextListItem = tr.mapping.map(positionOfNextListItem);
+    if (mappedPositionOfNextListItem > tr.doc.nodeSize) {
+      return false;
+    }
+    const nodeAfterPastedContentResolvedPos = findParentNodeOfTypeClosestToPos(tr.doc.resolve(mappedPositionOfNextListItem), [orderedList]);
+
+    // Work out the new split out lists 'order' (the number it starts from)
+    const originalParentOrderedListNodeOrder = selectionParentListNode === null || selectionParentListNode === void 0 ? void 0 : selectionParentListNode.attrs.order;
+    const numOfListItemsInOriginalList = (_findParentNodeOfType = 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) {
+      tr.setNodeMarkup(nodeAfterPastedContentResolvedPos.pos, orderedList, {
+        ...nodeAfterPastedContentResolvedPos.node.attrs,
+        order: originalParentOrderedListNodeOrder + numOfListItemsInOriginalList
+      });
+    }
+
+    // dispatch transaction
+    if (tr.docChanged) {
+      if (dispatch) {
+        dispatch(tr);
+      }
+      return true;
+    }
+    return false;
+  };
+}
+export function handlePastePanelOrDecisionContentIntoList(slice) {
   return (state, dispatch) => {
     const {
       schema,
@@ -122,17 +242,19 @@ export function handlePastePanelIntoList(slice) {
       selection
     } = tr;
     // Check this pasting action is related to copy content from panel node into a selected the list node
-    const panelNode = slice.content.firstChild;
+    const blockNode = slice.content.firstChild;
     const isSliceWholeNode = slice.openStart === 0 && slice.openEnd === 0;
     const selectionParentListItemNode = selection.$to.node(selection.$to.depth - 1);
     const sliceIsWholeNodeButShouldNotReplaceSelection = isSliceWholeNode && !doesSelectionWhichStartsOrEndsInListContainEntireList(selection);
-    if (!dispatch || !selectionParentListItemNode || (selectionParentListItemNode === null || selectionParentListItemNode === void 0 ? void 0 : selectionParentListItemNode.type) !== schema.nodes.listItem || !panelNode || (panelNode === null || panelNode === void 0 ? void 0 : panelNode.type) !== schema.nodes.panel || (panelNode === null || panelNode === void 0 ? void 0 : panelNode.content.firstChild) === undefined || sliceIsWholeNodeButShouldNotReplaceSelection) {
+    if (!selectionParentListItemNode || (selectionParentListItemNode === null || selectionParentListItemNode === void 0 ? void 0 : selectionParentListItemNode.type) !== schema.nodes.listItem || !blockNode || !['panel', 'decisionList'].includes(blockNode === null || blockNode === void 0 ? void 0 : blockNode.type.name) || slice.content.childCount > 1 || (blockNode === null || blockNode === void 0 ? void 0 : blockNode.content.firstChild) === undefined || sliceIsWholeNodeButShouldNotReplaceSelection) {
       return false;
     }
 
     // Paste the panel node contents extracted instead of pasting the entire panel node
     tr.replaceSelection(slice).scrollIntoView();
-    dispatch(tr);
+    if (dispatch) {
+      dispatch(tr);
+    }
     return true;
   };
 }

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

@@ -1,6 +1,6 @@
 import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, PasteTypes, PasteContents, withAnalytics } from '../../analytics';
 import { getPasteSource } from '../util';
-import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelIntoList } from '../handlers';
+import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelOrDecisionContentIntoList, handlePasteNonNestableBlockNodesIntoList } from '../handlers';
 import { pipe } from '../../../utils';
 import { findParentNode } from 'prosemirror-utils';
 import { mapSlice } from '../../../utils/slice';
@@ -186,7 +186,8 @@ export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
       content: PasteContents.text,
       source,
       hyperlinkPasteOnText: false,
-      linksInPasteCount: linkUrls.length
+      linksInPasteCount: linkUrls.length,
+      pasteSplitList: pasteContext.pasteSplitList
     });
   }
   const linkDomains = linkUrls.map(getLinkDomain);
@@ -197,7 +198,8 @@ export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
     source,
     hyperlinkPasteOnText: !!pasteContext.hyperlinkPasteOnText,
     linksInPasteCount: linkUrls.length,
-    mediaTraceId
+    mediaTraceId,
+    pasteSplitList: pasteContext.pasteSplitList
   }, linkDomains);
 }
 
@@ -238,9 +240,13 @@ export const handleMarkdownWithAnalytics = (view, event, slice) => pipe(handleMa
 export const handleRichTextWithAnalytics = (view, event, slice) => pipe(handleRichText, pasteCommandWithAnalytics(view, event, slice, {
   type: PasteTypes.richText
 }))(slice);
-export const handlePastePanelIntoListWithAnalytics = (view, event, slice) => pipe(handlePastePanelIntoList, pasteCommandWithAnalytics(view, event, slice, {
+export const handlePastePanelOrDecisionIntoListWithAnalytics = (view, event, slice) => pipe(handlePastePanelOrDecisionContentIntoList, pasteCommandWithAnalytics(view, event, slice, {
   type: PasteTypes.richText
 }))(slice);
+export const handlePasteNonNestableBlockNodesIntoListWithAnalytics = (view, event, slice) => pipe(handlePasteNonNestableBlockNodesIntoList, pasteCommandWithAnalytics(view, event, slice, {
+  type: PasteTypes.richText,
+  pasteSplitList: true
+}))(slice);
 export const handleExpandWithAnalytics = (view, event, slice) => pipe(handleExpandPasteInTable, pasteCommandWithAnalytics(view, event, slice, {
   type: PasteTypes.richText
 }))(slice);

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

@@ -12,7 +12,7 @@ import { linkifyContent } from '../../hyperlink/utils';
 import { transformSliceNestedExpandToExpand } from '../../expand/utils';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
 import { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark } from '../../code-block/utils';
-import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelIntoListWithAnalytics } from './analytics';
+import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelOrDecisionIntoListWithAnalytics, handlePasteNonNestableBlockNodesIntoListWithAnalytics } from './analytics';
 import { analyticsPluginKey, PasteTypes } from '../../analytics';
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
 import { measureRender } from '@atlaskit/editor-common/utils';
@@ -30,13 +30,18 @@ import { extractSliceFromStep } from '../../../utils/step';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 export { md } from '../md';
+import { getFeatureFlags } from '../../feature-flags-context';
 export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, cardOptions, sanitizePrivateContent, providerFactory) {
   const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
   function getMarkdownSlice(text, openStart, openEnd) {
     let textInput = text;
-    if (textInput.includes('\\')) {
-      textInput = textInput.replace(/\\/g, '\\\\');
+    const textSplitByCodeBlock = textInput.split(/```/);
+    for (let i = 0; i < textSplitByCodeBlock.length; i++) {
+      if (i % 2 === 0) {
+        textSplitByCodeBlock[i] = textSplitByCodeBlock[i].replace(/\\/g, '\\\\');
+      }
     }
+    textInput = textSplitByCodeBlock.join('```');
     const doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
     if (doc && doc.content) {
       return new Slice(doc.content, openStart, openEnd);
@@ -328,7 +333,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, cardOptio
           if (handlePasteIntoCaptionWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
             return true;
           }
-          if (handlePastePanelIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+          const featureFlags = getFeatureFlags(state);
+          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+            return true;
+          }
+          if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
             return true;
           }
           return handleRichTextWithAnalytics(view, event, slice)(state, dispatch);