@atlaskit/editor-core 187.28.0 → 187.28.2

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

@@ -1,104 +1,2 @@
-import { baseKeymap } from '@atlaskit/editor-prosemirror/commands';
-import { history } from '@atlaskit/editor-prosemirror/history';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { browser } from '@atlaskit/editor-common/utils';
-import { doc, paragraph, text } from '@atlaskit/adf-schema';
-import filterStepsPlugin from './pm-plugins/filter-steps';
-import fixChrome88SelectionPlugin from './pm-plugins/fix-chrome-88-selection';
-import disableSpellcheckingPlugin from './pm-plugins/disable-spell-checking';
-import contextIdentifierPlugin from './pm-plugins/context-identifier';
-import newlinePreserveMarksPlugin from './pm-plugins/newline-preserve-marks';
-import inlineCursorTargetPlugin from './pm-plugins/inline-cursor-target';
-import scrollGutter from './pm-plugins/scroll-gutter';
-import { keymap } from '@atlaskit/editor-common/keymaps';
-import frozenEditor from './pm-plugins/frozen-editor';
-// Chrome >= 88
-export const isChromeWithSelectionBug = browser.chrome && browser.chrome_version >= 88;
-const basePlugin = (options, api) => {
-  var _api$dependencies, _api$dependencies$fea;
-  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
-  return {
-    name: 'base',
-    pmPlugins() {
-      const plugins = [{
-        name: 'filterStepsPlugin',
-        plugin: ({
-          dispatchAnalyticsEvent
-        }) => filterStepsPlugin(dispatchAnalyticsEvent)
-      }];
-
-      // In Chrome, when the selection is placed between adjacent nodes which are not contenteditatble
-      // the cursor appears at the right most point of the parent container.
-      // In Firefox, when the selection is placed between adjacent nodes which are not contenteditatble
-      // no cursor is presented to users.
-      // In Safari, when the selection is placed between adjacent nodes which are not contenteditatble
-      // it is not possible to navigate with arrow keys.
-      // This plugin works around the issues by inserting decorations between
-      // inline nodes which are set as contenteditable, and have a zero width space.
-      plugins.push({
-        name: 'inlineCursorTargetPlugin',
-        plugin: () => options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined
-      });
-      plugins.push({
-        name: 'newlinePreserveMarksPlugin',
-        plugin: newlinePreserveMarksPlugin
-      }, {
-        name: 'frozenEditor',
-        plugin: ({
-          dispatchAnalyticsEvent
-        }) => {
-          var _options$inputTrackin;
-          return options !== null && options !== void 0 && (_options$inputTrackin = options.inputTracking) !== null && _options$inputTrackin !== void 0 && _options$inputTrackin.enabled || options !== null && options !== void 0 && options.ufo ? frozenEditor(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking, options.ufo) : undefined;
-        }
-      }, {
-        name: 'history',
-        plugin: () => history()
-      },
-      // should be last :(
-      {
-        name: 'codeBlockIndent',
-        plugin: () => keymap({
-          ...baseKeymap,
-          'Mod-[': () => true,
-          'Mod-]': () => true
-        })
-      }, {
-        name: 'contextIdentifier',
-        plugin: ({
-          dispatch,
-          providerFactory
-        }) => contextIdentifierPlugin(dispatch, providerFactory)
-      });
-      if (options && options.allowScrollGutter) {
-        plugins.push({
-          name: 'scrollGutterPlugin',
-          plugin: () => scrollGutter(options.allowScrollGutter)
-        });
-      }
-      if (isChromeWithSelectionBug && !getBooleanFF('platform.editor.disable-chrome-88-selection-fix_uk53m')) {
-        plugins.push({
-          name: 'fixChrome88SelectionPlugin',
-          plugin: () => fixChrome88SelectionPlugin()
-        });
-      }
-      plugins.push({
-        name: 'disableSpellcheckingPlugin',
-        plugin: () => disableSpellcheckingPlugin(featureFlags)
-      });
-      return plugins;
-    },
-    nodes() {
-      return [{
-        name: 'doc',
-        node: doc
-      }, {
-        name: 'paragraph',
-        node: paragraph
-      }, {
-        name: 'text',
-        node: text
-      }];
-    }
-  };
-};
-export default basePlugin;
+import basePlugin from './plugin';
+export { basePlugin };

