@atlaskit/editor-core 189.3.14 → 189.3.16

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 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
+
+- [#42925](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42925) [`8ea16423505`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8ea16423505) - Removes FF platform.editor.update-table-cell-width-via-step
+- [#42859](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42859) [`16cc82bf2e3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/16cc82bf2e3) - ED-20721 Extract Expand Plugin
+- [#42937](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42937) [`c9a523f6662`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c9a523f6662) - Remove internal withAnalytics function.
+- [#42451](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42451) [`36764ad64a9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/36764ad64a9) - [ECA11Y-87] Mentioned name is not communicated to the users of screen reader
+- Updated dependencies
+
 ## 189.3.14
 
 ### Patch Changes

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

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

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

@@ -11,12 +11,6 @@ Object.defineProperty(exports, "addAnalytics", {
   }
 });
 exports.default = void 0;
-Object.defineProperty(exports, "withAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _utils.withAnalytics;
-  }
-});
 var _plugin = _interopRequireDefault(require("./plugin"));
 var _utils = require("./utils");
 var _default = exports.default = _plugin.default;

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addAnalytics = addAnalytics;
-exports.withAnalytics = withAnalytics;
 var _consts = require("./consts");
 var _pluginKey = require("./plugin-key");
 function getCreateUIAnalyticsEvent(editorState) {
@@ -33,32 +32,4 @@ function addAnalytics(state, tr, payload) {
   }
   editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent(payload, channel)(tr);
   return tr;
-}
-// Below function has been copied to packages/editor/editor-plugin-ai/src/utils/analytics.ts
-// If changes are made to this function, please make the same update in the linked file.
-/**
- *
- * @private
- * @deprecated
- *
- * Do not use this anymore. Please use @atlaskit/editor-plugin-analytics
- *
- */
-function withAnalytics(payload, channel) {
-  return function (command) {
-    return function (state, dispatch, view) {
-      return command(state, function (tr) {
-        if (dispatch) {
-          if (payload instanceof Function) {
-            var dynamicPayload = payload(state);
-            if (dynamicPayload) {
-              dispatch(addAnalytics(state, tr, dynamicPayload, channel));
-            }
-          } else {
-            dispatch(addAnalytics(state, tr, payload, channel));
-          }
-        }
-      }, view);
-    };
-  };
 }

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

@@ -13,10 +13,10 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _utils = require("@atlaskit/editor-common/utils");
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
-var _constants = require("./constants");
 var _pluginKey = require("./plugin-key");
 var _findBreakoutNode = require("./utils/find-breakout-node");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _styles = require("@atlaskit/editor-common/styles");
 var _hooks = require("@atlaskit/editor-common/hooks");
 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; }
@@ -77,9 +77,9 @@ var BreakoutView = /*#__PURE__*/function () {
       }
     });
     var contentDOM = document.createElement('div');
-    contentDOM.className = _constants.BreakoutCssClassName.BREAKOUT_MARK_DOM;
+    contentDOM.className = _styles.BreakoutCssClassName.BREAKOUT_MARK_DOM;
     var dom = document.createElement('div');
-    dom.className = _constants.BreakoutCssClassName.BREAKOUT_MARK;
+    dom.className = _styles.BreakoutCssClassName.BREAKOUT_MARK;
     dom.setAttribute('data-layout', mark.attrs.mode);
     dom.appendChild(contentDOM);
     this.dom = dom;

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

@@ -25,12 +25,12 @@ var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton")
 var _getBreakoutMode = require("../utils/get-breakout-mode");
 var _setBreakoutMode = require("../commands/set-breakout-mode");
 var _removeBreakout = require("../commands/remove-breakout");
-var _constants = require("../constants");
+var _styles = require("@atlaskit/editor-common/styles");
 var _isBreakoutMarkAllowed = require("../utils/is-breakout-mark-allowed");
 var _pluginKey = require("../plugin-key");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _isSupportedNode = require("../utils/is-supported-node");
-var _constants2 = require("@atlaskit/theme/constants");
+var _constants = require("@atlaskit/theme/constants");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _templateObject;
 /** @jsx jsx */
@@ -88,7 +88,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
       var titleMessage = (0, _utils2.getTitle)(breakoutMode);
       var title = formatMessage(titleMessage);
       var nextBreakoutMode = (0, _utils2.getNextBreakoutMode)(breakoutMode);
