@atlaskit/editor-core 184.0.0 → 185.0.0

package/dist/esm/plugins/card/nodeviews/blockCard.js

@@ -61,6 +61,12 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         contentEditable: true
       });
     });
+    _defineProperty(_assertThisInitialized(_this), "onError", function (_ref) {
+      var err = _ref.err;
+      if (err) {
+        throw err;
+      }
+    });
     return _this;
   }
   _createClass(BlockCardComponent, [{
@@ -89,6 +95,7 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         appearance: "block",
         onClick: this.onClick,
         onResolve: this.onResolve,
+        onError: this.onError,
         showActions: platform === 'web',
         platform: platform,
         showServerActions: showServerActions

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -233,6 +233,12 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       });
       _this.saveOriginalDimensionsAttributes(height, undefined);
     });
+    _defineProperty(_assertThisInitialized(_this), "onError", function (_ref2) {
+      var err = _ref2.err;
+      if (err) {
+        throw err;
+      }
+    });
     return _this;
   }
   _createClass(EmbedCardComponent, [{
@@ -287,6 +293,7 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         appearance: "embed",
         onClick: this.onClick,
         onResolve: this.onResolve,
+        onError: this.onError,
         showActions: platform === 'web',
         isFrameVisible: true,
         inheritDimensions: true,

package/dist/esm/plugins/card/nodeviews/inlineCard.js

@@ -46,7 +46,11 @@ export var InlineCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       })();
     });
     _defineProperty(_assertThisInitialized(_this), "onError", function (data) {
-      var url = data.url;
+      var url = data.url,
+        err = data.err;
+      if (err) {
+        throw err;
+      }
       _this.onResolve({
         url: url
       });

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -6,8 +6,7 @@ import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE } from '@atlaskit/editor-common/analytics';
 import { nodesBetweenChanged, processRawValue } from '../../../utils';
 import { unlinkPayload } from '../../../utils/linking-utils';
 import { isFromCurrentDomain, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';

package/dist/esm/plugins/card/toolbar.js

@@ -9,8 +9,8 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
-import { linkToolbarMessages, linkMessages } from '../../messages';
-import commonMessages from '../../messages';
+import { linkToolbarMessages } from '../../messages';
+import commonMessages, { linkMessages } from '@atlaskit/editor-common/messages';
 import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
@@ -163,7 +163,7 @@ var withToolbarMetadata = function withToolbarMetadata(command) {
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.analytics) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
@@ -181,7 +181,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     }
     var pluginState = pluginKey.getState(state);
     var currentAppearance = appearanceForNodeType(node.type);
-    var hoverDecoration = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.base) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions.hoverDecoration;
+    var _ref2 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.decorations) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
+      hoverDecoration = _ref2.hoverDecoration;
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -238,8 +239,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$d5;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.width, cardOptions);
+        var _pluginInjectionApi$d6;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.width, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'

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

@@ -13,8 +13,8 @@ import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import PropTypes from 'prop-types';
 import { Fragment } from 'prosemirror-model';
 import React from 'react';
-import nodeNames from '../../../messages';
-import { isSupportedInParent } from '../../../utils/nodes';
+import nodeNames from '@atlaskit/editor-common/messages';
+import { isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { messages } from '../messages';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugins/doc';

package/dist/esm/plugins/code-block/index.js

@@ -8,11 +8,11 @@ import { getToolbarConfig } from './toolbar';
 import keymap from './pm-plugins/keymaps';
 import ideUX from './pm-plugins/ide-ux';
 import { codeBlockCopySelectionPlugin } from './pm-plugins/codeBlockCopySelectionPlugin';
-import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { IconCode } from '../quick-insert/assets';
 import { messages } from '../block-type/messages';
 import refreshBrowserSelectionOnChange from './refresh-browser-selection';
-var codeBlockPlugin = function codeBlockPlugin(options) {
+var codeBlockPlugin = function codeBlockPlugin(options, api) {
   return {
     name: 'codeBlock',
     nodes: function nodes() {
@@ -68,9 +68,10 @@ var codeBlockPlugin = function codeBlockPlugin(options) {
             return /*#__PURE__*/React.createElement(IconCode, null);
           },
           action: function action(insert, state) {
+            var _api$dependencies$ana;
             var schema = state.schema;
             var tr = insert(schema.nodes.codeBlock.createChecked());
-            return 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: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
@@ -78,11 +79,12 @@ var codeBlockPlugin = function codeBlockPlugin(options) {
                 inputMethod: INPUT_METHOD.QUICK_INSERT
               },
               eventType: EVENT_TYPE.TRACK
-            });
+            })(tr);
+            return tr;
           }
         }];
       },
