@atlaskit/editor-core 179.0.3 → 179.1.0

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

@@ -0,0 +1,311 @@
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin } from '../../../plugins';
+import { tablesPlugin } from '@atlaskit/editor-plugin-table';
+import { isFullPage as fullPageCheck } from '../../../utils/is-full-page';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { createDefaultPreset } from './default';
+import { shouldForceTracking } from '@atlaskit/editor-common/utils';
+/**
+ * Creates a preset with all of the available plugins.
+ * Basis for create-plugins-list and can be used to migrate from Editor -> EditorNext (Presets project)
+ * with minimal friction.
+ *
+ * @param appearance
+ * @param props A subset of full EditorProps for the full feature preset
+ * @param featureFlags
+ * @param prevAppearance The appearance of the editor in the previous render
+ * @param createAnalyticsEvent
+ * @param insertNodeAPI
+ * @param editorAnalyticsAPI
+ * @param editorSelectionAPI
+ * @param getEditorContainerWidth
+ * @returns a full featured preset configured according to the provided props - basis for create-plugins-list
+ */
+export default function createUniversalPreset(appearance, props, featureFlags, prevAppearance, createAnalyticsEvent, insertNodeAPI, editorAnalyticsAPI, editorSelectionAPI, getEditorContainerWidth) {
+  var _props$linking;
+  const isMobile = appearance === 'mobile';
+  const isComment = appearance === 'comment';
+  const isFullPage = fullPageCheck(appearance);
+  const preset = createDefaultPreset(props);
+  const getEditorFeatureFlags = () => featureFlags;
+  if (props.allowAnalyticsGASV3) {
+    const {
+      performanceTracking
+    } = props;
+    preset.add([analyticsPlugin, {
+      createAnalyticsEvent,
+      performanceTracking
+    }]);
+  }
+  if (props.allowBreakout && isFullPage) {
+    preset.add([breakoutPlugin, {
+      allowBreakoutButton: appearance === 'full-page'
+    }]);
+  }
+  if (props.allowTextAlignment) {
+    preset.add(alignmentPlugin);
+  }
+  preset.add(dataConsumerMarkPlugin);
+  if (props.allowTextColor) {
+    preset.add([textColorPlugin, props.allowTextColor]);
+  }
+
+  // Needs to be after allowTextColor as order of buttons in toolbar depends on it
+  preset.add([listPlugin, {
+    restartNumberedLists: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.restartNumberedLists,
+    restartNumberedListsToolbar: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.restartNumberedListsToolbar,
+    listNumberContinuity: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.listNumberContinuity
+  }]);
+  if (props.allowRule) {
+    preset.add(rulePlugin);
+  }
+  if (props.allowExpand) {
+    preset.add([expandPlugin, {
+      allowInsertion: isExpandInsertionEnabled(props),
+      useLongPressSelection: false,
+      appearance: appearance
+    }]);
+  }
+  if (props.media) {
+    preset.add([gridPlugin, {
+      shouldCalcBreakoutGridLines: isFullPage
+    }]);
+    const alignLeftOnInsert = typeof props.media.alignLeftOnInsert !== 'undefined' ? props.media.alignLeftOnInsert : isComment;
+    const showMediaLayoutOptions = typeof props.media.allowAdvancedToolBarOptions !== 'undefined' ? props.media.allowAdvancedToolBarOptions : isFullPage || isComment;
+    preset.add([mediaPlugin, {
+      ...props.media,
+      allowLazyLoading: !isMobile,
+      allowBreakoutSnapPoints: isFullPage,
+      allowAdvancedToolBarOptions: showMediaLayoutOptions,
+      allowDropzoneDropLine: isFullPage,
+      allowMediaSingleEditable: !isMobile,
+      allowRemoteDimensionsFetch: !isMobile,
+      editorSelectionAPI,
+      // This is a wild one. I didnt quite understand what the code was doing
+      // so a bit of guess for now.
+      allowMarkingUploadsAsIncomplete: isMobile,
+      fullWidthEnabled: appearance === 'full-width',
+      uploadErrorHandler: props.uploadErrorHandler,
+      waitForMediaUpload: props.waitForMediaUpload,
+      isCopyPasteEnabled: !isMobile,
+      alignLeftOnInsert
+    }]);
+
+    // EDM-799: inside caption plugin we do the feature flag in enabling the plugin
+    if (getMediaFeatureFlag('captions', props.media.featureFlags)) {
+      preset.add(captionPlugin);
+    }
+  }
+  if (props.mentionProvider) {
+    var _props$mention$insert, _props$mention, _props$mention2;
+    preset.add([mentionsPlugin, {
+      createAnalyticsEvent,
+      sanitizePrivateContent: props.sanitizePrivateContent,
+      insertDisplayName: (_props$mention$insert = (_props$mention = props.mention) === null || _props$mention === void 0 ? void 0 : _props$mention.insertDisplayName) !== null && _props$mention$insert !== void 0 ? _props$mention$insert : props.mentionInsertDisplayName,
+      allowZeroWidthSpaceAfter: !isMobile,
+      HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent
+    }]);
+  }
+  if (props.emojiProvider) {
+    preset.add([emojiPlugin, {
+      createAnalyticsEvent
+    }]);
+  }
+  if (props.allowTables) {
+    const tableOptions = !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables;
+    preset.add([tablesPlugin, {
+      tableOptions,
+      breakoutEnabled: appearance === 'full-page',
+      allowContextualMenu: !isMobile,
+      fullWidthEnabled: appearance === 'full-width',
+      wasFullWidthEnabled: prevAppearance && prevAppearance === 'full-width',
+      editorAnalyticsAPI,
+      editorSelectionAPI,
+      getEditorFeatureFlags
+    }]);
+  }
+  if (props.allowTasksAndDecisions || props.taskDecisionProvider) {
+    preset.add([tasksAndDecisionsPlugin, {
+      allowNestedTasks: props.allowNestedTasks,
+      consumeTabs: isFullPage,
+      useLongPressSelection: false
+    }]);
+  }
+  if (props.feedbackInfo) {
+    preset.add([feedbackDialogPlugin, props.feedbackInfo]);
+  }
+  if (props.allowHelpDialog) {
+    preset.add([helpDialogPlugin, !!props.legacyImageUploadProvider]);
+  }
+  if (props.saveOnEnter && props.onSave) {
+    preset.add([saveOnEnterPlugin, props.onSave]);
+  }
+  if (props.legacyImageUploadProvider) {
+    preset.add(imageUploadPlugin);
+    if (!props.media) {
+      preset.add([mediaPlugin, {
+        allowMediaSingle: {
+          disableLayout: true
+        },
+        allowMediaGroup: false,
+        isCopyPasteEnabled: true,
+        editorSelectionAPI
+      }]);
+    }
+  }
+  if (props.collabEdit || props.collabEditProvider) {
+    var _collabEditOptions$EX;
+    let collabEditOptions = {
+      sanitizePrivateContent: props.sanitizePrivateContent,
+      createAnalyticsEvent
+    };
+    if (props.collabEdit) {
+      collabEditOptions = {
+        ...props.collabEdit,
+        ...collabEditOptions
+      };
+    }
+    preset.add([collabEditPlugin, {
+      ...collabEditOptions,
+      EXPERIMENTAL_allowInternalErrorAnalytics: (_collabEditOptions$EX = collabEditOptions.EXPERIMENTAL_allowInternalErrorAnalytics) !== null && _collabEditOptions$EX !== void 0 ? _collabEditOptions$EX : shouldForceTracking()
+    }]);
+  }
+  if (props.maxContentSize) {
+    preset.add([maxContentSizePlugin, props.maxContentSize]);
+  }
+  if (props.allowJiraIssue) {
+    preset.add(jiraIssuePlugin);
+  }
+  if (props.allowPanel) {
+    const allowPanel = typeof props.allowPanel === 'object' ? props.allowPanel : {};
+    preset.add([panelPlugin, {
+      useLongPressSelection: false,
+      allowCustomPanel: allowPanel.allowCustomPanel,
+      allowCustomPanelEdit: allowPanel.allowCustomPanelEdit
+    }]);
+  }
+  if (props.allowExtension) {
+    const extensionConfig = typeof props.allowExtension === 'object' ? props.allowExtension : {};
+    preset.add([extensionPlugin, {
+      breakoutEnabled: appearance === 'full-page' && extensionConfig.allowBreakout !== false,
+      allowAutoSave: extensionConfig.allowAutoSave,
+      extensionHandlers: props.extensionHandlers,
+      useLongPressSelection: false,
+      appearance
+    }]);
+  }
+  if (props.macroProvider) {
+    preset.add(macroPlugin);
+  }
+
+  // See default list for when adding annotations with a provider
+  if (!props.annotationProviders && props.allowConfluenceInlineComment) {
+    preset.add([annotationPlugin, undefined]);
+  }
+  if (props.allowDate) {
+    preset.add(datePlugin);
+  }
+  if (props.allowTemplatePlaceholders) {
+    const options = props.allowTemplatePlaceholders !== true ? props.allowTemplatePlaceholders : {};
+    preset.add([placeholderTextPlugin, options]);
+  }
+  if (props.allowLayouts) {
+    const layoutOptions = typeof props.allowLayouts === 'object' ? props.allowLayouts : {};
+    preset.add([layoutPlugin, {
+      ...layoutOptions,
+      useLongPressSelection: false,
+      UNSAFE_allowSingleColumnLayout: layoutOptions.UNSAFE_allowSingleColumnLayout
+    }]);
+  }
+  if ((_props$linking = props.linking) !== null && _props$linking !== void 0 && _props$linking.smartLinks || props.smartLinks || props.UNSAFE_cards) {
+    var _props$linking2, _props$linking3;
+    const fullWidthMode = appearance === 'full-width';
+    preset.add([cardPlugin, {
+      ...props.UNSAFE_cards,
+      ...props.smartLinks,
+      ...((_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.smartLinks),
+      platform: isMobile ? 'mobile' : 'web',
+      fullWidthMode,
+      createAnalyticsEvent,
+      linkPicker: (_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.linkPicker
+    }]);
+  }
+  if (props.autoformattingProvider) {
+    preset.add(customAutoformatPlugin);
+  }
+  let statusMenuDisabled = true;
+  if (props.allowStatus) {
+    statusMenuDisabled = typeof props.allowStatus === 'object' ? props.allowStatus.menuDisabled : false;
+    preset.add([statusPlugin, {
+      menuDisabled: statusMenuDisabled,
+      allowZeroWidthSpaceAfter: !isMobile
+    }]);
+  }
+  if (props.allowIndentation) {
+    preset.add(indentationPlugin);
+  }
+  if (isFullPage) {
+    preset.add(contextPanelPlugin);
+  }
+  if (props.autoScrollIntoView !== false) {
+    preset.add(scrollIntoViewPlugin);
+  }
+  if (isMobile || props.allowUndoRedoButtons) {
+    preset.add(historyPlugin);
+  }
+  if (isMobile) {
+    preset.add(mobileDimensionsPlugin);
+    preset.add(mobileSelectionPlugin);
+  }
+
+  // UI only plugins
+  preset.add([toolbarListsIndentationPlugin, {
+    showIndentationButtons: !!featureFlags.indentationButtonsInTheToolbar,
+    allowHeadingAndParagraphIndentation: !!props.allowIndentation
+  }]);
+  preset.add([insertBlockPlugin, {
+    allowTables: !!props.allowTables,
+    allowExpand: isExpandInsertionEnabled(props),
+    insertMenuItems: props.insertMenuItems,
+    horizontalRuleEnabled: props.allowRule,
+    nativeStatusSupported: !statusMenuDisabled,
+    showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
+    replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false,
+    insertNodeAPI
+  }]);
+  const hasBeforePrimaryToolbar = components => {
+    if (components && 'before' in components) {
+      return !!components.before;
+    }
+    return false;
+  };
+  if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
+    preset.add([beforePrimaryToolbarPlugin, {
+      beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
+    }]);
+  }
+  if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    preset.add([avatarGroupPlugin, {
+      collabEdit: props.collabEdit,
+      takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
+    }]);
+  }
+  if (props.allowFindReplace) {
+    preset.add([findReplacePlugin, {
+      takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+      twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
+    }]);
+  }
+  if (props.allowFragmentMark) {
+    preset.add(fragmentMarkPlugin);
+  }
+  if (featureFlags.enableViewUpdateSubscription) {
+    preset.add(viewUpdateSubscriptionPlugin);
+  }
+  preset.add([codeBidiWarningPlugin, {
+    appearance
+  }]);
+  if (featureFlags.floatingToolbarCopyButton) {
+    preset.add(copyButtonPlugin);
+  }
+  return preset;
+}

