@atlaskit/editor-core 189.3.14 → 189.3.16

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

@@ -1,81 +1,95 @@
 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 var activateWithAnalytics = function activateWithAnalytics(_ref) {
-  var triggerMethod = _ref.triggerMethod;
-  return withAnalytics(function (state) {
-    return {
-      eventType: EVENT_TYPE.UI,
-      action: ACTION.ACTIVATED,
-      actionSubject: ACTION_SUBJECT.FIND_REPLACE_DIALOG,
+export var activateWithAnalytics = function activateWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref) {
+    var triggerMethod = _ref.triggerMethod;
+    return withAnalytics(editorAnalyticsAPI, function (state) {
+      return {
+        eventType: EVENT_TYPE.UI,
+        action: ACTION.ACTIVATED,
+        actionSubject: ACTION_SUBJECT.FIND_REPLACE_DIALOG,
+        attributes: {
+          inputMethod: state.selection instanceof TextSelection && !state.selection.empty ? INPUT_METHOD.PREFILL : INPUT_METHOD.KEYBOARD,
+          triggerMethod: triggerMethod
+        }
+      };
+    })(activate());
+  };
+};
+export var findWithAnalytics = function findWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref2) {
+    var editorView = _ref2.editorView,
+      containerElement = _ref2.containerElement,
+      keyword = _ref2.keyword;
+    return withAnalytics(editorAnalyticsAPI, {
+      eventType: EVENT_TYPE.TRACK,
+      action: ACTION.FIND_PERFORMED,
+      actionSubject: ACTION_SUBJECT.TEXT
+    })(find(editorView, containerElement, keyword));
+  };
+};
+export var findNextWithAnalytics = function findNextWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref3) {
+    var triggerMethod = _ref3.triggerMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      eventType: EVENT_TYPE.TRACK,
+      action: ACTION.FIND_NEXT_PERFORMED,
+      actionSubject: ACTION_SUBJECT.TEXT,
       attributes: {
-        inputMethod: state.selection instanceof TextSelection && !state.selection.empty ? INPUT_METHOD.PREFILL : INPUT_METHOD.KEYBOARD,
         triggerMethod: triggerMethod
       }
-    };
-  })(activate());
-};
-export var findWithAnalytics = function findWithAnalytics(_ref2) {
-  var editorView = _ref2.editorView,
-    containerElement = _ref2.containerElement,
-    keyword = _ref2.keyword;
-  return withAnalytics({
-    eventType: EVENT_TYPE.TRACK,
-    action: ACTION.FIND_PERFORMED,
-    actionSubject: ACTION_SUBJECT.TEXT
-  })(find(editorView, containerElement, keyword));
+    })(findNext());
+  };
 };
-export var findNextWithAnalytics = function findNextWithAnalytics(_ref3) {
-  var triggerMethod = _ref3.triggerMethod;
-  return withAnalytics({
-    eventType: EVENT_TYPE.TRACK,
-    action: ACTION.FIND_NEXT_PERFORMED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })(findNext());
-};
-export var findPrevWithAnalytics = function findPrevWithAnalytics(_ref4) {
-  var triggerMethod = _ref4.triggerMethod;
-  return withAnalytics({
-    eventType: EVENT_TYPE.TRACK,
-    action: ACTION.FIND_PREV_PERFORMED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })(findPrevious());
+export var findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref4) {
+    var triggerMethod = _ref4.triggerMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      eventType: EVENT_TYPE.TRACK,
+      action: ACTION.FIND_PREV_PERFORMED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      attributes: {
+        triggerMethod: triggerMethod
+      }
+    })(findPrevious());
+  };
 };
-export var replaceWithAnalytics = function replaceWithAnalytics(_ref5) {
-  var triggerMethod = _ref5.triggerMethod,
-    replaceText = _ref5.replaceText;
-  return withAnalytics({
-    eventType: EVENT_TYPE.TRACK,
-    action: ACTION.REPLACED_ONE,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })(replace(replaceText));
+export var replaceWithAnalytics = function replaceWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref5) {
+    var triggerMethod = _ref5.triggerMethod,
+      replaceText = _ref5.replaceText;
+    return withAnalytics(editorAnalyticsAPI, {
+      eventType: EVENT_TYPE.TRACK,
+      action: ACTION.REPLACED_ONE,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      attributes: {
+        triggerMethod: triggerMethod
+      }
+    })(replace(replaceText));
+  };
 };
