@atlaskit/editor-core 187.10.0 → 187.10.2

package/.eslintrc.js

@@ -23,6 +23,7 @@ module.exports = {
     '@typescript-eslint/consistent-type-imports': 'warn',
     'no-duplicate-imports': 'off',
     '@typescript-eslint/no-duplicate-imports': 'warn',
+    '@typescript-eslint/no-explicit-any': 'warn',
   },
   overrides: [
     {

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 187.10.2
+
+### Patch Changes
+
+- [`7cca8fcf473`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7cca8fcf473) - ED-18274: Remove unused feature flags listNumberContinuity and restartNumberedListsToolbar (not planned for future use either) (all related to the restart lists project)
+
+## 187.10.1
+
+### Patch Changes
+
+- [`31405891e32`](https://bitbucket.org/atlassian/atlassian-frontend/commits/31405891e32) - Extract editor disabled plugin as separate package.
+- Updated dependencies
+
 ## 187.10.0
 
 ### Minor Changes

package/dist/cjs/create-editor/feature-flags-from-props.js

@@ -32,7 +32,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 function createFeatureFlagsFromProps(props) {
-  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46;
+  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44;
   var normalizedFeatureFlags = (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags);
   var tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
 
@@ -74,11 +74,9 @@ function createFeatureFlagsFromProps(props) {
     // Including fallback to props.featureFlags so that mobile feature flags
     // are included (they are not kebab cased)
     restartNumberedLists: normalizedFeatureFlags.restartNumberedLists === true || ((_props$featureFlags40 = props.featureFlags) === null || _props$featureFlags40 === void 0 ? void 0 : _props$featureFlags40.restartNumberedLists) === true,
-    listNumberContinuity: normalizedFeatureFlags.listNumberContinuity === true || ((_props$featureFlags41 = props.featureFlags) === null || _props$featureFlags41 === void 0 ? void 0 : _props$featureFlags41.listNumberContinuity) === true,
-    restartNumberedListsToolbar: normalizedFeatureFlags.restartNumberedListsToolbar === true || ((_props$featureFlags42 = props.featureFlags) === null || _props$featureFlags42 === void 0 ? void 0 : _props$featureFlags42.restartNumberedListsToolbar) === true,
-    useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags43 = props.featureFlags) === null || _props$featureFlags43 === void 0 ? void 0 : _props$featureFlags43.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags44 = props.featureFlags) !== null && _props$featureFlags44 !== void 0 && _props$featureFlags44.useSomewhatSemanticTextColorNames) : false)),
+    useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags41 = props.featureFlags) === null || _props$featureFlags41 === void 0 ? void 0 : _props$featureFlags41.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags42 = props.featureFlags) !== null && _props$featureFlags42 !== void 0 && _props$featureFlags42.useSomewhatSemanticTextColorNames) : false)),
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
-    preventPopupOverflow: Boolean(typeof ((_props$featureFlags45 = props.featureFlags) === null || _props$featureFlags45 === void 0 ? void 0 : _props$featureFlags45['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags46 = props.featureFlags) !== null && _props$featureFlags46 !== void 0 && _props$featureFlags46['prevent-popup-overflow']) : false),
+    preventPopupOverflow: Boolean(typeof ((_props$featureFlags43 = props.featureFlags) === null || _props$featureFlags43 === void 0 ? void 0 : _props$featureFlags43['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags44 = props.featureFlags) !== null && _props$featureFlags44 !== void 0 && _props$featureFlags44['prevent-popup-overflow']) : false),
     // duplicated logic from `create-plugins-list.ts` due to presets not being finalised
     useBetterTypeaheadNavigation: Boolean(typeof pseudoNormalisedUseBetterTypeaheadNavigation === 'boolean' ? !!pseudoNormalisedUseBetterTypeaheadNavigation : true)
   });

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

@@ -14,7 +14,7 @@ var _textFormatting = _interopRequireDefault(require("../../../plugins/text-form
 var _editorPluginWidth = require("@atlaskit/editor-plugin-width");
 var _unsupportedContent = _interopRequireDefault(require("../../../plugins/unsupported-content"));
 var _base = _interopRequireDefault(require("../../../plugins/base"));
-var _editorDisabled = _interopRequireDefault(require("../../../plugins/editor-disabled"));
+var _editorPluginEditorDisabled = require("@atlaskit/editor-plugin-editor-disabled");
 var _typeAhead = _interopRequireDefault(require("../../../plugins/type-ahead"));
 var _submitEditor = _interopRequireDefault(require("../../../plugins/submit-editor"));
 var _fakeTextCursor = _interopRequireDefault(require("../../../plugins/fake-text-cursor"));
@@ -74,7 +74,7 @@ function createDefaultPreset(options) {
     return builder;
   }).add([_editorPluginHyperlink.hyperlinkPlugin, options.hyperlinkOptions]).add([_textFormatting.default, options.textFormatting]).add(_editorPluginWidth.widthPlugin).add([_quickInsert.default, options.quickInsert]).add([_typeAhead.default, options.typeAhead || {
     createAnalyticsEvent: options.createAnalyticsEvent
-  }]).add(_unsupportedContent.default).add(_editorDisabled.default).add([_submitEditor.default, options.submitEditor]).add(_fakeTextCursor.default).add(_floatingToolbar.default).add([_selection.default, options.selection]).add([_codeBlock.default, options.codeBlock || {
+  }]).add(_unsupportedContent.default).add(_editorPluginEditorDisabled.editorDisabledPlugin).add([_submitEditor.default, options.submitEditor]).add(_fakeTextCursor.default).add(_floatingToolbar.default).add([_selection.default, options.selection]).add([_codeBlock.default, options.codeBlock || {
     appearance: 'full-page'
   }]);
   return preset;

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

@@ -69,9 +69,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     }
     return builder;
   }).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
+    restartNumberedLists: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.restartNumberedLists
   }]).maybeAdd(_plugins.rulePlugin, function (plugin, builder) {
     if (props.allowRule) {
       return builder.add(plugin);

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

@@ -13,12 +13,10 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _types = require("../analytics/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _pluginKey = require("../extension/plugin-key");
-var _editorDisabled = require("../editor-disabled");
-var _pluginKey2 = require("./pm-plugins/toolbar-data/plugin-key");
+var _pluginKey = require("./pm-plugins/toolbar-data/plugin-key");
 var _plugin = require("./pm-plugins/toolbar-data/plugin");
 var _commands = require("./pm-plugins/toolbar-data/commands");
 var _ConfirmationModal = require("./ui/ConfirmationModal");
@@ -27,6 +25,7 @@ var _utils2 = require("./utils");
 var _ErrorBoundary = require("../../ui/ErrorBoundary");
 var _toolbar = require("../copy-button/toolbar");
 var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 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; }
 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; }
@@ -123,8 +122,6 @@ function filterUndefined(x) {
   return !!x;
 }
 var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
-  var _api$dependencies, _api$dependencies$fea;
-  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'floatingToolbar',
     pmPlugins: function pmPlugins() {
@@ -159,6 +156,17 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
     actions: {
       forceFocusSelector: _forceFocus.forceFocusSelector
     },
+    getSharedState: function getSharedState(editorState) {
+      var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+      if (!editorState) {
+        return undefined;
+      }
+      var configWithNodeInfo = (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 ? void 0 : (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined;
+      return {
+        configWithNodeInfo: configWithNodeInfo,
+        floatingToolbarData: _pluginKey.pluginKey.getState(editorState)
+      };
+    },
     contentComponent: function contentComponent(_ref3) {
       var popupsMountPoint = _ref3.popupsMountPoint,
         popupsBoundariesElement = _ref3.popupsBoundariesElement,
@@ -166,134 +174,150 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
         editorView = _ref3.editorView,
         providerFactory = _ref3.providerFactory,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-      return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-        plugins: {
-          floatingToolbarState: pluginKey,
-          floatingToolbarData: _pluginKey2.pluginKey,
-          editorDisabledPlugin: _editorDisabled.pluginKey,
-          extensionsState: _pluginKey.pluginKey
-        },
-        render: function render(_ref4) {
-          var _configWithNodeInfo$c, _configWithNodeInfo$c2;
-          var editorDisabledPlugin = _ref4.editorDisabledPlugin,
-            floatingToolbarState = _ref4.floatingToolbarState,
-            floatingToolbarData = _ref4.floatingToolbarData,
-            extensionsState = _ref4.extensionsState;
-          var configWithNodeInfo = floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.getConfigWithNodeInfo(editorView.state);
-          if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
-            return null;
-          }
-          var config = configWithNodeInfo.config,
-            node = configWithNodeInfo.node;
-          var title = config.title,
-            _config$getDomRef = config.getDomRef,
-            getDomRef = _config$getDomRef === void 0 ? getDomRefFromSelection : _config$getDomRef,
-            items = config.items,
-            _config$align = config.align,
-            align = _config$align === void 0 ? 'center' : _config$align,
-            _config$className = config.className,
-            className = _config$className === void 0 ? '' : _config$className,
-            height = config.height,
-            width = config.width,
-            zIndex = config.zIndex,
-            _config$offset = config.offset,
-            offset = _config$offset === void 0 ? [0, 12] : _config$offset,
-            forcePlacement = config.forcePlacement,
-            preventPopupOverflow = config.preventPopupOverflow,
-            onPositionCalculated = config.onPositionCalculated,
-            focusTrap = config.focusTrap;
-          var targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
-          if (!targetRef || editorDisabledPlugin && editorDisabledPlugin.editorDisabled) {
-            return null;
-          }
-          var customPositionCalculation;
-          var toolbarItems = (0, _toolbar.processCopyButtonItems)(editorView.state)(Array.isArray(items) ? items : items(node), api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration);
-          if (onPositionCalculated) {
-            customPositionCalculation = function customPositionCalculation(nextPos) {
-              return onPositionCalculated(editorView, nextPos);
-            };
-          }
-          var dispatchCommand = function dispatchCommand(fn) {
-            return fn && fn(editorView.state, editorView.dispatch, editorView);
-          };
-
-          // Confirm dialog
-          var _ref5 = floatingToolbarData || {},
-            confirmDialogForItem = _ref5.confirmDialogForItem;
-          var confirmButtonItem = confirmDialogForItem ? toolbarItems[confirmDialogForItem] : undefined;
-          var scrollable = featureFlags.floatingToolbarCopyButton && config.scrollable;
-          var confirmDialogOptions = typeof (confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog) === 'function' ? confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog() : confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog;
-          return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.ErrorBoundary, {
-            component: _analytics.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
-            componentId: (0, _camelCase.default)(title),
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            fallbackComponent: null
-          }, /*#__PURE__*/_react.default.createElement(_ui.Popup, {
-            ariaLabel: title,
-            offset: offset,
-            target: targetRef,
-            alignY: "bottom",
-            forcePlacement: forcePlacement,
-            fitHeight: height,
-            fitWidth: width,
-            alignX: align,
-            stick: true,
-            zIndex: zIndex,
-            mountTo: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            scrollableElement: popupsScrollableElement,
-            onPositionCalculated: customPositionCalculation,
-            style: scrollable ? {
-              maxWidth: '100%'
-            } : {},
-            focusTrap: focusTrap,
-            preventOverflow: preventPopupOverflow
-          }, /*#__PURE__*/_react.default.createElement(_ToolbarLoader.ToolbarLoader, {
-            target: targetRef,
-            items: toolbarItems,
-            node: node,
-            dispatchCommand: dispatchCommand,
-            editorView: editorView,
-            className: className,
-            focusEditor: function focusEditor() {
-              return editorView.focus();
-            },
-            providerFactory: providerFactory,
-            popupsMountPoint: popupsMountPoint,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsScrollableElement: popupsScrollableElement,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            extensionsProvider: extensionsState === null || extensionsState === void 0 ? void 0 : extensionsState.extensionProvider,
-            scrollable: scrollable,
-            featureFlags: featureFlags,
-            api: api
-          })), /*#__PURE__*/_react.default.createElement(_ConfirmationModal.ConfirmationModal, {
-            testId: "ak-floating-toolbar-confirmation-modal",
-            options: confirmDialogOptions,
-            onConfirm: function onConfirm() {
-              var isChecked = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-              if (!!confirmDialogOptions.onConfirm) {
-                dispatchCommand(confirmDialogOptions.onConfirm(isChecked));
-              } else {
-                dispatchCommand(confirmButtonItem.onClick);
-              }
-            },
-            onClose: function onClose() {
-              dispatchCommand((0, _commands.hideConfirmDialog)());
-              // Need to set focus to Editor here,
-              // As when the Confirmation dialog pop up, and user interacts with the dialog, Editor loses focus.
-              // So when Confirmation dialog is closed, Editor does not have the focus, then cursor goes to the position 1 of the doc,
-              // instead of the cursor position before the dialog pop up.
-              if (!editorView.hasFocus()) {
-                editorView.focus();
-              }
-            }
-          }));
-        }
+      return /*#__PURE__*/_react.default.createElement(ContentComponent, {
+        editorView: editorView,
+        pluginInjectionApi: api,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        providerFactory: providerFactory,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent
       });
     }
   };
 };
+function ContentComponent(_ref4) {
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _configWithNodeInfo$c, _configWithNodeInfo$c2;
+  var pluginInjectionApi = _ref4.pluginInjectionApi,
+    editorView = _ref4.editorView,
+    popupsMountPoint = _ref4.popupsMountPoint,
+    popupsBoundariesElement = _ref4.popupsBoundariesElement,
+    popupsScrollableElement = _ref4.popupsScrollableElement,
+    providerFactory = _ref4.providerFactory,
+    dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
+  var featureFlags = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.featureFlags) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.sharedState.currentState()) || {};
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled']),
+    floatingToolbarState = _useSharedPluginState.floatingToolbarState,
+    editorDisabledState = _useSharedPluginState.editorDisabledState;
+  var _ref5 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
+    configWithNodeInfo = _ref5.configWithNodeInfo,
+    floatingToolbarData = _ref5.floatingToolbarData;
+  if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
+    return null;
+  }
+  var config = configWithNodeInfo.config,
+    node = configWithNodeInfo.node;
+  var title = config.title,
+    _config$getDomRef = config.getDomRef,
+    getDomRef = _config$getDomRef === void 0 ? getDomRefFromSelection : _config$getDomRef,
+    items = config.items,
+    _config$align = config.align,
+    align = _config$align === void 0 ? 'center' : _config$align,
+    _config$className = config.className,
+    className = _config$className === void 0 ? '' : _config$className,
+    height = config.height,
+    width = config.width,
+    zIndex = config.zIndex,
+    _config$offset = config.offset,
+    offset = _config$offset === void 0 ? [0, 12] : _config$offset,
+    forcePlacement = config.forcePlacement,
+    preventPopupOverflow = config.preventPopupOverflow,
+    onPositionCalculated = config.onPositionCalculated,
+    focusTrap = config.focusTrap;
+  var targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
+  if (!targetRef || editorDisabledState && editorDisabledState.editorDisabled) {
+    return null;
+  }
+  var customPositionCalculation;
+  var toolbarItems = (0, _toolbar.processCopyButtonItems)(editorView.state)(Array.isArray(items) ? items : items(node), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions.hoverDecoration);
+  if (onPositionCalculated) {
+    customPositionCalculation = function customPositionCalculation(nextPos) {
+      return onPositionCalculated(editorView, nextPos);
+    };
+  }
+  var dispatchCommand = function dispatchCommand(fn) {
+    return fn && fn(editorView.state, editorView.dispatch, editorView);
+  };
+
+  // Confirm dialog
+  var _ref6 = floatingToolbarData || {},
+    confirmDialogForItem = _ref6.confirmDialogForItem;
+  var confirmButtonItem = confirmDialogForItem ? toolbarItems[confirmDialogForItem] : undefined;
+  var scrollable = featureFlags.floatingToolbarCopyButton && config.scrollable;
+  var confirmDialogOptions = typeof (confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog) === 'function' ? confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog() : confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog;
+  return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.ErrorBoundary, {
+    component: _analytics.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
+    componentId: (0, _camelCase.default)(title),
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    fallbackComponent: null
+  }, /*#__PURE__*/_react.default.createElement(_ui.Popup, {
+    ariaLabel: title,
+    offset: offset,
+    target: targetRef,
+    alignY: "bottom",
+    forcePlacement: forcePlacement,
+    fitHeight: height,
+    fitWidth: width,
+    alignX: align,
+    stick: true,
+    zIndex: zIndex,
+    mountTo: popupsMountPoint,
+    boundariesElement: popupsBoundariesElement,
+    scrollableElement: popupsScrollableElement,
+    onPositionCalculated: customPositionCalculation,
+    style: scrollable ? {
+      maxWidth: '100%'
+    } : {},
+    focusTrap: focusTrap,
+    preventOverflow: preventPopupOverflow
+  }, /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+    providerFactory: providerFactory,
+    providers: ['extensionProvider'],
+    renderNode: function renderNode(providers) {
+      return /*#__PURE__*/_react.default.createElement(_ToolbarLoader.ToolbarLoader, {
+        target: targetRef,
+        items: toolbarItems,
+        node: node,
+        dispatchCommand: dispatchCommand,
+        editorView: editorView,
+        className: className,
+        focusEditor: function focusEditor() {
+          return editorView.focus();
+        },
+        providerFactory: providerFactory,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        extensionsProvider: providers.extensionProvider,
+        scrollable: scrollable,
+        featureFlags: featureFlags,
+        api: pluginInjectionApi
+      });
+    }
+  })), /*#__PURE__*/_react.default.createElement(_ConfirmationModal.ConfirmationModal, {
+    testId: "ak-floating-toolbar-confirmation-modal",
+    options: confirmDialogOptions,
+    onConfirm: function onConfirm() {
+      var isChecked = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      if (!!confirmDialogOptions.onConfirm) {
+        dispatchCommand(confirmDialogOptions.onConfirm(isChecked));
+      } else {
+        dispatchCommand(confirmButtonItem.onClick);
+      }
+    },
+    onClose: function onClose() {
+      dispatchCommand((0, _commands.hideConfirmDialog)());
+      // Need to set focus to Editor here,
+      // As when the Confirmation dialog pop up, and user interacts with the dialog, Editor loses focus.
+      // So when Confirmation dialog is closed, Editor does not have the focus, then cursor goes to the position 1 of the doc,
+      // instead of the cursor position before the dialog pop up.
+      if (!editorView.hasFocus()) {
+        editorView.focus();
+      }
+    }
+  }));
+}
 var _default = floatingToolbarPlugin;
 /**
  *
@@ -320,7 +344,6 @@ function sanitizeFloatingToolbarConfig(config) {
 }
 function floatingToolbarPluginFactory(options) {
   var floatingToolbarHandlers = options.floatingToolbarHandlers,
-    dispatch = options.dispatch,
     providerFactory = options.providerFactory,
     getIntl = options.getIntl;
   var intl = getIntl();
@@ -335,7 +358,6 @@ function floatingToolbarPluginFactory(options) {
   };
   var apply = function apply(tr, pluginState) {
     var newPluginState = _objectSpread({}, pluginState);
-    dispatch(pluginKey, newPluginState);
     return newPluginState;
   };
   return new _safePlugin.SafePlugin({

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

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkShouldForceFocusAndApply = checkShouldForceFocusAndApply;
-exports.default = void 0;
-exports.forceFocusSelector = forceFocusSelector;
-exports.forceFocusStateKey = void 0;
+exports.forceFocusStateKey = exports.forceFocusSelector = exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var forceFocusStateKey = new _state.PluginKey('forceFocusStatePlugin');
@@ -40,17 +38,18 @@ var _default = function _default() {
  * 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, {
+var forceFocusSelector = function forceFocusSelector(selector) {
+  return function (tr) {
+    return tr.setMeta(forceFocusStateKey, {
       selector: selector
-    }));
-  }
-}
+    });
+  };
+};
 
 /**
  * If a selector is set and the element exists, focus it.
  */
