@atlaskit/editor-plugin-media 8.3.0 → 8.4.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-media
 
+## 8.4.0
+
+### Minor Changes
+
+- [`641ffaa365b47`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/641ffaa365b47) -
+  [ux] add prevent auto focus after uploading support
+
+## 8.3.1
+
+### Patch Changes
+
+- [`507be0327d12c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/507be0327d12c) -
+  [ux] ED-29558 [Jira] Media element toolbar 'resize' doesn't work
+- Updated dependencies
+
 ## 8.3.0
 
 ### Minor Changes

package/dist/cjs/mediaPlugin.js

@@ -10,10 +10,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _mediaCommon = require("@atlaskit/media-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _lazyMedia = require("./nodeviews/lazy-media");
 var _lazyMediaGroup = require("./nodeviews/lazy-media-group");
 var _lazyMediaInline = require("./nodeviews/lazy-media-inline");
@@ -278,7 +278,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
           }
         });
       }
-      if (options && options.allowAdvancedToolBarOptions && options.allowResizing && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && options.allowPixelResizing) {
+      if (options && options.allowAdvancedToolBarOptions && options.allowResizing && (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) && options.allowPixelResizing) {
         pmPlugins.push({
           name: 'mediaPixelResizing',
           plugin: _pixelResizing.createPlugin

package/dist/cjs/nodeviews/mediaNodeView/index.js

@@ -123,7 +123,8 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
           contextIdentifierProvider: contextIdentifierProvider,
           mediaOptions: mediaOptions,
           onExternalImageLoaded: _this.onExternalImageLoaded,
-          isViewOnly: ((_this$reactComponentP = _this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.sharedState.currentState()) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.mode) === 'view'
+          isViewOnly: ((_this$reactComponentP = _this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.sharedState.currentState()) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.mode) === 'view',
+          pluginInjectionApi: _this.reactComponentProps.pluginInjectionApi
         });
       };
     });

package/dist/cjs/nodeviews/mediaNodeView/media.js

@@ -18,6 +18,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _bindEventListener = require("bind-event-listener");
 var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-context");
 var _analyticsNext = require("@atlaskit/analytics-next");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _utils = require("@atlaskit/editor-common/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaCard = require("@atlaskit/media-card");
@@ -65,13 +66,14 @@ var MediaNode = exports.MediaNode = /*#__PURE__*/function (_Component) {
       }, _callee);
     })));
     (0, _defineProperty2.default)(_this, "selectMediaSingleFromCard", function (_ref2) {
+      var _this$props$pluginInj;
       var event = _ref2.event;
       _this.selectMediaSingle(event);
 
       // In edit mode (node content wrapper has contenteditable set to true), link redirection is disabled by default
       // We need to call "stopPropagation" here in order to prevent in editor view mode, the browser from navigating to
       // another URL if the media node is wrapped in a link mark.
-      if (_this.props.isViewOnly && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+      if (_this.props.isViewOnly && (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean((_this$props$pluginInj = _this.props.pluginInjectionApi) === null || _this$props$pluginInj === void 0 ? void 0 : _this$props$pluginInj.toolbar))) {
         event.preventDefault();
       }
     });

package/dist/cjs/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -24,7 +24,6 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _chevronLeftChevronLeftLarge = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-left--chevron-left-large"));
 var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/cross-circle"));
 var _colors = require("@atlaskit/theme/colors");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../commands");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
@@ -134,9 +133,10 @@ var AltTextEditComponent = exports.AltTextEditComponent = /*#__PURE__*/function
       });
     });
     (0, _defineProperty2.default)(_this, "handleOnBlur", function (e) {
+      var _this$props$areAnyNew;
       // prevent other selection transaction gets triggered
       e.stopPropagation();
-      if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+      if ((_this$props$areAnyNew = _this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew !== void 0 ? _this$props$areAnyNew : (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
         _this.closeMediaAltTextMenuAndSetFocus();
       } else {
         _this.closeMediaAltTextMenu();
@@ -182,7 +182,7 @@ var AltTextEditComponent = exports.AltTextEditComponent = /*#__PURE__*/function
   }, {
     key: "render",
     value: function render() {
-      var _this$props$areAnyNew, _this$props$areAnyNew2;
+      var _this$props$areAnyNew2, _this$props$areAnyNew3, _this$props$areAnyNew4;
       var formatMessage = this.props.intl.formatMessage;
       var showClearTextButton = this.state.showClearTextButton;
       var backButtonMessage = formatMessage(_media.altTextMessages.back);
@@ -199,7 +199,7 @@ var AltTextEditComponent = exports.AltTextEditComponent = /*#__PURE__*/function
         }, error);
       });
       var hasErrors = !!errorsList.length;
-      var onSubmit = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? this.closeMediaAltTextMenuAndSetFocus : this.closeMediaAltTextMenu;
+      var onSubmit = ((_this$props$areAnyNew2 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew2 !== void 0 ? _this$props$areAnyNew2 : (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) ? this.closeMediaAltTextMenuAndSetFocus : this.closeMediaAltTextMenu;
       return (0, _react2.jsx)("div", {
         css: containerStyles
       }, (0, _react2.jsx)("section", {
@@ -214,7 +214,7 @@ var AltTextEditComponent = exports.AltTextEditComponent = /*#__PURE__*/function
         }),
         tooltipContent: backButtonMessageComponent,
         onClick: this.closeMediaAltTextMenu,
-        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew !== void 0 ? _this$props$areAnyNew : (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()
+        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew3 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew3 !== void 0 ? _this$props$areAnyNew3 : (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()
       })), (0, _react2.jsx)(_ui.PanelTextInput, {
         testId: "alt-text-input",
         ariaLabel: formatMessage(_media.altTextMessages.placeholder),
@@ -241,7 +241,7 @@ var AltTextEditComponent = exports.AltTextEditComponent = /*#__PURE__*/function
         })),
         tooltipContent: formatMessage(_media.altTextMessages.clear),
         onClick: this.handleClearText,
-        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew2 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew2 !== void 0 ? _this$props$areAnyNew2 : (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()
+        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew4 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew4 !== void 0 ? _this$props$areAnyNew4 : (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()
       }))), hasErrors && (0, _react2.jsx)("section", {
         id: "errors-list",
         ref: this.errorsListRef,

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

@@ -50,6 +50,7 @@ var MEDIA_CONTENT_WRAP_CLASS_NAME = exports.MEDIA_CONTENT_WRAP_CLASS_NAME = 'med
 var MEDIA_PLUGIN_IS_RESIZING_KEY = exports.MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';
 var MEDIA_PLUGIN_RESIZING_WIDTH_KEY = exports.MEDIA_PLUGIN_RESIZING_WIDTH_KEY = 'mediaSinglePlugin.resizing-width';
 var createDropPlaceholder = function createDropPlaceholder(intl, nodeViewPortalProviderAPI, dropPlaceholderKey, allowDropLine) {
+  // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
   var dropPlaceholder = document.createElement('div');
   var createElement = _react.default.createElement;
   if (allowDropLine) {
@@ -670,7 +671,14 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
   }, {
     key: "selectLastAddedMediaNode",
     value: function selectLastAddedMediaNode() {
-      var _this2 = this;
+      var _this$mediaOptions5,
+        _this2 = this;
+      // if preventAutoFocusOnUpload is enabled, skip auto-selection and just clear the tracking array
+      if ((_this$mediaOptions5 = this.mediaOptions) !== null && _this$mediaOptions5 !== void 0 && _this$mediaOptions5.preventAutoFocusOnUpload && (0, _platformFeatureFlags.fg)('jira_kuro-jjj_disable_auto_focus_after_img_upload')) {
+        this.lastAddedMediaSingleFileIds = [];
+        return;
+      }
+
       // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected
       if (this.lastAddedMediaSingleFileIds.length !== 0) {
         this.waitForPendingTasks().then(function () {
@@ -969,6 +977,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
           var videoControls = videoControlsWrapperRef === null || videoControlsWrapperRef === void 0 ? void 0 : videoControlsWrapperRef.querySelectorAll('button, [tabindex]:not([tabindex="-1"])');
           if (videoControls) {
             var isVideoControl = Array.from(videoControls).some(function (videoControl) {
+              // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
               return document.activeElement === videoControl;
             });
             if (isVideoControl) {

package/dist/cjs/pm-plugins/pixel-resizing/ui/index.js

@@ -10,6 +10,7 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _media = require("@atlaskit/editor-common/media");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -70,6 +71,7 @@ var PixelEntry = exports.PixelEntry = function PixelEntry(_ref) {
   mediaWidth || _mediaSingle.DEFAULT_IMAGE_WIDTH);
   var pixelWidth = hasPixelType ? mediaSingleWidth : pixelWidthFromElement;
   var forceFocusSelector = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 || (_pluginInjectionApi$f = _pluginInjectionApi$f.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector;
+  var areAnyNewToolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   return (0, _react2.jsx)(_pixelEntry.PixelEntryComponent, {
     intl: intl,
     width: pluginState.isResizing ? pluginState.resizingWidth : pixelWidth,
@@ -121,7 +123,8 @@ var PixelEntry = exports.PixelEntry = function PixelEntry(_ref) {
       }
     },
     isViewMode: pluginState.isResizing,
-    triggerButtonSelector: triggerButtonSelector
+    triggerButtonSelector: triggerButtonSelector,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };
 var FullWidthDisplay = exports.FullWidthDisplay = function FullWidthDisplay(_ref4) {

package/dist/cjs/pm-plugins/pixel-resizing/ui/pixel-entry.js

@@ -17,7 +17,6 @@ var _form = _interopRequireWildcard(require("@atlaskit/form"));
 var _cross = _interopRequireDefault(require("@atlaskit/icon/core/cross"));
 var _primitives = require("@atlaskit/primitives");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _constants = require("./constants");
 var _styles = require("./styles");
@@ -49,7 +48,8 @@ var PixelEntryComponent = exports.PixelEntryComponent = function PixelEntryCompo
     showMigration = _ref.showMigration,
     onMigrate = _ref.onMigrate,
     onCloseAndSave = _ref.onCloseAndSave,
-    isViewMode = _ref.isViewMode;
+    isViewMode = _ref.isViewMode,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   var ratioWidth = (0, _react.useMemo)(function () {
     return mediaHeight / mediaWidth;
   }, [mediaHeight, mediaWidth]);
@@ -170,7 +170,7 @@ var PixelEntryComponent = exports.PixelEntryComponent = function PixelEntryCompo
       testId: _constants.PIXELENTRY_MIGRATION_BUTTON_TESTID
     }, formatMessage(_media.pixelEntryMessages.migrationButtonText)));
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if (areAnyNewToolbarFlagsEnabled) {
     return (0, _react2.jsx)(PixelEntryComponentNext, {
       maxWidth: maxWidth,
       formatMessage: formatMessage,

package/dist/cjs/ui/toolbar/alt-text.js

@@ -13,7 +13,6 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _imageAltText = _interopRequireDefault(require("@atlaskit/icon-lab/core/image-alt-text"));
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../../pm-plugins/alt-text/commands");
 var _AltTextEdit = _interopRequireDefault(require("../../pm-plugins/alt-text/ui/AltTextEdit"));
 var _isType = require("../../pm-plugins/utils/is-type");
@@ -60,7 +59,7 @@ var altTextEditComponent = function altTextEditComponent(options) {
         var _options$forceFocusSe;
         var tr = view.state.tr,
           dispatch = view.dispatch;
-        var elementSelector = options !== null && options !== void 0 && options.triggerButtonSelector && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? options.triggerButtonSelector : "[data-testid=\"".concat(testId, "\"]");
+        var elementSelector = options !== null && options !== void 0 && options.triggerButtonSelector && options !== null && options !== void 0 && options.areAnyNewToolbarFlagsEnabled ? options.triggerButtonSelector : "[data-testid=\"".concat(testId, "\"]");
         var newTr = options === null || options === void 0 || (_options$forceFocusSe = options.forceFocusSelector) === null || _options$forceFocusSe === void 0 ? void 0 : _options$forceFocusSe.call(options, elementSelector)(tr);
         if (newTr) {
           dispatch(newTr);

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

@@ -31,7 +31,6 @@ var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
 var _mediaUi = require("@atlaskit/media-ui");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _styles = require("../../nodeviews/styles");
 var _altText = require("../../pm-plugins/alt-text");
 var _linking = require("../../pm-plugins/commands/linking");
@@ -756,7 +755,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
 
   // testId is required to show focus on trigger button on ESC key press
   // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-  var overflowButtonSelector = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? "[data-testid=\"".concat(overflowDropdwonBtnTriggerTestId, "\"]") : undefined;
+  var overflowButtonSelector = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar)) ? "[data-testid=\"".concat(overflowDropdwonBtnTriggerTestId, "\"]") : undefined;
   if (allowAltTextOnImages) {
     var mediaAltTextPluginState = (0, _altText.getPluginState)(state);
     if (mediaAltTextPluginState.isAltTextEditorOpen) {
@@ -771,7 +770,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
   }
   var selection = state.selection;
   var isWithinTable = (0, _utils.hasParentNodeOfType)([state.schema.nodes.table])(selection);
-  if (allowAdvancedToolBarOptions && allowResizing && (!isWithinTable || allowResizingInTables === true) && allowPixelResizing && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if (allowAdvancedToolBarOptions && allowResizing && (!isWithinTable || allowResizingInTables === true) && allowPixelResizing && (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
     var mediaPixelResizingPluginState = (0, _pixelResizing.getPluginState)(state);
     if (mediaPixelResizingPluginState !== null && mediaPixelResizingPluginState !== void 0 && mediaPixelResizingPluginState.isPixelEditorOpen) {
       return (0, _pixelResizing2.getPixelResizingToolbar)(baseToolbar, {

package/dist/cjs/ui/toolbar/linking.js

@@ -15,7 +15,6 @@ var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _link = _interopRequireDefault(require("@atlaskit/icon/core/link"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _linking = require("../../pm-plugins/commands/linking");
 var _linking2 = require("../../pm-plugins/linking");
 var _currentMediaNode = require("../../pm-plugins/utils/current-media-node");
@@ -63,7 +62,7 @@ var getLinkingToolbar = exports.getLinkingToolbar = function getLinkingToolbar(t
               return null;
             }
             var setFocusOnFloatingToolbar = function setFocusOnFloatingToolbar(setFocus) {
-              if (setFocus && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+              if (setFocus && (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
                 var _pluginInjectionApi$f;
                 var tr = view.state.tr,
                   dispatch = view.dispatch;
@@ -98,7 +97,7 @@ var getLinkingToolbar = exports.getLinkingToolbar = function getLinkingToolbar(t
                  */
                 var tr = view.state.tr,
                   dispatch = view.dispatch;
-                var selector = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? FORCE_FOCUS_SELECTOR_EDITOR_CONTROLS : FORCE_FOCUS_SELECTOR;
+                var selector = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar)) ? FORCE_FOCUS_SELECTOR_EDITOR_CONTROLS : FORCE_FOCUS_SELECTOR;
                 pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 || _pluginInjectionApi$f2.forceFocusSelector(selector)(tr);
                 dispatch(tr);
               },

package/dist/cjs/ui/toolbar/mediaInline.js

@@ -20,7 +20,6 @@ var _maximize = _interopRequireDefault(require("@atlaskit/icon/core/maximize"));
 var _download = _interopRequireDefault(require("@atlaskit/icon/core/migration/download"));
 var _smartLinkCard = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-card"));
 var _mediaUi = require("@atlaskit/media-ui");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _linking = require("../../pm-plugins/commands/linking");
 var _linking2 = require("../../pm-plugins/linking");
 var _currentMediaNode = require("../../pm-plugins/utils/current-media-node");
@@ -189,7 +188,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
   var mediaSingleTitle = intl.formatMessage(_messages.mediaAndEmbedToolbarMessages.changeToMediaSingle);
   var widthPluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$w = pluginInjectionApi.width) === null || _pluginInjectionApi$w === void 0 ? void 0 : _pluginInjectionApi$w.sharedState.currentState();
   var inlineImageItems = [];
-  var isEditorControlsEnabled = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
+  var isEditorControlsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   var isViewOnly = options.isViewOnly,
     allowAltTextOnImages = options.allowAltTextOnImages,
     allowLinking = options.allowLinking,

package/dist/es2019/mediaPlugin.js

@@ -2,10 +2,10 @@ import React, { useMemo } from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { lazyMediaView } from './nodeviews/lazy-media';
 import { lazyMediaGroupView } from './nodeviews/lazy-media-group';
 import { lazyMediaInlineView } from './nodeviews/lazy-media-inline';
@@ -270,7 +270,7 @@ export const mediaPlugin = ({
           }) => keymapLinkingPlugin(schema)
         });
       }
-      if (options && options.allowAdvancedToolBarOptions && options.allowResizing && editorExperiment('platform_editor_controls', 'variant1') && options.allowPixelResizing) {
+      if (options && options.allowAdvancedToolBarOptions && options.allowResizing && areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) && options.allowPixelResizing) {
         pmPlugins.push({
           name: 'mediaPixelResizing',
           plugin: createMediaPixelResizingPlugin

package/dist/es2019/nodeviews/mediaNodeView/index.js

@@ -112,7 +112,8 @@ class MediaNodeView extends SelectionBasedNodeView {
           contextIdentifierProvider: contextIdentifierProvider,
           mediaOptions: mediaOptions,
           onExternalImageLoaded: this.onExternalImageLoaded,
-          isViewOnly: ((_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 ? void 0 : (_this$reactComponentP2 = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : (_this$reactComponentP3 = _this$reactComponentP2.sharedState.currentState()) === null || _this$reactComponentP3 === void 0 ? void 0 : _this$reactComponentP3.mode) === 'view'
+          isViewOnly: ((_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 ? void 0 : (_this$reactComponentP2 = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : (_this$reactComponentP3 = _this$reactComponentP2.sharedState.currentState()) === null || _this$reactComponentP3 === void 0 ? void 0 : _this$reactComponentP3.mode) === 'view',
+          pluginInjectionApi: this.reactComponentProps.pluginInjectionApi
         });
       };
     });

package/dist/es2019/nodeviews/mediaNodeView/media.js

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import { bind } from 'bind-event-listener';
 import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { setNodeSelection, setTextSelection, withImageLoader } from '@atlaskit/editor-common/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Card, CardLoading } from '@atlaskit/media-card';
@@ -36,12 +37,13 @@ export class MediaNode extends Component {
     _defineProperty(this, "selectMediaSingleFromCard", ({
       event
     }) => {
+      var _this$props$pluginInj;
       this.selectMediaSingle(event);
 
       // In edit mode (node content wrapper has contenteditable set to true), link redirection is disabled by default
       // We need to call "stopPropagation" here in order to prevent in editor view mode, the browser from navigating to
       // another URL if the media node is wrapped in a link mark.
-      if (this.props.isViewOnly && editorExperiment('platform_editor_controls', 'variant1')) {
+      if (this.props.isViewOnly && areToolbarFlagsEnabled(Boolean((_this$props$pluginInj = this.props.pluginInjectionApi) === null || _this$props$pluginInj === void 0 ? void 0 : _this$props$pluginInj.toolbar))) {
         event.preventDefault();
       }
     });

package/dist/es2019/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -19,7 +19,6 @@ import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import ChevronLeftLargeIcon from '@atlaskit/icon/core/migration/chevron-left--chevron-left-large';
 import CrossCircleIcon from '@atlaskit/icon/core/migration/cross-circle';
 import { N200, N30, N80, R400 } from '@atlaskit/theme/colors';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeMediaAltTextMenu, closeMediaAltTextMenuAndSave } from '../commands';
 export const MAX_ALT_TEXT_LENGTH = 510; // double tweet length
 
@@ -123,9 +122,10 @@ export class AltTextEditComponent extends React.Component {
       });
     });
     _defineProperty(this, "handleOnBlur", e => {
+      var _this$props$areAnyNew;
       // prevent other selection transaction gets triggered
       e.stopPropagation();
-      if (editorExperiment('platform_editor_controls', 'variant1')) {
+      if ((_this$props$areAnyNew = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew !== void 0 ? _this$props$areAnyNew : areToolbarFlagsEnabled()) {
         this.closeMediaAltTextMenuAndSetFocus();
       } else {
         this.closeMediaAltTextMenu();
@@ -165,7 +165,7 @@ export class AltTextEditComponent extends React.Component {
     return [];
   }
   render() {
-    var _this$props$areAnyNew, _this$props$areAnyNew2;
+    var _this$props$areAnyNew2, _this$props$areAnyNew3, _this$props$areAnyNew4;
     const {
       intl: {
         formatMessage
@@ -188,7 +188,7 @@ export class AltTextEditComponent extends React.Component {
       }, error);
     });
     const hasErrors = !!errorsList.length;
-    const onSubmit = editorExperiment('platform_editor_controls', 'variant1') ? this.closeMediaAltTextMenuAndSetFocus : this.closeMediaAltTextMenu;
+    const onSubmit = ((_this$props$areAnyNew2 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew2 !== void 0 ? _this$props$areAnyNew2 : areToolbarFlagsEnabled()) ? this.closeMediaAltTextMenuAndSetFocus : this.closeMediaAltTextMenu;
     return jsx("div", {
       css: containerStyles
     }, jsx("section", {
@@ -203,7 +203,7 @@ export class AltTextEditComponent extends React.Component {
       }),
       tooltipContent: backButtonMessageComponent,
       onClick: this.closeMediaAltTextMenu,
-      areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew !== void 0 ? _this$props$areAnyNew : areToolbarFlagsEnabled()
+      areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew3 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew3 !== void 0 ? _this$props$areAnyNew3 : areToolbarFlagsEnabled()
     })), jsx(PanelTextInput, {
       testId: "alt-text-input",
       ariaLabel: formatMessage(messages.placeholder),
@@ -230,7 +230,7 @@ export class AltTextEditComponent extends React.Component {
       })),
       tooltipContent: formatMessage(messages.clear),
       onClick: this.handleClearText,
-      areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew2 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew2 !== void 0 ? _this$props$areAnyNew2 : areToolbarFlagsEnabled()
+      areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew4 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew4 !== void 0 ? _this$props$areAnyNew4 : areToolbarFlagsEnabled()
     }))), hasErrors && jsx("section", {
       id: "errors-list",
       ref: this.errorsListRef,

package/dist/es2019/pm-plugins/main.js

@@ -33,6 +33,7 @@ export const MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 export const MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';
 export const MEDIA_PLUGIN_RESIZING_WIDTH_KEY = 'mediaSinglePlugin.resizing-width';
 const createDropPlaceholder = (intl, nodeViewPortalProviderAPI, dropPlaceholderKey, allowDropLine) => {
+  // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
   const dropPlaceholder = document.createElement('div');
   const createElement = React.createElement;
   if (allowDropLine) {
@@ -595,6 +596,13 @@ export class MediaPluginStateImplementation {
     return (_this$pluginInjection5 = this.pluginInjectionApi) === null || _this$pluginInjection5 === void 0 ? void 0 : (_this$pluginInjection6 = _this$pluginInjection5.contextIdentifier) === null || _this$pluginInjection6 === void 0 ? void 0 : (_this$pluginInjection7 = _this$pluginInjection6.sharedState.currentState()) === null || _this$pluginInjection7 === void 0 ? void 0 : _this$pluginInjection7.contextIdentifierProvider;
   }
   selectLastAddedMediaNode() {
+    var _this$mediaOptions5;
+    // if preventAutoFocusOnUpload is enabled, skip auto-selection and just clear the tracking array
+    if ((_this$mediaOptions5 = this.mediaOptions) !== null && _this$mediaOptions5 !== void 0 && _this$mediaOptions5.preventAutoFocusOnUpload && fg('jira_kuro-jjj_disable_auto_focus_after_img_upload')) {
+      this.lastAddedMediaSingleFileIds = [];
+      return;
+    }
+
     // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected
     if (this.lastAddedMediaSingleFileIds.length !== 0) {
       this.waitForPendingTasks().then(() => {
@@ -859,6 +867,7 @@ export const createPlugin = (_schema, options, getIntl, pluginInjectionApi, node
           const videoControls = videoControlsWrapperRef === null || videoControlsWrapperRef === void 0 ? void 0 : videoControlsWrapperRef.querySelectorAll('button, [tabindex]:not([tabindex="-1"])');
           if (videoControls) {
             const isVideoControl = Array.from(videoControls).some(videoControl => {
+              // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
               return document.activeElement === videoControl;
             });
             if (isVideoControl) {

package/dist/es2019/pm-plugins/pixel-resizing/ui/index.js

@@ -8,6 +8,7 @@ import { useCallback } from 'react';
 import { jsx } from '@emotion/react';
 import { pixelEntryMessages as messages } from '@atlaskit/editor-common/media';
 import { calcMinWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
@@ -68,6 +69,7 @@ export const PixelEntry = ({
   mediaWidth || DEFAULT_IMAGE_WIDTH);
   const pixelWidth = hasPixelType ? mediaSingleWidth : pixelWidthFromElement;
   const forceFocusSelector = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 ? void 0 : (_pluginInjectionApi$f2 = _pluginInjectionApi$f.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector;
+  const areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   return jsx(PixelEntryComponent, {
     intl: intl,
     width: pluginState.isResizing ? pluginState.resizingWidth : pixelWidth,
@@ -120,7 +122,8 @@ export const PixelEntry = ({
       }
     },
     isViewMode: pluginState.isResizing,
-    triggerButtonSelector: triggerButtonSelector
+    triggerButtonSelector: triggerButtonSelector,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };
 export const FullWidthDisplay = ({

package/dist/es2019/pm-plugins/pixel-resizing/ui/pixel-entry.js

@@ -16,7 +16,6 @@ import CrossIcon from '@atlaskit/icon/core/cross';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Inline, Box, Text, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { PIXEL_RESIZING_TOOLBAR_WIDTH, PIXEL_VIEW_MODE_TOOLBAR_WIDTH, PIXELENTRY_MIGRATION_BUTTON_TESTID } from './constants';
 import { pixelEntryForm, pixelEntryHiddenSubmit, pixelSizingHeightInput, pixelSizingInput, pixelSizingWidthInput, pixelSizingWrapper } from './styles';
@@ -38,7 +37,8 @@ export const PixelEntryComponent = ({
   showMigration,
   onMigrate,
   onCloseAndSave,
-  isViewMode
+  isViewMode,
+  areAnyNewToolbarFlagsEnabled
 }) => {
   const ratioWidth = useMemo(() => {
     return mediaHeight / mediaWidth;
@@ -152,7 +152,7 @@ export const PixelEntryComponent = ({
       testId: PIXELENTRY_MIGRATION_BUTTON_TESTID
     }, formatMessage(messages.migrationButtonText)));
   }
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areAnyNewToolbarFlagsEnabled) {
     return jsx(PixelEntryComponentNext, {
       maxWidth: maxWidth,
       formatMessage: formatMessage,

package/dist/es2019/ui/toolbar/alt-text.js

@@ -5,7 +5,6 @@ import { MediaSharedClassNames as ClassNames } from '@atlaskit/editor-common/sty
 import { RECENT_SEARCH_WIDTH_IN_PX as CONTAINER_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import ImageAltTextIcon from '@atlaskit/icon-lab/core/image-alt-text';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { openMediaAltTextMenu } from '../../pm-plugins/alt-text/commands';
 import AltTextEdit from '../../pm-plugins/alt-text/ui/AltTextEdit';
 import { isImage } from '../../pm-plugins/utils/is-type';
@@ -54,7 +53,7 @@ const altTextEditComponent = options => {
           },
           dispatch
         } = view;
-        const elementSelector = options !== null && options !== void 0 && options.triggerButtonSelector && editorExperiment('platform_editor_controls', 'variant1') ? options.triggerButtonSelector : `[data-testid="${testId}"]`;
+        const elementSelector = options !== null && options !== void 0 && options.triggerButtonSelector && options !== null && options !== void 0 && options.areAnyNewToolbarFlagsEnabled ? options.triggerButtonSelector : `[data-testid="${testId}"]`;
         const newTr = options === null || options === void 0 ? void 0 : (_options$forceFocusSe = options.forceFocusSelector) === null || _options$forceFocusSe === void 0 ? void 0 : _options$forceFocusSe.call(options, elementSelector)(tr);
         if (newTr) {
           dispatch(newTr);

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

@@ -21,7 +21,6 @@ import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import { messages } from '@atlaskit/media-ui';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { MediaSingleNodeSelector } from '../../nodeviews/styles';
 import { getPluginState as getMediaAltTextPluginState } from '../../pm-plugins/alt-text';
 import { showLinkingToolbar } from '../../pm-plugins/commands/linking';
@@ -756,7 +755,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
 
   // testId is required to show focus on trigger button on ESC key press
   // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-  const overflowButtonSelector = editorExperiment('platform_editor_controls', 'variant1') ? `[data-testid="${overflowDropdwonBtnTriggerTestId}"]` : undefined;
+  const overflowButtonSelector = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar)) ? `[data-testid="${overflowDropdwonBtnTriggerTestId}"]` : undefined;
   if (allowAltTextOnImages) {
     const mediaAltTextPluginState = getMediaAltTextPluginState(state);
     if (mediaAltTextPluginState.isAltTextEditorOpen) {
@@ -773,7 +772,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     selection
   } = state;
   const isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);
-  if (allowAdvancedToolBarOptions && allowResizing && (!isWithinTable || allowResizingInTables === true) && allowPixelResizing && editorExperiment('platform_editor_controls', 'variant1')) {
+  if (allowAdvancedToolBarOptions && allowResizing && (!isWithinTable || allowResizingInTables === true) && allowPixelResizing && areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
     const mediaPixelResizingPluginState = getMediaPixelResizingPluginState(state);
     if (mediaPixelResizingPluginState !== null && mediaPixelResizingPluginState !== void 0 && mediaPixelResizingPluginState.isPixelEditorOpen) {
       return getPixelResizingToolbar(baseToolbar, {

package/dist/es2019/ui/toolbar/linking.js

@@ -6,7 +6,6 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import LinkIcon from '@atlaskit/icon/core/link';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideLinkingToolbar, setUrlToMedia, showLinkingToolbar, unlink } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
 import { currentMediaInlineNode, currentMediaNode } from '../../pm-plugins/utils/current-media-node';
@@ -60,7 +59,7 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
               return null;
             }
             const setFocusOnFloatingToolbar = setFocus => {
-              if (setFocus && editorExperiment('platform_editor_controls', 'variant1')) {
+              if (setFocus && areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
                 var _pluginInjectionApi$f, _pluginInjectionApi$f2;
                 const {
                   state: {
@@ -103,7 +102,7 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
                   },
                   dispatch
                 } = view;
-                const selector = editorExperiment('platform_editor_controls', 'variant1') ? FORCE_FOCUS_SELECTOR_EDITOR_CONTROLS : FORCE_FOCUS_SELECTOR;
+                const selector = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar)) ? FORCE_FOCUS_SELECTOR_EDITOR_CONTROLS : FORCE_FOCUS_SELECTOR;
                 pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.actions) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.forceFocusSelector(selector)(tr);
                 dispatch(tr);
               },

package/dist/es2019/ui/toolbar/mediaInline.js

@@ -11,7 +11,6 @@ import MaximizeIcon from '@atlaskit/icon/core/maximize';
 import DownloadIcon from '@atlaskit/icon/core/migration/download';
 import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import { messages } from '@atlaskit/media-ui';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { showLinkingToolbar } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
 import { currentMediaOrInlineNodeBorderMark } from '../../pm-plugins/utils/current-media-node';
@@ -175,7 +174,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
   const mediaSingleTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaSingle);
   const widthPluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$w = pluginInjectionApi.width) === null || _pluginInjectionApi$w === void 0 ? void 0 : _pluginInjectionApi$w.sharedState.currentState();
   const inlineImageItems = [];
-  const isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
+  const isEditorControlsEnabled = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   const {
     isViewOnly,
     allowAltTextOnImages,

package/dist/esm/mediaPlugin.js

@@ -2,10 +2,10 @@ import React, { useMemo } from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { lazyMediaView } from './nodeviews/lazy-media';
 import { lazyMediaGroupView } from './nodeviews/lazy-media-group';
 import { lazyMediaInlineView } from './nodeviews/lazy-media-inline';
@@ -269,7 +269,7 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
           }
         });
       }
-      if (options && options.allowAdvancedToolBarOptions && options.allowResizing && editorExperiment('platform_editor_controls', 'variant1') && options.allowPixelResizing) {
+      if (options && options.allowAdvancedToolBarOptions && options.allowResizing && areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) && options.allowPixelResizing) {
         pmPlugins.push({
           name: 'mediaPixelResizing',
           plugin: createMediaPixelResizingPlugin

package/dist/esm/nodeviews/mediaNodeView/index.js

@@ -117,7 +117,8 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
           contextIdentifierProvider: contextIdentifierProvider,
           mediaOptions: mediaOptions,
           onExternalImageLoaded: _this.onExternalImageLoaded,
-          isViewOnly: ((_this$reactComponentP = _this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.sharedState.currentState()) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.mode) === 'view'
+          isViewOnly: ((_this$reactComponentP = _this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.sharedState.currentState()) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.mode) === 'view',
+          pluginInjectionApi: _this.reactComponentProps.pluginInjectionApi
         });
       };
     });

package/dist/esm/nodeviews/mediaNodeView/media.js

@@ -12,6 +12,7 @@ import React, { Component } from 'react';
 import { bind } from 'bind-event-listener';
 import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { setNodeSelection, setTextSelection, withImageLoader } from '@atlaskit/editor-common/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Card, CardLoading } from '@atlaskit/media-card';
@@ -57,13 +58,14 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
       }, _callee);
     })));
     _defineProperty(_this, "selectMediaSingleFromCard", function (_ref2) {
+      var _this$props$pluginInj;
       var event = _ref2.event;
       _this.selectMediaSingle(event);
 
       // In edit mode (node content wrapper has contenteditable set to true), link redirection is disabled by default
       // We need to call "stopPropagation" here in order to prevent in editor view mode, the browser from navigating to
       // another URL if the media node is wrapped in a link mark.
-      if (_this.props.isViewOnly && editorExperiment('platform_editor_controls', 'variant1')) {
+      if (_this.props.isViewOnly && areToolbarFlagsEnabled(Boolean((_this$props$pluginInj = _this.props.pluginInjectionApi) === null || _this$props$pluginInj === void 0 ? void 0 : _this$props$pluginInj.toolbar))) {
         event.preventDefault();
       }
     });

package/dist/esm/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -26,7 +26,6 @@ import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import ChevronLeftLargeIcon from '@atlaskit/icon/core/migration/chevron-left--chevron-left-large';
 import CrossCircleIcon from '@atlaskit/icon/core/migration/cross-circle';
 import { N200, N30, N80, R400 } from '@atlaskit/theme/colors';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeMediaAltTextMenu, closeMediaAltTextMenuAndSave } from '../commands';
 export var MAX_ALT_TEXT_LENGTH = 510; // double tweet length
 
@@ -131,9 +130,10 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "handleOnBlur", function (e) {
+      var _this$props$areAnyNew;
       // prevent other selection transaction gets triggered
       e.stopPropagation();
-      if (editorExperiment('platform_editor_controls', 'variant1')) {
+      if ((_this$props$areAnyNew = _this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew !== void 0 ? _this$props$areAnyNew : areToolbarFlagsEnabled()) {
         _this.closeMediaAltTextMenuAndSetFocus();
       } else {
         _this.closeMediaAltTextMenu();
@@ -179,7 +179,7 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props$areAnyNew, _this$props$areAnyNew2;
+      var _this$props$areAnyNew2, _this$props$areAnyNew3, _this$props$areAnyNew4;
       var formatMessage = this.props.intl.formatMessage;
       var showClearTextButton = this.state.showClearTextButton;
       var backButtonMessage = formatMessage(messages.back);
@@ -196,7 +196,7 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
         }, error);
       });
       var hasErrors = !!errorsList.length;
-      var onSubmit = editorExperiment('platform_editor_controls', 'variant1') ? this.closeMediaAltTextMenuAndSetFocus : this.closeMediaAltTextMenu;
+      var onSubmit = ((_this$props$areAnyNew2 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew2 !== void 0 ? _this$props$areAnyNew2 : areToolbarFlagsEnabled()) ? this.closeMediaAltTextMenuAndSetFocus : this.closeMediaAltTextMenu;
       return jsx("div", {
         css: containerStyles
       }, jsx("section", {
@@ -211,7 +211,7 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
         }),
         tooltipContent: backButtonMessageComponent,
         onClick: this.closeMediaAltTextMenu,
-        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew !== void 0 ? _this$props$areAnyNew : areToolbarFlagsEnabled()
+        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew3 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew3 !== void 0 ? _this$props$areAnyNew3 : areToolbarFlagsEnabled()
       })), jsx(PanelTextInput, {
         testId: "alt-text-input",
         ariaLabel: formatMessage(messages.placeholder),
@@ -238,7 +238,7 @@ export var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
         })),
         tooltipContent: formatMessage(messages.clear),
         onClick: this.handleClearText,
-        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew2 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew2 !== void 0 ? _this$props$areAnyNew2 : areToolbarFlagsEnabled()
+        areAnyNewToolbarFlagsEnabled: (_this$props$areAnyNew4 = this.props.areAnyNewToolbarFlagsEnabled) !== null && _this$props$areAnyNew4 !== void 0 ? _this$props$areAnyNew4 : areToolbarFlagsEnabled()
       }))), hasErrors && jsx("section", {
         id: "errors-list",
         ref: this.errorsListRef,

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

@@ -42,6 +42,7 @@ export var MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 export var MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';
 export var MEDIA_PLUGIN_RESIZING_WIDTH_KEY = 'mediaSinglePlugin.resizing-width';
 var createDropPlaceholder = function createDropPlaceholder(intl, nodeViewPortalProviderAPI, dropPlaceholderKey, allowDropLine) {
+  // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
   var dropPlaceholder = document.createElement('div');
   var createElement = React.createElement;
   if (allowDropLine) {
@@ -662,7 +663,14 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "selectLastAddedMediaNode",
     value: function selectLastAddedMediaNode() {
-      var _this2 = this;
+      var _this$mediaOptions5,
+        _this2 = this;
+      // if preventAutoFocusOnUpload is enabled, skip auto-selection and just clear the tracking array
+      if ((_this$mediaOptions5 = this.mediaOptions) !== null && _this$mediaOptions5 !== void 0 && _this$mediaOptions5.preventAutoFocusOnUpload && fg('jira_kuro-jjj_disable_auto_focus_after_img_upload')) {
+        this.lastAddedMediaSingleFileIds = [];
+        return;
+      }
+
       // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected
       if (this.lastAddedMediaSingleFileIds.length !== 0) {
         this.waitForPendingTasks().then(function () {
@@ -961,6 +969,7 @@ export var createPlugin = function createPlugin(_schema, options, getIntl, plugi
           var videoControls = videoControlsWrapperRef === null || videoControlsWrapperRef === void 0 ? void 0 : videoControlsWrapperRef.querySelectorAll('button, [tabindex]:not([tabindex="-1"])');
           if (videoControls) {
             var isVideoControl = Array.from(videoControls).some(function (videoControl) {
+              // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
               return document.activeElement === videoControl;
             });
             if (isVideoControl) {

package/dist/esm/pm-plugins/pixel-resizing/ui/index.js

@@ -11,6 +11,7 @@ import { useCallback } from 'react';
 import { jsx } from '@emotion/react';
 import { pixelEntryMessages as messages } from '@atlaskit/editor-common/media';
 import { calcMinWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
@@ -66,6 +67,7 @@ export var PixelEntry = function PixelEntry(_ref) {
   mediaWidth || DEFAULT_IMAGE_WIDTH);
   var pixelWidth = hasPixelType ? mediaSingleWidth : pixelWidthFromElement;
   var forceFocusSelector = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 || (_pluginInjectionApi$f = _pluginInjectionApi$f.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector;
+  var areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   return jsx(PixelEntryComponent, {
     intl: intl,
     width: pluginState.isResizing ? pluginState.resizingWidth : pixelWidth,
@@ -117,7 +119,8 @@ export var PixelEntry = function PixelEntry(_ref) {
       }
     },
     isViewMode: pluginState.isResizing,
-    triggerButtonSelector: triggerButtonSelector
+    triggerButtonSelector: triggerButtonSelector,
+    areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
   });
 };
 export var FullWidthDisplay = function FullWidthDisplay(_ref4) {

package/dist/esm/pm-plugins/pixel-resizing/ui/pixel-entry.js

@@ -17,7 +17,6 @@ import CrossIcon from '@atlaskit/icon/core/cross';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Inline, Box, Text, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { PIXEL_RESIZING_TOOLBAR_WIDTH, PIXEL_VIEW_MODE_TOOLBAR_WIDTH, PIXELENTRY_MIGRATION_BUTTON_TESTID } from './constants';
 import { pixelEntryForm, pixelEntryHiddenSubmit, pixelSizingHeightInput, pixelSizingInput, pixelSizingWidthInput, pixelSizingWrapper } from './styles';
@@ -37,7 +36,8 @@ export var PixelEntryComponent = function PixelEntryComponent(_ref) {
     showMigration = _ref.showMigration,
     onMigrate = _ref.onMigrate,
     onCloseAndSave = _ref.onCloseAndSave,
-    isViewMode = _ref.isViewMode;
+    isViewMode = _ref.isViewMode,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   var ratioWidth = useMemo(function () {
     return mediaHeight / mediaWidth;
   }, [mediaHeight, mediaWidth]);
@@ -158,7 +158,7 @@ export var PixelEntryComponent = function PixelEntryComponent(_ref) {
       testId: PIXELENTRY_MIGRATION_BUTTON_TESTID
     }, formatMessage(messages.migrationButtonText)));
   }
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areAnyNewToolbarFlagsEnabled) {
     return jsx(PixelEntryComponentNext, {
       maxWidth: maxWidth,
       formatMessage: formatMessage,

package/dist/esm/ui/toolbar/alt-text.js

@@ -8,7 +8,6 @@ import { MediaSharedClassNames as ClassNames } from '@atlaskit/editor-common/sty
 import { RECENT_SEARCH_WIDTH_IN_PX as CONTAINER_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import ImageAltTextIcon from '@atlaskit/icon-lab/core/image-alt-text';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { openMediaAltTextMenu } from '../../pm-plugins/alt-text/commands';
 import AltTextEdit from '../../pm-plugins/alt-text/ui/AltTextEdit';
 import { isImage } from '../../pm-plugins/utils/is-type';
@@ -53,7 +52,7 @@ var altTextEditComponent = function altTextEditComponent(options) {
         var _options$forceFocusSe;
         var tr = view.state.tr,
           dispatch = view.dispatch;
-        var elementSelector = options !== null && options !== void 0 && options.triggerButtonSelector && editorExperiment('platform_editor_controls', 'variant1') ? options.triggerButtonSelector : "[data-testid=\"".concat(testId, "\"]");
+        var elementSelector = options !== null && options !== void 0 && options.triggerButtonSelector && options !== null && options !== void 0 && options.areAnyNewToolbarFlagsEnabled ? options.triggerButtonSelector : "[data-testid=\"".concat(testId, "\"]");
         var newTr = options === null || options === void 0 || (_options$forceFocusSe = options.forceFocusSelector) === null || _options$forceFocusSe === void 0 ? void 0 : _options$forceFocusSe.call(options, elementSelector)(tr);
         if (newTr) {
           dispatch(newTr);

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

@@ -25,7 +25,6 @@ import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import { messages } from '@atlaskit/media-ui';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { MediaSingleNodeSelector } from '../../nodeviews/styles';
 import { getPluginState as getMediaAltTextPluginState } from '../../pm-plugins/alt-text';
 import { showLinkingToolbar } from '../../pm-plugins/commands/linking';
@@ -747,7 +746,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
 
   // testId is required to show focus on trigger button on ESC key press
   // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-  var overflowButtonSelector = editorExperiment('platform_editor_controls', 'variant1') ? "[data-testid=\"".concat(overflowDropdwonBtnTriggerTestId, "\"]") : undefined;
+  var overflowButtonSelector = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar)) ? "[data-testid=\"".concat(overflowDropdwonBtnTriggerTestId, "\"]") : undefined;
   if (allowAltTextOnImages) {
     var mediaAltTextPluginState = getMediaAltTextPluginState(state);
     if (mediaAltTextPluginState.isAltTextEditorOpen) {
@@ -762,7 +761,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
   }
   var selection = state.selection;
   var isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);
-  if (allowAdvancedToolBarOptions && allowResizing && (!isWithinTable || allowResizingInTables === true) && allowPixelResizing && editorExperiment('platform_editor_controls', 'variant1')) {
+  if (allowAdvancedToolBarOptions && allowResizing && (!isWithinTable || allowResizingInTables === true) && allowPixelResizing && areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
     var mediaPixelResizingPluginState = getMediaPixelResizingPluginState(state);
     if (mediaPixelResizingPluginState !== null && mediaPixelResizingPluginState !== void 0 && mediaPixelResizingPluginState.isPixelEditorOpen) {
       return getPixelResizingToolbar(baseToolbar, {

package/dist/esm/ui/toolbar/linking.js

@@ -9,7 +9,6 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import LinkIcon from '@atlaskit/icon/core/link';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideLinkingToolbar, setUrlToMedia, showLinkingToolbar, unlink } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
 import { currentMediaInlineNode, currentMediaNode } from '../../pm-plugins/utils/current-media-node';
@@ -55,7 +54,7 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
               return null;
             }
             var setFocusOnFloatingToolbar = function setFocusOnFloatingToolbar(setFocus) {
-              if (setFocus && editorExperiment('platform_editor_controls', 'variant1')) {
+              if (setFocus && areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar))) {
                 var _pluginInjectionApi$f;
                 var tr = view.state.tr,
                   dispatch = view.dispatch;
@@ -90,7 +89,7 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
                  */
                 var tr = view.state.tr,
                   dispatch = view.dispatch;
-                var selector = editorExperiment('platform_editor_controls', 'variant1') ? FORCE_FOCUS_SELECTOR_EDITOR_CONTROLS : FORCE_FOCUS_SELECTOR;
+                var selector = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar)) ? FORCE_FOCUS_SELECTOR_EDITOR_CONTROLS : FORCE_FOCUS_SELECTOR;
                 pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 || _pluginInjectionApi$f2.forceFocusSelector(selector)(tr);
                 dispatch(tr);
               },

package/dist/esm/ui/toolbar/mediaInline.js

@@ -14,7 +14,6 @@ import MaximizeIcon from '@atlaskit/icon/core/maximize';
 import DownloadIcon from '@atlaskit/icon/core/migration/download';
 import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import { messages } from '@atlaskit/media-ui';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { showLinkingToolbar } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
 import { currentMediaOrInlineNodeBorderMark } from '../../pm-plugins/utils/current-media-node';
@@ -180,7 +179,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
   var mediaSingleTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaSingle);
   var widthPluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$w = pluginInjectionApi.width) === null || _pluginInjectionApi$w === void 0 ? void 0 : _pluginInjectionApi$w.sharedState.currentState();
   var inlineImageItems = [];
-  var isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
+  var isEditorControlsEnabled = areToolbarFlagsEnabled(Boolean(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.toolbar));
   var isViewOnly = options.isViewOnly,
     allowAltTextOnImages = options.allowAltTextOnImages,
     allowLinking = options.allowLinking,

package/dist/types/nodeviews/mediaNodeView/media.d.ts

@@ -24,6 +24,7 @@ export interface MediaNodeProps extends ReactNodeProps, ImageLoaderProps {
     node: PMNode;
     onClick?: CardOnClickCallback;
     originalDimensions: NumericalCardDimensions;
+    pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     view: EditorView;
 }
 interface MediaNodeState {

package/dist/types/pm-plugins/pixel-resizing/ui/pixel-entry.d.ts

@@ -1,4 +1,4 @@
 import { jsx } from '@emotion/react';
 import type { PixelEntryComponentNextProps, PixelEntryProps } from './types';
-export declare const PixelEntryComponent: ({ width, mediaWidth, mediaHeight, onSubmit, minWidth, maxWidth, onChange, intl: { formatMessage }, showMigration, onMigrate, onCloseAndSave, isViewMode, }: PixelEntryProps) => jsx.JSX.Element;
+export declare const PixelEntryComponent: ({ width, mediaWidth, mediaHeight, onSubmit, minWidth, maxWidth, onChange, intl: { formatMessage }, showMigration, onMigrate, onCloseAndSave, isViewMode, areAnyNewToolbarFlagsEnabled, }: PixelEntryProps) => jsx.JSX.Element;
 export declare const PixelEntryComponentNext: ({ maxWidth, formatMessage, handleFieldChange, computedWidth, computedHeight, handleCloseAndSave, isViewMode, }: PixelEntryComponentNextProps) => jsx.JSX.Element;

package/dist/types/pm-plugins/pixel-resizing/ui/types.d.ts

@@ -1,6 +1,10 @@
 import type { ChangeEvent } from 'react';
 import type { IntlShape } from 'react-intl-next';
 export type PixelEntryProps = {
+    /**
+     * Whether the new toolbar flags are enabled
+     */
+    areAnyNewToolbarFlagsEnabled?: boolean;
     /**
      * IntlShape passed in for translations
      */

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

@@ -40,6 +40,12 @@ export interface MediaPluginOptions {
     allowResizing?: boolean;
     allowResizingInTables?: boolean;
     allowTemplatePlaceholders?: boolean | PlaceholderTextOptions;
+    /**
+     * When enabled, prevents automatic focus/selection of media nodes after upload completion.
+     * The existing focus will be preserved instead of switching to the uploaded media.
+     * @default false
+     */
+    preventAutoFocusOnUpload?: boolean;
     altTextValidator?: (value: string) => string[];
     customDropzoneContainer?: HTMLElement;
     customMediaPicker?: CustomMediaPicker;

package/dist/types-ts4.5/nodeviews/mediaNodeView/media.d.ts

@@ -24,6 +24,7 @@ export interface MediaNodeProps extends ReactNodeProps, ImageLoaderProps {
     node: PMNode;
     onClick?: CardOnClickCallback;
     originalDimensions: NumericalCardDimensions;
+    pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     view: EditorView;
 }
 interface MediaNodeState {

package/dist/types-ts4.5/pm-plugins/pixel-resizing/ui/pixel-entry.d.ts

@@ -1,4 +1,4 @@
 import { jsx } from '@emotion/react';
 import type { PixelEntryComponentNextProps, PixelEntryProps } from './types';
-export declare const PixelEntryComponent: ({ width, mediaWidth, mediaHeight, onSubmit, minWidth, maxWidth, onChange, intl: { formatMessage }, showMigration, onMigrate, onCloseAndSave, isViewMode, }: PixelEntryProps) => jsx.JSX.Element;
+export declare const PixelEntryComponent: ({ width, mediaWidth, mediaHeight, onSubmit, minWidth, maxWidth, onChange, intl: { formatMessage }, showMigration, onMigrate, onCloseAndSave, isViewMode, areAnyNewToolbarFlagsEnabled, }: PixelEntryProps) => jsx.JSX.Element;
 export declare const PixelEntryComponentNext: ({ maxWidth, formatMessage, handleFieldChange, computedWidth, computedHeight, handleCloseAndSave, isViewMode, }: PixelEntryComponentNextProps) => jsx.JSX.Element;

package/dist/types-ts4.5/pm-plugins/pixel-resizing/ui/types.d.ts

@@ -1,6 +1,10 @@
 import type { ChangeEvent } from 'react';
 import type { IntlShape } from 'react-intl-next';
 export type PixelEntryProps = {
+    /**
+     * Whether the new toolbar flags are enabled
+     */
+    areAnyNewToolbarFlagsEnabled?: boolean;
     /**
      * IntlShape passed in for translations
      */

package/dist/types-ts4.5/types/index.d.ts

@@ -40,6 +40,12 @@ export interface MediaPluginOptions {
     allowResizing?: boolean;
     allowResizingInTables?: boolean;
     allowTemplatePlaceholders?: boolean | PlaceholderTextOptions;
+    /**
+     * When enabled, prevents automatic focus/selection of media nodes after upload completion.
+     * The existing focus will be preserved instead of switching to the uploaded media.
+     * @default false
+     */
+    preventAutoFocusOnUpload?: boolean;
     altTextValidator?: (value: string) => string[];
     customDropzoneContainer?: HTMLElement;
     customMediaPicker?: CustomMediaPicker;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "8.3.0",
+	"version": "8.4.0",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -66,7 +66,7 @@
 		"@atlaskit/primitives": "^16.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.17.0",
+		"@atlaskit/tmp-editor-statsig": "^13.18.0",
 		"@atlaskit/tokens": "^7.0.0",
 		"@atlaskit/tooltip": "^20.6.0",
 		"@babel/runtime": "^7.0.0",
@@ -78,7 +78,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.16.0",
+		"@atlaskit/editor-common": "^110.17.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -162,6 +162,9 @@
 		},
 		"platform_editor_fix_media_card_removal": {
 			"type": "boolean"
+		},
+		"jira_kuro-jjj_disable_auto_focus_after_img_upload": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {