@atlaskit/editor-core 189.3.15 → 189.3.17

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 189.3.17
+
+### Patch Changes
+
+- [#42702](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42702) [`79e5ed8fac7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/79e5ed8fac7) - ED-19543 remove unused FF check
+- Updated dependencies
+
+## 189.3.16
+
+### Patch Changes
+
+- [#43042](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43042) [`fd547efa4e5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fd547efa4e5) - Remove `macro` editor plugin and migrate functionality into extension plugin.
+- Updated dependencies
+
 ## 189.3.15
 
 ### Patch Changes

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

@@ -10,8 +10,8 @@ var _validator = require("@atlaskit/adf-utils/validator");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _macro = require("../macro");
-var _pluginKey = require("../macro/plugin-key");
+var _actions = require("./pm-plugins/macro/actions");
+var _pluginKey = require("./pm-plugins/macro/plugin-key");
 var _utils = require("../../utils");
 var _commands = require("./commands");
 var _utils2 = require("./utils");
@@ -32,7 +32,7 @@ var getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function
     if (!nodeWithPos) {
       throw new Error("Missing nodeWithPos. Can't determine position of node");
     }
-    (0, _macro.insertMacroFromMacroBrowser)(editorAnalyticsAPI)(macroProvider, nodeWithPos.node, true)(view);
+    (0, _actions.insertMacroFromMacroBrowser)(editorAnalyticsAPI)(macroProvider, nodeWithPos.node, true)(view);
   };
 };
 var extensionAPICallPayload = function extensionAPICallPayload(functionName) {

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

@@ -8,13 +8,15 @@ exports.default = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _main = require("./pm-plugins/main");
+var _macro = require("./pm-plugins/macro");
+var _actions = require("./pm-plugins/macro/actions");
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _uniqueId = require("./pm-plugins/unique-id");
 var _toolbar = require("./toolbar");
 var _contextPanel = require("./context-panel");
 var _extensionApi = require("./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;
@@ -76,6 +78,13 @@ var extensionPlugin = function extensionPlugin(_ref) {
             }
           });
         }
+      }, {
+        name: 'macro',
+        plugin: function plugin(_ref3) {
+          var dispatch = _ref3.dispatch,
+            providerFactory = _ref3.providerFactory;
+          return (0, _macro.createPlugin)(dispatch, providerFactory);
+        }
       }];
     },
     actions: {
@@ -86,14 +95,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: (0, _actions.insertMacroFromMacroBrowser)(_api === null || _api === void 0 || (_api$analytics2 = _api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
+      runMacroAutoConvert: _actions.runMacroAutoConvert
     },
     pluginsOptions: {
       floatingToolbar: (0, _toolbar.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: (0, _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/cjs/plugins/{macro → extension/pm-plugins/macro}/actions.js

@@ -13,9 +13,8 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _validator = require("@atlaskit/editor-common/validator");
 var _insert = require("@atlaskit/editor-common/insert");
-var _pluginFactory = require("../extension/plugin-factory");
+var _pluginFactory = require("../../plugin-factory");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _extensionEvents = require("../analytics/types/extension-events");
 var _pluginKey = require("./plugin-key");
 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) { (0, _defineProperty2.default)(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; }
@@ -55,7 +54,7 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
               selection = state.selection, schema = state.schema;
               _schema$nodes = schema.nodes, extension = _schema$nodes.extension, inlineExtension = _schema$nodes.inlineExtension, bodiedExtension = _schema$nodes.bodiedExtension;
               extensionState = (0, _pluginFactory.getPluginState)(state);
-              targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
+              targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
               tr = state.tr;
               isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection); // When it's a bodiedExtension but not selected
               if (macroNode.type === bodiedExtension && !isBodiedExtensionSelected) {
@@ -77,7 +76,7 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
                 if (pos > -1) {
                   tr = tr.replaceWith(pos, pos + macroNode.nodeSize, node);
                   tr.setSelection(_state.Selection.near(tr.doc.resolve(pos)));
-                  targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+                  targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
                 }
               }
 

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.createPlugin = void 0;
+exports.createPlugin = void 0;
 Object.defineProperty(exports, "insertMacroFromMacroBrowser", {
   enumerable: true,
   get: function get() {
@@ -69,20 +69,4 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
       };
     }
   });
-};
-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);
-        }
-      }];
-    }
-  };
-};
-var _default = exports.default = macroPlugin;
+};

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

@@ -18,7 +18,7 @@ var _actions = require("./actions");
 var _main = require("./pm-plugins/main");
 var _utils2 = require("./utils");
 var _commands = require("./commands");
