@atlaskit/editor-core 184.0.0 → 185.0.0

package/dist/cjs/plugins/expand/toolbar.js

@@ -8,48 +8,49 @@ exports.getToolbarConfig = void 0;
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _messages = _interopRequireDefault(require("../../messages"));
 var _commands = require("./commands");
-var _decoration = require("../base/pm-plugins/decoration");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
-var getToolbarConfig = function getToolbarConfig(state, _ref) {
-  var formatMessage = _ref.formatMessage;
-  var _getPluginState = (0, _pluginFactory.getPluginState)(state),
-    expandRef = _getPluginState.expandRef;
-  if (expandRef) {
-    var _state$schema$nodes = state.schema.nodes,
-      nestedExpand = _state$schema$nodes.nestedExpand,
-      expand = _state$schema$nodes.expand;
-    return {
-      title: 'Expand toolbar',
-      getDomRef: function getDomRef() {
-        return expandRef;
-      },
-      nodeType: [nestedExpand, expand],
-      offset: [0, 6],
-      items: [{
-        type: 'copy-button',
+var getToolbarConfig = function getToolbarConfig(hoverDecoration) {
+  return function (state, _ref) {
+    var formatMessage = _ref.formatMessage;
+    var _getPluginState = (0, _pluginFactory.getPluginState)(state),
+      expandRef = _getPluginState.expandRef;
+    if (expandRef) {
+      var _state$schema$nodes = state.schema.nodes,
+        nestedExpand = _state$schema$nodes.nestedExpand,
+        expand = _state$schema$nodes.expand;
+      return {
+        title: 'Expand toolbar',
+        getDomRef: function getDomRef() {
+          return expandRef;
+        },
+        nodeType: [nestedExpand, expand],
+        offset: [0, 6],
         items: [{
-          state: state,
-          formatMessage: formatMessage,
-          nodeType: [nestedExpand, expand]
+          type: 'copy-button',
+          items: [{
+            state: state,
+            formatMessage: formatMessage,
+            nodeType: [nestedExpand, expand]
+          }, {
+            type: 'separator'
+          }]
         }, {
-          type: 'separator'
+          id: 'editor.expand.delete',
+          type: 'button',
+          appearance: 'danger',
+          focusEditoronEnter: true,
+          icon: _remove.default,
+          onClick: (0, _commands.deleteExpand)(),
+          onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration([nestedExpand, expand], true),
+          onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration([nestedExpand, expand], false),
+          onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration([nestedExpand, expand], true),
+          onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration([nestedExpand, expand], false),
+          title: formatMessage(_messages.default.remove),
+          tabIndex: null
         }]
-      }, {
-        id: 'editor.expand.delete',
-        type: 'button',
-        appearance: 'danger',
-        focusEditoronEnter: true,
-        icon: _remove.default,
-        onClick: (0, _commands.deleteExpand)(),
-        onMouseEnter: (0, _decoration.hoverDecoration)([nestedExpand, expand], true),
-        onMouseLeave: (0, _decoration.hoverDecoration)([nestedExpand, expand], false),
-        onFocus: (0, _decoration.hoverDecoration)([nestedExpand, expand], true),
-        onBlur: (0, _decoration.hoverDecoration)([nestedExpand, expand], false),
-        title: formatMessage(_messages.default.remove),
-        tabIndex: null
-      }]
-    };
-  }
-  return;
+      };
+    }
+    return;
+  };
 };
 exports.getToolbarConfig = getToolbarConfig;

package/dist/cjs/plugins/extension/index.js

@@ -54,7 +54,7 @@ var extensionPlugin = function extensionPlugin() {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(options.breakoutEnabled),
+      floatingToolbar: (0, _toolbar.getToolbarConfig)(options.breakoutEnabled, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
       contextPanel: (0, _contextPanel.getContextPanel)(options.allowAutoSave, featureFlags)
     }
   };

package/dist/cjs/plugins/extension/toolbar.js

@@ -14,7 +14,6 @@ var _mediaFullWidth = _interopRequireDefault(require("@atlaskit/icon/glyph/edito
 var _mediaWide = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-wide"));
 var _mediaCenter = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-center"));
 var _messages = _interopRequireDefault(require("../../messages"));
-var _decoration = require("../base/pm-plugins/decoration");
 var _actions = require("./actions");
 var _main = require("./pm-plugins/main");
 var _utils = require("./utils");
@@ -122,6 +121,7 @@ var editButton = function editButton(formatMessage, extensionState) {
 };
 var getToolbarConfig = function getToolbarConfig() {
   var breakoutEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
   return function (state, intl) {
     var formatMessage = intl.formatMessage;
     var extensionState = (0, _main.getPluginState)(state);
@@ -181,10 +181,10 @@ var getToolbarConfig = function getToolbarConfig() {
           icon: _remove.default,
           appearance: 'danger',
           onClick: (0, _commands.removeExtension)(),
-          onMouseEnter: (0, _decoration.hoverDecoration)(nodeType, true),
-          onMouseLeave: (0, _decoration.hoverDecoration)(nodeType, false),
-          onFocus: (0, _decoration.hoverDecoration)(nodeType, true),
-          onBlur: (0, _decoration.hoverDecoration)(nodeType, false),
+          onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+          onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
+          onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+          onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
           focusEditoronEnter: true,
           title: formatMessage(_messages.default.remove),
           tabIndex: null,

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

@@ -201,7 +201,7 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
             return null;
           }
           var customPositionCalculation;
-          var toolbarItems = (0, _toolbar.processCopyButtonItems)(editorView.state)(Array.isArray(items) ? items : items(node));
+          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);
@@ -259,7 +259,8 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             extensionsProvider: extensionsState === null || extensionsState === void 0 ? void 0 : extensionsState.extensionProvider,
             scrollable: scrollable,
-            featureFlags: featureFlags
+            featureFlags: featureFlags,
+            api: api
           })), /*#__PURE__*/_react.default.createElement(_ConfirmationModal.ConfirmationModal, {
             testId: "ak-floating-toolbar-confirmation-modal",
             options: confirmDialogOptions,

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

@@ -36,7 +36,6 @@ var _EmojiPickerButton = require("./EmojiPickerButton");
 var _announcer = _interopRequireDefault(require("../../../utils/announcer/announcer"));
 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");
@@ -378,15 +377,14 @@ var Toolbar = /*#__PURE__*/function (_Component) {
     value: function resetStyling(_ref4) {
       var table = _ref4.table;
       if (this.props.editorView) {
+        var _this$props$api;
         var _this$props$editorVie2 = this.props.editorView,
           state = _this$props$editorVie2.state,
           dispatch = _this$props$editorVie2.dispatch;
         if (table) {
           return (0, _commands2.clearHoverSelection)()(state, dispatch);
         }
-        dispatch(state.tr.setMeta(_decoration.decorationStateKey, {
-          action: _decoration.ACTIONS.DECORATION_REMOVE
-        }));
+        (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : _this$props$api.dependencies.decorations.actions.removeDecoration(state, dispatch);
       }
     }
   }, {

package/dist/cjs/plugins/layout/index.js

@@ -17,11 +17,12 @@ var _main = _interopRequireDefault(require("./pm-plugins/main"));
 var _toolbar = require("./toolbar");
 var _actions = require("./actions");
 var _assets = require("../quick-insert/assets");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var layoutPlugin = function layoutPlugin() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var api = arguments.length > 1 ? arguments[1] : undefined;
   return {
     name: 'layout',
     nodes: function nodes() {
@@ -49,7 +50,8 @@ var layoutPlugin = function layoutPlugin() {
           addSidebarLayouts = _ref.addSidebarLayouts,
           allowSingleColumnLayout = _ref.allowSingleColumnLayout;
         if (pos !== null) {
-          return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout);
+          var _api$dependencies$dec;
+          return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api === null || api === void 0 ? void 0 : (_api$dependencies$dec = api.dependencies.decorations.actions) === null || _api$dependencies$dec === void 0 ? void 0 : _api$dependencies$dec.hoverDecoration);
         }
         return undefined;
       },
@@ -65,8 +67,9 @@ var layoutPlugin = function layoutPlugin() {
             return /*#__PURE__*/_react.default.createElement(_assets.IconLayout, null);
           },
           action: function action(insert, state) {
+            var _api$dependencies$ana, _api$dependencies$ana2;
             var tr = insert((0, _actions.createDefaultLayoutSection)(state));
-            return (0, _analytics.addAnalytics)(state, tr, {
+            api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : (_api$dependencies$ana2 = _api$dependencies$ana.actions) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.attachAnalyticsEvent({
               action: _analytics.ACTION.INSERTED,
               actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
@@ -74,7 +77,8 @@ var layoutPlugin = function layoutPlugin() {
                 inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
               },
               eventType: _analytics.EVENT_TYPE.TRACK
-            });
+            })(tr);
+            return tr;
           }
         }];
       }

package/dist/cjs/plugins/layout/toolbar.js

@@ -17,7 +17,6 @@ var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove
 var _toolbarMessages = require("./toolbar-messages");
 var _messages = _interopRequireDefault(require("../../messages"));
 var _actions = require("./actions");
-var _decoration = require("../base/pm-plugins/decoration");
 var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
@@ -65,7 +64,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout) {
 };
 var layoutToolbarTitle = 'Layout floating controls';
 exports.layoutToolbarTitle = layoutToolbarTitle;
-var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) {
+var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) {
   var node = state.doc.nodeAt(pos);
   if (node) {
     var currentLayout = (0, _actions.getPresetLayout)(node);
@@ -82,10 +81,10 @@ var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSi
       testId: _messages.default.remove.id,
       title: intl.formatMessage(_messages.default.remove),
       onClick: _actions.deleteActiveLayoutNode,
-      onMouseEnter: (0, _decoration.hoverDecoration)(nodeType, true),
-      onMouseLeave: (0, _decoration.hoverDecoration)(nodeType, false),
-      onFocus: (0, _decoration.hoverDecoration)(nodeType, true),
-      onBlur: (0, _decoration.hoverDecoration)(nodeType, false),
+      onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+      onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
+      onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+      onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       tabIndex: null
     };
     var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;

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

@@ -15,7 +15,6 @@ var _download = _interopRequireDefault(require("@atlaskit/icon/glyph/download"))
 var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
 var _messages = _interopRequireDefault(require("../../../messages"));
 var _pluginKey = require("../pm-plugins/plugin-key");
-var _decoration = require("../../base/pm-plugins/decoration");
 var _linking = require("./linking");
 var _MediaAndEmbedsToolbar = _interopRequireDefault(require("../../../ui/MediaAndEmbedsToolbar"));
 var _linking2 = require("../pm-plugins/linking");
@@ -23,7 +22,7 @@ var _altText = require("../pm-plugins/alt-text");
 var _altText2 = require("./alt-text");
 var _linking3 = require("../commands/linking");
 var _linkingToolbarAppearance = require("./linking-toolbar-appearance");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _mediaUi = require("@atlaskit/media-ui");
 var _messages2 = require("../../card/messages");
 var _filePreviewItem = require("./filePreviewItem");
@@ -48,7 +47,7 @@ var handleRemoveMediaGroup = function handleRemoveMediaGroup(state, dispatch) {
   }
   return true;
 };
