@atlaskit/editor-core 179.0.4 → 179.1.1

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

@@ -0,0 +1,306 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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;
+  var isMobile = appearance === 'mobile';
+  var isComment = appearance === 'comment';
+  var isFullPage = fullPageCheck(appearance);
+  var preset = createDefaultPreset(props);
+  var getEditorFeatureFlags = function getEditorFeatureFlags() {
+    return featureFlags;
+  };
+  if (props.allowAnalyticsGASV3) {
+    var performanceTracking = props.performanceTracking;
+    preset.add([analyticsPlugin, {
+      createAnalyticsEvent: createAnalyticsEvent,
+      performanceTracking: 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
+    }]);
+    var alignLeftOnInsert = typeof props.media.alignLeftOnInsert !== 'undefined' ? props.media.alignLeftOnInsert : isComment;
+    var showMediaLayoutOptions = typeof props.media.allowAdvancedToolBarOptions !== 'undefined' ? props.media.allowAdvancedToolBarOptions : isFullPage || isComment;
+    preset.add([mediaPlugin, _objectSpread(_objectSpread({}, props.media), {}, {
+      allowLazyLoading: !isMobile,
+      allowBreakoutSnapPoints: isFullPage,
+      allowAdvancedToolBarOptions: showMediaLayoutOptions,
+      allowDropzoneDropLine: isFullPage,
+      allowMediaSingleEditable: !isMobile,
+      allowRemoteDimensionsFetch: !isMobile,
+      editorSelectionAPI: 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: 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: 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: createAnalyticsEvent
+    }]);
+  }
+  if (props.allowTables) {
+    var tableOptions = !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables;
+    preset.add([tablesPlugin, {
+      tableOptions: tableOptions,
+      breakoutEnabled: appearance === 'full-page',
+      allowContextualMenu: !isMobile,
+      fullWidthEnabled: appearance === 'full-width',
+      wasFullWidthEnabled: prevAppearance && prevAppearance === 'full-width',
+      editorAnalyticsAPI: editorAnalyticsAPI,
+      editorSelectionAPI: editorSelectionAPI,
+      getEditorFeatureFlags: 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: editorSelectionAPI
+      }]);
+    }
+  }
+  if (props.collabEdit || props.collabEditProvider) {
+    var _collabEditOptions$EX;
+    var collabEditOptions = {
+      sanitizePrivateContent: props.sanitizePrivateContent,
+      createAnalyticsEvent: createAnalyticsEvent
+    };
+    if (props.collabEdit) {
+      collabEditOptions = _objectSpread(_objectSpread({}, props.collabEdit), collabEditOptions);
+    }
+    preset.add([collabEditPlugin, _objectSpread(_objectSpread({}, 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) {
+    var allowPanel = _typeof(props.allowPanel) === 'object' ? props.allowPanel : {};
+    preset.add([panelPlugin, {
+      useLongPressSelection: false,
+      allowCustomPanel: allowPanel.allowCustomPanel,
+      allowCustomPanelEdit: allowPanel.allowCustomPanelEdit
+    }]);
+  }
+  if (props.allowExtension) {
+    var 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: 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) {
+    var options = props.allowTemplatePlaceholders !== true ? props.allowTemplatePlaceholders : {};
+    preset.add([placeholderTextPlugin, options]);
+  }
+  if (props.allowLayouts) {
+    var layoutOptions = _typeof(props.allowLayouts) === 'object' ? props.allowLayouts : {};
+    preset.add([layoutPlugin, _objectSpread(_objectSpread({}, 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;
+    var fullWidthMode = appearance === 'full-width';
+    preset.add([cardPlugin, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props.UNSAFE_cards), props.smartLinks), (_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.smartLinks), {}, {
+      platform: isMobile ? 'mobile' : 'web',
+      fullWidthMode: fullWidthMode,
+      createAnalyticsEvent: createAnalyticsEvent,
+      linkPicker: (_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.linkPicker
+    })]);
+  }
+  if (props.autoformattingProvider) {
+    preset.add(customAutoformatPlugin);
+  }
+  var 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: insertNodeAPI
+  }]);
+  var hasBeforePrimaryToolbar = function 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: appearance
+  }]);
+  if (featureFlags.floatingToolbarCopyButton) {
+    preset.add(copyButtonPlugin);
+  }
+  return preset;
+}

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