package/dist/es2019/plugins/base/plugin.js

@@ -0,0 +1,109 @@
+import { baseKeymap } from '@atlaskit/editor-prosemirror/commands';
+import { history } from '@atlaskit/editor-prosemirror/history';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { browser } from '@atlaskit/editor-common/utils';
+import { doc, paragraph, text } from '@atlaskit/adf-schema';
+import filterStepsPlugin from './pm-plugins/filter-steps';
+import fixChrome88SelectionPlugin from './pm-plugins/fix-chrome-88-selection';
+import disableSpellcheckingPlugin from './pm-plugins/disable-spell-checking';
+import contextIdentifierPlugin, { getContextIdentifier } from './pm-plugins/context-identifier';
+import newlinePreserveMarksPlugin from './pm-plugins/newline-preserve-marks';
+import inlineCursorTargetPlugin from './pm-plugins/inline-cursor-target';
+import scrollGutter from './pm-plugins/scroll-gutter';
+import { keymap } from '@atlaskit/editor-common/keymaps';
+import frozenEditor from './pm-plugins/frozen-editor';
+// Chrome >= 88
+export const isChromeWithSelectionBug = browser.chrome && browser.chrome_version >= 88;
+const basePlugin = (options, api) => {
+  var _api$dependencies, _api$dependencies$fea;
+  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
+  return {
+    name: 'base',
+    getSharedState(editorState) {
+      return {
+        contextIdentifier: getContextIdentifier(editorState)
+      };
+    },
+    pmPlugins() {
+      const plugins = [{
+        name: 'filterStepsPlugin',
+        plugin: ({
+          dispatchAnalyticsEvent
+        }) => filterStepsPlugin(dispatchAnalyticsEvent)
+      }];
+
+      // In Chrome, when the selection is placed between adjacent nodes which are not contenteditatble
+      // the cursor appears at the right most point of the parent container.
+      // In Firefox, when the selection is placed between adjacent nodes which are not contenteditatble
+      // no cursor is presented to users.
+      // In Safari, when the selection is placed between adjacent nodes which are not contenteditatble
+      // it is not possible to navigate with arrow keys.
+      // This plugin works around the issues by inserting decorations between
+      // inline nodes which are set as contenteditable, and have a zero width space.
+      plugins.push({
+        name: 'inlineCursorTargetPlugin',
+        plugin: () => options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined
+      });
+      plugins.push({
+        name: 'newlinePreserveMarksPlugin',
+        plugin: newlinePreserveMarksPlugin
+      }, {
+        name: 'frozenEditor',
+        plugin: ({
+          dispatchAnalyticsEvent
+        }) => {
+          var _options$inputTrackin;
+          return options !== null && options !== void 0 && (_options$inputTrackin = options.inputTracking) !== null && _options$inputTrackin !== void 0 && _options$inputTrackin.enabled || options !== null && options !== void 0 && options.ufo ? frozenEditor(dispatchAnalyticsEvent, options.inputTracking, options.browserFreezeTracking, options.ufo) : undefined;
+        }
+      }, {
+        name: 'history',
+        plugin: () => history()
+      },
+      // should be last :(
+      {
+        name: 'codeBlockIndent',
+        plugin: () => keymap({
+          ...baseKeymap,
+          'Mod-[': () => true,
+          'Mod-]': () => true
+        })
+      }, {
+        name: 'contextIdentifier',
+        plugin: ({
+          dispatch,
+          providerFactory
+        }) => contextIdentifierPlugin(dispatch, providerFactory)
+      });
+      if (options && options.allowScrollGutter) {
+        plugins.push({
+          name: 'scrollGutterPlugin',
+          plugin: () => scrollGutter(options.allowScrollGutter)
+        });
+      }
+      if (isChromeWithSelectionBug && !getBooleanFF('platform.editor.disable-chrome-88-selection-fix_uk53m')) {
+        plugins.push({
+          name: 'fixChrome88SelectionPlugin',
+          plugin: () => fixChrome88SelectionPlugin()
+        });
+      }
+      plugins.push({
+        name: 'disableSpellcheckingPlugin',
+        plugin: () => disableSpellcheckingPlugin(featureFlags)
+      });
+      return plugins;
+    },
+    nodes() {
+      return [{
+        name: 'doc',
+        node: doc
+      }, {
+        name: 'paragraph',
+        node: paragraph
+      }, {
+        name: 'text',
+        node: text
+      }];
+    }
+  };
+};
+export default basePlugin;

