@atlaskit/editor-core 189.3.14 → 189.3.16

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -3,8 +3,8 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import AddIcon from '@atlaskit/icon/glyph/editor/add';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import { ToolTipContent } from '../../../../keymaps';
-import ToolbarButton from '../../../../ui/ToolbarButton';
+import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { triggerWrapper } from './styles';
 const DropDownButtonIcon = /*#__PURE__*/React.memo(props => jsx("span", {

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -6,7 +6,7 @@ import ReactDOM from 'react-dom';
 import { injectIntl } from 'react-intl-next';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
 import { Popup } from '@atlaskit/editor-common/ui';
-import ToolbarButton from '../../../../ui/ToolbarButton';
+import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { separatorStyles, buttonGroupStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import { insertTaskDecisionCommand } from '../../../tasks-and-decisions/commands';
@@ -14,7 +14,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { messages } from './messages';
 import { createItems } from './create-items';
 import { BlockInsertMenu } from './block-insert-menu';
-import withOuterListeners from '../../../../ui/with-outer-listeners';
+import { withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 
 /**
  * Checks if an element is detached (i.e. not in the current document)
@@ -423,7 +423,6 @@ export class ToolbarInsertBlock extends React.PureComponent {
       horizontalRuleEnabled: props.horizontalRuleEnabled,
       layoutSectionEnabled: props.layoutSectionEnabled,
       expandEnabled: props.expandEnabled,
-      macroProvider: props.macroProvider,
       showElementBrowserLink: props.showElementBrowserLink,
       emojiProvider: props.emojiProvider,
       availableWrapperBlockTypes: props.availableWrapperBlockTypes,

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/item.js

@@ -19,8 +19,8 @@ import HorizontalRuleIcon from '@atlaskit/icon/glyph/editor/horizontal-rule';
 import CodeIcon from '@atlaskit/icon/glyph/editor/code';
 import InfoIcon from '@atlaskit/icon/glyph/editor/info';
 import QuoteIcon from '@atlaskit/icon/glyph/quote';
-import { shortcutStyle } from '../../../../ui/styles';
-import { tooltip, addLink, toggleTable } from '../../../../keymaps';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { tooltip, addLink, toggleTable } from '@atlaskit/editor-common/keymaps';
 import { shallowEquals } from './shallow-equals';
 import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 const from = init => ({

package/dist/es2019/plugins/paste/handlers.js

@@ -9,7 +9,7 @@ import { insideTable } from '@atlaskit/editor-common/core-utils';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 // TODO: ED-20519 Needs Macro extraction
-import { runMacroAutoConvert } from '../macro';
+
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
@@ -483,7 +483,7 @@ function insertAutoMacro(slice, macro, view, from, to) {
   }
   return false;
 }
-export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptions, extensionAutoConverter) {
+export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, runMacroAutoConvert, cardsOptions, extensionAutoConverter) {
   return (state, dispatch, view) => {
     let macro = null;
 
@@ -497,7 +497,8 @@ export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, car
 
     // then try from macro provider (which will be removed some time in the future)
     if (!macro) {
-      macro = runMacroAutoConvert(state, text);
+      var _runMacroAutoConvert;
+      macro = (_runMacroAutoConvert = runMacroAutoConvert === null || runMacroAutoConvert === void 0 ? void 0 : runMacroAutoConvert(state, text)) !== null && _runMacroAutoConvert !== void 0 ? _runMacroAutoConvert : null;
     }
     if (macro) {
       /**

package/dist/es2019/plugins/paste/pm-plugins/main.js

@@ -221,14 +221,14 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // force a "paste as plain text" action by clearing the markdownSlice.
           markdownSlice = !((_markdownSlice = markdownSlice) !== null && _markdownSlice !== void 0 && _markdownSlice.size) ? undefined : markdownSlice;
           if (markdownSlice) {
-            var _pluginInjectionApi$c, _pluginInjectionApi$c2;
+            var _pluginInjectionApi$c, _pluginInjectionApi$c2, _pluginInjectionApi$e, _pluginInjectionApi$e2;
             // linkify text prior to converting to macro
             if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
               return true;
             }
 
             // run macro autoconvert prior to other conversions
-            if (handleMacroAutoConvert(text, markdownSlice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : (_pluginInjectionApi$c2 = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+            if (handleMacroAutoConvert(text, markdownSlice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : (_pluginInjectionApi$c2 = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.extension) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.actions) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.runMacroAutoConvert, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
               // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
               sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, markdownSlice, {
                 type: PasteTypes.markdown
@@ -295,7 +295,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText) {
-          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c3, _pluginInjectionApi$c4, _pluginInjectionApi$e3, _pluginInjectionApi$e4, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -303,7 +303,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           }
 
           // run macro autoconvert prior to other conversions
-          if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : (_pluginInjectionApi$c4 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+          if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c3 = pluginInjectionApi.card) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : (_pluginInjectionApi$c4 = _pluginInjectionApi$c3.actions) === null || _pluginInjectionApi$c4 === void 0 ? void 0 : _pluginInjectionApi$c4.queueCardsFromChangedTr, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e3 = pluginInjectionApi.extension) === null || _pluginInjectionApi$e3 === void 0 ? void 0 : (_pluginInjectionApi$e4 = _pluginInjectionApi$e3.actions) === null || _pluginInjectionApi$e4 === void 0 ? void 0 : _pluginInjectionApi$e4.runMacroAutoConvert, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
             // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
             sendPasteAnalyticsEvent(editorAnalyticsAPI)(view, event, slice, {
               type: PasteTypes.richText

package/dist/es2019/presets/context.js

@@ -11,12 +11,12 @@ export const PresetContextProvider = ({
     }
   }, children);
 };
-export const usePresetContext = () => {
+export function usePresetContext() {
   const {
     editorApi
   } = useContext(EditorAPIContext);
   return editorApi;
-};
+}
 export const useSetPresetContext = () => {
   const {
     setEditorApi

package/dist/es2019/presets/universal.js

@@ -1,4 +1,4 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, macroPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
 import { panelPlugin } from '@atlaskit/editor-plugin-panel';
 import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
@@ -27,6 +27,7 @@ import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
 import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
 import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
 import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
+import { expandPlugin } from '@atlaskit/editor-plugin-expand';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createDefaultPreset } from './default';
@@ -265,11 +266,6 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       }]);
     }
     return builder;
-  }).maybeAdd(macroPlugin, (plugin, builder) => {
-    if (props.macroProvider) {
-      return builder.add(plugin);
-    }
-    return builder;
   }).maybeAdd(annotationPlugin, (plugin, builder) => {
     // See default list for when adding annotations with a provider
     if (!props.annotationProviders && props.allowConfluenceInlineComment) {
@@ -416,4 +412,12 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     appearance
   }]);
   return finalPreset;
+}
+export function isExpandInsertionEnabled({
+  allowExpand
+}) {
+  if (allowExpand && typeof allowExpand === 'object') {
+    return !!allowExpand.allowInsertion;
+  }
+  return false;
 }

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -238,7 +238,7 @@ function RenderWithPluginState({
   } = useSharedPluginState(api, ['media', 'maxContentSize']);
   return jsx(Fragment, null, renderChrome({
     maxContentSize: maxContentSizeState,
-    mediaState
+    mediaState: mediaState !== null && mediaState !== void 0 ? mediaState : undefined
   }));
 }
 export const CommentEditorWithIntl = injectIntl(Editor);

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -13,7 +13,7 @@ import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { usePresetContext } from '../../../presets/context';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
-  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3;
+  var _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$collabEdit, _props$collabEdit2, _props$collabEdit3, _editorAPI$analytics;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
   const editorAPI = usePresetContext();
 
@@ -62,7 +62,8 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     editorView: props.editorView,
     containerElement: props.containerElement,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
-    featureFlags: props.featureFlags
+    featureFlags: props.featureFlags,
+    editorAnalyticsAPI: editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   useEffect(() => {
     if (twoLineEditorToolbar) {

package/dist/es2019/{plugins/expand/ui/styles.js → ui/ContentStyles/expand.js}

@@ -1,14 +1,17 @@
 import { css } from '@emotion/react';
+import { DN50, N40A, N50A, N80A, R200, R300, R50 } from '@atlaskit/theme/colors';
+// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { themed } from '@atlaskit/theme/components';
-import { R50, R300, N40A, N50A, N80A, DN50, R200 } from '@atlaskit/theme/colors';
+import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { sharedExpandStyles } from '@atlaskit/editor-common/ui';
-import { SelectionStyle, getSelectionStyles, akLayoutGutterOffset, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-import { BreakoutCssClassName } from '../../breakout/constants';
-import { expandClassNames } from './class-names';
+import { akEditorSelectedNodeClassName, akLayoutGutterOffset, getSelectionStyles, SelectionStyle } from '@atlaskit/editor-shared-styles';
+import { expandClassNames } from '@atlaskit/editor-common/styles';
 const EXPAND_SELECTED_BACKGROUND = themed({
   light: "var(--ds-background-neutral-subtle, rgba(255, 255, 255, 0.6))",
   dark: "var(--ds-background-neutral-subtle, rgba(9, 10, 11, 0.29))"
 });
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 const EXPAND_ICON_COLOR = props => css`
   color: ${themed({
   light: `var(--ds-icon-subtle, ${N80A})`,
@@ -37,6 +40,8 @@ const DANGER_STATE_BORDER_COLOR = themed({
 const DANGER_STATE_BORDER_RADIUS = themed({
   dark: '3px'
 });
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 export const expandStyles = props => css`
   .${expandClassNames.icon} > div {
     display: flex;

package/dist/es2019/ui/ContentStyles/index.js

@@ -14,7 +14,7 @@ import { layoutStyles } from './layout';
 import { panelStyles } from './panel';
 import { placeholderTextStyles } from '@atlaskit/editor-plugin-placeholder-text/styles';
 import { extensionStyles } from '../../plugins/extension/ui/styles';
-import { expandStyles } from '../../plugins/expand/ui/styles';
+import { expandStyles } from './expand';
 import { MediaSharedClassNames } from '@atlaskit/editor-common/styles';
 import { findReplaceStyles } from '../../plugins/find-replace/styles';
 import { taskDecisionStyles } from '../../plugins/tasks-and-decisions/styles';

package/dist/es2019/ui/ToolbarFeedback/index.js

@@ -71,12 +71,12 @@ class ToolbarFeedbackInternal extends PureComponent {
       });
     });
     _defineProperty(this, "openJiraIssueCollector", async () => {
-      var _this$props$api, _window$localStorage$, _basePluginState$cont;
+      var _this$props$api, _this$props$api$base, _window$localStorage$, _basePluginState$cont;
       this.setState({
         jiraIssueCollectorScriptLoading: true,
         showOptOutOption: false
       });
-      const basePluginState = (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : _this$props$api.base.sharedState.currentState();
+      const basePluginState = (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : (_this$props$api$base = _this$props$api.base) === null || _this$props$api$base === void 0 ? void 0 : _this$props$api$base.sharedState.currentState();
       const sessionId = (_window$localStorage$ = window.localStorage.getItem('awc.session.id')) === null || _window$localStorage$ === void 0 ? void 0 : _window$localStorage$.toString();
       const contentId = basePluginState === null || basePluginState === void 0 ? void 0 : (_basePluginState$cont = basePluginState.contextIdentifier) === null || _basePluginState$cont === void 0 ? void 0 : _basePluginState$cont.objectId;
       const tabId = window.sessionStorage['awc.tab.id'];

package/dist/es2019/use-preset.js

@@ -35,7 +35,6 @@ import { usePresetContext } from './presets/context';
  */
 export function usePreset(createPreset, dependencies) {
   const editorApi = usePresetContext();
-
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const preset = useMemo(createPreset, dependencies);
   return {

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.3.14";
+export const version = "189.3.16";

package/dist/esm/nodeviews/getInlineNodeViewProducer.styles.js

@@ -7,4 +7,4 @@ import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 // For reasoning behind styles, see comments in:
 // ./getInlineNodeViewProducer -> portalChildren()
 
-export var InlineNodeViewSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    display: inline;\n    user-select: all;\n    /* Collapses zero width spaces inside the inline node view\n    to prevent the node from line breaking too early.\n    */\n    white-space: nowrap;\n    /* Then reset to the Editor default so we don't interfere\n    with any component styling. */\n    & > *:not(span[aria-hidden='true'].zeroWidthSpaceContainer) {\n      white-space: pre-wrap;\n    }\n    // Prevent visually hidden assistive text from being selected.\n    & > .assistive {\n      user-select: none;\n    }\n  }\n  /** Remove browser deafult selections style. This prevents\n    unexpected visual artefacts in Safari when navigating\n    with the keyboard or making range selections. */\n  &.ua-safari {\n    .", " {\n      ::selection,\n      *::selection {\n        background: transparent;\n      }\n    }\n  }\n\n  &.ua-chrome .", " > span {\n    user-select: none;\n  }\n\n  .", "AddZeroWidthSpace {\n    ::after {\n      content: '", "';\n    }\n  }\n"])), inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, ZERO_WIDTH_SPACE);
+export var InlineNodeViewSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    display: inline;\n    user-select: all;\n    /* Collapses zero width spaces inside the inline node view\n    to prevent the node from line breaking too early.\n    */\n    white-space: nowrap;\n    /* Then reset to the Editor default so we don't interfere\n    with any component styling. */\n    & > *:not(.zeroWidthSpaceContainer) {\n      white-space: pre-wrap;\n    }\n    // Prevent visually hidden assistive text from being selected.\n    & > .assistive {\n      user-select: none;\n    }\n  }\n  /** Remove browser deafult selections style. This prevents\n    unexpected visual artefacts in Safari when navigating\n    with the keyboard or making range selections. */\n  &.ua-safari {\n    .", " {\n      ::selection,\n      *::selection {\n        background: transparent;\n      }\n    }\n  }\n\n  &.ua-chrome .", " > span {\n    user-select: none;\n  }\n\n  .", "AddZeroWidthSpace {\n    ::after {\n      content: '", "';\n    }\n  }\n"])), inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, ZERO_WIDTH_SPACE);

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

@@ -1,3 +1,3 @@
 import analyticsPlugin from './plugin';
-export { withAnalytics, addAnalytics } from './utils';
+export { addAnalytics } from './utils';
 export default analyticsPlugin;

package/dist/esm/plugins/analytics/utils.js

@@ -26,32 +26,4 @@ export function addAnalytics(state, tr, payload) {
   }
   editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent(payload, channel)(tr);
   return tr;
-}
-// Below function has been copied to packages/editor/editor-plugin-ai/src/utils/analytics.ts
-// If changes are made to this function, please make the same update in the linked file.
-/**
- *
- * @private
- * @deprecated
- *
- * Do not use this anymore. Please use @atlaskit/editor-plugin-analytics
- *
- */
-export function withAnalytics(payload, channel) {
-  return function (command) {
-    return function (state, dispatch, view) {
-      return command(state, function (tr) {
-        if (dispatch) {
-          if (payload instanceof Function) {
-            var dynamicPayload = payload(state);
-            if (dynamicPayload) {
-              dispatch(addAnalytics(state, tr, dynamicPayload, channel));
-            }
-          } else {
-            dispatch(addAnalytics(state, tr, payload, channel));
-          }
-        }
-      }, view);
-    };
-  };
 }

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

@@ -8,10 +8,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { breakout } from '@atlaskit/adf-schema';
 import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
 import LayoutButton from './ui/LayoutButton';
-import { BreakoutCssClassName } from './constants';
 import { pluginKey } from './plugin-key';
 import { findSupportedNodeForBreakout } from './utils/find-breakout-node';
 import { akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
+import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 var BreakoutView = /*#__PURE__*/function () {
   function BreakoutView(

package/dist/esm/plugins/breakout/ui/LayoutButton.js

@@ -22,7 +22,7 @@ import ToolbarButton from '../../../ui/ToolbarButton';
 import { getBreakoutMode } from '../utils/get-breakout-mode';
 import { setBreakoutMode } from '../commands/set-breakout-mode';
 import { removeBreakout } from '../commands/remove-breakout';
-import { BreakoutCssClassName } from '../constants';
+import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { isBreakoutMarkAllowed } from '../utils/is-breakout-mark-allowed';
 import { getPluginState } from '../plugin-key';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';

package/dist/esm/plugins/extension/extension-api.js

@@ -3,8 +3,8 @@ import { validator } from '@atlaskit/adf-utils/validator';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { insertMacroFromMacroBrowser } from '../macro';
-import { pluginKey as macroPluginKey } from '../macro/plugin-key';
+import { insertMacroFromMacroBrowser } from './pm-plugins/macro/actions';
+import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
 import { nodeToJSON } from '../../utils';
 import { setEditingContextToContextPanel } from './commands';
 import { findNodePosWithLocalId, getDataConsumerMark, getNodeTypesReferenced, getSelectedExtension } from './utils';

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

@@ -1,13 +1,15 @@
 import { extension, bodiedExtension, inlineExtension } from '@atlaskit/adf-schema';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createPlugin } from './pm-plugins/main';
+import { createPlugin as createMacroPlugin } from './pm-plugins/macro';
+import { insertMacroFromMacroBrowser, runMacroAutoConvert } from './pm-plugins/macro/actions';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin as createUniqueIdPlugin } from './pm-plugins/unique-id';
 import { getToolbarConfig } from './toolbar';
 import { getContextPanel } from './context-panel';
 import { createExtensionAPI } from './extension-api';
 var extensionPlugin = function extensionPlugin(_ref) {
-  var _api$featureFlags, _api$contextPanel3, _api$analytics2, _api$contextPanel4;
+  var _api$featureFlags, _api$analytics2, _api$contextPanel3, _api$analytics3, _api$contextPanel4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     _api = _ref.api;
@@ -69,6 +71,13 @@ var extensionPlugin = function extensionPlugin(_ref) {
             }
           });
         }
+      }, {
+        name: 'macro',
+        plugin: function plugin(_ref3) {
+          var dispatch = _ref3.dispatch,
+            providerFactory = _ref3.providerFactory;
+          return createMacroPlugin(dispatch, providerFactory);
+        }
       }];
     },
     actions: {
@@ -79,14 +88,16 @@ var extensionPlugin = function extensionPlugin(_ref) {
           applyChange: _api === null || _api === void 0 || (_api$contextPanel2 = _api.contextPanel) === null || _api$contextPanel2 === void 0 ? void 0 : _api$contextPanel2.actions.applyChange,
           editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics = _api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
         });
-      }
+      },
+      insertMacroFromMacroBrowser: insertMacroFromMacroBrowser(_api === null || _api === void 0 || (_api$analytics2 = _api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
+      runMacroAutoConvert: runMacroAutoConvert
     },
     pluginsOptions: {
       floatingToolbar: getToolbarConfig({
         breakoutEnabled: options.breakoutEnabled,
         hoverDecoration: _api === null || _api === void 0 ? void 0 : _api.decorations.actions.hoverDecoration,
         applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel3 = _api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange,
-        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics2 = _api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
+        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics3 = _api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions
       }),
       contextPanel: getContextPanel(options.allowAutoSave, featureFlags, _api === null || _api === void 0 || (_api$contextPanel4 = _api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange)
     }

package/dist/esm/plugins/{macro → extension/pm-plugins/macro}/actions.js

@@ -8,9 +8,9 @@ import { Selection, NodeSelection, TextSelection } from '@atlaskit/editor-prosem
 import { safeInsert, replaceSelectedNode, findSelectedNodeOfType, replaceParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getValidNode } from '@atlaskit/editor-common/validator';
 import { normaliseNestedLayout } from '@atlaskit/editor-common/insert';
-import { getPluginState as getExtensionPluginState } from '../extension/plugin-factory';
+import { getPluginState as getExtensionPluginState } from '../../plugin-factory';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { TARGET_SELECTION_SOURCE } from '../analytics/types/extension-events';
+import { TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
 import { pluginKey } from './plugin-key';
 export var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(editorAnalyticsAPI) {
   return function (macroProvider, macroNode, isEditing) {

package/dist/esm/plugins/{macro → extension/pm-plugins/macro}/index.js

@@ -39,20 +39,4 @@ export var createPlugin = function createPlugin(dispatch, providerFactory) {
       };
     }
   });
-};
-var macroPlugin = function macroPlugin() {
-  return {
-    name: 'macro',
-    pmPlugins: function pmPlugins() {
-      return [{
-        name: 'macro',
-        plugin: function plugin(_ref) {
-          var dispatch = _ref.dispatch,
-            providerFactory = _ref.providerFactory;
-          return createPlugin(dispatch, providerFactory);
-        }
-      }];
-    }
-  };
-};
-export default macroPlugin;
+};

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