-var _pluginKey = require("../macro/plugin-key");
+var _pluginKey = require("./pm-plugins/macro/plugin-key");
 var _utils3 = require("@atlaskit/editor-common/utils");
 var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
   edit: {

package/dist/cjs/plugins/index.js

@@ -106,12 +106,6 @@ Object.defineProperty(exports, "jiraIssuePlugin", {
     return _jiraIssue.default;
   }
 });
-Object.defineProperty(exports, "macroPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _macro.default;
-  }
-});
 Object.defineProperty(exports, "mobileDimensionsPlugin", {
   enumerable: true,
   get: function get() {
@@ -160,7 +154,6 @@ var _extension = _interopRequireDefault(require("./extension"));
 var _insertBlock = _interopRequireDefault(require("./insert-block"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _toolbarListsIndentation = _interopRequireDefault(require("./toolbar-lists-indentation"));
-var _macro = _interopRequireDefault(require("./macro"));
 var _paste = _interopRequireDefault(require("./paste"));
 var _tasksAndDecisions = _interopRequireDefault(require("./tasks-and-decisions"));
 var _breakout = _interopRequireDefault(require("./breakout"));

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

@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
-var _macro = require("../macro");
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 var _ToolbarInsertBlock = _interopRequireDefault(require("./ui/ToolbarInsertBlock"));
 var _consts = require("@atlaskit/editor-plugin-block-type/consts");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _pluginKey = require("../macro/plugin-key");
-var _types = require("../../ui/Toolbar/types");
+var _types = require("@atlaskit/editor-common/types");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize) {
   switch (toolbarSize) {
@@ -69,34 +66,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.default.createElement(_WithPluginState.default, {
-          plugins: {
-            macroState: _pluginKey.pluginKey
-          },
-          render: function render(_ref3) {
-            var _ref3$macroState = _ref3.macroState,
-              macroState = _ref3$macroState === void 0 ? {} : _ref3$macroState;
-            return /*#__PURE__*/_react.default.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.default.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.default.createElement(_providerFactory.WithProviders, {
@@ -107,23 +92,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 = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText']),
     dateState = _useSharedPluginState.dateState,
@@ -151,8 +135,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,
@@ -165,8 +149,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: (0, _macro.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/cjs/{ui → plugins/insert-block/ui}/ElementBrowser/InsertMenu.js

@@ -12,7 +12,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _theme = require("@atlaskit/theme");
-var _components = require("@atlaskit/theme/components");
 var _colors = require("@atlaskit/theme/colors");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
@@ -92,9 +91,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 (0, _react2.jsx)("div", {
-    css: function css(theme) {
-      return insertMenuWrapper(theme, itemCount);
-    }
+    css: insertMenuWrapper(itemCount)
   }, (0, _react2.jsx)(ElementBrowserWrapper, {
     handleClickOutside: toggleVisiblity,
     handleEscapeKeydown: toggleVisiblity,
@@ -138,13 +135,10 @@ var getInsertMenuHeight = function getInsertMenuHeight(_ref3) {
   return 560; // For showing 6 Elements.
 };
 
-var insertMenuWrapper = function insertMenuWrapper(theme, itemCount) {
+var insertMenuWrapper = function insertMenuWrapper(itemCount) {
   return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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
-  }), (0, _components.themed)({
-    light: "var(--ds-surface-overlay, ".concat(_colors.N0, ")"),
-    dark: "var(--ds-surface-overlay, ".concat(_colors.DN50, ")")
-  })(theme), (0, _theme.borderRadius)(), "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(_colors.N30A, ",\n    0 2px 1px ").concat(_colors.N30A, ",\n    0 0 20px -6px ").concat(_colors.N60A), ")"));
+  }), "var(--ds-surface-overlay, ".concat(_colors.N0, ")"), (0, _theme.borderRadius)(), "var(--ds-shadow-overlay, ".concat("0 0 0 1px ".concat(_colors.N30A, ",\n    0 2px 1px ").concat(_colors.N30A, ",\n    0 0 20px -6px ").concat(_colors.N60A), ")"));
 };
 var flexWrapperStyles = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex: 1;\n  box-sizing: border-box;\n  overflow: hidden;\n"])));
 var FlexWrapper = function FlexWrapper(props) {

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.BlockInsertElementBrowser = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _InsertMenu = _interopRequireDefault(require("../../../../ui/ElementBrowser/InsertMenu"));
+var _InsertMenu = _interopRequireDefault(require("../ElementBrowser/InsertMenu"));
 var _dropdownButton = require("./dropdown-button");
 var BlockInsertElementBrowser = exports.BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.open && /*#__PURE__*/_react.default.createElement(_ui.Popup, {

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

@@ -12,7 +12,7 @@ var _memoize = _interopRequireDefault(require("lodash/memoize"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _messages = require("./messages");
 var _messages2 = require("@atlaskit/editor-common/messages");
-var _keymaps = require("../../../../keymaps");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _sortItems = require("./sort-items");
 var _item = require("./item");
 var _shallowEquals = require("./shallow-equals");

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

@@ -9,8 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _add = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/add"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _keymaps = require("../../../../keymaps");
-var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
+var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _styles = require("@atlaskit/editor-common/styles");
 var _styles2 = require("./styles");
 /** @jsx jsx */
@@ -27,7 +27,7 @@ var DropDownButtonIcon = /*#__PURE__*/_react.default.memo(function (props) {
   })));
 });
 var DropDownButton = exports.DropDownButton = /*#__PURE__*/_react.default.memo(function (props) {
-  return (0, _react2.jsx)(_ToolbarButton.default, {
+  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
     ref: props.handleRef,
     selected: props.selected,
     disabled: props.disabled,

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

@@ -19,7 +19,7 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _reactIntlNext = require("react-intl-next");
 var _picker = require("@atlaskit/emoji/picker");
 var _ui = require("@atlaskit/editor-common/ui");
-var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _commands = require("../../../tasks-and-decisions/commands");
@@ -27,7 +27,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("./messages");
 var _createItems3 = require("./create-items");
 var _blockInsertMenu = require("./block-insert-menu");
-var _withOuterListeners = _interopRequireDefault(require("../../../../ui/with-outer-listeners"));
+var _uiReact = require("@atlaskit/editor-common/ui-react");
 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) { (0, _defineProperty2.default)(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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -39,7 +39,7 @@ var isDetachedElement = function isDetachedElement(el) {
   return !document.body.contains(el);
 };
 var noop = function noop() {};
-var EmojiPickerWithListeners = (0, _withOuterListeners.default)(_picker.EmojiPicker);
+var EmojiPickerWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_picker.EmojiPicker);
 var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
   (0, _inherits2.default)(ToolbarInsertBlock, _React$PureComponent);
   var _super = _createSuper(ToolbarInsertBlock);
@@ -477,7 +477,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       return (0, _react2.jsx)("span", {
         css: _styles.buttonGroupStyle
       }, buttons.map(function (btn) {
-        return (0, _react2.jsx)(_ToolbarButton.default, {
+        return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
           item: btn,
           testId: String(btn.content),
           ref: btn.value.name === 'emoji' ? _this2.handleEmojiButtonRef : noop,
@@ -543,7 +543,6 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
           horizontalRuleEnabled: props.horizontalRuleEnabled,
           layoutSectionEnabled: props.layoutSectionEnabled,
           expandEnabled: props.expandEnabled,
-          macroProvider: props.macroProvider,
           showElementBrowserLink: props.showElementBrowserLink,
           emojiProvider: props.emojiProvider,
           availableWrapperBlockTypes: props.availableWrapperBlockTypes,

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

@@ -25,10 +25,9 @@ var _horizontalRule = _interopRequireDefault(require("@atlaskit/icon/glyph/edito
 var _code = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/code"));
 var _info = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/info"));
 var _quote = _interopRequireDefault(require("@atlaskit/icon/glyph/quote"));
-var _styles = require("../../../../ui/styles");
-var _keymaps = require("../../../../keymaps");
+var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _shallowEquals = require("./shallow-equals");
-var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 /** @jsx jsx */
 
 var from = function from(init) {
@@ -42,7 +41,7 @@ var from = function from(init) {
       label: init.content
     }),
     elemAfter: init.shortcut ? (0, _react2.jsx)("div", {
-      css: _styles.shortcutStyle
+      css: _shortcut.shortcutStyle
     }, init.shortcut) : undefined,
     'aria-label': init.shortcut ? init.content + ' ' + init.shortcut : init.content,
     'aria-haspopup': init['aria-haspopup'],
@@ -74,7 +73,7 @@ var link = exports.link = mem(function (init) {
     shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
     Icon: _link.default,
     'aria-haspopup': init['aria-haspopup'],
-    'aria-keyshortcuts': (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.addLink)
+    'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.addLink)
   });
 });
 var media = exports.media = mem(function (init) {
@@ -127,7 +126,7 @@ var table = exports.table = mem(function (init) {
     name: 'table',
     Icon: _table.default,
     shortcut: (0, _keymaps.tooltip)(_keymaps.toggleTable),
-    'aria-keyshortcuts': (0, _keymaps2.getAriaKeyshortcuts)(_keymaps.toggleTable)
+    'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.toggleTable)
   });
 });
 var layout = exports.layout = mem(function (init) {
@@ -147,7 +146,7 @@ var codeblock = exports.codeblock = mem(function (init) {
     name: 'codeblock',
     Icon: _code.default,
     shortcut: init.shortcut,
-    'aria-keyshortcuts': (0, _keymaps2.getAriaKeyshortcuts)(init.shortcut)
+    'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
   });
 });
 var panel = exports.panel = mem(function (init) {
@@ -158,7 +157,7 @@ var panel = exports.panel = mem(function (init) {
     name: 'panel',
     Icon: _info.default,
     shortcut: init.shortcut,
-    'aria-keyshortcuts': (0, _keymaps2.getAriaKeyshortcuts)(init.shortcut)
+    'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
   });
 });
 var blockquote = exports.blockquote = mem(function (init) {

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

@@ -35,7 +35,6 @@ var _utils3 = require("@atlaskit/editor-common/utils");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _selection = require("@atlaskit/editor-common/selection");
-var _macro = require("../macro");
 var _util = require("./util");
 var _edgeCases = require("./edge-cases");
 var _commands = require("./commands");
@@ -508,7 +507,7 @@ function insertAutoMacro(slice, macro, view, from, to) {
   }
   return false;
 }
-function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptions, extensionAutoConverter) {
+function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, runMacroAutoConvert, cardsOptions, extensionAutoConverter) {
   return function (state, dispatch, view) {
     var macro = null;
 
@@ -522,7 +521,8 @@ function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptio
 
     // then try from macro provider (which will be removed some time in the future)
     if (!macro) {
-      macro = (0, _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/cjs/plugins/paste/pm-plugins/main.js

@@ -254,14 +254,14 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // 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 ((0, _analytics2.handlePasteLinkOnSelectedTextWithAnalytics)(editorAnalyticsAPI)(view, event, markdownSlice, _analytics.PasteTypes.markdown)(state, dispatch)) {
               return true;
             }
 
             // run macro autoconvert prior to other conversions
-            if ((0, _handlers.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 ((0, _handlers.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
               (0, _analytics2.sendPasteAnalyticsEvent)(editorAnalyticsAPI)(view, event, markdownSlice, {
                 type: _analytics.PasteTypes.markdown
@@ -326,7 +326,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
 
         // 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 = (0, _utils.linkifyContent)(state.schema)(slice);
           if ((0, _analytics2.handlePasteLinkOnSelectedTextWithAnalytics)(editorAnalyticsAPI)(view, event, slice, _analytics.PasteTypes.richText)(state, dispatch)) {
@@ -334,7 +334,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           }
 
           // run macro autoconvert prior to other conversions
-          if ((0, _handlers.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 ((0, _handlers.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
             (0, _analytics2.sendPasteAnalyticsEvent)(editorAnalyticsAPI)(view, event, slice, {
               type: _analytics.PasteTypes.richText

package/dist/cjs/presets/universal.js

@@ -39,7 +39,6 @@ var _editorPluginMentions = require("@atlaskit/editor-plugin-mentions");
 var _editorPluginPlaceholderText = require("@atlaskit/editor-plugin-placeholder-text");
 var _editorPluginExpand = require("@atlaskit/editor-plugin-expand");
 var _isFullPage = require("../utils/is-full-page");
-var _mediaCommon = require("@atlaskit/media-common");
 var _default = require("./default");
 var _utils = require("@atlaskit/editor-common/utils");
 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; }
@@ -145,8 +144,9 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     }
     return builder;
   }).maybeAdd(_editorPluginCaption.captionPlugin, function (plugin, builder) {
+    var _props$media;
     // EDM-799: inside caption plugin we do the feature flag in enabling the plugin
-    if (props.media && (props.media.allowCaptions || (0, _mediaCommon.getMediaFeatureFlag)('captions', props.media.featureFlags))) {
+    if ((_props$media = props.media) !== null && _props$media !== void 0 && _props$media.allowCaptions) {
       return builder.add(plugin);
     }
     return builder;
@@ -274,11 +274,6 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
-  }).maybeAdd(_plugins.macroPlugin, function (plugin, builder) {
-    if (props.macroProvider) {
-      return builder.add(plugin);
-    }
-    return builder;
   }).maybeAdd(_plugins.annotationPlugin, function (plugin, builder) {
     // See default list for when adding annotations with a provider
     if (!props.annotationProviders && props.allowConfluenceInlineComment) {

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.15";
+var version = exports.version = "189.3.17";

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