-      var belowOtherPopupsZIndex = _constants2.layers.layer() - 1;
+      var belowOtherPopupsZIndex = _constants.layers.layer() - 1;
       var pluginState = (0, _pluginKey.getPluginState)(state);
       if (!pluginState) {
         return null;
@@ -97,7 +97,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
       if (!element) {
         return null;
       }
-      var closestEl = element.querySelector(".".concat(_constants.BreakoutCssClassName.BREAKOUT_MARK_DOM));
+      var closestEl = element.querySelector(".".concat(_styles.BreakoutCssClassName.BREAKOUT_MARK_DOM));
       if (closestEl && closestEl.firstChild) {
         element = closestEl.firstChild;
       }

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/find-replace/FindReplaceToolbarButtonWithState.js

@@ -12,15 +12,17 @@ var _commandsWithAnalytics = require("./commands-with-analytics");
 var _commands = require("./commands");
 var _FindReplaceToolbarButton = _interopRequireDefault(require("./ui/FindReplaceToolbarButton"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(props) {
-  var popupsBoundariesElement = props.popupsBoundariesElement,
-    popupsMountPoint = props.popupsMountPoint,
-    popupsScrollableElement = props.popupsScrollableElement,
-    isToolbarReducedSpacing = props.isToolbarReducedSpacing,
-    editorView = props.editorView,
-    containerElement = props.containerElement,
-    dispatchAnalyticsEvent = props.dispatchAnalyticsEvent,
-    featureFlags = props.featureFlags;
+var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref) {
+  var popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement,
+    isToolbarReducedSpacing = _ref.isToolbarReducedSpacing,
+    editorView = _ref.editorView,
+    containerElement = _ref.containerElement,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    featureFlags = _ref.featureFlags,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
+    takeFullWidth = _ref.takeFullWidth;
   if (!editorView) {
     return null;
   }
@@ -41,50 +43,50 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   };
   var handleActivate = function handleActivate() {
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.activateWithAnalytics)({
+      return dispatchCommand((0, _commandsWithAnalytics.activateWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: _analytics.TRIGGER_METHOD.TOOLBAR
       }));
     });
   };
   var handleFind = function handleFind(keyword) {
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.findWithAnalytics)({
+      return dispatchCommand((0, _commandsWithAnalytics.findWithAnalytics)(editorAnalyticsAPI)({
         editorView: editorView,
         containerElement: containerElement,
         keyword: keyword
       }));
     });
   };
-  var handleFindNext = function handleFindNext(_ref) {
-    var triggerMethod = _ref.triggerMethod;
+  var handleFindNext = function handleFindNext(_ref2) {
+    var triggerMethod = _ref2.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.findNextWithAnalytics)({
+      return dispatchCommand((0, _commandsWithAnalytics.findNextWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: triggerMethod
       }));
     });
   };
-  var handleFindPrev = function handleFindPrev(_ref2) {
-    var triggerMethod = _ref2.triggerMethod;
+  var handleFindPrev = function handleFindPrev(_ref3) {
+    var triggerMethod = _ref3.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.findPrevWithAnalytics)({
+      return dispatchCommand((0, _commandsWithAnalytics.findPrevWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: triggerMethod
       }));
     });
   };
-  var handleReplace = function handleReplace(_ref3) {
-    var triggerMethod = _ref3.triggerMethod,
-      replaceText = _ref3.replaceText;
+  var handleReplace = function handleReplace(_ref4) {
+    var triggerMethod = _ref4.triggerMethod,
+      replaceText = _ref4.replaceText;
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.replaceWithAnalytics)({
+      return dispatchCommand((0, _commandsWithAnalytics.replaceWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: triggerMethod,
         replaceText: replaceText
       }));
     });
   };
