@atlaskit/editor-core 189.3.15 → 189.3.16

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

@@ -1,6 +1,8 @@
 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';
@@ -10,7 +12,7 @@ const extensionPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags, _api$contextPanel3, _api$analytics2, _api$contextPanel4;
+  var _api$featureFlags, _api$analytics2, _api$contextPanel3, _api$analytics3, _api$contextPanel4;
   const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   //Note: This is a hack to get the editor view reference in the plugin. Copied from table plugin.
   //This is needed to get the current selection in the editor
@@ -68,6 +70,12 @@ const extensionPlugin = ({
             }
           });
         }
+      }, {
+        name: 'macro',
+        plugin: ({
+          dispatch,
+          providerFactory
+        }) => createMacroPlugin(dispatch, providerFactory)
       }];
     },
     actions: {
@@ -78,14 +86,16 @@ const extensionPlugin = ({
           applyChange: api === null || api === void 0 ? void 0 : (_api$contextPanel2 = api.contextPanel) === null || _api$contextPanel2 === void 0 ? void 0 : _api$contextPanel2.actions.applyChange,
           editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
         });
-      }
+      },
+      insertMacroFromMacroBrowser: insertMacroFromMacroBrowser(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
+      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 ? void 0 : (_api$contextPanel3 = api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange,
-        editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
+        editorAnalyticsAPI: api === null || api === void 0 ? 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 ? void 0 : (_api$contextPanel4 = api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange)
     }

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

@@ -3,9 +3,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 const insertMacroFromMacroBrowser = editorAnalyticsAPI => (macroProvider, macroNode, isEditing) => async view => {
   if (!macroProvider) {

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

@@ -33,17 +33,4 @@ export const createPlugin = (dispatch, providerFactory) => new SafePlugin({
       }
     };
   }
-});
-const macroPlugin = () => ({
-  name: 'macro',
-  pmPlugins() {
-    return [{
-      name: 'macro',
-      plugin: ({
-        dispatch,
-        providerFactory
-      }) => createPlugin(dispatch, providerFactory)
-    }];
-  }
-});
-export default macroPlugin;
+});

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

