@atlaskit/editor-core 189.3.13 → 189.3.15

package/dist/es2019/plugins/index.js

@@ -5,7 +5,6 @@ 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 maxContentSizePlugin } from './max-content-size';
 export { default as pastePlugin } from './paste';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
@@ -16,7 +15,6 @@ export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
-export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';
 export { default as mobileSelectionPlugin } from './mobile-selection';

package/dist/es2019/plugins/mobile-dimensions/index.js

@@ -70,6 +70,12 @@ const createPlugin = dispatch => {
 };
 const mobileDimensionsPlugin = () => ({
   name: 'mobileDimensions',
+  getSharedState(editorState) {
+    if (!editorState) {
+      return undefined;
+    }
+    return mobileDimensionsPluginKey.getState(editorState);
+  },
   pmPlugins() {
     return [{
       name: 'mobileDimensions',

package/dist/es2019/presets/context.js

@@ -11,12 +11,12 @@ export const PresetContextProvider = ({
     }
   }, children);
 };
-export const usePresetContext = () => {
+export function usePresetContext() {
   const {
     editorApi
   } = useContext(EditorAPIContext);
   return editorApi;
-};
+}
 export const useSetPresetContext = () => {
   const {
     setEditorApi

package/dist/es2019/presets/universal.js

@@ -1,9 +1,10 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, 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, macroPlugin, 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';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { datePlugin } from '@atlaskit/editor-plugin-date';
+import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';
 import { captionPlugin } from '@atlaskit/editor-plugin-caption';
 import { borderPlugin } from '@atlaskit/editor-plugin-border';
 import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
@@ -26,6 +27,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';
@@ -415,4 +417,12 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     appearance
   }]);
   return finalPreset;
+}
+export function isExpandInsertionEnabled({
+  allowExpand
+}) {
+  if (allowExpand && typeof allowExpand === 'object') {
+    return !!allowExpand.allowInsertion;
+  }
+  return false;
 }

package/dist/es2019/ui/Appearance/Chromeless.js

@@ -1,13 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /** @jsx jsx */
-import React from 'react';
+import React, { Fragment } from 'react';
 import { css, jsx } from '@emotion/react';
 import PluginSlot from '../PluginSlot';
-import WithPluginState from '../WithPluginState';
 import { createEditorContentStyle } from '../ContentStyles';
-import { pluginKey as maxContentSizePluginKey } from '../../plugins/max-content-size';
 import { scrollbarStyles } from '../styles';
 import WithFlash from '../WithFlash';
+import { usePresetContext } from '../../presets/context';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 const chromelessEditor = css`
   line-height: 20px;
   height: auto;
@@ -91,12 +91,20 @@ export default class Editor extends React.Component {
     });
   }
   render() {
-    return jsx(WithPluginState, {
-      plugins: {
-        maxContentSize: maxContentSizePluginKey
-      },
-      render: this.renderChrome
+    return jsx(RenderWithPluginState, {
+      renderChrome: this.renderChrome
     });
   }
 }
-_defineProperty(Editor, "displayName", 'ChromelessEditorAppearance');
+_defineProperty(Editor, "displayName", 'ChromelessEditorAppearance');
+function RenderWithPluginState({
+  renderChrome
+}) {
+  const api = usePresetContext();
+  const {
+    maxContentSizeState
+  } = useSharedPluginState(api, ['maxContentSize']);
+  return jsx(Fragment, null, renderChrome({
+    maxContentSize: maxContentSizeState
+  }));
+}

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

@@ -238,7 +238,7 @@ function RenderWithPluginState({
   } = useSharedPluginState(api, ['media', 'maxContentSize']);
   return jsx(Fragment, null, renderChrome({
     maxContentSize: maxContentSizeState,
-    mediaState
+    mediaState: mediaState !== null && mediaState !== void 0 ? mediaState : undefined
   }));
 }
 export const CommentEditorWithIntl = injectIntl(Editor);

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

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

package/dist/es2019/ui/AppearanceComponents/Mobile.js

@@ -1,13 +1,11 @@
 /** @jsx jsx */
 import React, { useCallback, forwardRef } from 'react';
 import { css, jsx } from '@emotion/react';
-import { pluginKey as maxContentSizePluginKey } from '../../plugins/max-content-size';
-import { mobileDimensionsPluginKey } from '../../plugins/mobile-dimensions/plugin-factory';
-import WithPluginState from '../WithPluginState';
 import WithFlash from '../WithFlash';
 import { createEditorContentStyle } from '../ContentStyles';
 import { ClickAreaMobile as ClickArea } from '../Addon';
 import { usePresetContext } from '../../presets/context';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 const mobileEditor = css`
   min-height: 30px;
   width: 100%;
@@ -33,6 +31,10 @@ export const MobileAppearance = /*#__PURE__*/forwardRef(function MobileAppearanc
 }, ref) {
   var _api$base2;
   const api = usePresetContext();
+  const {
+    maxContentSizeState,
+    mobileDimensionsState
+  } = useSharedPluginState(api, ['maxContentSize', 'mobileDimensions']);
   const render = useCallback(({
     maxContentSize,
     mobileDimensions
@@ -85,11 +87,8 @@ export const MobileAppearance = /*#__PURE__*/forwardRef(function MobileAppearanc
       className: "ak-editor-content-area"
     }, children)))));
   }, [children, editorView, persistScrollGutter, editorDisabled, ref, featureFlags, api === null || api === void 0 ? void 0 : (_api$base2 = api.base) === null || _api$base2 === void 0 ? void 0 : _api$base2.sharedState]);