package/dist/es2019/plugins/card/ui/EditLinkToolbar.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import HyperlinkToolbar from '../../hyperlink/ui/HyperlinkAddToolbar';
 import { showLinkToolbar, hideLinkToolbar } from '../pm-plugins/actions';
@@ -7,7 +8,17 @@ import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
 import { buildEditLinkPayload } from '../../../utils/linking-utils';
+import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
+import { withOuterListeners } from '@atlaskit/editor-common/ui';
+import { linkToolbarMessages } from '../../../messages';
+const HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export class EditLinkToolbar extends React.Component {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "handleEsc", e => {
+      forceFocusSelector(`[aria-label="${linkToolbarMessages.editLink.defaultMessage}"]`, this.props.view);
+    });
+  }
   componentDidUpdate(prevProps) {
     if (prevProps.node !== this.props.node) {
       this.hideLinkToolbar();
@@ -16,6 +27,11 @@ export class EditLinkToolbar extends React.Component {
   componentWillUnmount() {
     this.hideLinkToolbar();
   }
+
+  /** Focus should move to the 'Edit link' button when the toolbar closes
+   * and not close the floating toolbar.
+   */
+
   hideLinkToolbar() {
     const {
       view
@@ -31,12 +47,13 @@ export class EditLinkToolbar extends React.Component {
       view,
       onSubmit
     } = this.props;
-    return /*#__PURE__*/React.createElement(HyperlinkToolbar, {
+    return /*#__PURE__*/React.createElement(HyperLinkToolbarWithListeners, {
       view: view,
       linkPickerOptions: linkPickerOptions,
       providerFactory: providerFactory,
       displayUrl: url,
-      displayText: text
+      displayText: text,
+      handleEscapeKeydown: this.handleEsc
       // Assumes that the smart card link picker can only ever be invoked by clicking "edit"
       // via the floating toolbar
       ,

package/dist/es2019/plugins/floating-toolbar/index.js

@@ -21,6 +21,7 @@ import { findNode } from './utils';
 import { ErrorBoundary } from '../../ui/ErrorBoundary';
 import { getFeatureFlags } from '../feature-flags-context';
 import { processCopyButtonItems } from '../copy-button/toolbar';
+import forceFocusPlugin from './pm-plugins/force-focus';
 export const getRelevantConfig = (selection, configs) => {
   // node selections always take precedence, see if
   let configPair;
@@ -133,6 +134,9 @@ const floatingToolbarPlugin = () => ({
       plugin: ({
         dispatch
       }) => floatingToolbarDataPluginFactory(dispatch)
+    }, {
+      name: 'forceFocus',
+      plugin: () => forceFocusPlugin()
     }];
   },
   contentComponent({

package/dist/es2019/plugins/floating-toolbar/pm-plugins/force-focus/index.js

@@ -0,0 +1,59 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
+export const forceFocusStateKey = new PluginKey('forceFocusStatePlugin');
+/**
+ * Used in cases where a floating toolbar button opens a submenu which destroys
+ * the button, but the user has pressed ESC to close the submenu and focus needs
+ * to move back to the button. */
+export default (() => new SafePlugin({
+  key: forceFocusStateKey,
+  state: {
+    init: () => ({
+      selector: null
+    }),
+    apply: (tr, prevState) => {
+      const meta = tr.getMeta(forceFocusStateKey);
+      if (meta && 'selector' in meta) {
+        return {
+          selector: meta.selector
+        };
+      }
+      return prevState;
+    }
+  }
+}));
+
+/**
+ * The provided selector should be the floating toolbar button that needs focus.
+ */
+export function forceFocusSelector(selector, view) {
+  if (view) {
+    return view.dispatch(view.state.tr.setMeta(forceFocusStateKey, {
+      selector
+    }));
+  }
+}
+
+/**
+ * If a selector is set and the element exists, focus it.
+ */
+export function checkShouldForceFocusAndApply(view) {
+  const state = view === null || view === void 0 ? void 0 : view.state;
+  if (state) {
+    const {
+      selector
+    } = forceFocusStateKey.getState(state);
+    if (selector) {
+      const focusableElement = document.querySelector(selector);
+      if (focusableElement) {
+        focusableElement.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+          inline: 'nearest'
+        });
+        focusableElement.focus();
+        forceFocusSelector(null, view);
+      }
+    }
+  }
+}

package/dist/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -23,8 +23,10 @@ import Announcer from '../../../utils/announcer/announcer';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
 import { decorationStateKey, ACTIONS } from '../../base/pm-plugins/decoration';
+import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
 import ScrollButtons from './ScrollButtons';
 import { ToolbarArrowKeyNavigationProvider } from '../../../ui/ToolbarArrowKeyNavigationProvider';
+import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
 const akGridSize = gridSize();
 const ToolbarItems = /*#__PURE__*/React.memo(({
   items,
@@ -336,10 +338,8 @@ class Toolbar extends Component {
         state,
         dispatch
       } = this.props.editorView;
-      // tables use their own decorations
-      // TODO fix for tables https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-617
       if (table) {
-        return null;
+        return clearHoverSelection()(state, dispatch);
       }
       dispatch(state.tr.setMeta(decorationStateKey, {
         action: ACTIONS.DECORATION_REMOVE
@@ -366,6 +366,8 @@ class Toolbar extends Component {
     });
   }
   componentDidUpdate(prevProps) {
+    var _this$props;
+    checkShouldForceFocusAndApply((_this$props = this.props) === null || _this$props === void 0 ? void 0 : _this$props.editorView);
     if (this.props.node !== prevProps.node) {
       this.resetStyling({
         table: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.node.type.name) === 'table'
@@ -373,6 +375,7 @@ class Toolbar extends Component {
     }
   }
   componentWillUnmount() {
+    forceFocusSelector(null, this.props.editorView);
     this.resetStyling({
       table: this.props.node.type.name === 'table'
     });

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -10,7 +10,9 @@ export const BlockInsertElementBrowser = props => {
     offset: [0, 3],
     mountTo: props.popupsMountPoint,
     boundariesElement: props.popupsBoundariesElement,
-    scrollableElement: props.popupsScrollableElement
+    scrollableElement: props.popupsScrollableElement,
+    preventOverflow: true,
+    alignX: "right"
   }, /*#__PURE__*/React.createElement(InsertMenu, {
     editorView: props.editorView,
     dropdownItems: props.items,

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -459,7 +459,8 @@ export class ToolbarInsertBlock extends React.PureComponent {
     var _this$props$isDisable, _this$props$replacePl;
     const {
       buttons,
-      dropdownItems
+      dropdownItems,
+      emojiPickerOpen
     } = this.state;
     const {
       isDisabled,
@@ -478,7 +479,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
       spacing: isReducedSpacing ? 'none' : 'default',
       disabled: isDisabled || btn.isDisabled,
       iconBefore: btn.elemBefore,
-      selected: btn.isActive,
+      selected: btn.value.name === 'emoji' && emojiPickerOpen || btn.isActive,
       title: btn.title,
       "aria-label": btn['aria-label'],
       "aria-haspopup": btn['aria-haspopup'],

package/dist/es2019/plugins/list/actions/outdent-list-items-selected.js

@@ -7,6 +7,8 @@ import { findFirstParentListItemNode, findRootParentListNode } from '../utils/fi
 import { normalizeListItemsSelection, createListNodeRange } from '../utils/selection';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 import { getFeatureFlags } from '../../feature-flags-context';
+import { storeRestartListsAttributes, getRestartListsAttributes } from '../utils/analytics';
+import { OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 export const outdentListItemsSelected = (tr, state) => {
   const originalSelection = tr.selection;
   const normalizedSelection = normalizeListItemsSelection({
@@ -199,22 +201,55 @@ const extractListItemsRangeFromList = ({
   }
   let nextList = list.copy(Fragment.empty);
   const featureFlags = getFeatureFlags(state);
+  let nextListStartNumber;
   if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
     // if splitting a numbered list, keep the splitted item
     // counter as the start of the next (second half) list (instead
     // of reverting back to 1 as a starting number)
     const order = getOrderFromOrderedListNode(list);
     if (list.type.name === 'orderedList') {
+      nextListStartNumber = range.endIndex - 1 + order;
       nextList.attrs = {
         ...nextList.attrs,
-        order: range.endIndex - 1 + order
+        order: nextListStartNumber
       };
+      const {
+        splitListStartNumber
+      } = getRestartListsAttributes(tr);
+      if (typeof splitListStartNumber !== 'number') {
+        storeRestartListsAttributes(tr, {
+          splitListStartNumber: nextListStartNumber
+        });
+      }
     }
   }
   const nextListFragment = listItemContent.append(Fragment.from(nextList));
+  if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+    // if the split list with nextListStartNumber is below another list
+    // with order (e.g due to multi-level indent items being lifted), track the
+    // list above's order instead, as it will be the split list's order after sibling joins
+    nextListFragment.forEach((node, _offset, index) => {
+      var _node$attrs;
+      if (node.type.name === 'orderedList' && ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.order) === nextListStartNumber) {
+        var _prev$attrs;
+        const prev = nextListFragment.child(index - 1);
+        if ((prev === null || prev === void 0 ? void 0 : (_prev$attrs = prev.attrs) === null || _prev$attrs === void 0 ? void 0 : _prev$attrs.order) >= 0) {
+          var _prev$attrs2;
+          storeRestartListsAttributes(tr, {
+            splitListStartNumber: prev === null || prev === void 0 ? void 0 : (_prev$attrs2 = prev.attrs) === null || _prev$attrs2 === void 0 ? void 0 : _prev$attrs2.order
+          });
+        }
+      }
+    });
+  }
   if (isTheEntireList) {
     const slice = new Slice(listItemContent, 0, 0);
     const step = new ReplaceStep($start.pos - 1, range.end + 1, slice, false);
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+      storeRestartListsAttributes(tr, {
+        outdentScenario: undefined
+      });
+    }
     tr.step(step);
   } else if (isAtTop) {
     const slice = new Slice(nextListFragment, 0, 1);
@@ -225,6 +260,11 @@ const extractListItemsRangeFromList = ({
     const step = new ReplaceStep($start.pos, listEnd + 1, slice, false);
     tr.step(step);
   } else {
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+      storeRestartListsAttributes(tr, {
+        outdentScenario: OUTDENT_SCENARIOS.SPLIT_LIST
+      });
+    }
     const slice = new Slice(nextListFragment, 1, 1);
     const step = new ReplaceAroundStep($start.pos, listEnd, range.end, listEnd, slice, slice.size, false);
     tr.step(step);

package/dist/es2019/plugins/list/commands/outdent-list.js

@@ -1,10 +1,12 @@
+import { OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
 import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 import { isBulletList } from '../utils/node';
 import { findFirstParentListNode } from '../utils/find';
-import { getCommonListAnalyticsAttributes } from '../utils/analytics';
+import { getCommonListAnalyticsAttributes, getRestartListsAttributes } from '../utils/analytics';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
 import { closeHistory } from 'prosemirror-history';
+import { getFeatureFlags } from '../../feature-flags-context';
 export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD) {
   return function (state, dispatch) {
     if (!isInsideListItem(state)) {
@@ -29,6 +31,18 @@ export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD) {
       // If inside table cell and can't outdent list, then let it handle by table keymap
       return !isInsideTableCell(state);
     }
+    const featureFlags = getFeatureFlags(state);
+    const restartListsAttributes = {};
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+      const {
+        outdentScenario,
+        splitListStartNumber
+      } = getRestartListsAttributes(customTr);
+      if (outdentScenario === OUTDENT_SCENARIOS.SPLIT_LIST) {
+        restartListsAttributes.outdentScenario = outdentScenario;
+        restartListsAttributes.splitListStartNumber = splitListStartNumber;
+      }
+    }
     addAnalytics(state, customTr, {
       action: ACTION.OUTDENTED,
       actionSubject: ACTION_SUBJECT.LIST,
@@ -36,6 +50,7 @@ export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD) {
       eventType: EVENT_TYPE.TRACK,
       attributes: {
         ...getCommonListAnalyticsAttributes(state),
+        ...restartListsAttributes,
         inputMethod
       }
     });