package/dist/es2019/plugins/base/pm-plugins/scroll-gutter.js

@@ -1,9 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isEmptyDocument } from '@atlaskit/editor-common/utils';
+import { GUTTER_SELECTOR, GUTTER_SIZE_IN_PX, isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { getMobileDimensionsPluginState } from '../../mobile-dimensions/utils';
-export const GUTTER_SIZE_IN_PX = 120; // Default gutter size
-export const GUTTER_SIZE_MOBILE_IN_PX = 36; // Gutter size for Mobile
-export const GUTTER_SELECTOR = '#editor-scroll-gutter';
 const MIN_TAP_SIZE_IN_PX = 40;
 function supportsIntersectionObserver() {
   if (typeof window !== 'undefined' && 'IntersectionObserver' in window && 'IntersectionObserverEntry' in window && 'intersectionRatio' in window.IntersectionObserverEntry.prototype) {

package/dist/es2019/plugins/index.js

@@ -1,4 +1,4 @@
-export { default as basePlugin } from './base';
+export { basePlugin } from './base';
 export { default as blockTypePlugin } from './block-type';
 export { pluginKey as blockPluginStateKey } from './block-type';
 export { default as betterTypeHistoryPlugin } from './better-type-history';

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

@@ -7,6 +7,11 @@ import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../analytics';
 import { toggleBulletList, toggleOrderedList, tooltip } from '../../keymaps';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
+import { isInsideListItem } from './utils/selection';
+import { indentList, outdentList, toggleBulletList as toggleBulletListCommand, toggleOrderedList as toggleOrderedListCommand } from './commands';
+import { findRootParentListNode } from './utils/find';
+import { pluginKey as listPluginKey } from './pm-plugins/main';
+
 /*
   Toolbar buttons to bullet and ordered list can be found in
   packages/editor/editor-core/src/plugins/toolbar-lists-indentation/ui/Toolbar.tsx
@@ -17,6 +22,20 @@ const listPlugin = (options, api) => {
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions;
   return {
     name: 'list',
+    actions: {
+      indentList: indentList(editorAnalyticsAPI),
+      outdentList: outdentList(editorAnalyticsAPI),
+      toggleOrderedList: toggleOrderedListCommand(editorAnalyticsAPI),
+      toggleBulletList: toggleBulletListCommand(editorAnalyticsAPI),
+      isInsideListItem,
+      findRootParentListNode
+    },
+    getSharedState: editorState => {
+      if (!editorState) {
+        return undefined;
+      }
+      return listPluginKey.getState(editorState);
+    },
     nodes() {
       return [{
         name: 'bulletList',

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

@@ -36,7 +36,7 @@ export function findFirstParentListItemNode($pos) {
     pos: listItemNodePosition.pos
   };
 }
-export function findRootParentListNode($pos) {
+export const findRootParentListNode = $pos => {
   const {
     doc
   } = $pos;
@@ -58,4 +58,4 @@ export function findRootParentListNode($pos) {
   }
   const listNodePosition = doc.resolve(parentList.pos);
   return findRootParentListNode(listNodePosition);
-}
+};

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

@@ -25,7 +25,7 @@ import ImageBorderItem from '../ui/ImageBorder';
 import { currentMediaNodeBorderMark } from '../utils/current-media-node';
 import { shouldShowImageBorder } from './imageBorder';
 import { PixelEntry } from '../ui/PixelEntry';
-import { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, MEDIA_SINGLE_MIN_PIXEL_WIDTH, MEDIA_SINGLE_GUTTER_SIZE, calcMediaSinglePixelWidth } from '@atlaskit/editor-common/media-single';
+import { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_GUTTER_SIZE, calcMediaSinglePixelWidth } from '@atlaskit/editor-common/media-single';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 const remove = (state, dispatch) => {
   if (dispatch) {
@@ -308,7 +308,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             mediaWidth: mediaWidth || DEFAULT_IMAGE_WIDTH,
             mediaHeight: mediaHeight || DEFAULT_IMAGE_HEIGHT,
             validate: value => {
-              if (value !== '' && !isNaN(value) && value >= MEDIA_SINGLE_MIN_PIXEL_WIDTH && value <= akEditorFullWidthLayoutWidth) {
+              if (value !== '' && !isNaN(value) && value >= MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH && value <= akEditorFullWidthLayoutWidth) {
                 return true;
               }
               return false;

package/dist/es2019/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -6,12 +6,12 @@ import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit
 import { getMediaClient } from '@atlaskit/media-client';
 import { calcPctFromPx, wrappedLayouts, handleSides, imageAlignmentMap } from '@atlaskit/editor-common/ui';
 import { nonWrappedLayouts, setNodeSelection } from '@atlaskit/editor-common/utils';
-import { akEditorFullWidthLayoutWidth, akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
+import { akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { wrapperStyle } from './styled';
 import { ResizerNext } from '@atlaskit/editor-common/resizer';
 import classnames from 'classnames';
 import { richMediaClassName, resizerStyles } from '@atlaskit/editor-common/styles';
-import { MEDIA_SINGLE_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, calculateOffsetLeft, DEFAULT_IMAGE_WIDTH, calcMediaSingleMaxWidth } from '@atlaskit/editor-common/media-single';
+import { MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, calculateOffsetLeft, DEFAULT_IMAGE_WIDTH, calcMediaSingleMaxWidth } from '@atlaskit/editor-common/media-single';
 import { findClosestSnap, getGuidelinesWithHighlights, generateDefaultGuidelines, generateDynamicGuidelines, getGuidelineSnaps, getGuidelineTypeFromKey, getRelativeGuideSnaps, getRelativeGuidelines } from '@atlaskit/editor-common/guideline';
 import memoizeOne from 'memoize-one';
 import { getMediaResizeAnalyticsEvent } from '../../utils/analytics';
@@ -132,6 +132,9 @@ class ResizableMediaSingleNext extends React.Component {
       }
       return calcMediaSingleMaxWidth(containerWidth);
     }));
+    _defineProperty(this, "calcMinWidth", memoizeOne((isVideoFile, contentWidth) => {
+      return Math.min(contentWidth || akEditorDefaultLayoutWidth, isVideoFile ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH);
+    }));
     _defineProperty(this, "getRelativeGuides", () => {
       const $pos = this.$pos;
       const relativeGuides = $pos && $pos.nodeAfter && this.state.size.width ? getRelativeGuidelines(this.state.relativeGuides, {
@@ -411,7 +414,8 @@ class ResizableMediaSingleNext extends React.Component {
     } = this.props;
     const {
       isResizing,
-      size
+      size,
+      isVideoFile
     } = this.state;
     const enable = {};
     handleSides.forEach(side => {
@@ -430,6 +434,7 @@ class ResizableMediaSingleNext extends React.Component {
     });
     const resizerNextClassName = classnames(className, resizerStyles);
     const maxWidth = this.calcMaxWidth(lineLength, containerWidth, fullWidthMode);
+    const minWidth = this.calcMinWidth(isVideoFile, lineLength);
     return jsx("div", {
       ref: this.saveWrapper,
       css: wrapperStyle({
@@ -442,7 +447,7 @@ class ResizableMediaSingleNext extends React.Component {
         isExtendedResizeExperienceOn: true
       })
     }, jsx(ResizerNext, {
-      minWidth: MEDIA_SINGLE_MIN_PIXEL_WIDTH,
+      minWidth: minWidth,
       maxWidth: maxWidth,
       className: resizerNextClassName,
       snapGap: MEDIA_SINGLE_SNAP_GAP,

package/dist/es2019/plugins/media/utils/media-single.js

@@ -1,8 +1,8 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { checkNodeDown } from '../../../utils';
+import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
 import { isEmptyParagraph, floatingLayouts } from '@atlaskit/editor-common/utils';
-import { getMediaSingleInitialWidth } from '@atlaskit/editor-common/media-single';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { mapSlice } from '../../../utils/slice';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
@@ -94,9 +94,7 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
   // add undefined as fallback as we don't want media single width to have upper limit as 0
   // if widthPluginState.width is 0, default 760 will be used
   const contentWidth = (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
-  const node = createMediaSingleNode(state.schema, collection, contentWidth,
-  // pass undefined to use default min width
-  undefined, alignLeftOnInsert)(mediaState);
+  const node = createMediaSingleNode(state.schema, collection, contentWidth, mediaState.status !== 'error' && isVideo(mediaState.fileMimeType) ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, alignLeftOnInsert)(mediaState);
   let fileExtension;
   if (mediaState.fileName) {
     const extensionIdx = mediaState.fileName.lastIndexOf('.');
@@ -219,6 +217,7 @@ export function isCaptionNode(editorView) {
   }
   return false;
 }
+export const isVideo = fileType => !!fileType && fileType.includes('video');
 export const getParentWidthForNestedMediaSingleNode = (resolvedPos, view) => {
   const domNode = view.nodeDOM(resolvedPos.pos);
   if (resolvedPos.nodeAfter && floatingLayouts.includes(resolvedPos.nodeAfter.attrs.layout) && domNode && domNode.parentElement) {

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

@@ -15,7 +15,6 @@ import { linkifyContent, isListItemNode, isListNode, canLinkBeCreatedInRange } f
 import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
-import { doesSelectionWhichStartsOrEndsInListContainEntireList } from '../../utils/lists';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 // remove text attribute from mention for copy/paste (GDPR)
 export function handleMention(slice, schema) {
@@ -234,7 +233,32 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     return false;
   };
 }
-export function handlePastePanelOrDecisionContentIntoList(slice) {
+export const doesSelectionWhichStartsOrEndsInListContainEntireList = (selection, findRootParentListNode) => {
+  const {
+    $from,
+    $to,
+    from,
+    to
+  } = selection;
+  const selectionParentListItemNodeResolvedPos = findRootParentListNode ? findRootParentListNode($from) || findRootParentListNode($to) : null;
+  const selectionParentListNode = selectionParentListItemNodeResolvedPos === null || selectionParentListItemNodeResolvedPos === void 0 ? void 0 : selectionParentListItemNodeResolvedPos.parent;
+  if (!selectionParentListItemNodeResolvedPos || !selectionParentListNode) {
+    return false;
+  }
+  const startOfEntireList = $from.pos < $to.pos ? selectionParentListItemNodeResolvedPos.pos + $from.depth - 1 : selectionParentListItemNodeResolvedPos.pos + $to.depth - 1;
+  const endOfEntireList = $from.pos < $to.pos ? selectionParentListItemNodeResolvedPos.pos + selectionParentListNode.nodeSize - $to.depth - 1 : selectionParentListItemNodeResolvedPos.pos + selectionParentListNode.nodeSize - $from.depth - 1;
+  if (!startOfEntireList || !endOfEntireList) {
+    return false;
+  }
+  if (from < to) {
+    return startOfEntireList >= $from.pos && endOfEntireList <= $to.pos;
+  } else if (from > to) {
+    return startOfEntireList >= $to.pos && endOfEntireList <= $from.pos;
+  } else {
+    return false;
+  }
+};
+export function handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode) {
   return (state, dispatch) => {
     const {
       schema,
@@ -247,7 +271,7 @@ export function handlePastePanelOrDecisionContentIntoList(slice) {
     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);
+    const sliceIsWholeNodeButShouldNotReplaceSelection = isSliceWholeNode && !doesSelectionWhichStartsOrEndsInListContainEntireList(selection, findRootParentListNode);
     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;
     }

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

@@ -280,9 +280,9 @@ function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
     };
   };
 }
-export const handlePastePanelOrDecisionIntoListWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+export const handlePastePanelOrDecisionIntoListWithAnalytics = (view, event, slice, findRootParentListNode) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText
-}))(handlePastePanelOrDecisionContentIntoList(slice));
+}))(handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode));
 export const handlePasteNonNestableBlockNodesIntoListWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
   type: PasteTypes.richText,
   pasteSplitList: true

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

@@ -281,7 +281,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText) {
-          var _pluginInjectionApi$d6, _pluginInjectionApi$d7;
+          var _pluginInjectionApi$d6, _pluginInjectionApi$d7, _pluginInjectionApi$d8;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -344,7 +344,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (handlePasteIntoCaptionWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
             return true;
           }
-          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d8 = pluginInjectionApi.dependencies.list) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.actions.findRootParentListNode)(state, dispatch)) {
             return true;
           }
           if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {

package/dist/es2019/plugins/toolbar-lists-indentation/index.js

@@ -1,18 +1,23 @@
 import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ToolbarListsIndentation from './ui';
-import WithPluginState from '../../ui/WithPluginState';
 import { ToolbarSize } from '../../ui/Toolbar/types';
-import { pluginKey as listPluginKey } from '../list/pm-plugins/main';
-import { pluginKey as indentationButtonsPluginKey, createPlugin as indentationButtonsPlugin } from './pm-plugins/indentation-buttons';
+import { createPlugin as indentationButtonsPlugin } from './pm-plugins/indentation-buttons';
+import { pluginKey as indentationButtonPluginKey } from './pm-plugins/indentation-buttons';
 const toolbarListsIndentationPlugin = ({
   showIndentationButtons,
   allowHeadingAndParagraphIndentation
 }, api) => {
-  var _api$dependencies$ana;
-  const featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
-  const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions;
+  var _api$dependencies$fea;
+  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies$fea = api.dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'toolbarListsIndentation',
+    getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      return indentationButtonPluginKey.getState(editorState);
+    },
     pmPlugins() {
       return [{
         name: 'indentationButtons',
@@ -21,7 +26,8 @@ const toolbarListsIndentationPlugin = ({
         }) => indentationButtonsPlugin({
           dispatch,
           showIndentationButtons,
-          allowHeadingAndParagraphIndentation
+          allowHeadingAndParagraphIndentation,
+          api
         })
       }];
     },
@@ -35,39 +41,57 @@ const toolbarListsIndentationPlugin = ({
       isToolbarReducedSpacing
     }) {
       const isSmall = toolbarSize < ToolbarSize.L;
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          listState: listPluginKey,
-          indentationState: indentationButtonsPluginKey
-        },
-        render: ({
-          listState,
-          indentationState
-        }) => {
-          if (!listState) {
-            return null;
-          }
-          return /*#__PURE__*/React.createElement(ToolbarListsIndentation, {
-            featureFlags: featureFlags,
-            isSmall: isSmall,
-            isReducedSpacing: isToolbarReducedSpacing,
-            disabled: disabled,
-            editorView: editorView,
-            popupsMountPoint: popupsMountPoint,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsScrollableElement: popupsScrollableElement,
-            bulletListActive: listState.bulletListActive,
-            bulletListDisabled: listState.bulletListDisabled,
-            orderedListActive: listState.orderedListActive,
-            orderedListDisabled: listState.orderedListDisabled,
-            showIndentationButtons: !!showIndentationButtons,
-            indentDisabled: indentationState.indentDisabled,
-            outdentDisabled: indentationState.outdentDisabled,
-            editorAnalyticsAPI: editorAnalyticsAPI
-          });
-        }
+      return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
+        featureFlags: featureFlags,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        isSmall: isSmall,
+        isToolbarReducedSpacing: isToolbarReducedSpacing,
+        disabled: disabled,
+        editorView: editorView,
+        showIndentationButtons: showIndentationButtons,
+        pluginInjectionApi: api
       });
     }
   };
 };