-var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar(state, intl, mediaPluginState) {
+var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration) {
   var mediaGroup = state.schema.nodes.mediaGroup;
   var items = [{
     id: 'editor.media.view.switcher',
@@ -111,17 +110,17 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: _remove.default,
-    onMouseEnter: (0, _decoration.hoverDecoration)(mediaGroup, true),
-    onMouseLeave: (0, _decoration.hoverDecoration)(mediaGroup, false),
-    onFocus: (0, _decoration.hoverDecoration)(mediaGroup, true),
-    onBlur: (0, _decoration.hoverDecoration)(mediaGroup, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
     title: intl.formatMessage(_messages.default.remove),
     onClick: handleRemoveMediaGroup,
     testId: 'media-toolbar-remove-button'
   }];
   return items;
 };
-var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToolbar(state, intl, mediaPluginState) {
+var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration) {
   var mediaInline = state.schema.nodes.mediaInline;
   var items = [{
     id: 'editor.media.view.switcher',
@@ -184,17 +183,18 @@ var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToo
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: _remove.default,
-    onMouseEnter: (0, _decoration.hoverDecoration)(mediaInline, true),
-    onMouseLeave: (0, _decoration.hoverDecoration)(mediaInline, false),
-    onFocus: (0, _decoration.hoverDecoration)(mediaInline, true),
-    onBlur: (0, _decoration.hoverDecoration)(mediaInline, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
     title: intl.formatMessage(_messages.default.remove),
     onClick: _commands.removeInlineCard,
     testId: 'media-toolbar-remove-button'
   }];
   return items;
 };
-var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, widthPluginDependencyApi, getEditorFeatureFlags) {
+var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) {
+  var _pluginInjectionApi$d2;
   var mediaSingle = state.schema.nodes.mediaSingle;
   var allowResizing = options.allowResizing,
     allowLinking = options.allowLinking,
@@ -231,7 +231,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     });
   }
   if (allowAdvancedToolBarOptions) {
-    toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)((0, _MediaAndEmbedsToolbar.default)(state, intl, state.schema.nodes.mediaSingle, widthPluginDependencyApi, allowResizing, allowResizingInTables)));
+    toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)((0, _MediaAndEmbedsToolbar.default)(state, intl, state.schema.nodes.mediaSingle, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, allowResizing, allowResizingInTables)));
     if (toolbarButtons.length) {
       toolbarButtons.push({
         type: 'separator'
@@ -252,14 +252,16 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             };
             var openLink = function openLink() {
               if (editorView) {
-                var _state2 = editorView.state,
+                var _pluginInjectionApi$d;
+                var tr = editorView.state.tr,
                   dispatch = editorView.dispatch;
-                dispatch((0, _analytics.addAnalytics)(_state2, _state2.tr, {
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.attachAnalyticsEvent({
                   eventType: _analytics.EVENT_TYPE.TRACK,
                   action: _analytics.ACTION.VISITED,
                   actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
                   actionSubjectId: _analytics.ACTION_SUBJECT_ID.LINK
-                }));
+                })(tr);
+                dispatch(tr);
                 return true;
               }
             };
@@ -283,16 +285,18 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       type: 'separator'
     });
   }
