@atlaskit/editor-core 189.3.14 → 189.3.16

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

@@ -22,9 +22,9 @@ var _layout = require("./layout");
 var _panel = require("./panel");
 var _styles5 = require("@atlaskit/editor-plugin-placeholder-text/styles");
 var _styles6 = require("../../plugins/extension/ui/styles");
-var _styles7 = require("../../plugins/expand/ui/styles");
-var _styles8 = require("../../plugins/find-replace/styles");
-var _styles9 = require("../../plugins/tasks-and-decisions/styles");
+var _expand = require("./expand");
+var _styles7 = require("../../plugins/find-replace/styles");
+var _styles8 = require("../../plugins/tasks-and-decisions/styles");
 var _status = require("./status");
 var _date = require("./date");
 var _getInlineNodeViewProducer = require("../../nodeviews/getInlineNodeViewProducer.styles");
@@ -47,7 +47,7 @@ var placeholderStyles = exports.placeholderStyles = (0, _react2.css)(_templateOb
 var contentStyles = function contentStyles(props) {
   return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles5.placeholderTextStyles, placeholderStyles, (0, _codeBlock.codeBlockStyles)(props), (0, _styles3.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, ruleStyles(props), _media.mediaStyles, (0, _layout.layoutStyles)(props), _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _panel.panelStyles)(props), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles6.extensionStyles, (0, _styles7.expandStyles)(props), _styles8.findReplaceStyles, _styles4.textHighlightStyle, _styles9.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles5.placeholderTextStyles, placeholderStyles, (0, _codeBlock.codeBlockStyles)(props), (0, _styles3.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, ruleStyles(props), _media.mediaStyles, (0, _layout.layoutStyles)(props), _styles2.telepointerStyle, _selection.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _panel.panelStyles)(props), mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles6.extensionStyles, (0, _expand.expandStyles)(props), _styles7.findReplaceStyles, _styles4.textHighlightStyle, _styles8.taskDecisionStyles, _status.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _date.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {

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

@@ -108,7 +108,7 @@ var ToolbarFeedbackInternal = /*#__PURE__*/function (_PureComponent) {
               jiraIssueCollectorScriptLoading: true,
               showOptOutOption: false
             });
-            basePluginState = (_this$props$api = _this.props.api) === null || _this$props$api === void 0 ? void 0 : _this$props$api.base.sharedState.currentState();
+            basePluginState = (_this$props$api = _this.props.api) === null || _this$props$api === void 0 || (_this$props$api = _this$props$api.base) === null || _this$props$api === void 0 ? void 0 : _this$props$api.sharedState.currentState();
             sessionId = (_window$localStorage$ = window.localStorage.getItem('awc.session.id')) === null || _window$localStorage$ === void 0 ? void 0 : _window$localStorage$.toString();
             contentId = basePluginState === null || basePluginState === void 0 || (_basePluginState$cont = basePluginState.contextIdentifier) === null || _basePluginState$cont === void 0 ? void 0 : _basePluginState$cont.objectId;
             tabId = window.sessionStorage['awc.tab.id'];

package/dist/cjs/use-preset.js

@@ -41,7 +41,6 @@ var _context = require("./presets/context");
  */
 function usePreset(createPreset, dependencies) {
   var editorApi = (0, _context.usePresetContext)();
-
   // eslint-disable-next-line react-hooks/exhaustive-deps
   var preset = (0, _react.useMemo)(createPreset, dependencies);
   return {

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.3.14";
+var version = exports.version = "189.3.16";

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

@@ -15,7 +15,7 @@ export const InlineNodeViewSharedStyles = css`
     white-space: nowrap;
     /* Then reset to the Editor default so we don't interfere
     with any component styling. */
-    & > *:not(span[aria-hidden='true'].zeroWidthSpaceContainer) {
+    & > *:not(.zeroWidthSpaceContainer) {
       white-space: pre-wrap;
     }
     // Prevent visually hidden assistive text from being selected.

package/dist/es2019/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/es2019/plugins/analytics/utils.js

@@ -25,28 +25,4 @@ export function addAnalytics(state, tr, payload, channel = editorAnalyticsChanne
   }
   editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? 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 command => (state, dispatch, view) => command(state, tr => {
-    if (dispatch) {
-      if (payload instanceof Function) {
-        const dynamicPayload = payload(state);
-        if (dynamicPayload) {
-          dispatch(addAnalytics(state, tr, dynamicPayload, channel));
-        }
-      } else {
-        dispatch(addAnalytics(state, tr, payload, channel));
-      }
-    }
-  }, view);
 }

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

@@ -4,10 +4,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';
 class BreakoutView {
   constructor(

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

@@ -12,7 +12,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/es2019/plugins/extension/extension-api.js

@@ -2,8 +2,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/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/find-replace/FindReplaceToolbarButtonWithState.js

@@ -5,17 +5,18 @@ import { cancelSearchWithAnalytics, replaceWithAnalytics, replaceAllWithAnalytic
 import { blur, toggleMatchCase } from './commands';
 import FindReplaceToolbarButton from './ui/FindReplaceToolbarButton';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
-const FindReplaceToolbarButtonWithState = props => {
-  const {
-    popupsBoundariesElement,
-    popupsMountPoint,
-    popupsScrollableElement,
-    isToolbarReducedSpacing,
-    editorView,
-    containerElement,
-    dispatchAnalyticsEvent,
-    featureFlags
-  } = props;
+const FindReplaceToolbarButtonWithState = ({
+  popupsBoundariesElement,
+  popupsMountPoint,
+  popupsScrollableElement,
+  isToolbarReducedSpacing,
+  editorView,
+  containerElement,
+  dispatchAnalyticsEvent,
+  featureFlags,
+  editorAnalyticsAPI,
+  takeFullWidth
+}) => {
   if (!editorView) {
     return null;
   }
@@ -37,12 +38,12 @@ const FindReplaceToolbarButtonWithState = props => {
     cmd(state, dispatch);
   };
   const handleActivate = () => {
-    runWithEditorFocused(() => dispatchCommand(activateWithAnalytics({
+    runWithEditorFocused(() => dispatchCommand(activateWithAnalytics(editorAnalyticsAPI)({
       triggerMethod: TRIGGER_METHOD.TOOLBAR
     })));
   };
   const handleFind = keyword => {
-    runWithEditorFocused(() => dispatchCommand(findWithAnalytics({
+    runWithEditorFocused(() => dispatchCommand(findWithAnalytics(editorAnalyticsAPI)({
       editorView,
       containerElement,
       keyword
@@ -51,14 +52,14 @@ const FindReplaceToolbarButtonWithState = props => {
   const handleFindNext = ({
     triggerMethod
   }) => {
-    runWithEditorFocused(() => dispatchCommand(findNextWithAnalytics({
+    runWithEditorFocused(() => dispatchCommand(findNextWithAnalytics(editorAnalyticsAPI)({
       triggerMethod
     })));
   };
   const handleFindPrev = ({
     triggerMethod
   }) => {
-    runWithEditorFocused(() => dispatchCommand(findPrevWithAnalytics({
+    runWithEditorFocused(() => dispatchCommand(findPrevWithAnalytics(editorAnalyticsAPI)({
       triggerMethod
     })));
   };
@@ -66,7 +67,7 @@ const FindReplaceToolbarButtonWithState = props => {
     triggerMethod,
     replaceText
   }) => {
-    runWithEditorFocused(() => dispatchCommand(replaceWithAnalytics({
+    runWithEditorFocused(() => dispatchCommand(replaceWithAnalytics(editorAnalyticsAPI)({
       triggerMethod,
       replaceText
     })));
@@ -74,7 +75,7 @@ const FindReplaceToolbarButtonWithState = props => {
   const handleReplaceAll = ({
     replaceText
   }) => {
-    runWithEditorFocused(() => dispatchCommand(replaceAllWithAnalytics({
+    runWithEditorFocused(() => dispatchCommand(replaceAllWithAnalytics(editorAnalyticsAPI)({
       replaceText
     })));
   };
@@ -84,7 +85,7 @@ const FindReplaceToolbarButtonWithState = props => {
   const handleCancel = ({
     triggerMethod
   }) => {
-    dispatchCommand(cancelSearchWithAnalytics({
+    dispatchCommand(cancelSearchWithAnalytics(editorAnalyticsAPI)({
       triggerMethod
     }));
     editorView.focus();
@@ -129,7 +130,7 @@ const FindReplaceToolbarButtonWithState = props => {
         onFindPrev: handleFindPrev,
         onReplace: handleReplace,
         onReplaceAll: handleReplaceAll,
-        takeFullWidth: !!props.takeFullWidth
+        takeFullWidth: !!takeFullWidth
       });
     }
   });

package/dist/es2019/plugins/find-replace/commands-with-analytics.js

@@ -1,10 +1,10 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { withAnalytics } from '../analytics';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { activate, find, findNext, findPrevious, replace, replaceAll, cancelSearch } from './commands';
-export const activateWithAnalytics = ({
+export const activateWithAnalytics = editorAnalyticsAPI => ({
   triggerMethod
-}) => withAnalytics(state => ({
+}) => withAnalytics(editorAnalyticsAPI, state => ({
   eventType: EVENT_TYPE.UI,
   action: ACTION.ACTIVATED,
   actionSubject: ACTION_SUBJECT.FIND_REPLACE_DIALOG,
@@ -13,18 +13,18 @@ export const activateWithAnalytics = ({
     triggerMethod
   }
 }))(activate());
-export const findWithAnalytics = ({
+export const findWithAnalytics = editorAnalyticsAPI => ({
   editorView,
   containerElement,
   keyword
-}) => withAnalytics({
+}) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.TRACK,
   action: ACTION.FIND_PERFORMED,
   actionSubject: ACTION_SUBJECT.TEXT
 })(find(editorView, containerElement, keyword));
-export const findNextWithAnalytics = ({
+export const findNextWithAnalytics = editorAnalyticsAPI => ({
   triggerMethod
-}) => withAnalytics({
+}) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.TRACK,
   action: ACTION.FIND_NEXT_PERFORMED,
   actionSubject: ACTION_SUBJECT.TEXT,
@@ -32,9 +32,9 @@ export const findNextWithAnalytics = ({
     triggerMethod
   }
 })(findNext());
-export const findPrevWithAnalytics = ({
+export const findPrevWithAnalytics = editorAnalyticsAPI => ({
   triggerMethod
-}) => withAnalytics({
+}) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.TRACK,
   action: ACTION.FIND_PREV_PERFORMED,
   actionSubject: ACTION_SUBJECT.TEXT,
@@ -42,10 +42,10 @@ export const findPrevWithAnalytics = ({
     triggerMethod
   }
 })(findPrevious());
-export const replaceWithAnalytics = ({
+export const replaceWithAnalytics = editorAnalyticsAPI => ({
   triggerMethod,
   replaceText
-}) => withAnalytics({
+}) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.TRACK,
   action: ACTION.REPLACED_ONE,
   actionSubject: ACTION_SUBJECT.TEXT,
@@ -53,16 +53,16 @@ export const replaceWithAnalytics = ({
     triggerMethod
   }
 })(replace(replaceText));
-export const replaceAllWithAnalytics = ({
+export const replaceAllWithAnalytics = editorAnalyticsAPI => ({
   replaceText
-}) => withAnalytics({
+}) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.TRACK,
   action: ACTION.REPLACED_ALL,
   actionSubject: ACTION_SUBJECT.TEXT
 })(replaceAll(replaceText));
-export const cancelSearchWithAnalytics = ({
+export const cancelSearchWithAnalytics = editorAnalyticsAPI => ({
   triggerMethod
-}) => withAnalytics({
+}) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.UI,
   action: ACTION.DEACTIVATED,
   actionSubject: ACTION_SUBJECT.FIND_REPLACE_DIALOG,

package/dist/es2019/plugins/find-replace/index.js

@@ -18,7 +18,10 @@ export const findReplacePlugin = ({
         }) => createPlugin(dispatch)
       }, {
         name: 'findReplaceKeymap',
-        plugin: () => keymapPlugin()
+        plugin: () => {
+          var _api$analytics;
+          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+        }
       }];
     },
     primaryToolbarComponent({
@@ -33,6 +36,7 @@ export const findReplacePlugin = ({
       if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
         return null;
       } else {
+        var _api$analytics2;
         return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
@@ -42,7 +46,8 @@ export const findReplacePlugin = ({
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-          featureFlags: featureFlags
+          featureFlags: featureFlags,
+          editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
         });
       }
     }

package/dist/es2019/plugins/find-replace/keymap.js

@@ -2,15 +2,15 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { bindKeymapWithCommand, find as findKeymap } from '../../keymaps';
 import { activateWithAnalytics } from './commands-with-analytics';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
-const activateFindReplace = () => (state, dispatch) => {
-  activateWithAnalytics({
+const activateFindReplace = editorAnalyticsAPI => (state, dispatch) => {
+  activateWithAnalytics(editorAnalyticsAPI)({
     triggerMethod: TRIGGER_METHOD.SHORTCUT
   })(state, dispatch);
   return true;
 };
-const keymapPlugin = () => {
+const keymapPlugin = editorAnalyticsAPI => {
   const list = {};
-  bindKeymapWithCommand(findKeymap.common, activateFindReplace(), list);
+  bindKeymapWithCommand(findKeymap.common, activateFindReplace(editorAnalyticsAPI), list);
   return keymap(list);
 };
 export default keymapPlugin;

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';
@@ -15,7 +14,6 @@ export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
-export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';
 export { default as mobileSelectionPlugin } from './mobile-selection';

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';