@@ -1,8 +1,10 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
@@ -14,12 +16,24 @@ 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';
+var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   _inherits(EditLinkToolbar, _React$Component);
   var _super = _createSuper(EditLinkToolbar);
   function EditLinkToolbar() {
+    var _this;
     _classCallCheck(this, EditLinkToolbar);
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
+    _defineProperty(_assertThisInitialized(_this), "handleEsc", function (e) {
+      forceFocusSelector("[aria-label=\"".concat(linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
+    });
+    return _this;
   }
   _createClass(EditLinkToolbar, [{
     key: "componentDidUpdate",
@@ -33,6 +47,10 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
     value: function componentWillUnmount() {
       this.hideLinkToolbar();
     }
+
+    /** Focus should move to the 'Edit link' button when the toolbar closes
+     * and not close the floating toolbar.
+     */
   }, {
     key: "hideLinkToolbar",
     value: function hideLinkToolbar() {
@@ -42,7 +60,7 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this = this;
+      var _this2 = this;
       var _this$props = this.props,
         linkPickerOptions = _this$props.linkPickerOptions,
         providerFactory = _this$props.providerFactory,
@@ -50,18 +68,19 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
         text = _this$props.text,
         view = _this$props.view,
         _onSubmit = _this$props.onSubmit;
-      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
         ,
         invokeMethod: INPUT_METHOD.FLOATING_TB,
         onSubmit: function onSubmit(href, title, displayText) {
-          _this.hideLinkToolbar();
+          _this2.hideLinkToolbar();
           if (_onSubmit) {
             _onSubmit(href, displayText || title);
           }

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

@@ -24,6 +24,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 var getRelevantConfig = function getRelevantConfig(selection, configs) {
   // node selections always take precedence, see if
   var configPair;
@@ -138,6 +139,11 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
           var dispatch = _ref2.dispatch;
           return floatingToolbarDataPluginFactory(dispatch);
         }
+      }, {
+        name: 'forceFocus',
+        plugin: function plugin() {
+          return forceFocusPlugin();
+        }
       }];
     },
     contentComponent: function contentComponent(_ref3) {

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

@@ -0,0 +1,62 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
+export var 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 (function () {
+  return new SafePlugin({
+    key: forceFocusStateKey,
+    state: {
+      init: function init() {
+        return {
+          selector: null
+        };
+      },
+      apply: function apply(tr, prevState) {
+        var 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: selector
+    }));
+  }
+}
+
+/**
+ * If a selector is set and the element exists, focus it.
+ */
+export function checkShouldForceFocusAndApply(view) {
+  var state = view === null || view === void 0 ? void 0 : view.state;
+  if (state) {
+    var _forceFocusStateKey$g = forceFocusStateKey.getState(state),
+      selector = _forceFocusStateKey$g.selector;
+    if (selector) {
+      var focusableElement = document.querySelector(selector);
+      if (focusableElement) {
+        focusableElement.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+          inline: 'nearest'
+        });
+        focusableElement.focus();
+        forceFocusSelector(null, view);
+      }
+    }
+  }
+}

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

@@ -33,8 +33,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';
 var akGridSize = gridSize();
 var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
   var items = _ref.items,
@@ -337,10 +339,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         var _this$props$editorVie2 = this.props.editorView,
           state = _this$props$editorVie2.state,
           dispatch = _this$props$editorVie2.dispatch;
-        // 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
@@ -374,6 +374,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function 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'
@@ -383,6 +385,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
+      forceFocusSelector(null, this.props.editorView);
       this.resetStyling({
         table: this.props.node.type.name === 'table'
       });
@@ -390,12 +393,12 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props = this.props,
-        items = _this$props.items,
-        className = _this$props.className,
-        node = _this$props.node,
-        intl = _this$props.intl,
-        scrollable = _this$props.scrollable;
+      var _this$props2 = this.props,
+        items = _this$props2.items,
+        className = _this$props2.className,
+        node = _this$props2.node,
+        intl = _this$props2.intl,
+        scrollable = _this$props2.scrollable;
       if (!items || !items.length) {
         return null;
       }

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

@@ -10,7 +10,9 @@ export var BlockInsertElementBrowser = function 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/esm/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -421,7 +421,8 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         _this$props$replacePl;
       var _this$state = this.state,
         buttons = _this$state.buttons,
-        dropdownItems = _this$state.dropdownItems;
+        dropdownItems = _this$state.dropdownItems,
+        emojiPickerOpen = _this$state.emojiPickerOpen;
       var _this$props5 = this.props,
         isDisabled = _this$props5.isDisabled,
         isReducedSpacing = _this$props5.isReducedSpacing;
@@ -439,7 +440,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_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/esm/plugins/list/actions/outdent-list-items-selected.js

@@ -10,6 +10,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 var outdentListItemsSelected = function outdentListItemsSelected(tr, state) {
   var originalSelection = tr.selection;
   var normalizedSelection = normalizeListItemsSelection({
@@ -189,21 +191,53 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
   }
   var nextList = list.copy(Fragment.empty);
   var featureFlags = getFeatureFlags(state);
+  var 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)
     var order = getOrderFromOrderedListNode(list);
     if (list.type.name === 'orderedList') {
+      nextListStartNumber = range.endIndex - 1 + order;
       nextList.attrs = _objectSpread(_objectSpread({}, nextList.attrs), {}, {
-        order: range.endIndex - 1 + order
+        order: nextListStartNumber
       });
+      var _getRestartListsAttri = getRestartListsAttributes(tr),
+        splitListStartNumber = _getRestartListsAttri.splitListStartNumber;
+      if (typeof splitListStartNumber !== 'number') {
+        storeRestartListsAttributes(tr, {
+          splitListStartNumber: nextListStartNumber
+        });
+      }
     }
   }
   var 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(function (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;
+        var 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) {
     var slice = new Slice(listItemContent, 0, 0);
     var 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) {
     var _slice = new Slice(nextListFragment, 0, 1);
@@ -214,6 +248,11 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
     var _step2 = new ReplaceStep($start.pos, listEnd + 1, _slice2, false);
     tr.step(_step2);
   } else {
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+      storeRestartListsAttributes(tr, {
+        outdentScenario: OUTDENT_SCENARIOS.SPLIT_LIST
+      });
+    }
     var _slice3 = new Slice(nextListFragment, 1, 1);
     var _step3 = new ReplaceAroundStep($start.pos, listEnd, range.end, listEnd, _slice3, _slice3.size, false);
     tr.step(_step3);