+  var _ref = (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : {},
+    hoverDecoration = _ref.hoverDecoration;
   var removeButton = {
     id: 'editor.media.delete',
     type: 'button',
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: _remove.default,
-    onMouseEnter: (0, _decoration.hoverDecoration)(mediaSingle, true),
-    onMouseLeave: (0, _decoration.hoverDecoration)(mediaSingle, false),
-    onFocus: (0, _decoration.hoverDecoration)(mediaSingle, true),
-    onBlur: (0, _decoration.hoverDecoration)(mediaSingle, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
     title: intl.formatMessage(_messages.default.remove),
     onClick: remove,
     testId: 'media-toolbar-remove-button'
@@ -310,6 +314,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
   return items;
 };
 var floatingToolbar = function floatingToolbar(state, intl) {
+  var _pluginInjectionApi$d3;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var pluginInjectionApi = arguments.length > 3 ? arguments[3] : undefined;
   var _state$schema$nodes = state.schema.nodes,
@@ -325,6 +330,8 @@ var floatingToolbar = function floatingToolbar(state, intl) {
     getEditorFeatureFlags = options.getEditorFeatureFlags;
   var mediaPluginState = _pluginKey.stateKey.getState(state);
   var mediaLinkingState = (0, _linking2.getMediaLinkingState)(state);
+  var _ref2 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
+    hoverDecoration = _ref2.hoverDecoration;
   if (!mediaPluginState) {
     return;
   }
@@ -363,21 +370,21 @@ var floatingToolbar = function floatingToolbar(state, intl) {
       var selector = (0, _mediaFilmstrip.mediaFilmstripItemDOMSelector)(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
       var element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(".".concat(_styles.MediaInlineNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
   } else {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele3;
       var element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(".".concat(_styles.MediaSingleNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, getEditorFeatureFlags);
+    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags);
   }
   return _objectSpread(_objectSpread({}, baseToolbar), {}, {
     items: items,

package/dist/cjs/plugins/panel/index.js

@@ -36,6 +36,7 @@ var insertPanelType = function insertPanelType(panelAttributes, state) {
 };
 var panelPlugin = function panelPlugin() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var api = arguments.length > 1 ? arguments[1] : undefined;
   return {
     name: 'panel',
     nodes: function nodes() {
@@ -156,7 +157,7 @@ var panelPlugin = function panelPlugin() {
         return quickInsertOptions;
       },
       floatingToolbar: function floatingToolbar(state, intl, providerFactory) {
-        return (0, _toolbar.getToolbarConfig)(state, intl, options, providerFactory);
+        return (0, _toolbar.getToolbarConfig)(state, intl, options, providerFactory, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration);
       }
     }
   };

package/dist/cjs/plugins/panel/toolbar.js

@@ -15,7 +15,6 @@ var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/error")
 var _removeEmoji = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove-emoji"));
 var _messages = _interopRequireDefault(require("../../messages"));
 var _actions = require("./actions");
-var _decoration = require("../base/pm-plugins/decoration");
 var _panelBackgroundPalette = require("../../ui/ColorPalette/Palettes/panelBackgroundPalette");
 var _panel = require("@atlaskit/editor-common/panel");
 var _utils = require("./utils");
@@ -47,7 +46,7 @@ var panelIconMap = (_panelIconMap = {}, (0, _defineProperty2.default)(_panelIcon
   id: 'atlassian-tip'
 }), _panelIconMap);
 exports.panelIconMap = panelIconMap;
-var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon, state) {
+var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, hoverDecoration, activePanelType, activePanelColor, activePanelIcon, state) {
   // TODO: ED-14403 investigate why these titles are not getting translated for the tooltips
   var items = [{
     id: 'editor.panel.info',
@@ -250,10 +249,10 @@ var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isC
     focusEditoronEnter: true,
     icon: _remove.default,
     onClick: (0, _actions.removePanel)(),
-    onMouseEnter: (0, _decoration.hoverDecoration)(panelNodeType, true),
-    onMouseLeave: (0, _decoration.hoverDecoration)(panelNodeType, false),
-    onFocus: (0, _decoration.hoverDecoration)(panelNodeType, true),
-    onBlur: (0, _decoration.hoverDecoration)(panelNodeType, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
     title: formatMessage(_messages.default.remove),
     tabIndex: null
   });
@@ -263,6 +262,7 @@ exports.getToolbarItems = getToolbarItems;
 var getToolbarConfig = function getToolbarConfig(state, intl) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var providerFactory = arguments.length > 3 ? arguments[3] : undefined;
+  var hoverDecoration = arguments.length > 4 ? arguments[4] : undefined;
   var formatMessage = intl.formatMessage;
   var panelObject = (0, _utils.findPanel)(state);
   if (panelObject) {
@@ -276,7 +276,7 @@ var getToolbarConfig = function getToolbarConfig(state, intl) {
     };
 
     // force toolbar to be turned on
-    var items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
+    var items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, hoverDecoration, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
     var getDomRef = function getDomRef(editorView) {
       var domAtPos = editorView.domAtPos.bind(editorView);
       var element = (0, _prosemirrorUtils.findDomRefAtPos)(panelObject.pos, domAtPos);

package/dist/cjs/plugins/placeholder-text/index.js

@@ -18,7 +18,7 @@ var _PlaceholderFloatingToolbar = _interopRequireDefault(require("./ui/Placehold
 var _actions = require("./actions");
 var _placeholderTextNodeview = require("./placeholder-text-nodeview");
 var _pluginKey = require("./plugin-key");
-var _analytics = require("../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _selectionUtils = require("./selection-utils");
 var _api = require("../type-ahead/api");
@@ -194,7 +194,7 @@ var basePlaceholderTextPlugin = function basePlaceholderTextPlugin(options) {
     }
   };
 };
-var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options) {
+var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, options, api) {
   if (!options.allowInserting) {
     return plugin;
   }
@@ -213,11 +213,12 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
           });
         },
         action: function action(insert, state) {
+          var _api$dependencies$ana;
           var tr = state.tr;
           tr.setMeta(_pluginKey.pluginKey, {
             showInsertPanelAt: tr.selection.anchor
           });
-          return (0, _analytics.addAnalytics)(state, tr, {
+          api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions.attachAnalyticsEvent({
             action: _analytics.ACTION.INSERTED,
             actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
             actionSubjectId: _analytics.ACTION_SUBJECT_ID.PLACEHOLDER_TEXT,
@@ -225,7 +226,8 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
             },
             eventType: _analytics.EVENT_TYPE.TRACK
-          });
+          })(tr);
+          return tr;
         }
       }];
     }
@@ -233,7 +235,7 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
   return plugin;
 };
 var placeholderTextPlugin = function placeholderTextPlugin(options, api) {
-  return decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options);
+  return decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options, api);
 };
 var _default = placeholderTextPlugin;
 exports.default = _default;

package/dist/cjs/plugins/type-ahead/ui/TypeAheadPopup.js

@@ -181,6 +181,25 @@ var TypeAheadPopup = /*#__PURE__*/_react.default.memo(function (props) {
       element === null || element === void 0 ? void 0 : element.removeEventListener('focusout', focusOut);
     };
   }, [ref, cancel]);
+
+  // ED-17443 When you press escape on typeahead panel, it should remove focus and close the panel
+  // This is the expected keyboard behaviour advised by the Accessibility team
+  (0, _react.useLayoutEffect)(function () {
+    var escape = function escape(event) {
+      if (event.key === 'Escape') {
+        cancel({
+          addPrefixTrigger: true,
+          setSelectionAt: _constants2.CloseSelectionOptions.AFTER_TEXT_INSERTED,
+          forceFocusOnEditor: true
+        });
+      }
+    };
+    var element = ref.current;
+    element === null || element === void 0 ? void 0 : element.addEventListener('keydown', escape);
+    return function () {
+      element === null || element === void 0 ? void 0 : element.removeEventListener('keydown', escape);
+    };
+  }, [ref, cancel]);
   return (0, _react2.jsx)(_ui.Popup, {
     zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
     target: anchorElement,

package/dist/cjs/ui/CollapsedEditor/index.js

@@ -16,7 +16,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _react = _interopRequireDefault(require("react"));
 var _editor = _interopRequireDefault(require("../../editor"));
 var _editorNext = _interopRequireDefault(require("../../editor-next"));
-var _editorMigrationComponent = _interopRequireDefault(require("../../editor-next/editor-migration-component"));
 var _EditorWithActions = _interopRequireDefault(require("../../labs/EditorWithActions"));
 var _ChromeCollapsed = _interopRequireDefault(require("../ChromeCollapsed"));
 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); }; }