-      floatingToolbar: getToolbarConfig(options.allowCopyToClipboard)
+      floatingToolbar: getToolbarConfig(options.allowCopyToClipboard, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration)
     }
   };
 };

package/dist/esm/plugins/code-block/toolbar.js

@@ -6,7 +6,6 @@ import { removeCodeBlock, changeLanguage, copyContentToClipboard, resetCopiedSta
 import commonMessages from '../../messages';
 import { codeBlockButtonMessages } from '@atlaskit/editor-common/messages';
 import { provideVisualFeedbackForCopyButton, removeVisualFeedbackForCopyButton } from './pm-plugins/codeBlockCopySelectionPlugin';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { pluginKey } from './plugin-key';
 import { createLanguageList, getLanguageIdentifier, DEFAULT_LANGUAGES } from './language-list';
 export var messages = defineMessages({
@@ -19,6 +18,7 @@ export var messages = defineMessages({
 var languageList = createLanguageList(DEFAULT_LANGUAGES);
 export var getToolbarConfig = function getToolbarConfig() {
   var allowCopyToClipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
   return function (state, _ref) {
     var _codeBlockState$pos, _node$attrs;
     var formatMessage = _ref.formatMessage;
@@ -86,10 +86,10 @@ export var getToolbarConfig = function getToolbarConfig() {
       type: 'button',
       appearance: 'danger',
       icon: RemoveIcon,
-      onMouseEnter: hoverDecoration(nodeType, true),
-      onMouseLeave: hoverDecoration(nodeType, false),
-      onFocus: hoverDecoration(nodeType, true),
-      onBlur: 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),
       onClick: removeCodeBlock,
       title: formatMessage(commonMessages.remove),
       tabIndex: null

package/dist/esm/plugins/copy-button/commands.js

@@ -1,5 +1,4 @@
 import { copyButtonPluginKey } from './pm-plugins/plugin-key';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { NodeSelection } from 'prosemirror-state';
 import { copyHTMLToClipboard, copyHTMLToClipboardPolyfill } from '../../utils/clipboard';
 import { getSelectedNodeOrNodeParentByNodeType, toDOM } from './utils';
@@ -135,7 +134,7 @@ export var createToolbarCopyCommandForNode = function createToolbarCopyCommandFo
     return true;
   };
 };
-export var resetCopiedState = function resetCopiedState(nodeType, onMouseLeave) {
+export var resetCopiedState = function resetCopiedState(nodeType, hoverDecoration, onMouseLeave) {
   return function (state, dispatch) {
     var customTr = state.tr;
 
@@ -144,7 +143,7 @@ export var resetCopiedState = function resetCopiedState(nodeType, onMouseLeave)
     var customDispatch = function customDispatch(tr) {
       customTr = tr;
     };
-    onMouseLeave ? onMouseLeave(state, customDispatch) : hoverDecoration(nodeType, false)(state, customDispatch);
+    onMouseLeave ? onMouseLeave(state, customDispatch) : hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false)(state, customDispatch);
     var copyButtonState = copyButtonPluginKey.getState(state);
     if (copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied) {
       customTr.setMeta(copyButtonPluginKey, {

package/dist/esm/plugins/copy-button/toolbar.js

@@ -3,7 +3,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import CopyIcon from '@atlaskit/icon/glyph/copy';
 import commonMessages from '../../messages';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { createToolbarCopyCommandForNode, createToolbarCopyCommandForMark, resetCopiedState, getProvideMarkVisualFeedbackForCopyButtonCommand, removeMarkVisualFeedbackForCopyButtonCommand } from './commands';
 import { copyButtonPluginKey } from './pm-plugins/plugin-key';
 function isSeparator(item) {
@@ -12,7 +11,7 @@ function isSeparator(item) {
 function isNodeOptions(options) {
   return 'nodeType' in options && options.nodeType !== undefined;
 }
-export function getCopyButtonConfig(options) {
+export function getCopyButtonConfig(options, hoverDecoration) {
   var state = options.state,
     formatMessage = options.formatMessage,
     onMouseEnter = options.onMouseEnter,
@@ -26,12 +25,12 @@ export function getCopyButtonConfig(options) {
       onClick: createToolbarCopyCommandForNode(options.nodeType),
       // Note for future changes: these two handlers should perform
       // the same action.
-      onMouseEnter: onMouseEnter || hoverDecoration(options.nodeType, true, 'ak-editor-selected-node'),
-      onFocus: onFocus || hoverDecoration(options.nodeType, true, 'ak-editor-selected-node'),
+      onMouseEnter: onMouseEnter || (hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(options.nodeType, true, 'ak-editor-selected-node')),
+      onFocus: onFocus || (hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(options.nodeType, true, 'ak-editor-selected-node')),
       // Note for future changes: these two handlers should perform
       // the same action.
-      onMouseLeave: resetCopiedState(options.nodeType, onMouseLeave),
-      onBlur: resetCopiedState(options.nodeType, onBlur)
+      onMouseLeave: resetCopiedState(options.nodeType, hoverDecoration, onMouseLeave),
+      onBlur: resetCopiedState(options.nodeType, hoverDecoration, onBlur)
     };
   } else {
     buttonActionHandlers = {
@@ -72,7 +71,7 @@ export var showCopyButton = function showCopyButton(state) {
  * else process copy button to standard floatingtoobarbutton
  */
 export function processCopyButtonItems(state) {
-  return function (items) {
+  return function (items, hoverDecoration) {
     return items.flatMap(function (item) {
       switch (item.type) {
         case 'copy-button':
@@ -80,7 +79,7 @@ export function processCopyButtonItems(state) {
             return [];
           }
           return item === null || item === void 0 ? void 0 : item.items.map(function (copyButtonItem) {
-            return isSeparator(copyButtonItem) ? copyButtonItem : getCopyButtonConfig(copyButtonItem);
+            return isSeparator(copyButtonItem) ? copyButtonItem : getCopyButtonConfig(copyButtonItem, hoverDecoration);
           });
         default:
           return [item];

package/dist/esm/plugins/expand/index.js

@@ -38,7 +38,7 @@ var expandPlugin = function expandPlugin() {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: getToolbarConfig,
+      floatingToolbar: getToolbarConfig(api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
       quickInsert: function quickInsert(_ref2) {
         var formatMessage = _ref2.formatMessage;
         if (options && options.allowInsertion !== true) {

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

@@ -1,47 +1,48 @@
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import commonMessages from '../../messages';
 import { deleteExpand } from './commands';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { getPluginState } from './pm-plugins/plugin-factory';
-export var getToolbarConfig = function getToolbarConfig(state, _ref) {
-  var formatMessage = _ref.formatMessage;
-  var _getPluginState = 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',
+export var getToolbarConfig = function getToolbarConfig(hoverDecoration) {
+  return function (state, _ref) {
+    var formatMessage = _ref.formatMessage;
+    var _getPluginState = 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: RemoveIcon,
+          onClick: 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(commonMessages.remove),
+          tabIndex: null
         }]
-      }, {
-        id: 'editor.expand.delete',
-        type: 'button',
-        appearance: 'danger',
-        focusEditoronEnter: true,
-        icon: RemoveIcon,
-        onClick: deleteExpand(),
-        onMouseEnter: hoverDecoration([nestedExpand, expand], true),
-        onMouseLeave: hoverDecoration([nestedExpand, expand], false),
-        onFocus: hoverDecoration([nestedExpand, expand], true),
-        onBlur: hoverDecoration([nestedExpand, expand], false),
-        title: formatMessage(commonMessages.remove),
-        tabIndex: null
-      }]
-    };
-  }
-  return;
+      };
+    }
+    return;
+  };
 };

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

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

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

@@ -7,7 +7,6 @@ import FullWidthIcon from '@atlaskit/icon/glyph/editor/media-full-width';
 import WideIcon from '@atlaskit/icon/glyph/editor/media-wide';
 import CenterIcon from '@atlaskit/icon/glyph/editor/media-center';
 import commonMessages from '../../messages';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { editExtension } from './actions';
 import { getPluginState } from './pm-plugins/main';
 import { getSelectedExtension } from './utils';
@@ -114,6 +113,7 @@ var editButton = function editButton(formatMessage, extensionState) {
 };
 export 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 = getPluginState(state);
@@ -173,10 +173,10 @@ export var getToolbarConfig = function getToolbarConfig() {
           icon: RemoveIcon,
           appearance: 'danger',
           onClick: removeExtension(),
-          onMouseEnter: hoverDecoration(nodeType, true),
-          onMouseLeave: hoverDecoration(nodeType, false),
-          onFocus: hoverDecoration(nodeType, true),
-          onBlur: 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(commonMessages.remove),
           tabIndex: null,

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

@@ -194,7 +194,7 @@ var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
             return null;
           }
           var customPositionCalculation;
-          var toolbarItems = processCopyButtonItems(editorView.state)(Array.isArray(items) ? items : items(node));
+          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);
@@ -252,7 +252,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.createElement(ConfirmationModal, {
             testId: "ak-floating-toolbar-confirmation-modal",
             options: confirmDialogOptions,

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

@@ -33,7 +33,6 @@ import { EmojiPickerButton } from './EmojiPickerButton';
 import Announcer from '../../../utils/announcer/announcer';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
-import { decorationStateKey, ACTIONS } from '../../base/pm-plugins/decoration';
 import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
 import ScrollButtons from './ScrollButtons';
 import { ToolbarArrowKeyNavigationProvider } from '../../../ui/ToolbarArrowKeyNavigationProvider';
@@ -367,15 +366,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 clearHoverSelection()(state, dispatch);
         }
-        dispatch(state.tr.setMeta(decorationStateKey, {
-          action: 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/esm/plugins/layout/index.js

@@ -4,12 +4,13 @@ import { default as createLayoutPlugin } from './pm-plugins/main';
 import { buildToolbar } from './toolbar';
 import { createDefaultLayoutSection } from './actions';
 import { IconLayout } from '../quick-insert/assets';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { pluginKey } from './pm-plugins/plugin-key';
 export { pluginKey };
 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() {
@@ -37,7 +38,8 @@ var layoutPlugin = function layoutPlugin() {
           addSidebarLayouts = _ref.addSidebarLayouts,
           allowSingleColumnLayout = _ref.allowSingleColumnLayout;
         if (pos !== null) {
-          return buildToolbar(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout);
+          var _api$dependencies$dec;
+          return 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;
       },
@@ -53,8 +55,9 @@ var layoutPlugin = function layoutPlugin() {
             return /*#__PURE__*/React.createElement(IconLayout, null);
           },
           action: function action(insert, state) {
+            var _api$dependencies$ana, _api$dependencies$ana2;
             var tr = insert(createDefaultLayoutSection(state));
-            return 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: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
@@ -62,7 +65,8 @@ var layoutPlugin = function layoutPlugin() {
                 inputMethod: INPUT_METHOD.QUICK_INSERT
               },
               eventType: EVENT_TYPE.TRACK
-            });
+            })(tr);
+            return tr;
           }
         }];
       }

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

@@ -10,7 +10,6 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { toolbarMessages } from './toolbar-messages';
 import commonMessages from '../../messages';
 import { setPresetLayout, deleteActiveLayoutNode, getPresetLayout } from './actions';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
@@ -57,7 +56,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout) {
   };
 };
 export var layoutToolbarTitle = 'Layout floating controls';
-export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) {
+export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) {
   var node = state.doc.nodeAt(pos);
   if (node) {
     var currentLayout = getPresetLayout(node);
@@ -74,10 +73,10 @@ export var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout
       testId: commonMessages.remove.id,
       title: intl.formatMessage(commonMessages.remove),
       onClick: deleteActiveLayoutNode,
-      onMouseEnter: hoverDecoration(nodeType, true),
-      onMouseLeave: hoverDecoration(nodeType, false),
-      onFocus: hoverDecoration(nodeType, true),
-      onBlur: 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;