@atlaskit/editor-core 187.3.6 → 187.4.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 187.4.2
+
+### Patch Changes
+
+- [`e64541c6fda`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e64541c6fda) - [ux] [ED-18759] Updated table border, handlebar controls, blanket, icon, icon background and table cell options button colour tokens on light and dark theme for table selection and table deletion. Borders for Table Floating Contextual Button & Floating toolbar color palette button on dark & light theme are also updated.
+
+## 187.4.0
+
+### Minor Changes
+
+- [`315332d1509`](https://bitbucket.org/atlassian/atlassian-frontend/commits/315332d1509) - Converts the existing withAnalytics events within the text-formatting to use the new EditorAnalyticsAPI instead
+
 ## 187.3.6
 
 ### Patch Changes

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = exports.moveRight = exports.moveLeft = exports.createInlineCodeFromTextInputWithAnalytics = void 0;
 var _prosemirrorState = require("prosemirror-state");
 var _commands = require("../../../utils/commands");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("../utils");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var moveRight = function moveRight() {
   return function (state, dispatch) {
     var code = state.schema.marks.code;
@@ -114,17 +115,19 @@ var toggleEm = function toggleEm() {
   };
 };
 exports.toggleEm = toggleEm;
-var toggleEmWithAnalytics = function toggleEmWithAnalytics(_ref3) {
-  var inputMethod = _ref3.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleEm());
+var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref3) {
+    var inputMethod = _ref3.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleEm());
+  };
 };
 exports.toggleEmWithAnalytics = toggleEmWithAnalytics;
 var toggleStrike = function toggleStrike() {
@@ -137,17 +140,19 @@ var toggleStrike = function toggleStrike() {
   };
 };
 exports.toggleStrike = toggleStrike;
-var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(_ref4) {
-  var inputMethod = _ref4.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleStrike());
+var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref4) {
+    var inputMethod = _ref4.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrike());
+  };
 };
 exports.toggleStrikeWithAnalytics = toggleStrikeWithAnalytics;
 var toggleStrong = function toggleStrong() {
@@ -160,17 +165,19 @@ var toggleStrong = function toggleStrong() {
   };
 };
 exports.toggleStrong = toggleStrong;
-var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(_ref5) {
-  var inputMethod = _ref5.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleStrong());
+var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref5) {
+    var inputMethod = _ref5.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrong());
+  };
 };
 exports.toggleStrongWithAnalytics = toggleStrongWithAnalytics;
 var toggleUnderline = function toggleUnderline() {
@@ -183,17 +190,19 @@ var toggleUnderline = function toggleUnderline() {
   };
 };
 exports.toggleUnderline = toggleUnderline;
-var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(_ref6) {
-  var inputMethod = _ref6.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleUnderline());
+var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref6) {
+    var inputMethod = _ref6.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleUnderline());
+  };
 };
 exports.toggleUnderlineWithAnalytics = toggleUnderlineWithAnalytics;
 var toggleSuperscript = function toggleSuperscript() {
@@ -208,17 +217,19 @@ var toggleSuperscript = function toggleSuperscript() {
   };
 };
 exports.toggleSuperscript = toggleSuperscript;
-var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(_ref7) {
-  var inputMethod = _ref7.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SUPER,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleSuperscript());
+var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref7) {
+    var inputMethod = _ref7.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SUPER,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSuperscript());
+  };
 };
 exports.toggleSuperscriptWithAnalytics = toggleSuperscriptWithAnalytics;
 var toggleSubscript = function toggleSubscript() {
@@ -233,17 +244,19 @@ var toggleSubscript = function toggleSubscript() {
   };
 };
 exports.toggleSubscript = toggleSubscript;
-var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(_ref8) {
-  var inputMethod = _ref8.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SUB,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleSubscript());
+var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref8) {
+    var inputMethod = _ref8.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SUB,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSubscript());
+  };
 };
 exports.toggleSubscriptWithAnalytics = toggleSubscriptWithAnalytics;
 var toggleCode = function toggleCode() {
@@ -256,17 +269,19 @@ var toggleCode = function toggleCode() {
   };
 };
 exports.toggleCode = toggleCode;
-var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(_ref9) {
-  var inputMethod = _ref9.inputMethod;
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
-    attributes: {
-      inputMethod: inputMethod
-    }
-  })(toggleCode());
+var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref9) {
+    var inputMethod = _ref9.inputMethod;
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleCode());
+  };
 };
 exports.toggleCodeWithAnalytics = toggleCodeWithAnalytics;
 var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from, to, text) {
@@ -291,15 +306,17 @@ var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from,
     return false;
   };
 };