+function PrimaryToolbarComponent({
+  featureFlags,
+  popupsMountPoint,
+  popupsBoundariesElement,
+  popupsScrollableElement,
+  isSmall,
+  isToolbarReducedSpacing,
+  disabled,
+  editorView,
+  showIndentationButtons,
+  pluginInjectionApi
+}) {
+  const {
+    listState,
+    toolbarListsIndentationState
+  } = useSharedPluginState(pluginInjectionApi, ['list', 'toolbarListsIndentation']);
+  if (!listState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarListsIndentation, {
+    featureFlags: featureFlags,
+    isSmall: isSmall,
+    isReducedSpacing: isToolbarReducedSpacing,
+    disabled: disabled,
+    editorView: editorView,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    bulletListActive: listState.bulletListActive,
+    bulletListDisabled: listState.bulletListDisabled,
+    orderedListActive: listState.orderedListActive,
+    orderedListDisabled: listState.orderedListDisabled,
+    showIndentationButtons: !!showIndentationButtons,
+    indentDisabled: toolbarListsIndentationState.indentDisabled,
+    outdentDisabled: toolbarListsIndentationState.outdentDisabled,
+    pluginInjectionApi: pluginInjectionApi
+  });
+}
 export default toolbarListsIndentationPlugin;

package/dist/es2019/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -2,12 +2,11 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
-import { isInsideListItem } from '../../list/utils/selection';
 import { getCurrentIndentLevel as getTaskListIndentLevel, getTaskItemIndex, isInsideTask } from '../../tasks-and-decisions/pm-plugins/helpers';
 import { isIndentationAllowed, MAX_INDENTATION_LEVEL } from '../../indentation/commands';
 import { getListItemAttributes } from '@atlaskit/editor-common/lists';
 export const pluginKey = new PluginKey('indentationButtonsPlugin');