-export var replaceAllWithAnalytics = function replaceAllWithAnalytics(_ref6) {
-  var replaceText = _ref6.replaceText;
-  return withAnalytics({
-    eventType: EVENT_TYPE.TRACK,
-    action: ACTION.REPLACED_ALL,
-    actionSubject: ACTION_SUBJECT.TEXT
-  })(replaceAll(replaceText));
+export var replaceAllWithAnalytics = function replaceAllWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref6) {
+    var replaceText = _ref6.replaceText;
+    return withAnalytics(editorAnalyticsAPI, {
+      eventType: EVENT_TYPE.TRACK,
+      action: ACTION.REPLACED_ALL,
+      actionSubject: ACTION_SUBJECT.TEXT
+    })(replaceAll(replaceText));
+  };
 };
-export var cancelSearchWithAnalytics = function cancelSearchWithAnalytics(_ref7) {
-  var triggerMethod = _ref7.triggerMethod;
-  return withAnalytics({
-    eventType: EVENT_TYPE.UI,
-    action: ACTION.DEACTIVATED,
-    actionSubject: ACTION_SUBJECT.FIND_REPLACE_DIALOG,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })(cancelSearch());
+export var cancelSearchWithAnalytics = function cancelSearchWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref7) {
+    var triggerMethod = _ref7.triggerMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      eventType: EVENT_TYPE.UI,
+      action: ACTION.DEACTIVATED,
+      actionSubject: ACTION_SUBJECT.FIND_REPLACE_DIALOG,
+      attributes: {
+        triggerMethod: triggerMethod
+      }
+    })(cancelSearch());
+  };
 };

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

@@ -19,7 +19,8 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
       }, {
         name: 'findReplaceKeymap',
         plugin: function plugin() {
-          return keymapPlugin();
+          var _api$analytics;
+          return keymapPlugin(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }];
     },
@@ -34,6 +35,7 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
       if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
         return null;
       } else {
+        var _api$analytics2;
         return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
@@ -43,7 +45,8 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-          featureFlags: featureFlags
+          featureFlags: featureFlags,
+          editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
         });
       }
     }

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