@@ -11,7 +11,7 @@ import { editExtension } from './actions';
 import { getPluginState } from './pm-plugins/main';
 import { getSelectedExtension } from './utils';
 import { updateExtensionLayout, removeExtension, removeDescendantNodes } from './commands';
-import { pluginKey as macroPluginKey } from '../macro/plugin-key';
+import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
 import { isReferencedSource, getChildrenInfo as _getChildrenInfo, getNodeName } from '@atlaskit/editor-common/utils';
 export var messages = defineMessages({
   edit: {

package/dist/esm/plugins/find-replace/FindReplaceToolbarButtonWithState.js

@@ -5,15 +5,17 @@ import { cancelSearchWithAnalytics, replaceWithAnalytics, replaceAllWithAnalytic
 import { blur, toggleMatchCase } from './commands';
 import FindReplaceToolbarButton from './ui/FindReplaceToolbarButton';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
-var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(props) {
-  var popupsBoundariesElement = props.popupsBoundariesElement,
-    popupsMountPoint = props.popupsMountPoint,
-    popupsScrollableElement = props.popupsScrollableElement,
-    isToolbarReducedSpacing = props.isToolbarReducedSpacing,
-    editorView = props.editorView,
-    containerElement = props.containerElement,
-    dispatchAnalyticsEvent = props.dispatchAnalyticsEvent,
-    featureFlags = props.featureFlags;
+var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref) {
+  var popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement,
+    isToolbarReducedSpacing = _ref.isToolbarReducedSpacing,
+    editorView = _ref.editorView,
+    containerElement = _ref.containerElement,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    featureFlags = _ref.featureFlags,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
+    takeFullWidth = _ref.takeFullWidth;
   if (!editorView) {
     return null;
   }
@@ -34,50 +36,50 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   };
   var handleActivate = function handleActivate() {
     runWithEditorFocused(function () {
-      return dispatchCommand(activateWithAnalytics({
+      return dispatchCommand(activateWithAnalytics(editorAnalyticsAPI)({
         triggerMethod: TRIGGER_METHOD.TOOLBAR
       }));
     });
   };
   var handleFind = function handleFind(keyword) {
     runWithEditorFocused(function () {
-      return dispatchCommand(findWithAnalytics({
+      return dispatchCommand(findWithAnalytics(editorAnalyticsAPI)({
         editorView: editorView,
         containerElement: containerElement,
         keyword: keyword
       }));
     });
   };
-  var handleFindNext = function handleFindNext(_ref) {
-    var triggerMethod = _ref.triggerMethod;
+  var handleFindNext = function handleFindNext(_ref2) {
+    var triggerMethod = _ref2.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand(findNextWithAnalytics({
+      return dispatchCommand(findNextWithAnalytics(editorAnalyticsAPI)({
         triggerMethod: triggerMethod
       }));
     });
   };
-  var handleFindPrev = function handleFindPrev(_ref2) {
-    var triggerMethod = _ref2.triggerMethod;
+  var handleFindPrev = function handleFindPrev(_ref3) {
+    var triggerMethod = _ref3.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand(findPrevWithAnalytics({
+      return dispatchCommand(findPrevWithAnalytics(editorAnalyticsAPI)({
         triggerMethod: triggerMethod
       }));
     });
   };
-  var handleReplace = function handleReplace(_ref3) {
-    var triggerMethod = _ref3.triggerMethod,
-      replaceText = _ref3.replaceText;
+  var handleReplace = function handleReplace(_ref4) {
+    var triggerMethod = _ref4.triggerMethod,
+      replaceText = _ref4.replaceText;
     runWithEditorFocused(function () {
-      return dispatchCommand(replaceWithAnalytics({
+      return dispatchCommand(replaceWithAnalytics(editorAnalyticsAPI)({
         triggerMethod: triggerMethod,
         replaceText: replaceText
       }));
     });
   };
-  var handleReplaceAll = function handleReplaceAll(_ref4) {
-    var replaceText = _ref4.replaceText;
+  var handleReplaceAll = function handleReplaceAll(_ref5) {
+    var replaceText = _ref5.replaceText;
     runWithEditorFocused(function () {
-      return dispatchCommand(replaceAllWithAnalytics({
+      return dispatchCommand(replaceAllWithAnalytics(editorAnalyticsAPI)({
         replaceText: replaceText
       }));
     });
@@ -85,9 +87,9 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindBlur = function handleFindBlur() {
     dispatchCommand(blur());
   };
-  var handleCancel = function handleCancel(_ref5) {
-    var triggerMethod = _ref5.triggerMethod;
-    dispatchCommand(cancelSearchWithAnalytics({
+  var handleCancel = function handleCancel(_ref6) {
+    var triggerMethod = _ref6.triggerMethod;
+    dispatchCommand(cancelSearchWithAnalytics(editorAnalyticsAPI)({
       triggerMethod: triggerMethod
     }));
     editorView.focus();
@@ -101,8 +103,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     plugins: {
       findReplaceState: findReplacePluginKey
     },
-    render: function render(_ref6) {
-      var findReplaceState = _ref6.findReplaceState;
+    render: function render(_ref7) {
+      var findReplaceState = _ref7.findReplaceState;
       if (!findReplaceState) {
         return null;
       }
@@ -129,7 +131,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
         onFindPrev: handleFindPrev,
         onReplace: handleReplace,
         onReplaceAll: handleReplaceAll,
-        takeFullWidth: !!props.takeFullWidth
+        takeFullWidth: !!takeFullWidth
       });
     }
   });