-var createInlineCodeFromTextInputWithAnalytics = function createInlineCodeFromTextInputWithAnalytics(from, to, text) {
-  return (0, _analytics.withAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
-    attributes: {
-      inputMethod: _analytics.INPUT_METHOD.FORMATTING
-    }
-  })(createInlineCodeFromTextInput(from, to, text));
+var createInlineCodeFromTextInputWithAnalytics = function createInlineCodeFromTextInputWithAnalytics(editorAnalyticsAPI) {
+  return function (from, to, text) {
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _analytics.ACTION.FORMATTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
+      attributes: {
+        inputMethod: _analytics.INPUT_METHOD.FORMATTING
+      }
+    })(createInlineCodeFromTextInput(from, to, text));
+  };
 };
 exports.createInlineCodeFromTextInputWithAnalytics = createInlineCodeFromTextInputWithAnalytics;

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

@@ -46,8 +46,9 @@ var textFormatting = function textFormatting() {
       return [{
         name: 'textFormatting',
         plugin: function plugin(_ref) {
+          var _api$dependencies$ana;
           var dispatch = _ref.dispatch;
-          return (0, _main.plugin)(dispatch);
+          return (0, _main.plugin)(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',
@@ -76,14 +77,15 @@ var textFormatting = function textFormatting() {
       }, {
         name: 'textFormattingClearKeymap',
         plugin: function plugin() {
-          var _api$dependencies$ana;
-          return (0, _clearFormattingKeymap.default)(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 (0, _clearFormattingKeymap.default)(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 (0, _keymap.default)(schema);
+          return (0, _keymap.default)(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);
         }
       }];
     },
@@ -100,7 +102,7 @@ var textFormatting = function textFormatting() {
           clearFormattingPluginState: _clearFormatting.pluginKey
         },
         render: function render() {
-          var _api$dependencies$ana2;
+          var _api$dependencies$ana4;
           return /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
             editorState: editorView.state,
             popupsMountPoint: popupsMountPoint,
@@ -110,7 +112,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/cjs/plugins/text-formatting/pm-plugins/keymap.js

@@ -11,40 +11,40 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var commands = _interopRequireWildcard(require("../commands/text-formatting"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function keymapPlugin(schema) {
+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: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.em) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, commands.toggleEmWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, commands.toggleEmWithAnalytics(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.code) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, commands.toggleCodeWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, commands.toggleCodeWithAnalytics(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.strike) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, commands.toggleStrikeWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.underline) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics({
+    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }

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

@@ -22,7 +22,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // eslint-disable-next-line no-duplicate-imports
 
-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,
@@ -69,14 +69,14 @@ var getTextFormattingState = function getTextFormattingState(editorState) {
   }
   return state;
 };
-var plugin = function plugin(dispatch) {
+var plugin = function plugin(dispatch, editorAnalyticsAPI) {
   return new _safePlugin.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 (!(0, _utils.shallowEqual)(pluginState, state)) {
           dispatch(_pluginKey.pluginKey, state);
           return state;
@@ -102,7 +102,7 @@ var plugin = function plugin(dispatch) {
         var schema = state.schema,
           parentNodeType = state.selection.$from.parent.type;
         if (parentNodeType.allowsMarkType(schema.marks.code)) {
-          return (0, commands.createInlineCodeFromTextInputWithAnalytics)(from, to, text)(state, dispatch);
+          return (0, commands.createInlineCodeFromTextInputWithAnalytics)(editorAnalyticsAPI)(from, to, text)(state, dispatch);
         }
         return false;
       }

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

@@ -29,61 +29,64 @@ var withToolbarInputMethod = function withToolbarInputMethod(func) {
     inputMethod: _enums.INPUT_METHOD.TOOLBAR
   });
 };
-var IconButtons = {
-  strong: {
-    buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
-    command: withToolbarInputMethod(commands.toggleStrongWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.bold,
-    tooltipKeymap: _keymaps.toggleBold,
-    component: function component() {
-      return (0, _react2.jsx)(_bold.default, {
-        label: ""
-      });
-    }
-  },
-  em: {
-    buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
-    command: withToolbarInputMethod(commands.toggleEmWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.italic,
-    tooltipKeymap: _keymaps.toggleItalic,
-    component: function component() {
-      return (0, _react2.jsx)(_italic.default, {
-        label: ""
-      });
+var IconButtons = function IconButtons(editorAnalyticsAPI) {
+  return {
+    strong: {
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
+      command: withToolbarInputMethod(commands.toggleStrongWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.bold,
+      tooltipKeymap: _keymaps.toggleBold,
+      component: function component() {
+        return (0, _react2.jsx)(_bold.default, {
+          label: ""
+        });
+      }
+    },
+    em: {
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
+      command: withToolbarInputMethod(commands.toggleEmWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.italic,
+      tooltipKeymap: _keymaps.toggleItalic,
+      component: function component() {
+        return (0, _react2.jsx)(_italic.default, {
+          label: ""
+        });
+      }
+    },
+    underline: {
+      command: withToolbarInputMethod(commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.underline,
+      tooltipKeymap: _keymaps.toggleUnderline
+    },
+    strike: {
+      command: withToolbarInputMethod(commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.strike,
+      tooltipKeymap: _keymaps.toggleStrikethrough
+    },
+    code: {
+      command: withToolbarInputMethod(commands.toggleCodeWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.code,
+      tooltipKeymap: _keymaps.toggleCode
+    },
+    subscript: {
+      command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.subscript,
+      tooltipKeymap: _keymaps.toggleSubscript
+    },
+    superscript: {
+      command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)),
+      message: _toolbarMessages.toolbarMessages.superscript,
+      tooltipKeymap: _keymaps.toggleSuperscript
     }
-  },
-  underline: {
-    command: withToolbarInputMethod(commands.toggleUnderlineWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.underline,
-    tooltipKeymap: _keymaps.toggleUnderline
-  },
-  strike: {
-    command: withToolbarInputMethod(commands.toggleStrikeWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.strike,
-    tooltipKeymap: _keymaps.toggleStrikethrough
-  },
-  code: {
-    command: withToolbarInputMethod(commands.toggleCodeWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.code,
-    tooltipKeymap: _keymaps.toggleCode
-  },
-  subscript: {
-    command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.subscript,
-    tooltipKeymap: _keymaps.toggleSubscript
-  },
-  superscript: {
-    command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics),
-    message: _toolbarMessages.toolbarMessages.superscript,
-    tooltipKeymap: _keymaps.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 {
@@ -136,7 +139,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,
@@ -156,7 +159,8 @@ var buildIcon = function buildIcon(iconMark) {
         iconType: _types.IconTypes[iconMark],
         isDisabled: isToolbarDisabled || isDisabled,
         isActive: isActive,
-        intl: intl
+        intl: intl,
+        editorAnalyticsAPI: editorAnalyticsAPI
       });
     }, [isToolbarDisabled, isDisabled, isActive, intl]);
     var shouldRenderIcon = hasSchemaMark && !isHidden;
@@ -165,13 +169,6 @@ var buildIcon = function buildIcon(iconMark) {
     }, [shouldRenderIcon, iconComponent]);
   };
 };
-var buildStrongIcon = buildIcon(_types.IconTypes.strong);
-var buildEmIcon = buildIcon(_types.IconTypes.em);
-var buildUnderlineIcon = buildIcon(_types.IconTypes.underline);
-var buildStrikeIcon = buildIcon(_types.IconTypes.strike);
-var buildCodeIcon = buildIcon(_types.IconTypes.code);
-var buildSubscriptIcon = buildIcon(_types.IconTypes.subscript);
-var buildSuperscriptIcon = buildIcon(_types.IconTypes.superscript);
 var useTextFormattingPluginState = function useTextFormattingPluginState(editorState) {
   return (0, _react.useMemo)(function () {
     var pluginState = _pluginKey.pluginKey.getState(editorState);
@@ -183,7 +180,8 @@ var useTextFormattingPluginState = function useTextFormattingPluginState(editorS
 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 = {
@@ -192,6 +190,13 @@ var useFormattingIcons = function useFormattingIcons(_ref4) {
     intl: intl,
     isToolbarDisabled: Boolean(isToolbarDisabled)
   };
+  var buildStrongIcon = buildIcon(_types.IconTypes.strong, editorAnalyticsAPI);
+  var buildEmIcon = buildIcon(_types.IconTypes.em, editorAnalyticsAPI);
+  var buildUnderlineIcon = buildIcon(_types.IconTypes.underline, editorAnalyticsAPI);
+  var buildStrikeIcon = buildIcon(_types.IconTypes.strike, editorAnalyticsAPI);
+  var buildCodeIcon = buildIcon(_types.IconTypes.code, editorAnalyticsAPI);
+  var buildSubscriptIcon = buildIcon(_types.IconTypes.subscript, editorAnalyticsAPI);
+  var buildSuperscriptIcon = buildIcon(_types.IconTypes.superscript, editorAnalyticsAPI);
   var strongIcon = buildStrongIcon(props);
   var emIcon = buildEmIcon(props);
   var underlineIcon = buildUnderlineIcon(props);

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

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

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

@@ -41,7 +41,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.default.useRef(null);
   var _React$useState = _react.default.useState(false),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
@@ -168,8 +167,14 @@ var ColorPickerButton = function ColorPickerButton(props) {
   };
   var title = props.title || '';
   var currentColor = props.currentColor && props.hexToPaletteColor ? props.hexToPaletteColor(props.currentColor) : props.currentColor;
-  var buttonStyle = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\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;", _common.DEFAULT_BORDER_COLOR, (0, _constants.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 (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\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;", _common.DEFAULT_BORDER_COLOR, (0, _constants.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', (0, _components.themed)({
+      light: "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N30A, ")"),
+      dark: "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N30A, ")")
+    })(theme));
+  };
   return (0, _react2.jsx)("div", {
     css: colorPickerButtonWrapper
   }, (0, _react2.jsx)(_tooltip.default, {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.3.6";
+var version = "187.4.2";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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