@atlaskit/editor-core 187.3.6 → 187.4.2

package/dist/esm/plugins/text-formatting/commands/text-formatting.js

@@ -1,7 +1,8 @@
 import { Selection } from 'prosemirror-state';
 import { applyMarkOnRange, toggleMark } from '../../../utils/commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { hasCode, markActive } from '../utils';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 export var moveRight = function moveRight() {
   return function (state, dispatch) {
     var code = state.schema.marks.code;
@@ -105,17 +106,19 @@ export var toggleEm = function toggleEm() {
     return false;
   };
 };
-export var toggleEmWithAnalytics = function toggleEmWithAnalytics(_ref3) {
-  var inputMethod = _ref3.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleEm());
+export var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref3) {
+    var inputMethod = _ref3.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleEm());
+  };
 };
 export var toggleStrike = function toggleStrike() {
   return function (state, dispatch) {
@@ -126,17 +129,19 @@ export var toggleStrike = function toggleStrike() {
     return false;
   };
 };
-export var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(_ref4) {
-  var inputMethod = _ref4.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleStrike());
+export var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref4) {
+    var inputMethod = _ref4.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrike());
+  };
 };
 export var toggleStrong = function toggleStrong() {
   return function (state, dispatch) {
@@ -147,17 +152,19 @@ export var toggleStrong = function toggleStrong() {
     return false;
   };
 };
-export var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(_ref5) {
-  var inputMethod = _ref5.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleStrong());
+export var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref5) {
+    var inputMethod = _ref5.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrong());
+  };
 };
 export var toggleUnderline = function toggleUnderline() {
   return function (state, dispatch) {
@@ -168,17 +175,19 @@ export var toggleUnderline = function toggleUnderline() {
     return false;
   };
 };
-export var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(_ref6) {
-  var inputMethod = _ref6.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleUnderline());
+export var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref6) {
+    var inputMethod = _ref6.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleUnderline());
+  };
 };
 export var toggleSuperscript = function toggleSuperscript() {
   return function (state, dispatch) {
@@ -191,17 +200,19 @@ export var toggleSuperscript = function toggleSuperscript() {
     return false;
   };
 };
-export var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(_ref7) {
-  var inputMethod = _ref7.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUPER,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleSuperscript());
+export var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref7) {
+    var inputMethod = _ref7.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUPER,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSuperscript());
+  };
 };
 export var toggleSubscript = function toggleSubscript() {
   return function (state, dispatch) {
@@ -214,17 +225,19 @@ export var toggleSubscript = function toggleSubscript() {
     return false;
   };
 };
-export var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(_ref8) {
-  var inputMethod = _ref8.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUB,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleSubscript());
+export var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref8) {
+    var inputMethod = _ref8.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUB,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSubscript());
+  };
 };
 export var toggleCode = function toggleCode() {
   return function (state, dispatch) {
@@ -235,17 +248,19 @@ export var toggleCode = function toggleCode() {
     return false;
   };
 };
-export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(_ref9) {
-  var inputMethod = _ref9.inputMethod;
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleCode());
+export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref9) {
+    var inputMethod = _ref9.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleCode());
+  };
 };
 var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from, to, text) {
   return function (state, dispatch) {
@@ -269,14 +284,16 @@ var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from,
     return false;
   };
 };
-export var createInlineCodeFromTextInputWithAnalytics = function createInlineCodeFromTextInputWithAnalytics(from, to, text) {
-  return withAnalytics({
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
-    attributes: {
-      inputMethod: INPUT_METHOD.FORMATTING
-    }
-  })(createInlineCodeFromTextInput(from, to, text));
+export var createInlineCodeFromTextInputWithAnalytics = function createInlineCodeFromTextInputWithAnalytics(editorAnalyticsAPI) {
+  return function (from, to, text) {
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
+      attributes: {
+        inputMethod: INPUT_METHOD.FORMATTING
+      }
+    })(createInlineCodeFromTextInput(from, to, text));
+  };
 };

package/dist/esm/plugins/text-formatting/index.js

