@atlaskit/editor-core 179.0.3 → 179.1.0

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

@@ -0,0 +1,313 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = createUniversalPreset;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _plugins = require("../../../plugins");
+var _editorPluginTable = require("@atlaskit/editor-plugin-table");
+var _isFullPage = require("../../../utils/is-full-page");
+var _mediaCommon = require("@atlaskit/media-common");
+var _default = require("./default");
+var _utils = require("@atlaskit/editor-common/utils");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+/**
+ * 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
+ */
+function createUniversalPreset(appearance, props, featureFlags, prevAppearance, createAnalyticsEvent, insertNodeAPI, editorAnalyticsAPI, editorSelectionAPI, getEditorContainerWidth) {
+  var _props$linking;
+  var isMobile = appearance === 'mobile';
+  var isComment = appearance === 'comment';
+  var isFullPage = (0, _isFullPage.isFullPage)(appearance);
+  var preset = (0, _default.createDefaultPreset)(props);
+  var getEditorFeatureFlags = function getEditorFeatureFlags() {
+    return featureFlags;
+  };
+  if (props.allowAnalyticsGASV3) {
+    var performanceTracking = props.performanceTracking;
+    preset.add([_plugins.analyticsPlugin, {
+      createAnalyticsEvent: createAnalyticsEvent,
+      performanceTracking: performanceTracking
+    }]);
+  }
+  if (props.allowBreakout && isFullPage) {
+    preset.add([_plugins.breakoutPlugin, {
+      allowBreakoutButton: appearance === 'full-page'
+    }]);
+  }
+  if (props.allowTextAlignment) {
+    preset.add(_plugins.alignmentPlugin);
+  }
+  preset.add(_plugins.dataConsumerMarkPlugin);
+  if (props.allowTextColor) {
+    preset.add([_plugins.textColorPlugin, props.allowTextColor]);
+  }
+
+  // Needs to be after allowTextColor as order of buttons in toolbar depends on it
+  preset.add([_plugins.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(_plugins.rulePlugin);
+  }
+  if (props.allowExpand) {
+    preset.add([_plugins.expandPlugin, {
+      allowInsertion: (0, _plugins.isExpandInsertionEnabled)(props),
+      useLongPressSelection: false,
+      appearance: appearance
+    }]);
+  }
+  if (props.media) {
+    preset.add([_plugins.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([_plugins.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 ((0, _mediaCommon.getMediaFeatureFlag)('captions', props.media.featureFlags)) {
+      preset.add(_plugins.captionPlugin);
+    }
+  }
+  if (props.mentionProvider) {
+    var _props$mention$insert, _props$mention, _props$mention2;
+    preset.add([_plugins.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([_plugins.emojiPlugin, {
+      createAnalyticsEvent: createAnalyticsEvent
+    }]);
+  }
+  if (props.allowTables) {
+    var tableOptions = !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables;
+    preset.add([_editorPluginTable.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([_plugins.tasksAndDecisionsPlugin, {
+      allowNestedTasks: props.allowNestedTasks,
+      consumeTabs: isFullPage,
+      useLongPressSelection: false
+    }]);
+  }
+  if (props.feedbackInfo) {
+    preset.add([_plugins.feedbackDialogPlugin, props.feedbackInfo]);
+  }
+  if (props.allowHelpDialog) {
+    preset.add([_plugins.helpDialogPlugin, !!props.legacyImageUploadProvider]);
+  }
+  if (props.saveOnEnter && props.onSave) {
+    preset.add([_plugins.saveOnEnterPlugin, props.onSave]);
+  }
+  if (props.legacyImageUploadProvider) {
+    preset.add(_plugins.imageUploadPlugin);
+    if (!props.media) {
+      preset.add([_plugins.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([_plugins.collabEditPlugin, _objectSpread(_objectSpread({}, collabEditOptions), {}, {
+      EXPERIMENTAL_allowInternalErrorAnalytics: (_collabEditOptions$EX = collabEditOptions.EXPERIMENTAL_allowInternalErrorAnalytics) !== null && _collabEditOptions$EX !== void 0 ? _collabEditOptions$EX : (0, _utils.shouldForceTracking)()
+    })]);
+  }
+  if (props.maxContentSize) {
+    preset.add([_plugins.maxContentSizePlugin, props.maxContentSize]);
+  }
+  if (props.allowJiraIssue) {
+    preset.add(_plugins.jiraIssuePlugin);
+  }
+  if (props.allowPanel) {
+    var allowPanel = (0, _typeof2.default)(props.allowPanel) === 'object' ? props.allowPanel : {};
+    preset.add([_plugins.panelPlugin, {
+      useLongPressSelection: false,
+      allowCustomPanel: allowPanel.allowCustomPanel,
+      allowCustomPanelEdit: allowPanel.allowCustomPanelEdit
+    }]);
+  }
+  if (props.allowExtension) {
+    var extensionConfig = (0, _typeof2.default)(props.allowExtension) === 'object' ? props.allowExtension : {};
+    preset.add([_plugins.extensionPlugin, {
+      breakoutEnabled: appearance === 'full-page' && extensionConfig.allowBreakout !== false,
+      allowAutoSave: extensionConfig.allowAutoSave,
+      extensionHandlers: props.extensionHandlers,
+      useLongPressSelection: false,
+      appearance: appearance
+    }]);
+  }
+  if (props.macroProvider) {
+    preset.add(_plugins.macroPlugin);
+  }
+
+  // See default list for when adding annotations with a provider
+  if (!props.annotationProviders && props.allowConfluenceInlineComment) {
+    preset.add([_plugins.annotationPlugin, undefined]);
+  }
+  if (props.allowDate) {
+    preset.add(_plugins.datePlugin);
+  }
+  if (props.allowTemplatePlaceholders) {
+    var options = props.allowTemplatePlaceholders !== true ? props.allowTemplatePlaceholders : {};
+    preset.add([_plugins.placeholderTextPlugin, options]);
+  }
+  if (props.allowLayouts) {
+    var layoutOptions = (0, _typeof2.default)(props.allowLayouts) === 'object' ? props.allowLayouts : {};
+    preset.add([_plugins.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([_plugins.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(_plugins.customAutoformatPlugin);
+  }
+  var statusMenuDisabled = true;
+  if (props.allowStatus) {
+    statusMenuDisabled = (0, _typeof2.default)(props.allowStatus) === 'object' ? props.allowStatus.menuDisabled : false;
+    preset.add([_plugins.statusPlugin, {
+      menuDisabled: statusMenuDisabled,
+      allowZeroWidthSpaceAfter: !isMobile
+    }]);
+  }
+  if (props.allowIndentation) {
+    preset.add(_plugins.indentationPlugin);
+  }
+  if (isFullPage) {
+    preset.add(_plugins.contextPanelPlugin);
+  }
+  if (props.autoScrollIntoView !== false) {
+    preset.add(_plugins.scrollIntoViewPlugin);
+  }
+  if (isMobile || props.allowUndoRedoButtons) {
+    preset.add(_plugins.historyPlugin);
+  }
+  if (isMobile) {
+    preset.add(_plugins.mobileDimensionsPlugin);
+    preset.add(_plugins.mobileSelectionPlugin);
+  }
+
+  // UI only plugins
+  preset.add([_plugins.toolbarListsIndentationPlugin, {
+    showIndentationButtons: !!featureFlags.indentationButtonsInTheToolbar,
+    allowHeadingAndParagraphIndentation: !!props.allowIndentation
+  }]);
+  preset.add([_plugins.insertBlockPlugin, {
+    allowTables: !!props.allowTables,
+    allowExpand: (0, _plugins.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([_plugins.beforePrimaryToolbarPlugin, {
+      beforePrimaryToolbarComponents: props.primaryToolbarComponents.before
+    }]);
+  }
+  if (featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar) {
+    preset.add([_plugins.avatarGroupPlugin, {
+      collabEdit: props.collabEdit,
+      takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents)
+    }]);
+  }
+  if (props.allowFindReplace) {
+    preset.add([_plugins.findReplacePlugin, {
+      takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
+      twoLineEditorToolbar: !!featureFlags.twoLineEditorToolbar
+    }]);
+  }
+  if (props.allowFragmentMark) {
+    preset.add(_plugins.fragmentMarkPlugin);
+  }
+  if (featureFlags.enableViewUpdateSubscription) {
+    preset.add(_plugins.viewUpdateSubscriptionPlugin);
+  }
+  preset.add([_plugins.codeBidiWarningPlugin, {
+    appearance: appearance
+  }]);
+  if (featureFlags.floatingToolbarCopyButton) {
+    preset.add(_plugins.copyButtonPlugin);
+  }
+  return preset;
+}

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

@@ -7,9 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.editLinkToolbarConfig = exports.editLink = exports.buildEditLinkToolbar = exports.EditLinkToolbar = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _HyperlinkAddToolbar = _interopRequireDefault(require("../../hyperlink/ui/HyperlinkAddToolbar"));
 var _actions = require("../pm-plugins/actions");
@@ -19,14 +21,26 @@ var _doc = require("../pm-plugins/doc");
 var _utils = require("../utils");
 var _prosemirrorState = require("prosemirror-state");
 var _linkingUtils = require("../../../utils/linking-utils");
+var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
+var _ui = require("@atlaskit/editor-common/ui");
+var _messages = require("../../../messages");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
+var HyperLinkToolbarWithListeners = (0, _ui.withOuterListeners)(_HyperlinkAddToolbar.default);
 var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(EditLinkToolbar, _React$Component);
   var _super = _createSuper(EditLinkToolbar);
   function EditLinkToolbar() {
+    var _this;
     (0, _classCallCheck2.default)(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));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleEsc", function (e) {
+      (0, _forceFocus.forceFocusSelector)("[aria-label=\"".concat(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
+    });
+    return _this;
   }
   (0, _createClass2.default)(EditLinkToolbar, [{
     key: "componentDidUpdate",
@@ -40,6 +54,10 @@ 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() {
@@ -49,7 +67,7 @@ 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,
@@ -57,18 +75,19 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
         text = _this$props.text,
         view = _this$props.view,
         _onSubmit = _this$props.onSubmit;
-      return /*#__PURE__*/_react.default.createElement(_HyperlinkAddToolbar.default, {
+      return /*#__PURE__*/_react.default.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: _analytics.INPUT_METHOD.FLOATING_TB,
         onSubmit: function onSubmit(href, title, displayText) {
-          _this.hideLinkToolbar();
+          _this2.hideLinkToolbar();
           if (_onSubmit) {
             _onSubmit(href, displayText || title);
           }

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

@@ -26,6 +26,7 @@ var _utils = require("./utils");
 var _ErrorBoundary = require("../../ui/ErrorBoundary");
 var _featureFlagsContext = require("../feature-flags-context");
 var _toolbar = require("../copy-button/toolbar");
+var _forceFocus = _interopRequireDefault(require("./pm-plugins/force-focus"));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var getRelevantConfig = function getRelevantConfig(selection, configs) {
@@ -143,6 +144,11 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
           var dispatch = _ref2.dispatch;
           return (0, _plugin.createPlugin)(dispatch);
         }
+      }, {
+        name: 'forceFocus',
+        plugin: function plugin() {
+          return (0, _forceFocus.default)();
+        }
       }];
     },
     contentComponent: function contentComponent(_ref3) {

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

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkShouldForceFocusAndApply = checkShouldForceFocusAndApply;
+exports.default = void 0;
+exports.forceFocusSelector = forceFocusSelector;
+exports.forceFocusStateKey = void 0;
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _prosemirrorState = require("prosemirror-state");
+var forceFocusStateKey = new _prosemirrorState.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. */
+exports.forceFocusStateKey = forceFocusStateKey;
+var _default = function _default() {
+  return new _safePlugin.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.
+ */
+exports.default = _default;
+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.
+ */
+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/cjs/plugins/floating-toolbar/ui/Toolbar.js

@@ -36,8 +36,10 @@ var _announcer = _interopRequireDefault(require("../../../utils/announcer/announ
 var _reactIntlNext = require("react-intl-next");
 var _messages = _interopRequireDefault(require("./messages"));
 var _decoration = require("../../base/pm-plugins/decoration");
+var _commands2 = require("@atlaskit/editor-plugin-table/commands");
 var _ScrollButtons = _interopRequireDefault(require("./ScrollButtons"));
 var _ToolbarArrowKeyNavigationProvider = require("../../../ui/ToolbarArrowKeyNavigationProvider");
+var _forceFocus = require("../pm-plugins/force-focus");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -347,10 +349,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 (0, _commands2.clearHoverSelection)()(state, dispatch);
         }
         dispatch(state.tr.setMeta(_decoration.decorationStateKey, {
           action: _decoration.ACTIONS.DECORATION_REMOVE
@@ -384,6 +384,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
+      var _this$props;
+      (0, _forceFocus.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'
@@ -393,6 +395,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
+      (0, _forceFocus.forceFocusSelector)(null, this.props.editorView);
       this.resetStyling({
         table: this.props.node.type.name === 'table'
       });
@@ -400,12 +403,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/cjs/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -17,7 +17,9 @@ 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.default.createElement(_InsertMenu.default, {
     editorView: props.editorView,
     dropdownItems: props.items,

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

@@ -426,7 +426,8 @@ 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;
@@ -444,7 +445,7 @@ 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/cjs/plugins/list/actions/outdent-list-items-selected.js

@@ -15,6 +15,8 @@ var _find = require("../utils/find");
 var _selection = require("../utils/selection");
 var _gapCursorSelection = require("../../selection/gap-cursor-selection");
 var _featureFlagsContext = require("../../feature-flags-context");
+var _analytics = require("../utils/analytics");
+var _analytics2 = require("@atlaskit/editor-common/analytics");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var outdentListItemsSelected = function outdentListItemsSelected(tr, state) {
@@ -197,21 +199,53 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
   }
   var nextList = list.copy(_prosemirrorModel.Fragment.empty);
   var featureFlags = (0, _featureFlagsContext.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 = (0, _utils.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 = (0, _analytics.getRestartListsAttributes)(tr),
+        splitListStartNumber = _getRestartListsAttri.splitListStartNumber;
+      if (typeof splitListStartNumber !== 'number') {
+        (0, _analytics.storeRestartListsAttributes)(tr, {
+          splitListStartNumber: nextListStartNumber
+        });
+      }
     }
   }
   var nextListFragment = listItemContent.append(_prosemirrorModel.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;
+          (0, _analytics.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 _prosemirrorModel.Slice(listItemContent, 0, 0);
     var step = new _prosemirrorTransform.ReplaceStep($start.pos - 1, range.end + 1, slice, false);
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+      (0, _analytics.storeRestartListsAttributes)(tr, {
+        outdentScenario: undefined
+      });
+    }
     tr.step(step);
   } else if (isAtTop) {
     var _slice = new _prosemirrorModel.Slice(nextListFragment, 0, 1);
@@ -222,6 +256,11 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
     var _step2 = new _prosemirrorTransform.ReplaceStep($start.pos, listEnd + 1, _slice2, false);
     tr.step(_step2);
   } else {
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
+      (0, _analytics.storeRestartListsAttributes)(tr, {
+        outdentScenario: _analytics2.OUTDENT_SCENARIOS.SPLIT_LIST
+      });
+    }
     var _slice3 = new _prosemirrorModel.Slice(nextListFragment, 1, 1);
     var _step3 = new _prosemirrorTransform.ReplaceAroundStep($start.pos, listEnd, range.end, listEnd, _slice3, _slice3.size, false);
     tr.step(_step3);