@@ -10,7 +10,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, getNodeName } from '@atlaskit/editor-common/utils';
 export const messages = defineMessages({
   edit: {

package/dist/es2019/plugins/index.js

@@ -4,7 +4,6 @@ export { default as extensionPlugin } from './extension';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
-export { default as macroPlugin } from './macro';
 export { default as pastePlugin } from './paste';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';

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

@@ -1,12 +1,9 @@
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { insertMacroFromMacroBrowser } from '../macro';
-import WithPluginState from '../../ui/WithPluginState';
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
 import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { pluginKey as macroStateKey } from '../macro/plugin-key';
-import { ToolbarSize } from '../../ui/Toolbar/types';
+import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 const toolbarSizeToButtons = toolbarSize => {
   switch (toolbarSize) {
@@ -61,34 +58,22 @@ const insertBlockPlugin = ({
       isLastItem
     }) {
       const renderNode = providers => {
-        // We will slowly migrate these to use the new approach inside
-        // `ToolbarInsertBlockWithInjectionApi` and remove `WithPluginState`
-        return /*#__PURE__*/React.createElement(WithPluginState, {
-          plugins: {
-            macroState: macroStateKey
-          },
-          render: ({
-            macroState = {}
-          }) => {
-            return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
-              pluginInjectionApi: api,
-              editorView: editorView,
-              editorActions: editorActions,
-              dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-              providerFactory: providerFactory,
-              popupsMountPoint: popupsMountPoint,
-              popupsBoundariesElement: popupsBoundariesElement,
-              popupsScrollableElement: popupsScrollableElement,
-              toolbarSize: toolbarSize,
-              disabled: disabled,
-              isToolbarReducedSpacing: isToolbarReducedSpacing,
-              isLastItem: isLastItem,
-              featureFlags: featureFlags,
-              macroState: macroState,
-              providers: providers,
-              options: options
-            });
-          }
+        return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
+          pluginInjectionApi: api,
+          editorView: editorView,
+          editorActions: editorActions,
+          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+          providerFactory: providerFactory,
+          popupsMountPoint: popupsMountPoint,
+          popupsBoundariesElement: popupsBoundariesElement,
+          popupsScrollableElement: popupsScrollableElement,
+          toolbarSize: toolbarSize,
+          disabled: disabled,
+          isToolbarReducedSpacing: isToolbarReducedSpacing,
+          isLastItem: isLastItem,
+          featureFlags: featureFlags,
+          providers: providers,
+          options: options
         });
       };
       return /*#__PURE__*/React.createElement(WithProviders, {
@@ -113,10 +98,9 @@ function ToolbarInsertBlockWithInjectionApi({
   providers,
   pluginInjectionApi,
   options,
-  macroState,
   featureFlags
 }) {
-  var _ref, _ref2, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$a;
+  var _ref, _ref2, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$e;
   const buttons = toolbarSizeToButtons(toolbarSize);
   const {
     dateState,
@@ -159,8 +143,7 @@ function ToolbarInsertBlockWithInjectionApi({
     nativeStatusSupported: options.nativeStatusSupported,
     horizontalRuleEnabled: options.horizontalRuleEnabled,
     onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
-    onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions),
-    macroProvider: macroState.macroProvider,
+    onInsertMacroFromMacroBrowser: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.extension) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.actions.insertMacroFromMacroBrowser,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,

package/dist/es2019/{ui → plugins/insert-block/ui}/ElementBrowser/InsertMenu.js

@@ -6,8 +6,7 @@ import { css, jsx } from '@emotion/react';
 // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import { borderRadius } from '@atlaskit/theme';
-import { themed } from '@atlaskit/theme/components';
-import { DN50, N0, N30A, N60A } from '@atlaskit/theme/colors';
+import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import { IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { ElementBrowser, ELEMENT_ITEM_HEIGHT } from '@atlaskit/editor-common/element-browser';
@@ -73,7 +72,7 @@ const InsertMenu = ({
   }, [pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$q6 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q6 === void 0 ? void 0 : _pluginInjectionApi$q6.actions, quickInsertDropdownItems]);
   const emptyStateHandler = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$q7 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q7 === void 0 ? void 0 : (_pluginInjectionApi$q8 = _pluginInjectionApi$q7.sharedState.currentState()) === null || _pluginInjectionApi$q8 === void 0 ? void 0 : _pluginInjectionApi$q8.emptyStateHandler;
   return jsx("div", {
-    css: theme => insertMenuWrapper(theme, itemCount)
+    css: insertMenuWrapper(itemCount)
   }, jsx(ElementBrowserWrapper, {
     handleClickOutside: toggleVisiblity,
     handleEscapeKeydown: toggleVisiblity,
@@ -119,17 +118,14 @@ const getInsertMenuHeight = ({
   return 560; // For showing 6 Elements.
 };
 
-const insertMenuWrapper = (theme, itemCount) => css`
+const insertMenuWrapper = itemCount => css`
   display: flex;
   flex-direction: column;
   width: 320px;
   height: ${getInsertMenuHeight({
   itemCount
 })}px;
-  background-color: ${themed({
-  light: `var(--ds-surface-overlay, ${N0})`,
-  dark: `var(--ds-surface-overlay, ${DN50})`
-})(theme)};
+  background-color: ${`var(--ds-surface-overlay, ${N0})`};
   border-radius: ${borderRadius()}px;
   box-shadow: ${`var(--ds-shadow-overlay, ${`0 0 0 1px ${N30A},
     0 2px 1px ${N30A},

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Popup } from '@atlaskit/editor-common/ui';
-import InsertMenu from '../../../../ui/ElementBrowser/InsertMenu';
+import InsertMenu from '../ElementBrowser/InsertMenu';
 import { DropDownButton } from './dropdown-button';
 export const BlockInsertElementBrowser = props => {
   return /*#__PURE__*/React.createElement(React.Fragment, null, props.open && /*#__PURE__*/React.createElement(Popup, {

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

@@ -3,7 +3,7 @@ import memoize from 'lodash/memoize';
 import memoizeOne from 'memoize-one';
 import { messages } from './messages';
 import { blockTypeMessages } from '@atlaskit/editor-common/messages';
-import { ToolTipContent } from '../../../../keymaps';
+import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { sortItems } from './sort-items';
 import { action, link, media, mention, emoji, table, layout, codeblock, panel, blockquote, decision, horizontalrule, expand, date, placeholder, status, more, imageUpload } from './item';
 import { shallowEquals } from './shallow-equals';

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/universal.js

@@ -1,4 +1,4 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, macroPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, 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';
@@ -266,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) {

package/dist/es2019/version-wrapper.js

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

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/index.js

@@ -4,7 +4,6 @@ export { default as extensionPlugin } from './extension';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
-export { default as macroPlugin } from './macro';
 export { default as pastePlugin } from './paste';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';