@@ -2,17 +2,17 @@ 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';
-var activateFindReplace = function activateFindReplace() {
+var activateFindReplace = function activateFindReplace(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    activateWithAnalytics({
+    activateWithAnalytics(editorAnalyticsAPI)({
       triggerMethod: TRIGGER_METHOD.SHORTCUT
     })(state, dispatch);
     return true;
   };
 };
-var keymapPlugin = function keymapPlugin() {
+var keymapPlugin = function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  bindKeymapWithCommand(findKeymap.common, activateFindReplace(), list);
+  bindKeymapWithCommand(findKeymap.common, activateFindReplace(editorAnalyticsAPI), list);
   return keymap(list);
 };
 export default keymapPlugin;

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';
@@ -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/esm/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';
 var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize) {
   switch (toolbarSize) {
@@ -62,34 +59,22 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
         isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
         isLastItem = _ref2.isLastItem;
       var renderNode = function 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: function render(_ref3) {
-            var _ref3$macroState = _ref3.macroState,
-              macroState = _ref3$macroState === void 0 ? {} : _ref3$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, {
@@ -100,23 +85,22 @@ var insertBlockPlugin = function insertBlockPlugin(_ref) {
     }
   };
 };
-function ToolbarInsertBlockWithInjectionApi(_ref4) {
-  var _ref5, _ref6, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$a;
-  var editorView = _ref4.editorView,
-    editorActions = _ref4.editorActions,
-    dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent,
-    popupsMountPoint = _ref4.popupsMountPoint,
-    popupsBoundariesElement = _ref4.popupsBoundariesElement,
-    popupsScrollableElement = _ref4.popupsScrollableElement,
-    toolbarSize = _ref4.toolbarSize,
-    disabled = _ref4.disabled,
-    isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing,
-    isLastItem = _ref4.isLastItem,
-    providers = _ref4.providers,
-    pluginInjectionApi = _ref4.pluginInjectionApi,
-    options = _ref4.options,
-    macroState = _ref4.macroState,
-    featureFlags = _ref4.featureFlags;
+function ToolbarInsertBlockWithInjectionApi(_ref3) {
+  var _ref4, _ref5, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$e;
+  var editorView = _ref3.editorView,
+    editorActions = _ref3.editorActions,
+    dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
+    popupsMountPoint = _ref3.popupsMountPoint,
+    popupsBoundariesElement = _ref3.popupsBoundariesElement,
+    popupsScrollableElement = _ref3.popupsScrollableElement,
+    toolbarSize = _ref3.toolbarSize,
+    disabled = _ref3.disabled,
+    isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing,
+    isLastItem = _ref3.isLastItem,
+    providers = _ref3.providers,
+    pluginInjectionApi = _ref3.pluginInjectionApi,
+    options = _ref3.options,
+    featureFlags = _ref3.featureFlags;
   var buttons = toolbarSizeToButtons(toolbarSize);
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText']),
     dateState = _useSharedPluginState.dateState,
@@ -144,8 +128,8 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
     layoutSectionEnabled: Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.layout),
     expandEnabled: !!options.allowExpand,
-    mediaUploadsEnabled: (_ref5 = mediaState && mediaState.allowsUploads) !== null && _ref5 !== void 0 ? _ref5 : undefined,
-    onShowMediaPicker: (_ref6 = mediaState && mediaState.showMediaPicker) !== null && _ref6 !== void 0 ? _ref6 : undefined,
+    mediaUploadsEnabled: (_ref4 = mediaState && mediaState.allowsUploads) !== null && _ref4 !== void 0 ? _ref4 : undefined,
+    onShowMediaPicker: (_ref5 = mediaState && mediaState.showMediaPicker) !== null && _ref5 !== void 0 ? _ref5 : undefined,
     mediaSupported: !!mediaState,
     imageUploadSupported: !!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.imageUpload),
     imageUploadEnabled: imageUploadState === null || imageUploadState === void 0 ? void 0 : imageUploadState.enabled,
@@ -158,8 +142,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     nativeStatusSupported: options.nativeStatusSupported,
     horizontalRuleEnabled: options.horizontalRuleEnabled,
     onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
-    onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser(pluginInjectionApi === null || pluginInjectionApi === 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 || (_pluginInjectionApi$e = pluginInjectionApi.extension) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.actions.insertMacroFromMacroBrowser,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,

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

@@ -11,8 +11,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';
@@ -86,9 +85,7 @@ var InsertMenu = function InsertMenu(_ref) {
   }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q6 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q6 === void 0 ? void 0 : _pluginInjectionApi$q6.actions, quickInsertDropdownItems]);
   var emptyStateHandler = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q7 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q7 === void 0 || (_pluginInjectionApi$q7 = _pluginInjectionApi$q7.sharedState.currentState()) === null || _pluginInjectionApi$q7 === void 0 ? void 0 : _pluginInjectionApi$q7.emptyStateHandler;
   return jsx("div", {
-    css: function css(theme) {
-      return insertMenuWrapper(theme, itemCount);
-    }
+    css: insertMenuWrapper(itemCount)
   }, jsx(ElementBrowserWrapper, {
     handleClickOutside: toggleVisiblity,
     handleEscapeKeydown: toggleVisiblity,
@@ -132,13 +129,10 @@ var getInsertMenuHeight = function getInsertMenuHeight(_ref3) {
   return 560; // For showing 6 Elements.
 };
 
-var insertMenuWrapper = function insertMenuWrapper(theme, itemCount) {
+var insertMenuWrapper = function insertMenuWrapper(itemCount) {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  width: 320px;\n  height: ", "px;\n  background-color: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n"])), getInsertMenuHeight({
     itemCount: itemCount
-  }), themed({
-    light: "var(--ds-surface-overlay, ".concat(N0, ")"),
-    dark: "var(--ds-surface-overlay, ".concat(DN50, ")")
-  })(theme), borderRadius(), "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(N30A, ",\n    0 2px 1px ").concat(N30A, ",\n    0 0 20px -6px ").concat(N60A), ")"));
+  }), "var(--ds-surface-overlay, ".concat(N0, ")"), borderRadius(), "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(N30A, ",\n    0 2px 1px ").concat(N30A, ",\n    0 0 20px -6px ").concat(N60A), ")"));
 };
 var flexWrapperStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  flex: 1;\n  box-sizing: border-box;\n  overflow: hidden;\n"])));
 var FlexWrapper = function FlexWrapper(props) {

package/dist/esm/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 var BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, props.open && /*#__PURE__*/React.createElement(Popup, {

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

@@ -7,7 +7,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/esm/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';
 var DropDownButtonIcon = /*#__PURE__*/React.memo(function (props) {

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

@@ -17,7 +17,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';
@@ -25,7 +25,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)
@@ -538,7 +538,6 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_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/esm/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';
 var from = function from(init) {

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

@@ -17,7 +17,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';
@@ -486,7 +486,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 function (state, dispatch, view) {
     var macro = null;
 
@@ -500,7 +500,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/esm/plugins/paste/pm-plugins/main.js

@@ -241,14 +241,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;
+            var _pluginInjectionApi$c, _pluginInjectionApi$e;
             // 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 || (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+            if (handleMacroAutoConvert(text, markdownSlice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.queueCardsFromChangedTr, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.extension) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.actions) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.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
@@ -313,7 +313,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText) {
-          var _pluginInjectionApi$c2, _pluginInjectionApi$l;
+          var _pluginInjectionApi$c2, _pluginInjectionApi$e2, _pluginInjectionApi$l;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(editorAnalyticsAPI)(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -321,7 +321,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           }
 
           // run macro autoconvert prior to other conversions
-          if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+          if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.actions) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.queueCardsFromChangedTr, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e2 = pluginInjectionApi.extension) === null || _pluginInjectionApi$e2 === void 0 || (_pluginInjectionApi$e2 = _pluginInjectionApi$e2.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, slice, {
               type: PasteTypes.richText

package/dist/esm/presets/context.js

@@ -14,11 +14,11 @@ export var PresetContextProvider = function PresetContextProvider(_ref) {
     }
   }, children);
 };
-export var usePresetContext = function usePresetContext() {
+export function usePresetContext() {
   var _useContext = useContext(EditorAPIContext),
     editorApi = _useContext.editorApi;
   return editorApi;
-};
+}
 export var useSetPresetContext = function useSetPresetContext() {
   var _useContext2 = useContext(EditorAPIContext),
     setEditorApi = _useContext2.setEditorApi;

package/dist/esm/presets/universal.js

@@ -2,7 +2,7 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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';
@@ -31,6 +31,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, function (plugin, builder) {
-    if (props.macroProvider) {
-      return builder.add(plugin);
-    }
-    return builder;
   }).maybeAdd(annotationPlugin, function (plugin, builder) {
     // See default list for when adding annotations with a provider
     if (!props.annotationProviders && props.allowConfluenceInlineComment) {
@@ -412,4 +408,11 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     appearance: appearance
   }]);
   return finalPreset;
+}
+export function isExpandInsertionEnabled(_ref) {
+  var allowExpand = _ref.allowExpand;
+  if (allowExpand && _typeof(allowExpand) === 'object') {
+    return !!allowExpand.allowInsertion;
+  }
+  return false;
 }

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

@@ -203,7 +203,7 @@ function RenderWithPluginState(_ref4) {
     maxContentSizeState = _useSharedPluginState.maxContentSizeState;
   return jsx(Fragment, null, renderChrome({
     maxContentSize: maxContentSizeState,
-    mediaState: mediaState
+    mediaState: mediaState !== null && mediaState !== void 0 ? mediaState : undefined
   }));
 }
 export var CommentEditorWithIntl = injectIntl(Editor);

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

@@ -14,7 +14,7 @@ import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { usePresetContext } from '../../../presets/context';
 export var EditorToolbar = /*#__PURE__*/React.memo(function (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;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     shouldSplitToolbar = _useState2[0],
@@ -66,7 +66,8 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     editorView: props.editorView,
     containerElement: props.containerElement,
     dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
-    featureFlags: props.featureFlags
+    featureFlags: props.featureFlags,
+    editorAnalyticsAPI: editorAPI === null || editorAPI === 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(function () {
     if (twoLineEditorToolbar) {