-  var handleReplaceAll = function handleReplaceAll(_ref4) {
-    var replaceText = _ref4.replaceText;
+  var handleReplaceAll = function handleReplaceAll(_ref5) {
+    var replaceText = _ref5.replaceText;
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.replaceAllWithAnalytics)({
+      return dispatchCommand((0, _commandsWithAnalytics.replaceAllWithAnalytics)(editorAnalyticsAPI)({
         replaceText: replaceText
       }));
     });
@@ -92,9 +94,9 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindBlur = function handleFindBlur() {
     dispatchCommand((0, _commands.blur)());
   };
-  var handleCancel = function handleCancel(_ref5) {
-    var triggerMethod = _ref5.triggerMethod;
-    dispatchCommand((0, _commandsWithAnalytics.cancelSearchWithAnalytics)({
+  var handleCancel = function handleCancel(_ref6) {
+    var triggerMethod = _ref6.triggerMethod;
+    dispatchCommand((0, _commandsWithAnalytics.cancelSearchWithAnalytics)(editorAnalyticsAPI)({
       triggerMethod: triggerMethod
     }));
     editorView.focus();
@@ -108,8 +110,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     plugins: {
       findReplaceState: _types.findReplacePluginKey
     },
-    render: function render(_ref6) {
-      var findReplaceState = _ref6.findReplaceState;
+    render: function render(_ref7) {
+      var findReplaceState = _ref7.findReplaceState;
       if (!findReplaceState) {
         return null;
       }
@@ -136,7 +138,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
         onFindPrev: handleFindPrev,
         onReplace: handleReplace,
         onReplaceAll: handleReplaceAll,
-        takeFullWidth: !!props.takeFullWidth
+        takeFullWidth: !!takeFullWidth
       });
     }
   });

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

@@ -5,83 +5,97 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.replaceWithAnalytics = exports.replaceAllWithAnalytics = exports.findWithAnalytics = exports.findPrevWithAnalytics = exports.findNextWithAnalytics = exports.cancelSearchWithAnalytics = exports.activateWithAnalytics = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _analytics = require("../analytics");
-var _analytics2 = require("@atlaskit/editor-common/analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _commands = require("./commands");
-var activateWithAnalytics = exports.activateWithAnalytics = function activateWithAnalytics(_ref) {
-  var triggerMethod = _ref.triggerMethod;
-  return (0, _analytics.withAnalytics)(function (state) {
-    return {
-      eventType: _analytics2.EVENT_TYPE.UI,
-      action: _analytics2.ACTION.ACTIVATED,
-      actionSubject: _analytics2.ACTION_SUBJECT.FIND_REPLACE_DIALOG,
+var activateWithAnalytics = exports.activateWithAnalytics = function activateWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref) {
+    var triggerMethod = _ref.triggerMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, function (state) {
+      return {
+        eventType: _analytics.EVENT_TYPE.UI,
+        action: _analytics.ACTION.ACTIVATED,
+        actionSubject: _analytics.ACTION_SUBJECT.FIND_REPLACE_DIALOG,
+        attributes: {
+          inputMethod: state.selection instanceof _state.TextSelection && !state.selection.empty ? _analytics.INPUT_METHOD.PREFILL : _analytics.INPUT_METHOD.KEYBOARD,
+          triggerMethod: triggerMethod
+        }
+      };
+    })((0, _commands.activate)());
+  };
+};
+var findWithAnalytics = exports.findWithAnalytics = function findWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref2) {
+    var editorView = _ref2.editorView,
+      containerElement = _ref2.containerElement,
+      keyword = _ref2.keyword;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _analytics.ACTION.FIND_PERFORMED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT
+    })((0, _commands.find)(editorView, containerElement, keyword));
+  };
+};
+var findNextWithAnalytics = exports.findNextWithAnalytics = function findNextWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref3) {
+    var triggerMethod = _ref3.triggerMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _analytics.ACTION.FIND_NEXT_PERFORMED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
       attributes: {
-        inputMethod: state.selection instanceof _state.TextSelection && !state.selection.empty ? _analytics2.INPUT_METHOD.PREFILL : _analytics2.INPUT_METHOD.KEYBOARD,
         triggerMethod: triggerMethod
       }
-    };
-  })((0, _commands.activate)());
-};
-var findWithAnalytics = exports.findWithAnalytics = function findWithAnalytics(_ref2) {
-  var editorView = _ref2.editorView,
-    containerElement = _ref2.containerElement,
-    keyword = _ref2.keyword;
-  return (0, _analytics.withAnalytics)({
-    eventType: _analytics2.EVENT_TYPE.TRACK,
-    action: _analytics2.ACTION.FIND_PERFORMED,
-    actionSubject: _analytics2.ACTION_SUBJECT.TEXT
-  })((0, _commands.find)(editorView, containerElement, keyword));
-};
-var findNextWithAnalytics = exports.findNextWithAnalytics = function findNextWithAnalytics(_ref3) {
-  var triggerMethod = _ref3.triggerMethod;
-  return (0, _analytics.withAnalytics)({
-    eventType: _analytics2.EVENT_TYPE.TRACK,
-    action: _analytics2.ACTION.FIND_NEXT_PERFORMED,
-    actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })((0, _commands.findNext)());
+    })((0, _commands.findNext)());
+  };
 };