+exports.forceFocusSelector = forceFocusSelector;
 function checkShouldForceFocusAndApply(view) {
   var state = view === null || view === void 0 ? void 0 : view.state;
   if (state) {
@@ -65,7 +64,9 @@ function checkShouldForceFocusAndApply(view) {
           inline: 'nearest'
         });
         focusableElement.focus();
-        forceFocusSelector(null, view);
+        var tr = view.state.tr,
+          dispatch = view.dispatch;
+        dispatch(forceFocusSelector(null)(tr));
       }
     }
   }

package/dist/cjs/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js

@@ -112,25 +112,32 @@ var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
     extensions = _useState2[0],
     setExtensions = _useState2[1];
   (0, _react.useEffect)(function () {
-    if (extensionProvider) {
-      getExtensions();
-    }
+    getExtensions();
     function getExtensions() {
       return _getExtensions.apply(this, arguments);
     } // leaving dependencies array empty so that this effect runs just once on component mount
     // eslint-disable-next-line react-hooks/exhaustive-deps
     function _getExtensions() {
       _getExtensions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var provider;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              _context3.next = 2;
+              return extensionProvider;
+            case 2:
+              provider = _context3.sent;
+              if (!provider) {
+                _context3.next = 9;
+                break;
+              }
               _context3.t0 = setExtensions;
-              _context3.next = 3;
-              return extensionProvider.getExtensions();
-            case 3:
+              _context3.next = 7;
+              return provider.getExtensions();
+            case 7:
               _context3.t1 = _context3.sent;
               (0, _context3.t0)(_context3.t1);
-            case 5:
+            case 9:
             case "end":
               return _context3.stop();
           }

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

@@ -427,7 +427,12 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      (0, _forceFocus.forceFocusSelector)(null, this.props.editorView);
+      var editorView = this.props.editorView;
+      if (editorView) {
+        var tr = editorView.state.tr,
+          dispatch = editorView.dispatch;
+        dispatch((0, _forceFocus.forceFocusSelector)(null)(tr));
+      }
       this.resetStyling({
         table: this.props.node.type.name === 'table'
       });

package/dist/cjs/plugins/index.js

@@ -125,12 +125,6 @@ Object.defineProperty(exports, "datePlugin", {
     return _date.default;
   }
 });
-Object.defineProperty(exports, "editorDisabledPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _editorDisabled.default;
-  }
-});
 Object.defineProperty(exports, "emojiPlugin", {
   enumerable: true,
   get: function get() {
@@ -421,7 +415,6 @@ var _status = _interopRequireDefault(require("./status"));
 var _breakout = _interopRequireDefault(require("./breakout"));
 var _alignment = _interopRequireDefault(require("./alignment"));
 var _dataConsumer = _interopRequireDefault(require("./data-consumer"));
-var _editorDisabled = _interopRequireDefault(require("./editor-disabled"));
 var _fragment = _interopRequireDefault(require("./fragment"));
 var _indentation = _interopRequireDefault(require("./indentation"));
 var _annotation = _interopRequireDefault(require("./annotation"));

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

@@ -60,7 +60,9 @@ var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
       (0, _commands.closeMediaAltTextMenu)(view.state, view.dispatch);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "dispatchCancelEvent", function (event) {
-      var view = _this.props.view;
+      var _this$props = _this.props,
+        view = _this$props.view,
+        onEscape = _this$props.onEscape;
 
       // We need to pass down the ESCAPE keymap
       // because when we focus on the Toolbar, Prosemirror blur,
@@ -68,6 +70,7 @@ var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
       view.someProp('handleKeyDown', function (fn) {
         return fn(view, event);
       });
+      onEscape === null || onEscape === void 0 ? void 0 : onEscape();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateAltText", function (newAltText) {
       var view = _this.props.view;

package/dist/cjs/plugins/media/toolbar/alt-text.js

@@ -14,7 +14,6 @@ var _messages = require("../pm-plugins/alt-text/messages");
 var _AltTextEdit = _interopRequireWildcard(require("../pm-plugins/alt-text/ui/AltTextEdit"));
 var _mediaCommon = require("../utils/media-common");
 var _style = require("../pm-plugins/alt-text/style");
-var _ui = require("@atlaskit/editor-common/ui");
 var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
 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; }
@@ -39,7 +38,6 @@ var altTextButton = function altTextButton(intl, state) {
   };
 };
 exports.altTextButton = altTextButton;
-var AltTextEditWithListeners = (0, _ui.withOuterListeners)(_AltTextEdit.default);
 var altTextEditComponent = function altTextEditComponent(options) {
   return {
     type: 'custom',
@@ -56,15 +54,17 @@ var altTextEditComponent = function altTextEditComponent(options) {
       /** Focus should move to the 'Alt text' button when the toolbar closes
        * and not close the floating toolbar.
        */
-      var handleEsc = function handleEsc(e) {
-        (0, _forceFocus.forceFocusSelector)("[data-testid=\"".concat(testId, "\"]"), view);
+      var handleEsc = function handleEsc() {
+        var tr = view.state.tr,
+          dispatch = view.dispatch;
+        dispatch((0, _forceFocus.forceFocusSelector)("[data-testid=\"".concat(testId, "\"]"))(tr));
       };
-      return /*#__PURE__*/_react.default.createElement(AltTextEditWithListeners, {
+      return /*#__PURE__*/_react.default.createElement(_AltTextEdit.default, {
         view: view,
         key: idx,
         value: mediaNode.attrs.alt,
         altTextValidator: options && options.altTextValidator,
-        handleEscapeKeydown: handleEsc
+        onEscape: handleEsc
       });
     }
   };

package/dist/cjs/plugins/media/toolbar/linking.js

@@ -72,7 +72,10 @@ var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, mediaLinki
                 /** Focus should move to the 'Add link' button when the toolbar closes
                  * and not close the floating toolbar.
                  */
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR, view);
+                var tr = view.state.tr,
+                  dispatch = view.dispatch;
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR)(tr);
+                dispatch(tr);
               },
               onSubmit: function onSubmit(href, meta) {
                 (0, _linking.setUrlToMedia)(href, meta.inputMethod)(view.state, view.dispatch, view);