@atlaskit/editor-plugin-media-insert 44.0.4 → 44.0.6

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-media-insert
 
+## 44.0.6
+
+### Patch Changes
+
+- [`a6e997a7a24f7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a6e997a7a24f7) -
+  Clean up experiment `platform_editor_fix_focus_mediainsertpicker`
+
+## 44.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 44.0.4
 
 ### Patch Changes

package/dist/cjs/mediaInsertPlugin.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mediaInsertPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _assets = require("@atlaskit/editor-common/assets");
 var _rank = require("@atlaskit/editor-common/media-insert/rank");
-var _messages = require("@atlaskit/editor-common/messages");
-var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _actions = require("./pm-plugins/actions");
 var _main = require("./pm-plugins/main");
@@ -18,8 +18,8 @@ var _MediaInsertPicker = require("./ui/MediaInsertPicker");
 var _getMediaInsertQuickInsertComponents = require("./ui/quick-insert/getMediaInsertQuickInsertComponents");
 var getInitialMediaInsertTab = function getInitialMediaInsertTab(registeredTabs, isOnlyExternalLinks) {
   var _firstRegisteredTab$r;
-  var initialBuiltInTab = isOnlyExternalLinks ? _analytics.MEDIA_INSERT_TAB.LINK : _analytics.MEDIA_INSERT_TAB.UPLOAD;
-  var initialBuiltInRank = isOnlyExternalLinks ? _rank.MEDIA_INSERT_TAB_RANK[_analytics.MEDIA_INSERT_TAB.LINK] : _rank.MEDIA_INSERT_TAB_RANK[_analytics.MEDIA_INSERT_TAB.UPLOAD];
+  var initialBuiltInTab = isOnlyExternalLinks ? _enums.MEDIA_INSERT_TAB.LINK : _enums.MEDIA_INSERT_TAB.UPLOAD;
+  var initialBuiltInRank = isOnlyExternalLinks ? _rank.MEDIA_INSERT_TAB_RANK[_enums.MEDIA_INSERT_TAB.LINK] : _rank.MEDIA_INSERT_TAB_RANK[_enums.MEDIA_INSERT_TAB.UPLOAD];
   var firstRegisteredTab = registeredTabs.reduce(function (firstTab, tab) {
     var _tab$rank, _firstTab$rank;
     return !firstTab || ((_tab$rank = tab.rank) !== null && _tab$rank !== void 0 ? _tab$rank : _rank.DEFAULT_MEDIA_INSERT_TAB_RANK) < ((_firstTab$rank = firstTab.rank) !== null && _firstTab$rank !== void 0 ? _firstTab$rank : _rank.DEFAULT_MEDIA_INSERT_TAB_RANK) ? tab : firstTab;
@@ -143,7 +143,7 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
           alt: fileName,
           __fileMimeType: mediaState.fileMimeType
         });
-        return (_api$media$actions$in = api === null || api === void 0 ? void 0 : api.media.actions.insertMediaAsMediaSingle(editorView, node, inputMethod, _analytics.INSERT_MEDIA_VIA.EXTERNAL_UPLOAD)) !== null && _api$media$actions$in !== void 0 ? _api$media$actions$in : false;
+        return (_api$media$actions$in = api === null || api === void 0 ? void 0 : api.media.actions.insertMediaAsMediaSingle(editorView, node, inputMethod, _enums.INSERT_MEDIA_VIA.EXTERNAL_UPLOAD)) !== null && _api$media$actions$in !== void 0 ? _api$media$actions$in : false;
       };
       var insertExternalMediaSingle = function insertExternalMediaSingle(_ref7) {
         var _api$media$actions$in2;
@@ -156,7 +156,7 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
           alt: alt,
           __external: true
         });
-        return (_api$media$actions$in2 = api === null || api === void 0 ? void 0 : api.media.actions.insertMediaAsMediaSingle(editorView, node, inputMethod, _analytics.INSERT_MEDIA_VIA.EXTERNAL_URL)) !== null && _api$media$actions$in2 !== void 0 ? _api$media$actions$in2 : false;
+        return (_api$media$actions$in2 = api === null || api === void 0 ? void 0 : api.media.actions.insertMediaAsMediaSingle(editorView, node, inputMethod, _enums.INSERT_MEDIA_VIA.EXTERNAL_URL)) !== null && _api$media$actions$in2 !== void 0 ? _api$media$actions$in2 : false;
       };
       var insertFile = function insertFile(_ref8) {
         var _api$media$sharedStat, _api$media$sharedStat2;
@@ -164,7 +164,7 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
           inputMethod = _ref8.inputMethod,
           onMediaStateChanged = _ref8.onMediaStateChanged;
         var collection = mediaState.collection;
-        return collection !== undefined ? (_api$media$sharedStat = api === null || api === void 0 || (_api$media$sharedStat2 = api.media.sharedState.currentState()) === null || _api$media$sharedStat2 === void 0 ? void 0 : _api$media$sharedStat2.insertFile(mediaState, onMediaStateChanged, inputMethod, _analytics.INSERT_MEDIA_VIA.LOCAL_UPLOAD)) !== null && _api$media$sharedStat !== void 0 ? _api$media$sharedStat : false : false;
+        return collection !== undefined ? (_api$media$sharedStat = api === null || api === void 0 || (_api$media$sharedStat2 = api.media.sharedState.currentState()) === null || _api$media$sharedStat2 === void 0 ? void 0 : _api$media$sharedStat2.insertFile(mediaState, onMediaStateChanged, inputMethod, _enums.INSERT_MEDIA_VIA.LOCAL_UPLOAD)) !== null && _api$media$sharedStat !== void 0 ? _api$media$sharedStat : false : false;
       };
       return /*#__PURE__*/_react.default.createElement(_MediaInsertPicker.MediaInsertPicker, {
         api: api,
@@ -191,12 +191,12 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
         var formatMessage = _ref9.formatMessage;
         return [{
           id: 'media-insert',
-          title: formatMessage(_messages.toolbarInsertBlockMessages.mediaFiles),
-          description: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
+          title: formatMessage(_insertBlock.toolbarInsertBlockMessages.mediaFiles),
+          description: formatMessage(_insertBlock.toolbarInsertBlockMessages.mediaFilesDescription),
           priority: 400,
           keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video', 'file'],
           icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconImages, null);
+            return /*#__PURE__*/_react.default.createElement(_assets.IconImages, null);
           },
           isDisabledOffline: true,
           action: function action(insert) {
@@ -208,14 +208,14 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
               tr: tr
             });
             api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
-              action: _analytics.ACTION.OPENED,
-              actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
+              action: _enums.ACTION.OPENED,
+              actionSubject: _enums.ACTION_SUBJECT.PICKER,
+              actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
               attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT,
+                inputMethod: _enums.INPUT_METHOD.QUICK_INSERT,
                 openedTab: getInitialMediaInsertTab(insertTabRegistry.getAll(), config === null || config === void 0 ? void 0 : config.isOnlyExternalLinks)
               },
-              eventType: _analytics.EVENT_TYPE.UI
+              eventType: _enums.EVENT_TYPE.UI
             })(tr);
             return tr;
           }

package/dist/cjs/ui/LocalMedia.js

@@ -12,8 +12,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _button = _interopRequireDefault(require("@atlaskit/button/default/button"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _mediaInsert = require("@atlaskit/editor-common/messages/media-insert");
 var _upload = _interopRequireDefault(require("@atlaskit/icon/core/upload"));
 var _browser = require("@atlaskit/media-picker/browser");
 var _compiled = require("@atlaskit/primitives/compiled");
@@ -58,10 +58,10 @@ var LocalMedia = exports.LocalMedia = /*#__PURE__*/_react.default.forwardRef(fun
     insertFile = _ref.insertFile;
   var intl = (0, _reactIntl.useIntl)();
   var strings = {
-    upload: intl.formatMessage(_messages.mediaInsertMessages.upload),
-    chooseFile: intl.formatMessage(_messages.mediaInsertMessages.chooseFile),
-    networkError: intl.formatMessage(_messages.mediaInsertMessages.localFileNetworkErrorMessage),
-    genericError: intl.formatMessage(_messages.mediaInsertMessages.localFileErrorMessage)
+    upload: intl.formatMessage(_mediaInsert.mediaInsertMessages.upload),
+    chooseFile: intl.formatMessage(_mediaInsert.mediaInsertMessages.chooseFile),
+    networkError: intl.formatMessage(_mediaInsert.mediaInsertMessages.localFileNetworkErrorMessage),
+    genericError: intl.formatMessage(_mediaInsert.mediaInsertMessages.localFileErrorMessage)
   };
   var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(dispatchAnalyticsEvent),
     onUploadButtonClickedAnalytics = _useAnalyticsEvents.onUploadButtonClickedAnalytics,
@@ -110,7 +110,7 @@ var LocalMedia = exports.LocalMedia = /*#__PURE__*/_react.default.forwardRef(fun
     };
     insertFile({
       mediaState: mediaState,
-      inputMethod: _analytics.INPUT_METHOD.MEDIA_PICKER,
+      inputMethod: _enums.INPUT_METHOD.MEDIA_PICKER,
       onMediaStateChanged: onStateChanged(file.id)
     });
     closeMediaInsertPicker();

package/dist/cjs/ui/MediaCard.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.MediaCard = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
+var _mediaInsert = require("@atlaskit/editor-common/messages/media-insert");
 var _cardLoader = _interopRequireDefault(require("@atlaskit/media-card/cardLoader"));
 var _cardLoading = require("@atlaskit/media-card/cardLoading");
 var maxDimensions = {
@@ -18,7 +18,7 @@ var MediaCard = exports.MediaCard = function MediaCard(_ref) {
   var attrs = _ref.attrs,
     mediaProvider = _ref.mediaProvider;
   var intl = (0, _reactIntl.useIntl)();
-  var mediaAlt = intl.formatMessage(_messages.mediaInsertMessages.mediaAlt);
+  var mediaAlt = intl.formatMessage(_mediaInsert.mediaInsertMessages.mediaAlt);
   var dimensions = _react.default.useMemo(function () {
     return {
       width: attrs.dimensions.width,

package/dist/cjs/ui/MediaFromURL.js

@@ -18,8 +18,8 @@ var _reactIntl = require("react-intl");
 var _isSafeUrl = require("@atlaskit/adf-schema/is-safe-url");
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
 var _button = _interopRequireDefault(require("@atlaskit/button/default/button"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _mediaInsert = require("@atlaskit/editor-common/messages/media-insert");
 var _errorMessage = require("@atlaskit/form/error-message");
 var _field = _interopRequireDefault(require("@atlaskit/form/field"));
 var _form = _interopRequireDefault(require("@atlaskit/form/form"));
@@ -28,7 +28,6 @@ var _helperMessage = require("@atlaskit/form/helper-message");
 var _messageWrapper = require("@atlaskit/form/message-wrapper");
 var _growDiagonal = _interopRequireDefault(require("@atlaskit/icon/core/grow-diagonal"));
 var _getMediaClient = require("@atlaskit/media-client-react/get-media-client");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _primitives = require("@atlaskit/primitives");
 var _message = _interopRequireDefault(require("@atlaskit/section-message/message"));
 var _textField = _interopRequireDefault(require("@atlaskit/textfield/text-field"));
@@ -116,13 +115,13 @@ function MediaFromURL(_ref) {
     customizedHelperMessage = _ref.customizedHelperMessage;
   var intl = (0, _reactIntl.useIntl)();
   var strings = {
-    loadPreview: intl.formatMessage(_messages.mediaInsertMessages.loadPreview),
-    insert: intl.formatMessage(_messages.mediaInsertMessages.insert),
-    pasteLinkToUpload: intl.formatMessage(_messages.mediaInsertMessages.pasteLinkToUpload),
-    cancel: intl.formatMessage(_messages.mediaInsertMessages.cancel),
-    errorMessage: intl.formatMessage(_messages.mediaInsertMessages.fromUrlErrorMessage),
-    warning: intl.formatMessage(_messages.mediaInsertMessages.fromUrlWarning),
-    invalidUrl: intl.formatMessage(_messages.mediaInsertMessages.invalidUrlErrorMessage)
+    loadPreview: intl.formatMessage(_mediaInsert.mediaInsertMessages.loadPreview),
+    insert: intl.formatMessage(_mediaInsert.mediaInsertMessages.insert),
+    pasteLinkToUpload: intl.formatMessage(_mediaInsert.mediaInsertMessages.pasteLinkToUpload),
+    cancel: intl.formatMessage(_mediaInsert.mediaInsertMessages.cancel),
+    errorMessage: intl.formatMessage(_mediaInsert.mediaInsertMessages.fromUrlErrorMessage),
+    warning: intl.formatMessage(_mediaInsert.mediaInsertMessages.fromUrlWarning),
+    invalidUrl: intl.formatMessage(_mediaInsert.mediaInsertMessages.invalidUrlErrorMessage)
   };
   var _React$useReducer = _react.default.useReducer(previewStateReducer, INITIAL_PREVIEW_STATE),
     _React$useReducer2 = (0, _slicedToArray2.default)(_React$useReducer, 2),
@@ -249,7 +248,7 @@ function MediaFromURL(_ref) {
     if (previewState.previewInfo) {
       insertMediaSingle({
         mediaState: previewState.previewInfo,
-        inputMethod: _analytics.INPUT_METHOD.MEDIA_PICKER
+        inputMethod: _enums.INPUT_METHOD.MEDIA_PICKER
       });
     }
     closeMediaInsertPicker();
@@ -259,7 +258,7 @@ function MediaFromURL(_ref) {
       insertExternalMediaSingle({
         url: url,
         alt: '',
-        inputMethod: _analytics.INPUT_METHOD.MEDIA_PICKER
+        inputMethod: _enums.INPUT_METHOD.MEDIA_PICKER
       });
     }
     closeMediaInsertPicker();
@@ -268,39 +267,31 @@ function MediaFromURL(_ref) {
     if (event && event.key === 'Esc') {
       if (dispatchAnalyticsEvent) {
         var payload = {
-          action: _analytics.ACTION.CLOSED,
-          actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
-          eventType: _analytics.EVENT_TYPE.UI,
+          action: _enums.ACTION.CLOSED,
+          actionSubject: _enums.ACTION_SUBJECT.PICKER,
+          actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
+          eventType: _enums.EVENT_TYPE.UI,
           attributes: {
-            exitMethod: _analytics.INPUT_METHOD.KEYBOARD
+            exitMethod: _enums.INPUT_METHOD.KEYBOARD
           }
         };
         dispatchAnalyticsEvent(payload);
       }
-      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-        cancelMediaInsertPicker();
-      } else {
-        closeMediaInsertPicker();
-      }
+      cancelMediaInsertPicker();
     }
-  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker, closeMediaInsertPicker]);
+  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker]);
   var onCancel = _react.default.useCallback(function () {
     if (dispatchAnalyticsEvent) {
       var payload = {
-        action: _analytics.ACTION.CANCELLED,
-        actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
-        eventType: _analytics.EVENT_TYPE.UI
+        action: _enums.ACTION.CANCELLED,
+        actionSubject: _enums.ACTION_SUBJECT.PICKER,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
+        eventType: _enums.EVENT_TYPE.UI
       };
       dispatchAnalyticsEvent(payload);
     }
-    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-      cancelMediaInsertPicker();
-    } else {
-      closeMediaInsertPicker();
-    }
-  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent, closeMediaInsertPicker]);
+    cancelMediaInsertPicker();
+  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent]);
   return /*#__PURE__*/_react.default.createElement(_form.default, {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     onSubmit: function onSubmit(_ref3, form) {

package/dist/cjs/ui/MediaInsertPicker.js

@@ -9,14 +9,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _getDomRefFromSelection = require("@atlaskit/editor-common/get-dom-ref-from-selection");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _rank = require("@atlaskit/editor-common/media-insert/rank");
-var _messages = require("@atlaskit/editor-common/messages");
+var _mediaInsert = require("@atlaskit/editor-common/messages/media-insert");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _withOuterListeners = _interopRequireDefault(require("@atlaskit/editor-common/with-outer-listeners"));
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _tabList = _interopRequireDefault(require("@atlaskit/tabs/tab-list"));
 var _tabs = _interopRequireDefault(require("@atlaskit/tabs/tabs"));
@@ -30,7 +31,7 @@ var _MediaFromURL = require("./MediaFromURL");
 var _MediaInsertWrapper = require("./MediaInsertWrapper");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var PopupWithListeners = (0, _ui.withOuterListeners)(_ui.Popup);
+var PopupWithListeners = (0, _withOuterListeners.default)(_Popup.default);
 var MEDIA_INSERT_PICKER_ANALYTICS_SOURCE = 'MediaInsertPicker';
 var EMPTY_REGISTERED_TABS = [];
 var getMediaInsertPickerTabSource = function getMediaInsertPickerTabSource(selectedTab) {
@@ -132,7 +133,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
   // Read once per render; the registry is mutated only at plugin setup time so this is stable
   // for the lifetime of an editor instance.
   var registeredTabs = (_api$mediaInsert$acti = api === null || api === void 0 || (_api$mediaInsert = api.mediaInsert) === null || _api$mediaInsert === void 0 || (_api$mediaInsert = _api$mediaInsert.actions) === null || _api$mediaInsert === void 0 || (_api$mediaInsert$getI = _api$mediaInsert.getInsertTabs) === null || _api$mediaInsert$getI === void 0 ? void 0 : _api$mediaInsert$getI.call(_api$mediaInsert)) !== null && _api$mediaInsert$acti !== void 0 ? _api$mediaInsert$acti : EMPTY_REGISTERED_TABS;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media', 'mediaInsert'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['media', 'mediaInsert'], function (states) {
       var _states$mediaState, _states$mediaInsertSt, _states$mediaInsertSt2;
       return {
         mediaProvider: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.mediaProvider,
@@ -151,7 +152,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
   } else {
     var _api$analytics;
     // If targetRef is undefined, target the selection in the editor
-    targetRef = (0, _getDomRefFromSelection.getDomRefFromSelection)(editorView, _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+    targetRef = (0, _getDomRefFromSelection.getDomRefFromSelection)(editorView, _enums.ACTION_SUBJECT_ID.PICKER_MEDIA, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
     mountPoint = popupsMountPoint;
   }
   var focusButton = (0, _useFocus.useFocus)({
@@ -173,6 +174,10 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     returnFocusRef.current = focusButton;
     closeMediaInsertPicker();
   }, [closeMediaInsertPicker, focusButton]);
+  // Return focus on unmount to whichever element `returnFocusRef` currently points at.
+  var returnFocusOnUnmount = _react.default.useCallback(function () {
+    returnFocusRef.current();
+  }, []);
   var intl = (0, _reactIntl.useIntl)();
   var _useUnholyAutofocus = (0, _useUnholyAutofocus2.useUnholyAutofocus)(),
     autofocusRef = _useUnholyAutofocus.autofocusRef,
@@ -182,15 +187,15 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     var tieBreaker = 0;
     if (!isOnlyExternalLinks) {
       tabs.push({
-        key: _analytics.MEDIA_INSERT_TAB.UPLOAD,
-        rank: _rank.MEDIA_INSERT_TAB_RANK[_analytics.MEDIA_INSERT_TAB.UPLOAD],
+        key: _enums.MEDIA_INSERT_TAB.UPLOAD,
+        rank: _rank.MEDIA_INSERT_TAB_RANK[_enums.MEDIA_INSERT_TAB.UPLOAD],
         tieBreaker: tieBreaker++,
         type: 'upload'
       });
     }
     tabs.push({
-      key: _analytics.MEDIA_INSERT_TAB.LINK,
-      rank: _rank.MEDIA_INSERT_TAB_RANK[_analytics.MEDIA_INSERT_TAB.LINK],
+      key: _enums.MEDIA_INSERT_TAB.LINK,
+      rank: _rank.MEDIA_INSERT_TAB_RANK[_enums.MEDIA_INSERT_TAB.LINK],
       tieBreaker: tieBreaker++,
       type: 'link'
     });
@@ -248,10 +253,10 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     var selectedTabMetadata = getTabAnalyticsMetadata(0);
     selectedTabAnalyticsMetadataRef.current = selectedTabMetadata;
     var payload = {
-      action: _analytics.ACTION.VIEWED,
-      actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
-      eventType: _analytics.EVENT_TYPE.UI,
+      action: _enums.ACTION.VIEWED,
+      actionSubject: _enums.ACTION_SUBJECT.PICKER,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
+      eventType: _enums.EVENT_TYPE.UI,
       attributes: {
         selectedTab: selectedTabMetadata.selectedTab,
         selectedTabIndex: selectedTabMetadata.selectedTabIndex
@@ -273,10 +278,10 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     }).fire();
     if (dispatchAnalyticsEvent) {
       var payload = {
-        action: _analytics.ACTION.VIEWED,
-        actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
-        eventType: _analytics.EVENT_TYPE.UI,
+        action: _enums.ACTION.VIEWED,
+        actionSubject: _enums.ACTION_SUBJECT.PICKER,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
+        eventType: _enums.EVENT_TYPE.UI,
         attributes: {
           selectedTab: selectedTabMetadata.selectedTab,
           selectedTabIndex: selectedTabIndex
@@ -292,55 +297,40 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     return function (event) {
       // Same as AIImageGenerationPopup: react-select can detach the option
       // before `click` fires, so withOuterListeners treats it as outside.
-      if (exitMethod === _analytics.INPUT_METHOD.MOUSE && event.target instanceof Node && !event.target.isConnected) {
+      if (exitMethod === _enums.INPUT_METHOD.MOUSE && event.target instanceof Node && !event.target.isConnected) {
         return;
       }
       event.preventDefault();
       if (dispatchAnalyticsEvent) {
         var payload = {
-          action: _analytics.ACTION.CLOSED,
-          actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
-          eventType: _analytics.EVENT_TYPE.UI,
+          action: _enums.ACTION.CLOSED,
+          actionSubject: _enums.ACTION_SUBJECT.PICKER,
+          actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
+          eventType: _enums.EVENT_TYPE.UI,
           attributes: {
             exitMethod: exitMethod
           }
         };
         dispatchAnalyticsEvent(payload);
       }
-      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-        closeAndReturnFocusToButton();
-      } else {
-        closeMediaInsertPicker(); // Focuses editor on unmount
-        focusEditor();
-      }
+      closeAndReturnFocusToButton();
     };
   };
-  var closePickerAndFocusEditor = function closePickerAndFocusEditor() {
-    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndFocusEditor();
-    } else {
-      closeMediaInsertPicker();
-      focusEditor();
-    }
-  };
-  var fileTabTitle = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(_messages.mediaInsertMessages.uploadTabTitle) : intl.formatMessage(_messages.mediaInsertMessages.fileTabTitle);
+  var fileTabTitle = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(_mediaInsert.mediaInsertMessages.uploadTabTitle) : intl.formatMessage(_mediaInsert.mediaInsertMessages.fileTabTitle);
   return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
-    ariaLabel: intl.formatMessage(_messages.mediaInsertMessages.mediaPickerPopupAriaLabel)
+    ariaLabel: intl.formatMessage(_mediaInsert.mediaInsertMessages.mediaPickerPopupAriaLabel)
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
     offset: [0, 12],
     target: targetRef,
-    zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
+    zIndex: _constants.akEditorFloatingDialogZIndex,
     fitHeight: 390,
     fitWidth: 340,
     mountTo: mountPoint,
-    onUnmount: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker') ? function () {
-      return returnFocusRef.current();
-    } : undefined,
+    onUnmount: returnFocusOnUnmount,
     boundariesElement: popupsBoundariesElement,
-    handleClickOutside: handleClose(_analytics.INPUT_METHOD.MOUSE),
-    handleEscapeKeydown: handleClose(_analytics.INPUT_METHOD.KEYBOARD),
+    handleClickOutside: handleClose(_enums.INPUT_METHOD.MOUSE),
+    handleEscapeKeydown: handleClose(_enums.INPUT_METHOD.KEYBOARD),
     scrollableElement: popupsScrollableElement,
     preventOverflow: true,
     onPositionCalculated: onPositionCalculated,
@@ -360,7 +350,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
         onSelectTabForAnalytics: setSelectedTabAnalyticsMetadata,
         selectedTabIndex: index,
         tabCount: tabCount
-      }, tab.type === 'registered' ? tab.registeredTab.label : tab.type === 'upload' ? fileTabTitle : intl.formatMessage(_messages.mediaInsertMessages.linkTabTitle));
+      }, tab.type === 'registered' ? tab.registeredTab.label : tab.type === 'upload' ? fileTabTitle : intl.formatMessage(_mediaInsert.mediaInsertMessages.linkTabTitle));
     }))), orderedTabs.map(function (tab) {
       if (tab.type === 'registered') {
         var TabComponent = tab.registeredTab.component;
@@ -368,7 +358,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
           key: tab.key,
           disablePaddingBlockEnd: true
         }, /*#__PURE__*/_react.default.createElement(TabComponent, {
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertMediaSingle: insertMediaSingle,
           mediaProvider: mediaProvider
@@ -380,7 +370,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
         }, /*#__PURE__*/_react.default.createElement(_LocalMedia.LocalMedia, {
           ref: autofocusRef,
           mediaProvider: mediaProvider,
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertFile: insertFile
         }));
@@ -390,7 +380,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
       }, /*#__PURE__*/_react.default.createElement(_MediaFromURL.MediaFromURL, {
         mediaProvider: mediaProvider,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         cancelMediaInsertPicker: closeAndReturnFocusToButton,
         insertMediaSingle: insertMediaSingle,
         insertExternalMediaSingle: insertExternalMediaSingle,

package/dist/cjs/ui/quick-insert/MediaInsertQuickInsertMenuItem.js

@@ -8,11 +8,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.MediaInsertQuickInsertMenuItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _rank = require("@atlaskit/editor-common/media-insert/rank");
-var _messages = require("@atlaskit/editor-common/messages");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
 var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
-var _messages2 = require("@atlaskit/editor-common/quick-insert/messages");
+var _messages = require("@atlaskit/editor-common/quick-insert/messages");
 var _useQuickInsertContext = require("@atlaskit/editor-common/quick-insert/use-quick-insert-context");
 var _image = _interopRequireDefault(require("@atlaskit/icon/core/image"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -31,7 +31,7 @@ var MediaInsertQuickInsertMenuItem = exports.MediaInsertQuickInsertMenuItem = fu
     return {
       image: previewImageUrls,
       attribution: {
-        name: formatMessage(_messages2.messages.previewAttributionAtlassian)
+        name: formatMessage(_messages.messages.previewAttributionAtlassian)
       }
     };
   }, [formatMessage]);
@@ -42,32 +42,32 @@ var MediaInsertQuickInsertMenuItem = exports.MediaInsertQuickInsertMenuItem = fu
     api === null || api === void 0 || (_api$mediaInsert = api.mediaInsert) === null || _api$mediaInsert === void 0 || _api$mediaInsert.commands.showMediaInsertPopup()({
       tr: tr
     });
-    var initialBuiltInTab = config !== null && config !== void 0 && config.isOnlyExternalLinks ? _analytics.MEDIA_INSERT_TAB.LINK : _analytics.MEDIA_INSERT_TAB.UPLOAD;
-    var initialBuiltInRank = config !== null && config !== void 0 && config.isOnlyExternalLinks ? _rank.MEDIA_INSERT_TAB_RANK[_analytics.MEDIA_INSERT_TAB.LINK] : _rank.MEDIA_INSERT_TAB_RANK[_analytics.MEDIA_INSERT_TAB.UPLOAD];
+    var initialBuiltInTab = config !== null && config !== void 0 && config.isOnlyExternalLinks ? _enums.MEDIA_INSERT_TAB.LINK : _enums.MEDIA_INSERT_TAB.UPLOAD;
+    var initialBuiltInRank = config !== null && config !== void 0 && config.isOnlyExternalLinks ? _rank.MEDIA_INSERT_TAB_RANK[_enums.MEDIA_INSERT_TAB.LINK] : _rank.MEDIA_INSERT_TAB_RANK[_enums.MEDIA_INSERT_TAB.UPLOAD];
     var firstRegisteredTab = api === null || api === void 0 || (_api$mediaInsert2 = api.mediaInsert) === null || _api$mediaInsert2 === void 0 ? void 0 : _api$mediaInsert2.actions.getInsertTabs().reduce(function (firstTab, tab) {
       var _tab$rank, _firstTab$rank;
       return !firstTab || ((_tab$rank = tab.rank) !== null && _tab$rank !== void 0 ? _tab$rank : _rank.DEFAULT_MEDIA_INSERT_TAB_RANK) < ((_firstTab$rank = firstTab.rank) !== null && _firstTab$rank !== void 0 ? _firstTab$rank : _rank.DEFAULT_MEDIA_INSERT_TAB_RANK) ? tab : firstTab;
     }, undefined);
     api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
-      action: _analytics.ACTION.OPENED,
-      actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
+      action: _enums.ACTION.OPENED,
+      actionSubject: _enums.ACTION_SUBJECT.PICKER,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
       attributes: {
-        inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT,
+        inputMethod: _enums.INPUT_METHOD.QUICK_INSERT,
         openedTab: firstRegisteredTab && ((_firstRegisteredTab$r = firstRegisteredTab.rank) !== null && _firstRegisteredTab$r !== void 0 ? _firstRegisteredTab$r : _rank.DEFAULT_MEDIA_INSERT_TAB_RANK) < initialBuiltInRank ? firstRegisteredTab.key : initialBuiltInTab
       },
-      eventType: _analytics.EVENT_TYPE.UI
+      eventType: _enums.EVENT_TYPE.UI
     })(tr);
     return tr;
   }, [api, config]);
   return /*#__PURE__*/_react.default.createElement(_menuItem.QuickInsertMenuItem, {
-    description: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
+    description: formatMessage(_insertBlock.toolbarInsertBlockMessages.mediaFilesDescription),
     iconBefore: /*#__PURE__*/_react.default.createElement(_image.default, {
       label: ""
     }),
     isDisabled: isOffline,
     onSelect: onSelect,
     preview: preview,
-    title: formatMessage(_messages.toolbarInsertBlockMessages.mediaFiles)
+    title: formatMessage(_insertBlock.toolbarInsertBlockMessages.mediaFiles)
   });
 };

package/dist/cjs/ui/quick-insert/getMediaInsertQuickInsertComponents.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getMediaInsertQuickInsertComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
 var _createQuickInsertMatcher = require("@atlaskit/editor-common/quick-insert/create-quick-insert-matcher");
 var _keys = require("@atlaskit/editor-common/quick-insert/keys");
 var _rank = require("@atlaskit/editor-common/quick-insert/rank");
@@ -25,9 +25,9 @@ var getMediaInsertQuickInsertComponents = exports.getMediaInsertQuickInsertCompo
     match: (0, _createQuickInsertMatcher.createQuickInsertMatcher)(function (_ref2) {
       var formatMessage = _ref2.formatMessage;
       return {
-        description: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
+        description: formatMessage(_insertBlock.toolbarInsertBlockMessages.mediaFilesDescription),
         keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video', 'file'],
-        title: formatMessage(_messages.toolbarInsertBlockMessages.mediaFiles)
+        title: formatMessage(_insertBlock.toolbarInsertBlockMessages.mediaFiles)
       };
     }),
     component: function component() {

package/dist/cjs/ui/useAnalyticsEvents.js

@@ -6,22 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useAnalyticsEvents = useAnalyticsEvents;
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 function useAnalyticsEvents(dispatchAnalyticsEvent) {
   var onUploadButtonClickedAnalytics = _react.default.useCallback(function () {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
-      action: _analytics.ACTION.CLICKED,
-      actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
-      eventType: _analytics.EVENT_TYPE.UI
+      action: _enums.ACTION.CLICKED,
+      actionSubject: _enums.ACTION_SUBJECT.BUTTON,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: _enums.EVENT_TYPE.UI
     });
   }, [dispatchAnalyticsEvent]);
   var onUploadCommencedAnalytics = _react.default.useCallback(function (mediaUploadSource) {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
-      action: _analytics.ACTION.UPLOAD_COMMENCED,
-      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
-      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      action: _enums.ACTION.UPLOAD_COMMENCED,
+      actionSubject: _enums.ACTION_SUBJECT.MEDIA,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: _enums.EVENT_TYPE.OPERATIONAL,
       attributes: {
         mediaUploadSource: mediaUploadSource
       }
@@ -29,10 +29,10 @@ function useAnalyticsEvents(dispatchAnalyticsEvent) {
   }, [dispatchAnalyticsEvent]);
   var onUploadSuccessAnalytics = _react.default.useCallback(function (mediaUploadSource) {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
-      action: _analytics.ACTION.UPLOAD_SUCCEEDED,
-      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
-      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      action: _enums.ACTION.UPLOAD_SUCCEEDED,
+      actionSubject: _enums.ACTION_SUBJECT.MEDIA,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: _enums.EVENT_TYPE.OPERATIONAL,
       attributes: {
         mediaUploadSource: mediaUploadSource
       }
@@ -40,10 +40,10 @@ function useAnalyticsEvents(dispatchAnalyticsEvent) {
   }, [dispatchAnalyticsEvent]);
   var onUploadFailureAnalytics = _react.default.useCallback(function (reason, mediaUploadSource) {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
-      action: _analytics.ACTION.UPLOAD_FAILED,
-      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
-      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      action: _enums.ACTION.UPLOAD_FAILED,
+      actionSubject: _enums.ACTION_SUBJECT.MEDIA,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: _enums.EVENT_TYPE.OPERATIONAL,
       attributes: {
         reason: reason,
         mediaUploadSource: mediaUploadSource

package/dist/es2019/mediaInsertPlugin.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INSERT_MEDIA_VIA, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INSERT_MEDIA_VIA, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconImages } from '@atlaskit/editor-common/assets';
 import { DEFAULT_MEDIA_INSERT_TAB_RANK, MEDIA_INSERT_TAB_RANK } from '@atlaskit/editor-common/media-insert/rank';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { IconImages } from '@atlaskit/editor-common/quick-insert';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { closeMediaInsertPicker, showMediaInsertPopup } from './pm-plugins/actions';
 import { createPlugin } from './pm-plugins/main';

package/dist/es2019/ui/LocalMedia.js

@@ -1,8 +1,8 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import Button from '@atlaskit/button/default/button';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
 import UploadIcon from '@atlaskit/icon/core/upload';
 import { BrowserLoader as Browser } from '@atlaskit/media-picker/browser';
 import { Stack } from '@atlaskit/primitives/compiled';

package/dist/es2019/ui/MediaCard.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
 import Card from '@atlaskit/media-card/cardLoader';
 import { CardLoading } from '@atlaskit/media-card/cardLoading';
 const maxDimensions = {

package/dist/es2019/ui/MediaFromURL.js

@@ -4,8 +4,8 @@ import { useIntl } from 'react-intl';
 import { isSafeUrl } from '@atlaskit/adf-schema/is-safe-url';
 import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/default/button';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
 import { ErrorMessage } from '@atlaskit/form/error-message';
 import Field from '@atlaskit/form/field';
 import Form from '@atlaskit/form/form';
@@ -14,7 +14,6 @@ import { HelperMessage } from '@atlaskit/form/helper-message';
 import { MessageWrapper } from '@atlaskit/form/message-wrapper';
 import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
 import { getMediaClient } from '@atlaskit/media-client-react/get-media-client';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, Flex, Inline, Stack, xcss } from '@atlaskit/primitives';
 import SectionMessage from '@atlaskit/section-message/message';
@@ -242,13 +241,9 @@ export function MediaFromURL({
         };
         dispatchAnalyticsEvent(payload);
       }
-      if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-        cancelMediaInsertPicker();
-      } else {
-        closeMediaInsertPicker();
-      }
+      cancelMediaInsertPicker();
     }
-  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker, closeMediaInsertPicker]);
+  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker]);
   const onCancel = React.useCallback(() => {
     if (dispatchAnalyticsEvent) {
       const payload = {
@@ -259,12 +254,8 @@ export function MediaFromURL({
       };
       dispatchAnalyticsEvent(payload);
     }
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      cancelMediaInsertPicker();
-    } else {
-      closeMediaInsertPicker();
-    }
-  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent, closeMediaInsertPicker]);
+    cancelMediaInsertPicker();
+  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(Form, {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     onSubmit: ({

package/dist/es2019/ui/MediaInsertPicker.js

@@ -1,14 +1,15 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics/types/enums';
 import { getDomRefFromSelection } from '@atlaskit/editor-common/get-dom-ref-from-selection';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DEFAULT_MEDIA_INSERT_TAB_RANK, MEDIA_INSERT_TAB_RANK } from '@atlaskit/editor-common/media-insert/rank';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
-import { PlainOutsideClickTargetRefContext, Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
-import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
+import Popup from '@atlaskit/editor-common/Popup';
+import { PlainOutsideClickTargetRefContext } from '@atlaskit/editor-common/ui';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import withOuterListeners from '@atlaskit/editor-common/with-outer-listeners';
+import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { Box, Focusable, Text } from '@atlaskit/primitives/compiled';
 import TabList from '@atlaskit/tabs/tab-list';
 import Tabs from '@atlaskit/tabs/tabs';
@@ -164,6 +165,10 @@ export const MediaInsertPicker = ({
     returnFocusRef.current = focusButton;
     closeMediaInsertPicker();
   }, [closeMediaInsertPicker, focusButton]);
+  // Return focus on unmount to whichever element `returnFocusRef` currently points at.
+  const returnFocusOnUnmount = React.useCallback(() => {
+    returnFocusRef.current();
+  }, []);
   const intl = useIntl();
   const {
     autofocusRef,
@@ -295,20 +300,7 @@ export const MediaInsertPicker = ({
       };
       dispatchAnalyticsEvent(payload);
     }
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndReturnFocusToButton();
-    } else {
-      closeMediaInsertPicker(); // Focuses editor on unmount
-      focusEditor();
-    }
-  };
-  const closePickerAndFocusEditor = () => {
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndFocusEditor();
-    } else {
-      closeMediaInsertPicker();
-      focusEditor();
-    }
+    closeAndReturnFocusToButton();
   };
   const fileTabTitle = expValEqualsNoExposure('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(mediaInsertMessages.uploadTabTitle) : intl.formatMessage(mediaInsertMessages.fileTabTitle);
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
@@ -321,7 +313,7 @@ export const MediaInsertPicker = ({
     fitHeight: 390,
     fitWidth: 340,
     mountTo: mountPoint,
-    onUnmount: isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker') ? () => returnFocusRef.current() : undefined,
+    onUnmount: returnFocusOnUnmount,
     boundariesElement: popupsBoundariesElement,
     handleClickOutside: handleClose(INPUT_METHOD.MOUSE),
     handleEscapeKeydown: handleClose(INPUT_METHOD.KEYBOARD),
@@ -349,7 +341,7 @@ export const MediaInsertPicker = ({
         key: tab.key,
         disablePaddingBlockEnd: true
       }, /*#__PURE__*/React.createElement(TabComponent, {
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         insertMediaSingle: insertMediaSingle,
         mediaProvider: mediaProvider
@@ -361,7 +353,7 @@ export const MediaInsertPicker = ({
       }, /*#__PURE__*/React.createElement(LocalMedia, {
         ref: autofocusRef,
         mediaProvider: mediaProvider,
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         insertFile: insertFile
       }));
@@ -371,7 +363,7 @@ export const MediaInsertPicker = ({
     }, /*#__PURE__*/React.createElement(MediaFromURL, {
       mediaProvider: mediaProvider,
       dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      closeMediaInsertPicker: closePickerAndFocusEditor,
+      closeMediaInsertPicker: closeAndFocusEditor,
       cancelMediaInsertPicker: closeAndReturnFocusToButton,
       insertMediaSingle: insertMediaSingle,
       insertExternalMediaSingle: insertExternalMediaSingle,

package/dist/es2019/ui/quick-insert/MediaInsertQuickInsertMenuItem.js

@@ -1,8 +1,8 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics/types/enums';
 import { DEFAULT_MEDIA_INSERT_TAB_RANK, MEDIA_INSERT_TAB_RANK } from '@atlaskit/editor-common/media-insert/rank';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import { useQuickInsertContext } from '@atlaskit/editor-common/quick-insert/use-quick-insert-context';

package/dist/es2019/ui/quick-insert/getMediaInsertQuickInsertComponents.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { MEDIA_INSERT_MENU_ITEM, MEDIA_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { MEDIA_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';

package/dist/es2019/ui/useAnalyticsEvents.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 export function useAnalyticsEvents(dispatchAnalyticsEvent) {
   const onUploadButtonClickedAnalytics = React.useCallback(() => {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({

package/dist/esm/mediaInsertPlugin.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INSERT_MEDIA_VIA, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, INSERT_MEDIA_VIA, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconImages } from '@atlaskit/editor-common/assets';
 import { DEFAULT_MEDIA_INSERT_TAB_RANK, MEDIA_INSERT_TAB_RANK } from '@atlaskit/editor-common/media-insert/rank';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { IconImages } from '@atlaskit/editor-common/quick-insert';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { closeMediaInsertPicker as _closeMediaInsertPicker, showMediaInsertPopup as _showMediaInsertPopup } from './pm-plugins/actions';
 import { createPlugin } from './pm-plugins/main';

package/dist/esm/ui/LocalMedia.js

@@ -6,8 +6,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import Button from '@atlaskit/button/default/button';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
 import UploadIcon from '@atlaskit/icon/core/upload';
 import { BrowserLoader as Browser } from '@atlaskit/media-picker/browser';
 import { Stack } from '@atlaskit/primitives/compiled';

package/dist/esm/ui/MediaCard.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
 import Card from '@atlaskit/media-card/cardLoader';
 import { CardLoading } from '@atlaskit/media-card/cardLoading';
 var maxDimensions = {

package/dist/esm/ui/MediaFromURL.js

@@ -12,8 +12,8 @@ import { useIntl } from 'react-intl';
 import { isSafeUrl } from '@atlaskit/adf-schema/is-safe-url';
 import ButtonGroup from '@atlaskit/button/button-group';
 import Button from '@atlaskit/button/default/button';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
 import { ErrorMessage } from '@atlaskit/form/error-message';
 import Field from '@atlaskit/form/field';
 import Form from '@atlaskit/form/form';
@@ -22,7 +22,6 @@ import { HelperMessage } from '@atlaskit/form/helper-message';
 import { MessageWrapper } from '@atlaskit/form/message-wrapper';
 import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
 import { getMediaClient } from '@atlaskit/media-client-react/get-media-client';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, Flex, Inline, Stack, xcss } from '@atlaskit/primitives';
 import SectionMessage from '@atlaskit/section-message/message';
@@ -270,13 +269,9 @@ export function MediaFromURL(_ref) {
         };
         dispatchAnalyticsEvent(payload);
       }
-      if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-        cancelMediaInsertPicker();
-      } else {
-        closeMediaInsertPicker();
-      }
+      cancelMediaInsertPicker();
     }
-  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker, closeMediaInsertPicker]);
+  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker]);
   var onCancel = React.useCallback(function () {
     if (dispatchAnalyticsEvent) {
       var payload = {
@@ -287,12 +282,8 @@ export function MediaFromURL(_ref) {
       };
       dispatchAnalyticsEvent(payload);
     }
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      cancelMediaInsertPicker();
-    } else {
-      closeMediaInsertPicker();
-    }
-  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent, closeMediaInsertPicker]);
+    cancelMediaInsertPicker();
+  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(Form, {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     onSubmit: function onSubmit(_ref3, form) {

package/dist/esm/ui/MediaInsertPicker.js

@@ -4,14 +4,15 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics/types/enums';
 import { getDomRefFromSelection } from '@atlaskit/editor-common/get-dom-ref-from-selection';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DEFAULT_MEDIA_INSERT_TAB_RANK, MEDIA_INSERT_TAB_RANK } from '@atlaskit/editor-common/media-insert/rank';
-import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
-import { PlainOutsideClickTargetRefContext, Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
-import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages/media-insert';
+import Popup from '@atlaskit/editor-common/Popup';
+import { PlainOutsideClickTargetRefContext } from '@atlaskit/editor-common/ui';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import withOuterListeners from '@atlaskit/editor-common/with-outer-listeners';
+import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { Box, Focusable, Text } from '@atlaskit/primitives/compiled';
 import TabList from '@atlaskit/tabs/tab-list';
 import Tabs from '@atlaskit/tabs/tabs';
@@ -166,6 +167,10 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
     returnFocusRef.current = focusButton;
     closeMediaInsertPicker();
   }, [closeMediaInsertPicker, focusButton]);
+  // Return focus on unmount to whichever element `returnFocusRef` currently points at.
+  var returnFocusOnUnmount = React.useCallback(function () {
+    returnFocusRef.current();
+  }, []);
   var intl = useIntl();
   var _useUnholyAutofocus = useUnholyAutofocus(),
     autofocusRef = _useUnholyAutofocus.autofocusRef,
@@ -301,22 +306,9 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
         };
         dispatchAnalyticsEvent(payload);
       }
-      if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-        closeAndReturnFocusToButton();
-      } else {
-        closeMediaInsertPicker(); // Focuses editor on unmount
-        focusEditor();
-      }
+      closeAndReturnFocusToButton();
     };
   };
-  var closePickerAndFocusEditor = function closePickerAndFocusEditor() {
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndFocusEditor();
-    } else {
-      closeMediaInsertPicker();
-      focusEditor();
-    }
-  };
   var fileTabTitle = expValEqualsNoExposure('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(mediaInsertMessages.uploadTabTitle) : intl.formatMessage(mediaInsertMessages.fileTabTitle);
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     ariaLabel: intl.formatMessage(mediaInsertMessages.mediaPickerPopupAriaLabel)
@@ -328,9 +320,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
     fitHeight: 390,
     fitWidth: 340,
     mountTo: mountPoint,
-    onUnmount: isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker') ? function () {
-      return returnFocusRef.current();
-    } : undefined,
+    onUnmount: returnFocusOnUnmount,
     boundariesElement: popupsBoundariesElement,
     handleClickOutside: handleClose(INPUT_METHOD.MOUSE),
     handleEscapeKeydown: handleClose(INPUT_METHOD.KEYBOARD),
@@ -361,7 +351,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
           key: tab.key,
           disablePaddingBlockEnd: true
         }, /*#__PURE__*/React.createElement(TabComponent, {
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertMediaSingle: insertMediaSingle,
           mediaProvider: mediaProvider
@@ -373,7 +363,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
         }, /*#__PURE__*/React.createElement(LocalMedia, {
           ref: autofocusRef,
           mediaProvider: mediaProvider,
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertFile: insertFile
         }));
@@ -383,7 +373,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
       }, /*#__PURE__*/React.createElement(MediaFromURL, {
         mediaProvider: mediaProvider,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         cancelMediaInsertPicker: closeAndReturnFocusToButton,
         insertMediaSingle: insertMediaSingle,
         insertExternalMediaSingle: insertExternalMediaSingle,

package/dist/esm/ui/quick-insert/MediaInsertQuickInsertMenuItem.js

@@ -1,8 +1,8 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, MEDIA_INSERT_TAB } from '@atlaskit/editor-common/analytics/types/enums';
 import { DEFAULT_MEDIA_INSERT_TAB_RANK, MEDIA_INSERT_TAB_RANK } from '@atlaskit/editor-common/media-insert/rank';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import { useQuickInsertContext } from '@atlaskit/editor-common/quick-insert/use-quick-insert-context';

package/dist/esm/ui/quick-insert/getMediaInsertQuickInsertComponents.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { MEDIA_INSERT_MENU_ITEM, MEDIA_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { MEDIA_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';

package/dist/esm/ui/useAnalyticsEvents.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 export function useAnalyticsEvents(dispatchAnalyticsEvent) {
   var onUploadButtonClickedAnalytics = React.useCallback(function () {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({

package/dist/types/mediaInsertPluginType.d.ts

@@ -1,11 +1,12 @@
 import type { ComponentType, ReactNode } from 'react';
-import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
-import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics/types/events';
+import type { MediaProvider } from '@atlaskit/editor-common/provider-factory/media-provider';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
 import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { MediaPlugin } from '@atlaskit/editor-plugin-media';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags/featureFlagsPluginType';
+import type { MediaPlugin } from '@atlaskit/editor-plugin-media/media-plugin-type';
 import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry/ui-control-registry-plugin-type';
 import type { CustomizedHelperMessage, InsertMediaSingle } from './types';
 /**

package/dist/types/types/index.d.ts

@@ -1,6 +1,7 @@
-import type { InputMethodInsertMedia } from '@atlaskit/editor-common/analytics';
-import type { Providers } from '@atlaskit/editor-common/provider-factory';
-import type { UiComponentFactoryParams, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { InputMethodInsertMedia } from '@atlaskit/editor-common/analytics/types/insert-events';
+import type { Providers } from '@atlaskit/editor-common/provider-factory/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { UiComponentFactoryParams } from '@atlaskit/editor-common/types/ui-components';
 import type { MediaState, MediaStateEventSubscriber } from '@atlaskit/editor-plugin-media/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaInsertPlugin, MediaInsertPluginConfig } from '../mediaInsertPluginType';

package/dist/types/ui/LocalMedia.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { type DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics/types/dispatch-analytics-event';
+import type { MediaProvider } from '@atlaskit/editor-common/provider-factory/media-provider';
 import type { InsertFile } from '../types';
 type Props = {
     closeMediaInsertPicker: () => void;

package/dist/types/ui/MediaCard.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
+import type { MediaProvider } from '@atlaskit/editor-common/provider-factory/media-provider';
 import type { OnInsertAttrs } from './types';
 type Props = {
     attrs: Required<OnInsertAttrs>;

package/dist/types/ui/MediaFromURL.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { type DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics/types/dispatch-analytics-event';
+import type { MediaProvider } from '@atlaskit/editor-common/provider-factory/media-provider';
 import type { CustomizedHelperMessage, InsertExternalMediaSingle, InsertMediaSingle } from '../types';
 export declare const isValidUrl: (value: string) => boolean;
 type Props = {

package/dist/types/ui/hooks/use-unholy-autofocus.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { PopupPosition } from '@atlaskit/editor-common/ui';
+import type { Position as PopupPosition } from '@atlaskit/editor-common/Popup/utils';
 /**
  * Autofocuses the first interactive element in the first tab panel
  * when the media picker is opened.

package/dist/types/ui/quick-insert/MediaInsertQuickInsertMenuItem.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { MediaInsertPlugin, MediaInsertPluginConfig } from '../../mediaInsertPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaInsertPlugin> | undefined;

package/dist/types/ui/quick-insert/getMediaInsertQuickInsertComponents.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { RegisterMenuItem } from '@atlaskit/editor-ui-control-model/types';
 import type { MediaInsertPlugin, MediaInsertPluginConfig } from '../../mediaInsertPluginType';
 type Params = {

package/dist/types/ui/useAnalyticsEvents.d.ts

@@ -1,4 +1,4 @@
-import { type DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics/types/dispatch-analytics-event';
 type Source = 'local' | 'url';
 export declare function useAnalyticsEvents(dispatchAnalyticsEvent?: DispatchAnalyticsEvent): {
     onUploadButtonClickedAnalytics: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media-insert",
-	"version": "44.0.4",
+	"version": "44.0.6",
 	"description": "Media Insert plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,11 +42,11 @@
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/tabs": "^21.3.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^231.0.0",
+		"@atlaskit/tmp-editor-statsig": "^232.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.3.0",
+		"@atlaskit/editor-common": "^130.4.0",
 		"@atlaskit/platform-feature-flags-react": "^1.2.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"react": "^18.2.0 || ^19.2.0",