@@ -39,8 +39,9 @@ var textFormatting = function textFormatting() {
       return [{
         name: 'textFormatting',
         plugin: function plugin(_ref) {
+          var _api$dependencies$ana;
           var dispatch = _ref.dispatch;
-          return textFormattingPlugin(dispatch);
+          return textFormattingPlugin(dispatch, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
         }
       }, {
         name: 'textFormattingCursor',
@@ -69,14 +70,15 @@ var textFormatting = function textFormatting() {
       }, {
         name: 'textFormattingClearKeymap',
         plugin: function plugin() {
-          var _api$dependencies$ana;
-          return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
+          var _api$dependencies$ana2;
+          return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
         }
       }, {
         name: 'textFormattingKeymap',
         plugin: function plugin(_ref5) {
+          var _api$dependencies$ana3;
           var schema = _ref5.schema;
-          return keymapPlugin(schema);
+          return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions);
         }
       }];
     },
@@ -93,7 +95,7 @@ var textFormatting = function textFormatting() {
           clearFormattingPluginState: clearFormattingPluginKey
         },
         render: function render() {
-          var _api$dependencies$ana2;
+          var _api$dependencies$ana4;
           return /*#__PURE__*/React.createElement(Toolbar, {
             editorState: editorView.state,
             popupsMountPoint: popupsMountPoint,
@@ -103,7 +105,7 @@ var textFormatting = function textFormatting() {
             editorView: editorView,
             isToolbarDisabled: disabled,
             shouldUseResponsiveToolbar: Boolean(options.responsiveToolbarMenu),
-            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions
+            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions
           });
         }
       });

package/dist/esm/plugins/text-formatting/pm-plugins/keymap.js

@@ -2,40 +2,40 @@ import * as keymaps from '../../../keymaps';
 import { keymap } from '../../../utils/keymap';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import * as commands from '../commands/text-formatting';
-export default function keymapPlugin(schema) {
+export default function keymapPlugin(schema, editorAnalyticsAPI) {
   var list = {};
   if (schema.marks.strong) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleBold.common, commands.toggleStrongWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleBold.common, commands.toggleStrongWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.em) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, commands.toggleEmWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, commands.toggleEmWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.code) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, commands.toggleCodeWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, commands.toggleCodeWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.strike) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, commands.toggleStrikeWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.underline) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)({
       inputMethod: INPUT_METHOD.SHORTCUT
     }), list);
   }

package/dist/esm/plugins/text-formatting/pm-plugins/main.js

@@ -8,7 +8,7 @@ import * as commands from '../commands/text-formatting';
 import { anyMarkActive } from '../utils';
 import { pluginKey } from './plugin-key';
 export { pluginKey };
-var getTextFormattingState = function getTextFormattingState(editorState) {
+var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,
     em = _editorState$schema$m.em,
     code = _editorState$schema$m.code,
@@ -55,14 +55,14 @@ var getTextFormattingState = function getTextFormattingState(editorState) {
   }
   return state;
 };