@@ -53,7 +52,7 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
       var child = _react.default.Children.only(this.props.children);
-      if (child.type !== _editor.default && child.type !== _EditorWithActions.default && child.type !== _editorNext.default && child.type !== _editorMigrationComponent.default) {
+      if (child.type !== _editor.default && child.type !== _EditorWithActions.default && child.type !== _editorNext.default) {
         throw new Error('Expected child to be of type `Editor`');
       }
       if (!this.props.isExpanded) {

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

@@ -166,8 +166,8 @@ var ColorPickerButton = function ColorPickerButton(props) {
   };
   var title = props.title || '';
   var currentColor = props.currentColor && props.hexToPaletteColor ? props.hexToPaletteColor(props.currentColor) : props.currentColor;
-  var buttonStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    padding: 6px;\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: ", "px;\n      height: ", "px;\n      padding: 0;\n    }\n  "])), "var(--ds-background-neutral, 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;", _common.DEFAULT_BORDER_COLOR, (0, _constants.borderRadius)(), currentColor || 'transparent', ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || 14, ((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || 14);
+  var buttonStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    padding: 6px;\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    }\n  "])), "var(--ds-background-neutral, 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;", _common.DEFAULT_BORDER_COLOR, (0, _constants.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');
   return (0, _react2.jsx)("div", {
     css: colorPickerButtonWrapper
   }, (0, _react2.jsx)(_tooltip.default, {