-  return jsx(WithPluginState, {
-    plugins: {
-      maxContentSize: maxContentSizePluginKey,
-      mobileDimensions: mobileDimensionsPluginKey
-    },
-    render: render
+  return render({
+    maxContentSize: maxContentSizeState,
+    mobileDimensions: mobileDimensionsState
   });
 });

package/dist/es2019/{plugins/expand/ui/styles.js → ui/ContentStyles/expand.js}

@@ -1,14 +1,17 @@
 import { css } from '@emotion/react';
+import { DN50, N40A, N50A, N80A, R200, R300, R50 } from '@atlaskit/theme/colors';
+// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { themed } from '@atlaskit/theme/components';
-import { R50, R300, N40A, N50A, N80A, DN50, R200 } from '@atlaskit/theme/colors';
+import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { sharedExpandStyles } from '@atlaskit/editor-common/ui';
-import { SelectionStyle, getSelectionStyles, akLayoutGutterOffset, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-import { BreakoutCssClassName } from '../../breakout/constants';
-import { expandClassNames } from './class-names';
+import { akEditorSelectedNodeClassName, akLayoutGutterOffset, getSelectionStyles, SelectionStyle } from '@atlaskit/editor-shared-styles';
+import { expandClassNames } from '@atlaskit/editor-common/styles';
 const EXPAND_SELECTED_BACKGROUND = themed({
   light: "var(--ds-background-neutral-subtle, rgba(255, 255, 255, 0.6))",
   dark: "var(--ds-background-neutral-subtle, rgba(9, 10, 11, 0.29))"
 });
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 const EXPAND_ICON_COLOR = props => css`
   color: ${themed({
   light: `var(--ds-icon-subtle, ${N80A})`,
@@ -37,6 +40,8 @@ const DANGER_STATE_BORDER_COLOR = themed({
 const DANGER_STATE_BORDER_RADIUS = themed({
   dark: '3px'
 });
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 export const expandStyles = props => css`
   .${expandClassNames.icon} > div {
     display: flex;

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

@@ -14,7 +14,7 @@ import { layoutStyles } from './layout';
 import { panelStyles } from './panel';
 import { placeholderTextStyles } from '@atlaskit/editor-plugin-placeholder-text/styles';
 import { extensionStyles } from '../../plugins/extension/ui/styles';
-import { expandStyles } from '../../plugins/expand/ui/styles';
+import { expandStyles } from './expand';
 import { MediaSharedClassNames } from '@atlaskit/editor-common/styles';
 import { findReplaceStyles } from '../../plugins/find-replace/styles';
 import { taskDecisionStyles } from '../../plugins/tasks-and-decisions/styles';

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

@@ -71,12 +71,12 @@ class ToolbarFeedbackInternal extends PureComponent {
       });
     });
     _defineProperty(this, "openJiraIssueCollector", async () => {
-      var _this$props$api, _window$localStorage$, _basePluginState$cont;
+      var _this$props$api, _this$props$api$base, _window$localStorage$, _basePluginState$cont;
       this.setState({
         jiraIssueCollectorScriptLoading: true,
         showOptOutOption: false
       });
-      const basePluginState = (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : _this$props$api.base.sharedState.currentState();
+      const basePluginState = (_this$props$api = this.props.api) === null || _this$props$api === void 0 ? void 0 : (_this$props$api$base = _this$props$api.base) === null || _this$props$api$base === void 0 ? void 0 : _this$props$api$base.sharedState.currentState();
       const sessionId = (_window$localStorage$ = window.localStorage.getItem('awc.session.id')) === null || _window$localStorage$ === void 0 ? void 0 : _window$localStorage$.toString();
       const contentId = basePluginState === null || basePluginState === void 0 ? void 0 : (_basePluginState$cont = basePluginState.contextIdentifier) === null || _basePluginState$cont === void 0 ? void 0 : _basePluginState$cont.objectId;
       const tabId = window.sessionStorage['awc.tab.id'];

package/dist/es2019/use-preset.js

@@ -35,7 +35,6 @@ import { usePresetContext } from './presets/context';
  */
 export function usePreset(createPreset, dependencies) {
   const editorApi = usePresetContext();
-
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const preset = useMemo(createPreset, dependencies);
   return {

package/dist/es2019/version-wrapper.js

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

package/dist/esm/create-editor/ErrorBoundary.js

@@ -16,8 +16,6 @@ import uuid from 'uuid';
 import { ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { IntlErrorBoundary } from '@atlaskit/editor-common/ui';
 import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
-// eslint-disable-next-line import/no-extraneous-dependencies
-
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, editorAnalyticsChannel } from '@atlaskit/editor-common/analytics';
 import { getDocStructure } from '../utils/document-logger';
 import { WithEditorView } from './WithEditorView';

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

@@ -7,4 +7,4 @@ import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 // For reasoning behind styles, see comments in:
 // ./getInlineNodeViewProducer -> portalChildren()
 
-export var InlineNodeViewSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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"])), inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, ZERO_WIDTH_SPACE);
+export var InlineNodeViewSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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"])), inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, inlineNodeViewClassname, ZERO_WIDTH_SPACE);

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

@@ -1,3 +1,3 @@
 import analyticsPlugin from './plugin';
-export { withAnalytics, addAnalytics } from './utils';
+export { addAnalytics } from './utils';
 export default analyticsPlugin;

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

@@ -26,32 +26,4 @@ export 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
- *
- */
-export 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/esm/plugins/breakout/index.js

@@ -8,10 +8,10 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { breakout } from '@atlaskit/adf-schema';
 import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
 import LayoutButton from './ui/LayoutButton';
-import { BreakoutCssClassName } from './constants';
 import { pluginKey } from './plugin-key';
 import { findSupportedNodeForBreakout } from './utils/find-breakout-node';
 import { akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
+import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 var BreakoutView = /*#__PURE__*/function () {
   function BreakoutView(

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

@@ -22,7 +22,7 @@ import ToolbarButton from '../../../ui/ToolbarButton';
 import { getBreakoutMode } from '../utils/get-breakout-mode';
 import { setBreakoutMode } from '../commands/set-breakout-mode';
 import { removeBreakout } from '../commands/remove-breakout';
-import { BreakoutCssClassName } from '../constants';
+import { BreakoutCssClassName } from '@atlaskit/editor-common/styles';
 import { isBreakoutMarkAllowed } from '../utils/is-breakout-mark-allowed';
 import { getPluginState } from '../plugin-key';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';

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

@@ -5,15 +5,17 @@ import { cancelSearchWithAnalytics, replaceWithAnalytics, replaceAllWithAnalytic
 import { blur, toggleMatchCase } from './commands';
 import FindReplaceToolbarButton from './ui/FindReplaceToolbarButton';
 import { TRIGGER_METHOD } from '@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;
   }
@@ -34,50 +36,50 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   };
   var handleActivate = function handleActivate() {
     runWithEditorFocused(function () {
-      return dispatchCommand(activateWithAnalytics({
+      return dispatchCommand(activateWithAnalytics(editorAnalyticsAPI)({
         triggerMethod: TRIGGER_METHOD.TOOLBAR
       }));
     });
   };
   var handleFind = function handleFind(keyword) {
     runWithEditorFocused(function () {
-      return dispatchCommand(findWithAnalytics({
+      return dispatchCommand(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(findNextWithAnalytics({
+      return dispatchCommand(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(findPrevWithAnalytics({
+      return dispatchCommand(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(replaceWithAnalytics({
+      return dispatchCommand(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(replaceAllWithAnalytics({
+      return dispatchCommand(replaceAllWithAnalytics(editorAnalyticsAPI)({
         replaceText: replaceText
       }));
     });
@@ -85,9 +87,9 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindBlur = function handleFindBlur() {
     dispatchCommand(blur());
   };
-  var handleCancel = function handleCancel(_ref5) {
-    var triggerMethod = _ref5.triggerMethod;
-    dispatchCommand(cancelSearchWithAnalytics({
+  var handleCancel = function handleCancel(_ref6) {
+    var triggerMethod = _ref6.triggerMethod;
+    dispatchCommand(cancelSearchWithAnalytics(editorAnalyticsAPI)({
       triggerMethod: triggerMethod
     }));
     editorView.focus();
@@ -101,8 +103,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     plugins: {
       findReplaceState: findReplacePluginKey
     },
-    render: function render(_ref6) {
-      var findReplaceState = _ref6.findReplaceState;
+    render: function render(_ref7) {
+      var findReplaceState = _ref7.findReplaceState;
       if (!findReplaceState) {
         return null;
       }
@@ -129,7 +131,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
         onFindPrev: handleFindPrev,
         onReplace: handleReplace,
         onReplaceAll: handleReplaceAll,
-        takeFullWidth: !!props.takeFullWidth
+        takeFullWidth: !!takeFullWidth
       });
     }
   });

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());
+  };
 };