-function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation) {
+function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, api) {
   const state = {
     indentDisabled: true,
     outdentDisabled: true,
@@ -22,7 +21,7 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   // not use the indentation mark.
   // Check for lists before paragraphs and headings in case
   // the selection is in a list nested in a layout column.
-  if (isInsideListItem(editorState)) {
+  if (api !== null && api !== void 0 && api.dependencies.list.actions.isInsideListItem(editorState)) {
     const {
       indentLevel,
       itemIndex
@@ -70,7 +69,8 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
 export const createPlugin = ({
   dispatch,
   showIndentationButtons,
-  allowHeadingAndParagraphIndentation
+  allowHeadingAndParagraphIndentation,
+  api
 }) => new SafePlugin({
   state: {
     init(_config, state) {
@@ -79,11 +79,11 @@ export const createPlugin = ({
         outdentDisabled: true,
         node: null
       };
-      return showIndentationButtons ? getIndentationButtonsState(state, allowHeadingAndParagraphIndentation) : initialState;
+      return showIndentationButtons ? getIndentationButtonsState(state, allowHeadingAndParagraphIndentation, api) : initialState;
     },
     apply(_tr, pluginState, _oldState, newState) {
       if (showIndentationButtons) {
-        const state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation);
+        const state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation, api);
         if (!shallowEqual(pluginState, state)) {
           dispatch(pluginKey, state);
           return state;