@atlaskit/editor-core 187.9.2 → 187.10.1

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

@@ -9,11 +9,9 @@ import camelCase from 'lodash/camelCase';
 import { Popup } from '@atlaskit/editor-common/ui';
 // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
-import WithPluginState from '../../ui/WithPluginState';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { CONTENT_COMPONENT } from '../analytics/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { pluginKey as extensionsPluginKey } from '../extension/plugin-key';
-import { pluginKey as editorDisabledPluginKey } from '../editor-disabled';
 import { pluginKey as dataPluginKey } from './pm-plugins/toolbar-data/plugin-key';
 import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/toolbar-data/plugin';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
@@ -113,8 +111,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() {
@@ -149,6 +145,17 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
     actions: {
       forceFocusSelector: 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: dataPluginKey.getState(editorState)
+      };
+    },
     contentComponent: function contentComponent(_ref3) {
       var popupsMountPoint = _ref3.popupsMountPoint,
         popupsBoundariesElement = _ref3.popupsBoundariesElement,
@@ -156,134 +163,151 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
         editorView = _ref3.editorView,
         providerFactory = _ref3.providerFactory,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          floatingToolbarState: pluginKey,
-          floatingToolbarData: dataPluginKey,
-          editorDisabledPlugin: editorDisabledPluginKey,
-          extensionsState: extensionsPluginKey
-        },
-        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 = 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.createElement(ErrorBoundary, {
-            component: ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
-            componentId: camelCase(title),
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            fallbackComponent: null
-          }, /*#__PURE__*/React.createElement(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.createElement(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.createElement(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(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.createElement(ContentComponent, {
+        editorView: editorView,
+        pluginInjectionApi: api,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        providerFactory: providerFactory,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent
       });
     }
   };
 };
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+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 = 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 = 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.createElement(ErrorBoundary, {
+    component: ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
+    componentId: camelCase(title),
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    fallbackComponent: null
+  }, /*#__PURE__*/React.createElement(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.createElement(WithProviders, {
+    providerFactory: providerFactory,
+    providers: ['extensionProvider'],
+    renderNode: function renderNode(providers) {
+      return /*#__PURE__*/React.createElement(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.createElement(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(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();
+      }
+    }
+  }));
+}
 export default floatingToolbarPlugin;
 
 /**
@@ -309,7 +333,6 @@ function sanitizeFloatingToolbarConfig(config) {
 }
 function floatingToolbarPluginFactory(options) {
   var floatingToolbarHandlers = options.floatingToolbarHandlers,
-    dispatch = options.dispatch,
     providerFactory = options.providerFactory,
     getIntl = options.getIntl;
   var intl = getIntl();
@@ -324,7 +347,6 @@ function floatingToolbarPluginFactory(options) {
   };
   var apply = function apply(tr, pluginState) {
     var newPluginState = _objectSpread({}, pluginState);
-    dispatch(pluginKey, newPluginState);
     return newPluginState;
   };
   return new SafePlugin({

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

@@ -30,13 +30,13 @@ export default (function () {
 /**
  * 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, {
+export 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.
@@ -55,7 +55,9 @@ export function checkShouldForceFocusAndApply(view) {
           inline: 'nearest'
         });
         focusableElement.focus();
-        forceFocusSelector(null, view);
+        var tr = view.state.tr,
+          dispatch = view.dispatch;
+        dispatch(forceFocusSelector(null)(tr));
       }
     }
   }

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

@@ -102,25 +102,32 @@ export var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
     extensions = _useState2[0],
     setExtensions = _useState2[1];
   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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        var provider;
         return _regeneratorRuntime.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/esm/plugins/floating-toolbar/ui/Toolbar.js

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

package/dist/esm/plugins/index.js

@@ -37,7 +37,6 @@ export { default as statusPlugin } from './status';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as editorDisabledPlugin } from './editor-disabled';
 export { default as fragmentMarkPlugin } from './fragment';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';

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

@@ -54,7 +54,9 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
       closeMediaAltTextMenu(view.state, view.dispatch);
     });
     _defineProperty(_assertThisInitialized(_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,
@@ -62,6 +64,7 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
       view.someProp('handleKeyDown', function (fn) {
         return fn(view, event);
       });
+      onEscape === null || onEscape === void 0 ? void 0 : onEscape();
     });
     _defineProperty(_assertThisInitialized(_this), "updateAltText", function (newAltText) {
       var view = _this.props.view;

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

@@ -9,7 +9,6 @@ import AltTextEdit from '../pm-plugins/alt-text/ui/AltTextEdit';
 import { CONTAINER_WIDTH_IN_PX } from '../pm-plugins/alt-text/ui/AltTextEdit';
 import { getMediaNodeFromSelection } from '../utils/media-common';
 import { ClassNames } from '../pm-plugins/alt-text/style';
-import { withOuterListeners } from '@atlaskit/editor-common/ui';
 import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
 var testId = 'alt-text-edit-button';
 export var altTextButton = function altTextButton(intl, state) {
@@ -29,7 +28,6 @@ export var altTextButton = function altTextButton(intl, state) {
     })
   };
 };
-var AltTextEditWithListeners = withOuterListeners(AltTextEdit);
 export var altTextEditComponent = function altTextEditComponent(options) {
   return {
     type: 'custom',
@@ -46,15 +44,17 @@ export 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) {
-        forceFocusSelector("[data-testid=\"".concat(testId, "\"]"), view);
+      var handleEsc = function handleEsc() {
+        var tr = view.state.tr,
+          dispatch = view.dispatch;
+        dispatch(forceFocusSelector("[data-testid=\"".concat(testId, "\"]"))(tr));
       };
-      return /*#__PURE__*/React.createElement(AltTextEditWithListeners, {
+      return /*#__PURE__*/React.createElement(AltTextEdit, {
         view: view,
         key: idx,
         value: mediaNode.attrs.alt,
         altTextValidator: options && options.altTextValidator,
-        handleEscapeKeydown: handleEsc
+        onEscape: handleEsc
       });
     }
   };

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

@@ -64,7 +64,10 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
                 /** 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) {
                 setUrlToMedia(href, meta.inputMethod)(view.state, view.dispatch, view);

package/dist/esm/plugins/media/ui/MediaLinkingToolbar.js

@@ -26,8 +26,8 @@ import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { R400 } from '@atlaskit/theme/colors';
 import { INPUT_METHOD } from '../../analytics/types/enums';
 import { mediaLinkToolbarMessages } from './media-linking-toolbar-messages';
-var validationWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  line-height: 0;\n  padding: 12px 24px 12px 0;\n  margin: 0 4px 0 32px;\n  border-top: 1px solid ", ";\n  align-items: start;\n  display: flex;\n  flex-direction: column;\n"])), "var(--ds-border-danger, ".concat(R400, ")"));
-var buttonWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 4px 8px 4px 0px;\n"])));
+var validationWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  line-height: 0;\n  padding: ", " ", "\n    ", " 0;\n  margin: 0 ", " 0 ", ";\n  border-top: 1px solid ", ";\n  align-items: start;\n  display: flex;\n  flex-direction: column;\n"])), "var(--ds-space-150, 12px)", "var(--ds-space-300, 24px)", "var(--ds-space-150, 12px)", "var(--ds-space-050, 4px)", "var(--ds-space-400, 32px)", "var(--ds-border-danger, ".concat(R400, ")"));
+var buttonWrapper = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: ", " ", "\n    ", " 0px;\n"])), "var(--ds-space-050, 4px)", "var(--ds-space-100, 8px)", "var(--ds-space-050, 4px)");
 export var LinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(LinkAddToolbar, _React$PureComponent);
   var _super = _createSuper(LinkAddToolbar);

package/dist/esm/plugins/media/utils/media-common.js

@@ -1,7 +1,7 @@
 import { deleteSelection, splitBlock } from '@atlaskit/editor-prosemirror/commands';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
-import { createParagraphNear, createNewParagraphBelow } from '../../../commands';
+import { createParagraphNear, createNewParagraphBelow } from '@atlaskit/editor-common/utils';
 import { isTemporary } from '../../../utils';
 import { mapSlice } from '../../../utils/slice';
 import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '../../../utils/dom';

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -7,7 +7,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { uuid } from '@atlaskit/adf-schema';
-import { filterCommand as filter, isEmptySelectionAtStart, deleteEmptyParagraphAndMoveBlockUp, isEmptySelectionAtEnd } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter, isEmptySelectionAtStart, isEmptySelectionAtEnd, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';

package/dist/esm/plugins/undo-redo/pm-plugins/keymaps.js

@@ -1,5 +1,5 @@
 import * as keymaps from '../../../keymaps';
-import { keymap } from '../../../utils/keymap';
+import { keymap } from '@atlaskit/editor-common/keymaps';
 import { redoFromKeyboard, undoFromKeyboard } from '../commands';
 export function keymapPlugin() {
   var list = {};

package/dist/esm/ui/ColorPickerButton/index.js

@@ -34,6 +34,7 @@ var colorPickerWrapper = function colorPickerWrapper(theme) {
 };
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
+var ColorPaletteWithListeners = withOuterListeners(ColorPalette);
 var ColorPickerButton = function ColorPickerButton(props) {
   var buttonRef = React.useRef(null);
   var _React$useState = React.useState(false),
@@ -75,7 +76,6 @@ var ColorPickerButton = function ColorPickerButton(props) {
     setIsPopupPositioned(true);
     return position;
   }, []);
-  var ColorPaletteWithListeners = withOuterListeners(ColorPalette);
   var onChange = props.onChange,
     createAnalyticsEvent = props.createAnalyticsEvent,
     colorPalette = props.colorPalette,
@@ -163,8 +163,8 @@ var ColorPickerButton = function ColorPickerButton(props) {
   var currentColor = props.currentColor && props.hexToPaletteColor ? props.hexToPaletteColor(props.currentColor) : props.currentColor;
   var buttonStyle = function buttonStyle(theme) {
     var _props$size, _props$size2, _props$size3;
-    return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    padding: 0 10px;\n    background-color: ", ";\n    ", "\n    &:before {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      align-self: center;\n      content: '';\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      background-color: ", ";\n      width: ", ";\n      height: ", ";\n      padding: 0;\n      margin: 0px 2px;\n    }\n    &:hover {\n      background: ", ";\n    }\n  "])), "var(--ds-background-neutral-subtle, transparent)", /* If custom props size height, override the button base height property */
-    !!((_props$size = props.size) !== null && _props$size !== void 0 && _props$size.height) && "height: inherit;", DEFAULT_BORDER_COLOR, borderRadius(), currentColor || 'transparent', ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || '14px', ((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || '14px', themed({
+    return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    padding: 0 10px;\n    background-color: ", ";\n    ", "\n    &:before {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      align-self: center;\n      content: '';\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      background-color: ", ";\n      width: ", ";\n      height: ", ";\n      padding: 0;\n      margin: 0px ", ";\n    }\n    &:hover {\n      background: ", ";\n    }\n  "])), "var(--ds-background-neutral-subtle, transparent)", /* If custom props size height, override the button base height property */
+    !!((_props$size = props.size) !== null && _props$size !== void 0 && _props$size.height) && "height: inherit;", DEFAULT_BORDER_COLOR, borderRadius(), currentColor || 'transparent', ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || '14px', ((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || '14px', "var(--ds-space-025, 2px)", themed({
       light: "var(--ds-background-neutral-subtle-hovered, ".concat(N30A, ")"),
       dark: "var(--ds-background-neutral-subtle-hovered, ".concat(N30A, ")")
     })(theme));

package/dist/esm/ui/styles.js

@@ -1,10 +1,7 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2;
 import { css } from '@emotion/react';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export var wrapperSmallStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin-left: ", ";\n  min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
-export var expandIconWrapperStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));
-export var buttonContentStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  min-width: 80px;\n  align-items: center;\n  overflow: hidden;\n  justify-content: center;\n  flex-direction: column;\n  padding: ", ";\n"])), "var(--ds-space-075, 6px)");
-export var buttonContentReducedSpacingStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  padding: ", ";\n"])), "var(--ds-space-100, 8px)");
-export var clickSelectWrapperStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  user-select: all;\n"])));
+export var expandIconWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));
+export var clickSelectWrapperStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  user-select: all;\n"])));