-var findPrevWithAnalytics = exports.findPrevWithAnalytics = function findPrevWithAnalytics(_ref4) {
-  var triggerMethod = _ref4.triggerMethod;
-  return (0, _analytics.withAnalytics)({
-    eventType: _analytics2.EVENT_TYPE.TRACK,
-    action: _analytics2.ACTION.FIND_PREV_PERFORMED,
-    actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })((0, _commands.findPrevious)());
+var findPrevWithAnalytics = exports.findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref4) {
+    var triggerMethod = _ref4.triggerMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _analytics.ACTION.FIND_PREV_PERFORMED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      attributes: {
+        triggerMethod: triggerMethod
+      }
+    })((0, _commands.findPrevious)());
+  };
 };
-var replaceWithAnalytics = exports.replaceWithAnalytics = function replaceWithAnalytics(_ref5) {
-  var triggerMethod = _ref5.triggerMethod,
-    replaceText = _ref5.replaceText;
-  return (0, _analytics.withAnalytics)({
-    eventType: _analytics2.EVENT_TYPE.TRACK,
-    action: _analytics2.ACTION.REPLACED_ONE,
-    actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })((0, _commands.replace)(replaceText));
+var replaceWithAnalytics = exports.replaceWithAnalytics = function replaceWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref5) {
+    var triggerMethod = _ref5.triggerMethod,
+      replaceText = _ref5.replaceText;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _analytics.ACTION.REPLACED_ONE,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      attributes: {
+        triggerMethod: triggerMethod
+      }
+    })((0, _commands.replace)(replaceText));
+  };
 };
-var replaceAllWithAnalytics = exports.replaceAllWithAnalytics = function replaceAllWithAnalytics(_ref6) {
-  var replaceText = _ref6.replaceText;
-  return (0, _analytics.withAnalytics)({
-    eventType: _analytics2.EVENT_TYPE.TRACK,
-    action: _analytics2.ACTION.REPLACED_ALL,
-    actionSubject: _analytics2.ACTION_SUBJECT.TEXT
-  })((0, _commands.replaceAll)(replaceText));
+var replaceAllWithAnalytics = exports.replaceAllWithAnalytics = function replaceAllWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref6) {
+    var replaceText = _ref6.replaceText;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _analytics.ACTION.REPLACED_ALL,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT
+    })((0, _commands.replaceAll)(replaceText));
+  };
 };
-var cancelSearchWithAnalytics = exports.cancelSearchWithAnalytics = function cancelSearchWithAnalytics(_ref7) {
-  var triggerMethod = _ref7.triggerMethod;
-  return (0, _analytics.withAnalytics)({
-    eventType: _analytics2.EVENT_TYPE.UI,
-    action: _analytics2.ACTION.DEACTIVATED,
-    actionSubject: _analytics2.ACTION_SUBJECT.FIND_REPLACE_DIALOG,
-    attributes: {
-      triggerMethod: triggerMethod
-    }
-  })((0, _commands.cancelSearch)());
+var cancelSearchWithAnalytics = exports.cancelSearchWithAnalytics = function cancelSearchWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref7) {
+    var triggerMethod = _ref7.triggerMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      eventType: _analytics.EVENT_TYPE.UI,
+      action: _analytics.ACTION.DEACTIVATED,
+      actionSubject: _analytics.ACTION_SUBJECT.FIND_REPLACE_DIALOG,
+      attributes: {
+        triggerMethod: triggerMethod
+      }
+    })((0, _commands.cancelSearch)());
+  };
 };

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

@@ -26,7 +26,8 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
       }, {
         name: 'findReplaceKeymap',
         plugin: function plugin() {
-          return (0, _keymap.default)();
+          var _api$analytics;
+          return (0, _keymap.default)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }];
     },
@@ -41,6 +42,7 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
       if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
         return null;
       } else {
+        var _api$analytics2;
         return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButtonWithState.default, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
@@ -50,7 +52,8 @@ var findReplacePlugin = exports.findReplacePlugin = function 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 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
         });
       }
     }

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

@@ -8,17 +8,17 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _keymaps = require("../../keymaps");
 var _commandsWithAnalytics = require("./commands-with-analytics");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var activateFindReplace = function activateFindReplace() {
+var activateFindReplace = function activateFindReplace(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    (0, _commandsWithAnalytics.activateWithAnalytics)({
+    (0, _commandsWithAnalytics.activateWithAnalytics)(editorAnalyticsAPI)({
       triggerMethod: _analytics.TRIGGER_METHOD.SHORTCUT
     })(state, dispatch);
     return true;
   };
 };
-var keymapPlugin = function keymapPlugin() {
+var keymapPlugin = function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.find.common, activateFindReplace(), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.find.common, activateFindReplace(editorAnalyticsAPI), list);
   return (0, _keymap.keymap)(list);
 };
 var _default = exports.default = keymapPlugin;