-export var plugin = function plugin(dispatch) {
+export var plugin = function plugin(dispatch, editorAnalyticsAPI) {
   return new SafePlugin({
     state: {
       init: function init(_config, state) {
-        return getTextFormattingState(state);
+        return getTextFormattingState(state, editorAnalyticsAPI);
       },
       apply: function apply(_tr, pluginState, _oldState, newState) {
-        var state = getTextFormattingState(newState);
+        var state = getTextFormattingState(newState, editorAnalyticsAPI);
         if (!shallowEqual(pluginState, state)) {
           dispatch(pluginKey, state);
           return state;
@@ -88,7 +88,7 @@ export var plugin = function plugin(dispatch) {
         var schema = state.schema,
           parentNodeType = state.selection.$from.parent.type;
         if (parentNodeType.allowsMarkType(schema.marks.code)) {
-          return createInlineCodeFromTextInputWithAnalytics(from, to, text)(state, dispatch);
+          return createInlineCodeFromTextInputWithAnalytics(editorAnalyticsAPI)(from, to, text)(state, dispatch);
         }
         return false;
       }

package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -19,61 +19,64 @@ var withToolbarInputMethod = function withToolbarInputMethod(func) {
     inputMethod: INPUT_METHOD.TOOLBAR
   });
 };
-var IconButtons = {
-  strong: {
-    buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
-    command: withToolbarInputMethod(commands.toggleStrongWithAnalytics),
-    message: toolbarMessages.bold,
-    tooltipKeymap: toggleBold,
-    component: function component() {
-      return jsx(BoldIcon, {
-        label: ""
-      });
-    }
-  },
-  em: {
-    buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
-    command: withToolbarInputMethod(commands.toggleEmWithAnalytics),
-    message: toolbarMessages.italic,
-    tooltipKeymap: toggleItalic,
-    component: function component() {
-      return jsx(ItalicIcon, {
-        label: ""
-      });
+var IconButtons = function IconButtons(editorAnalyticsAPI) {
+  return {
+    strong: {
+      buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
+      command: withToolbarInputMethod(commands.toggleStrongWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.bold,
+      tooltipKeymap: toggleBold,
+      component: function component() {
+        return jsx(BoldIcon, {
+          label: ""
+        });
+      }
+    },
+    em: {
+      buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
+      command: withToolbarInputMethod(commands.toggleEmWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.italic,
+      tooltipKeymap: toggleItalic,
+      component: function component() {
+        return jsx(ItalicIcon, {
+          label: ""
+        });
+      }
+    },
+    underline: {
+      command: withToolbarInputMethod(commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.underline,
+      tooltipKeymap: toggleUnderline
+    },
+    strike: {
+      command: withToolbarInputMethod(commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.strike,
+      tooltipKeymap: toggleStrikethrough
+    },
+    code: {
+      command: withToolbarInputMethod(commands.toggleCodeWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.code,
+      tooltipKeymap: toggleCode
+    },
+    subscript: {
+      command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.subscript,
+      tooltipKeymap: toggleSubscript
+    },
+    superscript: {
+      command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)),
+      message: toolbarMessages.superscript,
+      tooltipKeymap: toggleSuperscript
     }
-  },
-  underline: {
-    command: withToolbarInputMethod(commands.toggleUnderlineWithAnalytics),
-    message: toolbarMessages.underline,
-    tooltipKeymap: toggleUnderline
-  },
-  strike: {
-    command: withToolbarInputMethod(commands.toggleStrikeWithAnalytics),
-    message: toolbarMessages.strike,
-    tooltipKeymap: toggleStrikethrough
-  },
-  code: {
-    command: withToolbarInputMethod(commands.toggleCodeWithAnalytics),
-    message: toolbarMessages.code,
-    tooltipKeymap: toggleCode
-  },
-  subscript: {
-    command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics),
-    message: toolbarMessages.subscript,
-    tooltipKeymap: toggleSubscript
-  },
-  superscript: {
-    command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics),
-    message: toolbarMessages.superscript,
-    tooltipKeymap: toggleSuperscript
-  }
+  };
 };
 var getIcon = function getIcon(_ref) {
   var iconType = _ref.iconType,
     isDisabled = _ref.isDisabled,
     isActive = _ref.isActive,
-    intl = _ref.intl;
-  var icon = IconButtons[iconType];
+    intl = _ref.intl,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI;
+  var icon = IconButtons(editorAnalyticsAPI)[iconType];
   var content = intl.formatMessage(icon.message);
   var tooltipKeymap = icon.tooltipKeymap;
   return {
@@ -126,7 +129,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark) {
     };
   };
 };
-var buildIcon = function buildIcon(iconMark) {
+var buildIcon = function buildIcon(iconMark, editorAnalyticsAPI) {
   var getState = buildMenuIconState(iconMark);
   return function (_ref3) {
     var schema = _ref3.schema,
@@ -146,7 +149,8 @@ var buildIcon = function buildIcon(iconMark) {
         iconType: IconTypes[iconMark],
         isDisabled: isToolbarDisabled || isDisabled,
         isActive: isActive,
-        intl: intl
+        intl: intl,
+        editorAnalyticsAPI: editorAnalyticsAPI
       });
     }, [isToolbarDisabled, isDisabled, isActive, intl]);
     var shouldRenderIcon = hasSchemaMark && !isHidden;
@@ -155,13 +159,6 @@ var buildIcon = function buildIcon(iconMark) {
     }, [shouldRenderIcon, iconComponent]);
   };
 };
-var buildStrongIcon = buildIcon(IconTypes.strong);
-var buildEmIcon = buildIcon(IconTypes.em);
-var buildUnderlineIcon = buildIcon(IconTypes.underline);
-var buildStrikeIcon = buildIcon(IconTypes.strike);
-var buildCodeIcon = buildIcon(IconTypes.code);
-var buildSubscriptIcon = buildIcon(IconTypes.subscript);
-var buildSuperscriptIcon = buildIcon(IconTypes.superscript);
 var useTextFormattingPluginState = function useTextFormattingPluginState(editorState) {
   return useMemo(function () {
     var pluginState = textFormattingPluginKey.getState(editorState);
@@ -173,7 +170,8 @@ var useTextFormattingPluginState = function useTextFormattingPluginState(editorS
 export var useFormattingIcons = function useFormattingIcons(_ref4) {
   var isToolbarDisabled = _ref4.isToolbarDisabled,
     editorState = _ref4.editorState,
-    intl = _ref4.intl;
+    intl = _ref4.intl,
+    editorAnalyticsAPI = _ref4.editorAnalyticsAPI;
   var textFormattingPluginState = useTextFormattingPluginState(editorState);
   var schema = editorState.schema;
   var props = {
@@ -182,6 +180,13 @@ export var useFormattingIcons = function useFormattingIcons(_ref4) {
     intl: intl,
     isToolbarDisabled: Boolean(isToolbarDisabled)
   };
+  var buildStrongIcon = buildIcon(IconTypes.strong, editorAnalyticsAPI);
+  var buildEmIcon = buildIcon(IconTypes.em, editorAnalyticsAPI);
+  var buildUnderlineIcon = buildIcon(IconTypes.underline, editorAnalyticsAPI);
+  var buildStrikeIcon = buildIcon(IconTypes.strike, editorAnalyticsAPI);
+  var buildCodeIcon = buildIcon(IconTypes.code, editorAnalyticsAPI);
+  var buildSubscriptIcon = buildIcon(IconTypes.subscript, editorAnalyticsAPI);
+  var buildSuperscriptIcon = buildIcon(IconTypes.superscript, editorAnalyticsAPI);
   var strongIcon = buildStrongIcon(props);
   var emIcon = buildEmIcon(props);
   var underlineIcon = buildUnderlineIcon(props);

package/dist/esm/plugins/text-formatting/ui/Toolbar/index.js

@@ -44,7 +44,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
   var defaultIcons = useFormattingIcons({
     editorState: editorState,
     intl: intl,
-    isToolbarDisabled: isToolbarDisabled
+    isToolbarDisabled: isToolbarDisabled,
+    editorAnalyticsAPI: editorAnalyticsAPI
   });
   var clearIcon = useClearIcon({
     editorState: editorState,

package/dist/esm/ui/ColorPickerButton/index.js

@@ -9,7 +9,7 @@ import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/ed
 import { getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color';
 import Button from '@atlaskit/button';
 import Tooltip from '@atlaskit/tooltip';
-import { DN50, N0, N60A } from '@atlaskit/theme/colors';
+import { DN50, N0, N60A, N30A } from '@atlaskit/theme/colors';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import ColorPalette from '../ColorPalette';
@@ -35,7 +35,6 @@ var colorPickerWrapper = function colorPickerWrapper(theme) {
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
 var ColorPickerButton = function ColorPickerButton(props) {
-  var _props$size, _props$size2, _props$size3;
   var buttonRef = React.useRef(null);
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -162,8 +161,14 @@ var ColorPickerButton = function ColorPickerButton(props) {
   };
   var title = props.title || '';
   var currentColor = props.currentColor && props.hexToPaletteColor ? props.hexToPaletteColor(props.currentColor) : props.currentColor;
-  var buttonStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    padding: 0 10px;\n    background-color: ", ";\n    ", "\n    &:before {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      align-self: center;\n      content: '';\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      background-color: ", ";\n      width: ", ";\n      height: ", ";\n      padding: 0;\n      margin: 0px 2px;\n    }\n  "])), "var(--ds-background-neutral, transparent)", /* If custom props size height, override the button base height property */
-  !!((_props$size = props.size) !== null && _props$size !== void 0 && _props$size.height) && "height: inherit;", DEFAULT_BORDER_COLOR, borderRadius(), currentColor || 'transparent', ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || '14px', ((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || '14px');
+  var buttonStyle = function buttonStyle(theme) {
+    var _props$size, _props$size2, _props$size3;
+    return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    padding: 0 10px;\n    background-color: ", ";\n    ", "\n    &:before {\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      align-self: center;\n      content: '';\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      background-color: ", ";\n      width: ", ";\n      height: ", ";\n      padding: 0;\n      margin: 0px 2px;\n    }\n    &:hover {\n      background: ", ";\n    }\n  "])), "var(--ds-background-neutral-subtle, transparent)", /* If custom props size height, override the button base height property */
+    !!((_props$size = props.size) !== null && _props$size !== void 0 && _props$size.height) && "height: inherit;", DEFAULT_BORDER_COLOR, borderRadius(), currentColor || 'transparent', ((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || '14px', ((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || '14px', themed({
+      light: "var(--ds-background-neutral-subtle-hovered, ".concat(N30A, ")"),
+      dark: "var(--ds-background-neutral-subtle-hovered, ".concat(N30A, ")")
+    })(theme));
+  };
   return jsx("div", {
     css: colorPickerButtonWrapper
   }, jsx(Tooltip, {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.3.6";
+export var version = "187.4.2";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.3.6",
+	"version": "187.4.2",
 	"sideEffects": false
 }