@atlaskit/editor-core 184.0.4 → 185.0.2

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

@@ -228,6 +228,13 @@ export class EmbedCardComponent extends React.PureComponent {
       });
       this.saveOriginalDimensionsAttributes(height, undefined);
     });
+    _defineProperty(this, "onError", ({
+      err
+    }) => {
+      if (err) {
+        throw err;
+      }
+    });
   }
   UNSAFE_componentWillMount() {
     const {
@@ -282,6 +289,7 @@ export class EmbedCardComponent extends React.PureComponent {
       appearance: "embed",
       onClick: this.onClick,
       onResolve: this.onResolve,
+      onError: this.onError,
       showActions: platform === 'web',
       isFrameVisible: true,
       inheritDimensions: true,

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

@@ -33,8 +33,12 @@ export class InlineCardComponent extends React.PureComponent {
     });
     _defineProperty(this, "onError", data => {
       const {
-        url
+        url,
+        err
       } = data;
+      if (err) {
+        throw err;
+      }
       this.onResolve({
         url
       });

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

@@ -2,8 +2,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/es2019/plugins/card/toolbar.js

@@ -5,8 +5,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';
@@ -165,7 +165,7 @@ const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB
 });
 const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -186,7 +186,9 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
   }
   const pluginState = pluginKey.getState(state);
   const currentAppearance = appearanceForNodeType(node.type);
-  const 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;
+  const {
+    hoverDecoration
+  } = (_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 : {};
 
   /* mobile builds toolbar natively using toolbarItems */
   if (pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -245,8 +247,8 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
     }];
     if (currentAppearance === 'embed') {
-      var _pluginInjectionApi$d5;
-      const 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;
+      const 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/es2019/plugins/card/ui/LinkToolbarAppearance.js

@@ -3,8 +3,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/es2019/plugins/code-block/index.js

@@ -5,11 +5,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';
-const codeBlockPlugin = options => ({
+const codeBlockPlugin = (options, api) => ({
   name: 'codeBlock',
   nodes() {
     return [{
@@ -57,9 +57,10 @@ const codeBlockPlugin = options => ({
       keyshortcut: '```',
       icon: () => /*#__PURE__*/React.createElement(IconCode, null),
       action(insert, state) {
+        var _api$dependencies$ana;
         const schema = state.schema;
         const 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,
@@ -67,10 +68,11 @@ const 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)
   }
 });
 export default codeBlockPlugin;

package/dist/es2019/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 const messages = defineMessages({
@@ -17,7 +16,7 @@ export const messages = defineMessages({
   }
 });
 const languageList = createLanguageList(DEFAULT_LANGUAGES);
-export const getToolbarConfig = (allowCopyToClipboard = false) => (state, {
+export const getToolbarConfig = (allowCopyToClipboard = false, hoverDecoration) => (state, {
   formatMessage
 }) => {
   var _codeBlockState$pos, _node$attrs;
@@ -77,10 +76,10 @@ export const getToolbarConfig = (allowCopyToClipboard = false) => (state, {
     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/es2019/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 const createToolbarCopyCommandForNode = nodeType => (state, dispatch) =>
   }
   return true;
 };
-export const resetCopiedState = (nodeType, onMouseLeave) => (state, dispatch) => {
+export const resetCopiedState = (nodeType, hoverDecoration, onMouseLeave) => (state, dispatch) => {
   let customTr = state.tr;
 
   // Avoid multipe dispatch
@@ -143,7 +142,7 @@ export const resetCopiedState = (nodeType, onMouseLeave) => (state, dispatch) =>
   const 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);
   const copyButtonState = copyButtonPluginKey.getState(state);
   if (copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied) {
     customTr.setMeta(copyButtonPluginKey, {

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

@@ -1,6 +1,5 @@
 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) {
@@ -9,7 +8,7 @@ function isSeparator(item) {
 function isNodeOptions(options) {
   return 'nodeType' in options && options.nodeType !== undefined;
 }
-export function getCopyButtonConfig(options) {
+export function getCopyButtonConfig(options, hoverDecoration) {
   const {
     state,
     formatMessage,
@@ -25,12 +24,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 = {
@@ -69,13 +68,13 @@ export const showCopyButton = state => {
  * else process copy button to standard floatingtoobarbutton
  */
 export function processCopyButtonItems(state) {
-  return items => items.flatMap(item => {
+  return (items, hoverDecoration) => items.flatMap(item => {
     switch (item.type) {
       case 'copy-button':
         if (item !== null && item !== void 0 && item.hidden || !showCopyButton(state)) {
           return [];
         }
-        return item === null || item === void 0 ? void 0 : item.items.map(copyButtonItem => isSeparator(copyButtonItem) ? copyButtonItem : getCopyButtonConfig(copyButtonItem));
+        return item === null || item === void 0 ? void 0 : item.items.map(copyButtonItem => isSeparator(copyButtonItem) ? copyButtonItem : getCopyButtonConfig(copyButtonItem, hoverDecoration));
       default:
         return [item];
     }

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

@@ -36,7 +36,7 @@ const expandPlugin = (options = {}, api) => {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: getToolbarConfig,
+      floatingToolbar: getToolbarConfig(api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
       quickInsert: ({
         formatMessage
       }) => {

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

@@ -1,9 +1,8 @@
 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 const getToolbarConfig = (state, {
+export const getToolbarConfig = hoverDecoration => (state, {
   formatMessage
 }) => {
   const {
@@ -35,10 +34,10 @@ export const getToolbarConfig = (state, {
         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),
+        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
       }]

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

@@ -44,7 +44,7 @@ const extensionPlugin = (options = {}, api) => {
       }];
     },
     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/es2019/plugins/extension/toolbar.js

@@ -6,7 +6,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';
@@ -119,7 +118,7 @@ const editButton = (formatMessage, extensionState) => {
     focusEditoronEnter: true
   }];
 };
-export const getToolbarConfig = (breakoutEnabled = true) => (state, intl) => {
+export const getToolbarConfig = (breakoutEnabled = true, hoverDecoration) => (state, intl) => {
   const {
     formatMessage
   } = intl;
@@ -173,10 +172,10 @@ export const getToolbarConfig = (breakoutEnabled = true) => (state, intl) => {
         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/es2019/plugins/floating-toolbar/index.js

@@ -190,7 +190,7 @@ const floatingToolbarPlugin = (_, api) => {
             return null;
           }
           let customPositionCalculation;
-          const toolbarItems = processCopyButtonItems(editorView.state)(Array.isArray(items) ? items : items(node));
+          const 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 = nextPos => {
               return onPositionCalculated(editorView, nextPos);
@@ -245,7 +245,8 @@ const 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/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -23,7 +23,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';
@@ -365,6 +364,7 @@ class Toolbar extends Component {
     table
   }) {
     if (this.props.editorView) {
+      var _this$props$api;
       const {
         state,
         dispatch
@@ -372,9 +372,7 @@ class Toolbar extends Component {
       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);
     }
   }
   setDisableScroll(disabled) {

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

@@ -4,11 +4,11 @@ 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 };
-const layoutPlugin = (options = {}) => ({
+const layoutPlugin = (options = {}, api) => ({
   name: 'layout',
   nodes() {
     return [{
@@ -34,7 +34,8 @@ const layoutPlugin = (options = {}) => ({
         allowSingleColumnLayout
       } = pluginKey.getState(state);
       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;
     },
@@ -48,8 +49,9 @@ const layoutPlugin = (options = {}) => ({
       priority: 1100,
       icon: () => /*#__PURE__*/React.createElement(IconLayout, null),
       action(insert, state) {
+        var _api$dependencies$ana, _api$dependencies$ana2;
         const 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,
@@ -57,7 +59,8 @@ const layoutPlugin = (options = {}) => ({
             inputMethod: INPUT_METHOD.QUICK_INSERT
           },
           eventType: EVENT_TYPE.TRACK
-        });
+        })(tr);
+        return tr;
       }
     }]
   }

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

@@ -9,7 +9,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';
 const LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
@@ -54,7 +53,7 @@ const buildLayoutButton = (intl, item, currentLayout) => ({
   tabIndex: null
 });
 export const layoutToolbarTitle = 'Layout floating controls';
-export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) => {
+export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) => {
   const node = state.doc.nodeAt(pos);
   if (node) {
     const currentLayout = getPresetLayout(node);
@@ -71,10 +70,10 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       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
     };
     const layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;

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

@@ -6,7 +6,6 @@ import DownloadIcon from '@atlaskit/icon/glyph/download';
 import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import commonMessages from '../../../messages';
 import { stateKey } from '../pm-plugins/plugin-key';
-import { hoverDecoration } from '../../base/pm-plugins/decoration';
 import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
 import buildLayoutButtons from '../../../ui/MediaAndEmbedsToolbar';
 import { getMediaLinkingState } from '../pm-plugins/linking';
@@ -14,7 +13,7 @@ import { getPluginState as getMediaAltTextPluginState } from '../pm-plugins/alt-
 import { altTextButton, getAltTextToolbar } from './alt-text';
 import { showLinkingToolbar } from '../commands/linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/media-ui';
 import { messages as cardMessages } from '../../card/messages';
 import { FilePreviewItem } from './filePreviewItem';
@@ -37,7 +36,7 @@ const handleRemoveMediaGroup = (state, dispatch) => {
   }
   return true;
 };
-const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
+const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration) => {
   const {
     mediaGroup
   } = state.schema.nodes;
@@ -102,17 +101,17 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(mediaGroup, true),
-    onMouseLeave: hoverDecoration(mediaGroup, false),
-    onFocus: hoverDecoration(mediaGroup, true),
-    onBlur: 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(commonMessages.remove),
     onClick: handleRemoveMediaGroup,
     testId: 'media-toolbar-remove-button'
   }];
   return items;
 };
-const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState) => {
+const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration) => {
   const {
     mediaInline
   } = state.schema.nodes;
@@ -177,17 +176,18 @@ const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState) => {
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(mediaInline, true),
-    onMouseLeave: hoverDecoration(mediaInline, false),
-    onFocus: hoverDecoration(mediaInline, true),
-    onBlur: 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(commonMessages.remove),
     onClick: removeInlineCard,
     testId: 'media-toolbar-remove-button'
   }];
   return items;
 };
-const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, widthPluginDependencyApi, getEditorFeatureFlags) => {
+const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) => {
+  var _pluginInjectionApi$d2;
   const {
     mediaSingle
   } = state.schema.nodes;
@@ -230,7 +230,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     });
   }
   if (allowAdvancedToolBarOptions) {
-    toolbarButtons = [...toolbarButtons, ...buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPluginDependencyApi, allowResizing, allowResizingInTables)];
+    toolbarButtons = [...toolbarButtons, ...buildLayoutButtons(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'
@@ -253,16 +253,20 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             };
             const openLink = () => {
               if (editorView) {
+                var _pluginInjectionApi$d;
                 const {
-                  state,
+                  state: {
+                    tr
+                  },
                   dispatch
                 } = editorView;
-                dispatch(addAnalytics(state, state.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: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
                   actionSubjectId: ACTION_SUBJECT_ID.LINK
-                }));
+                })(tr);
+                dispatch(tr);
                 return true;
               }
             };
@@ -286,16 +290,19 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       type: 'separator'
     });
   }
+  const {
+    hoverDecoration
+  } = (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : {};
   const removeButton = {
     id: 'editor.media.delete',
     type: 'button',
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(mediaSingle, true),
-    onMouseLeave: hoverDecoration(mediaSingle, false),
-    onFocus: hoverDecoration(mediaSingle, true),
-    onBlur: 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(commonMessages.remove),
     onClick: remove,
     testId: 'media-toolbar-remove-button'
@@ -313,6 +320,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
   return items;
 };
 export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) => {
+  var _pluginInjectionApi$d3;
   const {
     media,
     mediaInline,
@@ -329,6 +337,9 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
   } = options;
   const mediaPluginState = stateKey.getState(state);
   const mediaLinkingState = getMediaLinkingState(state);
+  const {
+    hoverDecoration
+  } = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {};
   if (!mediaPluginState) {
     return;
   }
@@ -365,21 +376,21 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
       const selector = 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 = () => {
       var _mediaPluginState$ele2;
       const element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(`.${MediaInlineNodeSelector}`);
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
   } else {
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele3;
       const element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(`.${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 {
     ...baseToolbar,