@atlaskit/editor-core 187.18.2 → 187.19.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 187.19.1
+
+### Patch Changes
+
+- [`f284dd4d761`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f284dd4d761) - updated withAnalytics usage to new EditorAnalyticsAPI
+- [`442d9be406d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/442d9be406d) - [ux] [ED-19027] Fixed gap cursor for nodes with fixed width
+
+## 187.19.0
+
+### Minor Changes
+
+- [`7cb6ec49e68`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7cb6ec49e68) - Decouple `composition` plugin from `base` plugin
+
 ## 187.18.2
 
 ### Patch Changes

package/dist/cjs/labs/next/presets/default.js

@@ -26,6 +26,7 @@ var _plugins = require("../../../plugins");
 var _editorPluginAnalytics = require("@atlaskit/editor-plugin-analytics");
 var _placeholder = _interopRequireDefault(require("../../../plugins/placeholder"));
 var _annotation = _interopRequireDefault(require("../../../plugins/annotation"));
+var _composition = _interopRequireDefault(require("../../../plugins/composition"));
 var _quickInsert = _interopRequireDefault(require("../../../plugins/quick-insert"));
 var _selection = _interopRequireDefault(require("../../../plugins/selection"));
 var _codeBlock = _interopRequireDefault(require("../../../plugins/code-block"));
@@ -61,7 +62,7 @@ function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add([_base.default, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
+  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add(_composition.default).add([_base.default, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

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

@@ -19,7 +19,6 @@ var _inlineCursorTarget = _interopRequireDefault(require("./pm-plugins/inline-cu
 var _scrollGutter = _interopRequireDefault(require("./pm-plugins/scroll-gutter"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _frozenEditor = _interopRequireDefault(require("./pm-plugins/frozen-editor"));
-var _composition = _interopRequireDefault(require("./pm-plugins/composition"));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Chrome >= 88
@@ -112,12 +111,6 @@ var basePlugin = function basePlugin(options, api) {
           return (0, _disableSpellChecking.default)(featureFlags);
         }
       });
-      plugins.push({
-        name: 'compositionPlugin',
-        plugin: function plugin() {
-          return (0, _composition.default)();
-        }
-      });
       return plugins;
     },
     nodes: function nodes() {

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

@@ -44,7 +44,7 @@ var codeBlockPlugin = function codeBlockPlugin(options, api) {
       }, {
         name: 'codeBlockIDEKeyBindings',
         plugin: function plugin() {
-          return _ideUx.default;
+          return (0, _ideUx.default)(api);
         }
       }, {
         name: 'codeBlockKeyMap',

package/dist/cjs/plugins/code-block/pm-plugins/ide-ux.js

@@ -15,113 +15,116 @@ var _bracketHandling = require("../ide-ux/bracket-handling");
 var _quoteHandling = require("../ide-ux/quote-handling");
 var _lineHandling = require("../ide-ux/line-handling");
 var _commands = require("../ide-ux/commands");
-var _composition = require("../../base/pm-plugins/composition");
-var _default = new _safePlugin.SafePlugin({
-  props: {
-    handleTextInput: function handleTextInput(view, from, to, text) {
-      var state = view.state,
-        dispatch = view.dispatch;
-      if ((0, _lineHandling.isCursorInsideCodeBlock)(state) && !(0, _composition.isComposing)(state)) {
-        var beforeText = (0, _lineHandling.getStartOfCurrentLine)(state).text;
-        var afterText = (0, _lineHandling.getEndOfCurrentLine)(state).text;
-
-        // If text is a closing bracket/quote and we've already inserted it, move the selection after
-        if ((0, _pairedCharacterHandling.isCursorBeforeClosingCharacter)(afterText) && (0, _pairedCharacterHandling.isClosingCharacter)(text) && afterText.startsWith(text)) {
-          dispatch((0, _utils.setTextSelection)(to + text.length)(state.tr));
-          return true;
-        }
-
-        // Automatically add right-hand side bracket when user types the left bracket
-        if ((0, _bracketHandling.shouldAutoCloseBracket)(beforeText, afterText)) {
-          var _getAutoClosingBracke = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText + text, afterText),
-            left = _getAutoClosingBracke.left,
-            right = _getAutoClosingBracke.right;
-          if (left && right) {
-            var bracketPair = state.schema.text(text + right);
-            var tr = state.tr.replaceWith(from, to, bracketPair);
-            dispatch((0, _utils.setTextSelection)(from + text.length)(tr));
-            return true;
-          }
-        }
-
-        // Automatically add closing quote when user types a starting quote
-        if ((0, _quoteHandling.shouldAutoCloseQuote)(beforeText, afterText)) {
-          var _getAutoClosingQuoteI = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText + text, afterText),
-            leftQuote = _getAutoClosingQuoteI.left,
-            rightQuote = _getAutoClosingQuoteI.right;
-          if (leftQuote && rightQuote) {
-            var quotePair = state.schema.text(text + rightQuote);
-            var _tr = state.tr.replaceWith(from, to, quotePair);
-            dispatch((0, _utils.setTextSelection)(from + text.length)(_tr));
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-    handleKeyDown: (0, _keymap.keydownHandler)({
-      Backspace: function Backspace(state, dispatch) {
-        if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
-          var $cursor = (0, _utils2.getCursor)(state.selection);
+var ideUX = function ideUX(pluginInjectionApi) {
+  return new _safePlugin.SafePlugin({
+    props: {
+      handleTextInput: function handleTextInput(view, from, to, text) {
+        var state = view.state,
+          dispatch = view.dispatch;
+        var compositionPluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.composition.sharedState.currentState();
+        if ((0, _lineHandling.isCursorInsideCodeBlock)(state) && !(compositionPluginState !== null && compositionPluginState !== void 0 && compositionPluginState.isComposing)) {
           var beforeText = (0, _lineHandling.getStartOfCurrentLine)(state).text;
           var afterText = (0, _lineHandling.getEndOfCurrentLine)(state).text;
-          var _getAutoClosingBracke2 = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText, afterText),
-            leftBracket = _getAutoClosingBracke2.left,
-            rightBracket = _getAutoClosingBracke2.right,
-            hasTrailingMatchingBracket = _getAutoClosingBracke2.hasTrailingMatchingBracket;
-          if (leftBracket && rightBracket && hasTrailingMatchingBracket && dispatch) {
-            dispatch(state.tr.delete($cursor.pos - leftBracket.length, $cursor.pos + rightBracket.length));
+
+          // If text is a closing bracket/quote and we've already inserted it, move the selection after
+          if ((0, _pairedCharacterHandling.isCursorBeforeClosingCharacter)(afterText) && (0, _pairedCharacterHandling.isClosingCharacter)(text) && afterText.startsWith(text)) {
+            dispatch((0, _utils.setTextSelection)(to + text.length)(state.tr));
             return true;
           }
-          var _getAutoClosingQuoteI2 = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText, afterText),
-            leftQuote = _getAutoClosingQuoteI2.left,
-            rightQuote = _getAutoClosingQuoteI2.right,
-            hasTrailingMatchingQuote = _getAutoClosingQuoteI2.hasTrailingMatchingQuote;
-          if (leftQuote && rightQuote && hasTrailingMatchingQuote && dispatch) {
-            dispatch(state.tr.delete($cursor.pos - leftQuote.length, $cursor.pos + rightQuote.length));
-            return true;
+
+          // Automatically add right-hand side bracket when user types the left bracket
+          if ((0, _bracketHandling.shouldAutoCloseBracket)(beforeText, afterText)) {
+            var _getAutoClosingBracke = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText + text, afterText),
+              left = _getAutoClosingBracke.left,
+              right = _getAutoClosingBracke.right;
+            if (left && right) {
+              var bracketPair = state.schema.text(text + right);
+              var tr = state.tr.replaceWith(from, to, bracketPair);
+              dispatch((0, _utils.setTextSelection)(from + text.length)(tr));
+              return true;
+            }
           }
-          var _getLineInfo = (0, _lineHandling.getLineInfo)(beforeText),
-            _getLineInfo$indentTo = _getLineInfo.indentToken,
-            size = _getLineInfo$indentTo.size,
-            token = _getLineInfo$indentTo.token,
-            indentText = _getLineInfo.indentText;
-          if (beforeText === indentText) {
-            if (indentText.endsWith(token.repeat(size)) && dispatch) {
-              dispatch(state.tr.delete($cursor.pos - (size - indentText.length % size || size), $cursor.pos));
+
+          // Automatically add closing quote when user types a starting quote
+          if ((0, _quoteHandling.shouldAutoCloseQuote)(beforeText, afterText)) {
+            var _getAutoClosingQuoteI = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText + text, afterText),
+              leftQuote = _getAutoClosingQuoteI.left,
+              rightQuote = _getAutoClosingQuoteI.right;
+            if (leftQuote && rightQuote) {
+              var quotePair = state.schema.text(text + rightQuote);
+              var _tr = state.tr.replaceWith(from, to, quotePair);
+              dispatch((0, _utils.setTextSelection)(from + text.length)(_tr));
               return true;
             }
           }
         }
         return false;
       },
-      Enter: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.insertNewlineWithIndent),
-      'Mod-]': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.indent),
-      'Mod-[': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
-      Tab: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, function (state, dispatch) {
-        if (!dispatch) {
+      handleKeyDown: (0, _keymap.keydownHandler)({
+        Backspace: function Backspace(state, dispatch) {
+          if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
+            var $cursor = (0, _utils2.getCursor)(state.selection);
+            var beforeText = (0, _lineHandling.getStartOfCurrentLine)(state).text;
+            var afterText = (0, _lineHandling.getEndOfCurrentLine)(state).text;
+            var _getAutoClosingBracke2 = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText, afterText),
+              leftBracket = _getAutoClosingBracke2.left,
+              rightBracket = _getAutoClosingBracke2.right,
+              hasTrailingMatchingBracket = _getAutoClosingBracke2.hasTrailingMatchingBracket;
+            if (leftBracket && rightBracket && hasTrailingMatchingBracket && dispatch) {
+              dispatch(state.tr.delete($cursor.pos - leftBracket.length, $cursor.pos + rightBracket.length));
+              return true;
+            }
+            var _getAutoClosingQuoteI2 = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText, afterText),
+              leftQuote = _getAutoClosingQuoteI2.left,
+              rightQuote = _getAutoClosingQuoteI2.right,
+              hasTrailingMatchingQuote = _getAutoClosingQuoteI2.hasTrailingMatchingQuote;
+            if (leftQuote && rightQuote && hasTrailingMatchingQuote && dispatch) {
+              dispatch(state.tr.delete($cursor.pos - leftQuote.length, $cursor.pos + rightQuote.length));
+              return true;
+            }
+            var _getLineInfo = (0, _lineHandling.getLineInfo)(beforeText),
+              _getLineInfo$indentTo = _getLineInfo.indentToken,
+              size = _getLineInfo$indentTo.size,
+              token = _getLineInfo$indentTo.token,
+              indentText = _getLineInfo.indentText;
+            if (beforeText === indentText) {
+              if (indentText.endsWith(token.repeat(size)) && dispatch) {
+                dispatch(state.tr.delete($cursor.pos - (size - indentText.length % size || size), $cursor.pos));
+                return true;
+              }
+            }
+          }
           return false;
-        }
-        if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
-          return (0, _commands.insertIndent)(state, dispatch);
-        }
-        return (0, _commands.indent)(state, dispatch);
-      }),
-      'Shift-Tab': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
-      'Mod-a': function ModA(state, dispatch) {
-        if ((0, _lineHandling.isSelectionEntirelyInsideCodeBlock)(state)) {
-          var _state$selection = state.selection,
-            $from = _state$selection.$from,
-            $to = _state$selection.$to;
-          var isFullCodeBlockSelection = $from.parentOffset === 0 && $to.parentOffset === $to.parent.nodeSize - 2;
-          if (!isFullCodeBlockSelection && dispatch) {
-            dispatch(state.tr.setSelection(_state.TextSelection.create(state.doc, $from.start(), $to.end())));
-            return true;
+        },
+        Enter: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.insertNewlineWithIndent),
+        'Mod-]': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.indent),
+        'Mod-[': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
+        Tab: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, function (state, dispatch) {
+          if (!dispatch) {
+            return false;
+          }
+          if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
+            return (0, _commands.insertIndent)(state, dispatch);
+          }
+          return (0, _commands.indent)(state, dispatch);
+        }),
+        'Shift-Tab': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
+        'Mod-a': function ModA(state, dispatch) {
+          if ((0, _lineHandling.isSelectionEntirelyInsideCodeBlock)(state)) {
+            var _state$selection = state.selection,
+              $from = _state$selection.$from,
+              $to = _state$selection.$to;
+            var isFullCodeBlockSelection = $from.parentOffset === 0 && $to.parentOffset === $to.parent.nodeSize - 2;
+            if (!isFullCodeBlockSelection && dispatch) {
+              dispatch(state.tr.setSelection(_state.TextSelection.create(state.doc, $from.start(), $to.end())));
+              return true;
+            }
           }
+          return false;
         }
-        return false;
-      }
-    })
-  }
-});
+      })
+    }
+  });
+};
+var _default = ideUX;
 exports.default = _default;

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

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _main = _interopRequireDefault(require("./pm-plugins/main"));
+var _pluginKey = require("./pm-plugins/plugin-key");
+var composition = function composition() {
+  return {
+    name: 'composition',
+    getSharedState: function getSharedState(editorState) {
+      var _pluginKey$getState;
+      if (!editorState) {
+        return undefined;
+      }
+      return {
+        isComposing: !!((_pluginKey$getState = _pluginKey.pluginKey.getState(editorState)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.isComposing)
+      };
+    },
+    pmPlugins: function pmPlugins() {
+      return [{
+        name: 'composition',
+        plugin: function plugin() {
+          return (0, _main.default)();
+        }
+      }];
+    }
+  };
+};
+var _default = composition;
+exports.default = _default;

package/dist/cjs/plugins/{base/pm-plugins/composition.js → composition/pm-plugins/main.js}

@@ -3,22 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isComposing = exports.default = void 0;
+exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-common/utils");
-var compositionPluginKey = new _state.PluginKey('compositionPlugin');
-var isComposing = function isComposing(state) {
-  var _compositionPluginKey;
-  return !!((_compositionPluginKey = compositionPluginKey.getState(state)) !== null && _compositionPluginKey !== void 0 && _compositionPluginKey.isComposing);
-};
-exports.isComposing = isComposing;
+var _pluginKey = require("./plugin-key");
 var isLinux = function isLinux() {
   return navigator.userAgent.indexOf('Linux') >= 0;
 };
 var _default = function _default() {
   return new _safePlugin.SafePlugin({
-    key: compositionPluginKey,
+    key: _pluginKey.pluginKey,
     state: {
       init: function init() {
         return {
@@ -27,7 +21,7 @@ var _default = function _default() {
         };
       },
       apply: function apply(tr, value) {
-        var isComposing = tr.getMeta(compositionPluginKey);
+        var isComposing = tr.getMeta(_pluginKey.pluginKey);
         var zeroWidthSpacePos = tr.getMeta('zeroWidthSpacePos');
         if (typeof isComposing === 'undefined') {
           return value;
@@ -42,7 +36,7 @@ var _default = function _default() {
       handleDOMEvents: {
         compositionstart: function compositionstart(view, event) {
           var tr = view.state.tr;
-          tr.setMeta(compositionPluginKey, true);
+          tr.setMeta(_pluginKey.pluginKey, true);
 
           // only apply for linux and cursor is at start of line
           if (isLinux() && view.state.selection.$from.parentOffset === 0) {
@@ -56,10 +50,10 @@ var _default = function _default() {
         },
         compositionend: function compositionend(view, event) {
           var tr = view.state.tr;
-          tr.setMeta(compositionPluginKey, false);
+          tr.setMeta(_pluginKey.pluginKey, false);
           if (isLinux()) {
-            var _compositionPluginKey2;
-            var zeroWidthSpacePos = (_compositionPluginKey2 = compositionPluginKey.getState(view.state)) === null || _compositionPluginKey2 === void 0 ? void 0 : _compositionPluginKey2.zeroWidthSpacePos;
+            var _pluginKey$getState;
+            var zeroWidthSpacePos = (_pluginKey$getState = _pluginKey.pluginKey.getState(view.state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.zeroWidthSpacePos;
             if (typeof zeroWidthSpacePos !== 'undefined') {
               tr.deleteRange(zeroWidthSpacePos, zeroWidthSpacePos + 1);
             }

package/dist/cjs/plugins/composition/pm-plugins/plugin-key.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pluginKey = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('compositionPlugin');
+exports.pluginKey = pluginKey;

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

@@ -145,8 +145,9 @@ var mediaPlugin = function mediaPlugin() {
         pmPlugins.push({
           name: 'mediaAltTextKeymap',
           plugin: function plugin(_ref4) {
+            var _api$dependencies$ana2;
             var schema = _ref4.schema;
-            return (0, _keymap.default)(schema);
+            return (0, _keymap.default)(schema, 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);
           }
         });
       }
@@ -241,11 +242,11 @@ var mediaPlugin = function mediaPlugin() {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconImages, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana2;
+            var _api$dependencies$ana3;
             var pluginState = _main.stateKey.getState(state);
             pluginState === null || pluginState === void 0 ? void 0 : pluginState.showMediaPicker();
             var tr = insert('');
-            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.attachAnalyticsEvent({
+            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.attachAnalyticsEvent({
               action: _analytics.ACTION.OPENED,
               actionSubject: _analytics.ACTION_SUBJECT.PICKER,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_CLOUD,

package/dist/cjs/plugins/media/pm-plugins/alt-text/commands.js

@@ -8,16 +8,19 @@ exports.updateAltText = exports.openMediaAltTextMenu = exports.closeMediaAltText
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ = require(".");
 var _mediaCommon = require("../../utils/media-common");
-var _analytics = require("../../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var createCommandWithAnalytics = function createCommandWithAnalytics(actionType, action, transform) {
-  return (0, _analytics.withAnalytics)({
-    action: actionType,
-    actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.ALT_TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK
-  })((0, _.createCommand)(action, transform));
+  return function (editorAnalyticsAPI) {
+    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: actionType,
+      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.ALT_TEXT,
+      eventType: _analytics.EVENT_TYPE.TRACK
+    })((0, _.createCommand)(action, transform));
+  };
 };
 var closeMediaAltTextMenu = (0, _.createCommand)(function (state) {
   if ((0, _mediaCommon.isSelectionMediaSingleNode)(state)) {

package/dist/cjs/plugins/media/pm-plugins/alt-text/keymap.js

@@ -10,9 +10,9 @@ var keymaps = _interopRequireWildcard(require("../../../../keymaps"));
 var _commands = require("./commands");
 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 = {};
-  keymaps.bindKeymapWithCommand(keymaps.addAltText.common, _commands.openMediaAltTextMenu, list);
+  keymaps.bindKeymapWithCommand(keymaps.addAltText.common, (0, _commands.openMediaAltTextMenu)(editorAnalyticsAPI), list);
   keymaps.bindKeymapWithCommand(keymaps.escape.common, _commands.closeMediaAltTextMenu, list);
   return (0, _keymap.keymap)(list);
 }

package/dist/cjs/plugins/media/pm-plugins/main.js

@@ -33,7 +33,7 @@ var _mediaCommon = require("../utils/media-common");
 var helpers = _interopRequireWildcard(require("../commands/helpers"));
 var _pluginKey = require("./plugin-key");
 var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
-var _types = require("../../analytics/types");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _document = require("../../../utils/document");
 var _mediaCommon2 = require("@atlaskit/media-common");
 var _utils3 = require("../../../utils");
@@ -240,16 +240,16 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
         });
       }
       if ((0, _mediaSingle.isMediaSingle)(state.schema, mediaStateWithContext.fileMimeType)) {
-        var _this$pluginInjection;
+        var _this$pluginInjection, _pluginInjectionApi$d, _pluginInjectionApi$d2;
         // read width state right before inserting to get up-to-date and define values
         var widthPluginState = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.dependencies.width.sharedState.currentState();
-        (0, _mediaSingle.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState);
+        (0, _mediaSingle.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions);
       } else if ((0, _mediaCommon2.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !(0, _document.isInEmptyLine)(state) && (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _utils3.isInListItem)(state)) && (0, _mediaFiles.canInsertMediaInline)(state)) {
-        var _pluginInjectionApi$d, _pluginInjectionApi$d2;
-        (0, _mediaFiles.insertMediaInlineNode)(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
-      } else {
         var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
-        (0, _mediaFiles.insertMediaGroupNode)(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.analytics) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
+        (0, _mediaFiles.insertMediaInlineNode)(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.analytics) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
+      } else {
+        var _pluginInjectionApi$d5, _pluginInjectionApi$d6;
+        (0, _mediaFiles.insertMediaGroupNode)(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : (_pluginInjectionApi$d6 = _pluginInjectionApi$d5.analytics) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.actions)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
       }
 
       // do events when media state changes
@@ -409,9 +409,9 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "getInputMethod", function (pickerType) {
       switch (pickerType) {
         case 'clipboard':
-          return _types.INPUT_METHOD.CLIPBOARD;
+          return _analytics.INPUT_METHOD.CLIPBOARD;
         case 'dropzone':
-          return _types.INPUT_METHOD.DRAG_AND_DROP;
+          return _analytics.INPUT_METHOD.DRAG_AND_DROP;
       }
       return;
     });

package/dist/cjs/plugins/media/toolbar/alt-text.js

@@ -19,7 +19,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var testId = 'alt-text-edit-button';
-var altTextButton = function altTextButton(intl, state) {
+var altTextButton = function altTextButton(intl, state, editorAnalyticsAPI) {
   var mediaNode = (0, _mediaCommon.getMediaNodeFromSelection)(state);
   var message = mediaNode && mediaNode.attrs.alt ? _messages.messages.editAltText : _messages.messages.altText;
   var title = intl.formatMessage(message);
@@ -27,7 +27,7 @@ var altTextButton = function altTextButton(intl, state) {
     title: title,
     id: 'editor.media.altText',
     type: 'button',
-    onClick: _commands.openMediaAltTextMenu,
+    onClick: (0, _commands.openMediaAltTextMenu)(editorAnalyticsAPI),
     showTitle: true,
     testId: testId,
     tooltipContent: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {

package/dist/cjs/plugins/media/toolbar/index.js

@@ -198,7 +198,7 @@ var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToo
   return items;
 };
 var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) {
-  var _pluginInjectionApi$d7;
+  var _pluginInjectionApi$d8;
   var mediaSingle = state.schema.nodes.mediaSingle;
   var allowResizing = options.allowResizing,
     allowLinking = options.allowLinking,
@@ -354,11 +354,12 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     }
   }
   if (allowAltTextOnImages) {
-    toolbarButtons.push((0, _altText2.altTextButton)(intl, state), {
+    var _pluginInjectionApi$d7;
+    toolbarButtons.push((0, _altText2.altTextButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d7 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d7 === void 0 ? void 0 : _pluginInjectionApi$d7.actions), {
       type: 'separator'
     });
   }
-  var _ref2 = (_pluginInjectionApi$d7 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d7 !== void 0 ? _pluginInjectionApi$d7 : {},
+  var _ref2 = (_pluginInjectionApi$d8 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d8 !== void 0 ? _pluginInjectionApi$d8 : {},
     hoverDecoration = _ref2.hoverDecoration;
   var removeButton = {
     id: 'editor.media.delete',
@@ -387,7 +388,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
   return items;
 };
 var floatingToolbar = function floatingToolbar(state, intl) {
-  var _pluginInjectionApi$d8;
+  var _pluginInjectionApi$d9;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var pluginInjectionApi = arguments.length > 3 ? arguments[3] : undefined;
   var _state$schema$nodes = state.schema.nodes,
@@ -403,7 +404,7 @@ var floatingToolbar = function floatingToolbar(state, intl) {
     getEditorFeatureFlags = options.getEditorFeatureFlags;
   var mediaPluginState = _pluginKey.stateKey.getState(state);
   var mediaLinkingState = (0, _linking2.getMediaLinkingState)(state);
-  var _ref3 = (_pluginInjectionApi$d8 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d8 !== void 0 ? _pluginInjectionApi$d8 : {},
+  var _ref3 = (_pluginInjectionApi$d9 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d9 !== void 0 ? _pluginInjectionApi$d9 : {},
     hoverDecoration = _ref3.hoverDecoration;
   if (!mediaPluginState || mediaPluginState.isResizing) {
     return;
@@ -425,10 +426,10 @@ var floatingToolbar = function floatingToolbar(state, intl) {
   if (allowAltTextOnImages) {
     var mediaAltTextPluginState = (0, _altText.getPluginState)(state);
     if (mediaAltTextPluginState.isAltTextEditorOpen) {
-      var _pluginInjectionApi$d9;
+      var _pluginInjectionApi$d10;
       return (0, _altText2.getAltTextToolbar)(baseToolbar, {
         altTextValidator: altTextValidator,
-        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d9 = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d9 === void 0 ? void 0 : _pluginInjectionApi$d9.forceFocusSelector
+        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d10 = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d10 === void 0 ? void 0 : _pluginInjectionApi$d10.forceFocusSelector
       });
     }
   }
@@ -439,22 +440,22 @@ var floatingToolbar = function floatingToolbar(state, intl) {
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$d10, _pluginInjectionApi$d11;
+    var _pluginInjectionApi$d11, _pluginInjectionApi$d12;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele;
       var selector = (0, _mediaFilmstrip.mediaFilmstripItemDOMSelector)(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d10 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d10 === void 0 ? void 0 : (_pluginInjectionApi$d11 = _pluginInjectionApi$d10.analytics) === null || _pluginInjectionApi$d11 === void 0 ? void 0 : _pluginInjectionApi$d11.actions);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d11 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d11 === void 0 ? void 0 : (_pluginInjectionApi$d12 = _pluginInjectionApi$d11.analytics) === null || _pluginInjectionApi$d12 === void 0 ? void 0 : _pluginInjectionApi$d12.actions);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
-    var _pluginInjectionApi$d12, _pluginInjectionApi$d13;
+    var _pluginInjectionApi$d13, _pluginInjectionApi$d14;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
       var element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(".".concat(_styles.MediaInlineNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d12 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d12 === void 0 ? void 0 : (_pluginInjectionApi$d13 = _pluginInjectionApi$d12.analytics) === null || _pluginInjectionApi$d13 === void 0 ? void 0 : _pluginInjectionApi$d13.actions);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d13 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d13 === void 0 ? void 0 : (_pluginInjectionApi$d14 = _pluginInjectionApi$d13.analytics) === null || _pluginInjectionApi$d14 === void 0 ? void 0 : _pluginInjectionApi$d14.actions);
   } else {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele3;