@atlaskit/editor-plugin-media 24.1.0 → 25.0.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-media
 
+## 25.0.1
+
+### Patch Changes
+
+- [`e9abdca4bf1d7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e9abdca4bf1d7) -
+  Restore legacy inline media configuration behind platform_editor_remove_media_inline_feature_flag
+  to fix inline attachment insertion and upload completion in Jira.
+- Updated dependencies
+
+## 25.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 24.1.0
 
 ### Minor Changes

package/dist/cjs/mediaPlugin.js

@@ -15,7 +15,9 @@ var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 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 _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _lazyMediaGroup = require("./nodeviews/lazy-media-group");
 var _lazyMediaInline = require("./nodeviews/lazy-media-inline");
 var _mediaNodeView = require("./nodeviews/mediaNodeView");
@@ -35,7 +37,7 @@ var _keymap3 = _interopRequireDefault(require("./pm-plugins/linking/keymap"));
 var _main = require("./pm-plugins/main");
 var _pixelResizing = require("./pm-plugins/pixel-resizing");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _mediaCommon = require("./pm-plugins/utils/media-common");
+var _mediaCommon2 = require("./pm-plugins/utils/media-common");
 var _mediaSingle3 = require("./pm-plugins/utils/media-single");
 var _MediaPicker = require("./ui/MediaPicker");
 var _PortalWrapper = require("./ui/MediaViewer/PortalWrapper");
@@ -90,8 +92,8 @@ var MediaViewerFunctionalComponent = function MediaViewerFunctionalComponent(_re
     mediaClientConfig = _useSharedPluginState2.mediaClientConfig;
   var mediaItems = (0, _react.useMemo)(function () {
     if (isMediaViewerVisible) {
-      var mediaNodes = (0, _mediaCommon.extractMediaNodes)(editorView.state.doc);
-      return (0, _mediaCommon.createMediaIdentifierArray)(mediaNodes);
+      var mediaNodes = (0, _mediaCommon2.extractMediaNodes)(editorView.state.doc);
+      return (0, _mediaCommon2.createMediaIdentifierArray)(mediaNodes);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps -- only update mediaItems once when media viewer is visible
   }, [isMediaViewerVisible]);
@@ -193,8 +195,9 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
         _ref5$allowPixelResiz = _ref5.allowPixelResizing,
         allowPixelResizing = _ref5$allowPixelResiz === void 0 ? false : _ref5$allowPixelResiz,
         allowCaptions = _ref5.allowCaptions,
-        allowMediaInlineImages = _ref5.allowMediaInlineImages;
-      var allowMediaInline = allowMediaInlineImages;
+        allowMediaInlineImages = _ref5.allowMediaInlineImages,
+        mediaFeatureFlags = _ref5.featureFlags;
+      var allowMediaInline = (0, _fg.fg)('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaFeatureFlags);
       var mediaSingleOption = {
         withCaption: allowCaptions,
         withExtendedWidthTypes: allowPixelResizing
@@ -404,6 +407,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
         var _api$editorViewMode;
         return (0, _toolbar.floatingToolbar)(state, intl, {
           providerFactory: providerFactory,
+          allowMediaInline: options && (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', options.featureFlags),
           allowResizing: options && options.allowResizing,
           allowResizingInTables: options && options.allowResizingInTables,
           allowCommentsOnMedia: options && options.allowCommentsOnMedia,

package/dist/cjs/nodeviews/mediaGroupNext.js

@@ -16,7 +16,9 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _media = require("@atlaskit/editor-common/media");
 var _utils = require("@atlaskit/editor-common/utils");
 var _cross = _interopRequireDefault(require("@atlaskit/icon/core/cross"));
+var _mediaCommon = require("@atlaskit/media-common");
 var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _mediaNodeUpdater = require("./mediaNodeUpdater");
@@ -56,7 +58,8 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
     getPos = _ref.getPos,
     intl = _ref.intl,
     isMediaItemSelected = _ref.isMediaItemSelected,
-    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection;
+    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection,
+    featureFlags = _ref.featureFlags;
   return function (item, idx) {
     // We declared this to get a fresh position every time
     var getNodePos = function getNodePos() {
@@ -95,7 +98,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
       onClick: function onClick() {
         setMediaGroupNodeSelection(getNodePos());
       }
-    }, mediaInlineOptions(allowMediaInlineImages));
+    }, mediaInlineOptions((0, _fg.fg)('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', featureFlags)));
   };
 };
 
@@ -231,9 +234,10 @@ var MediaGroupNext = exports.MediaGroupNext = (0, _reactIntl.injectIntl)( /*#__P
       getPos: _getPos,
       intl: intl,
       isMediaItemSelected: isMediaItemSelected,
-      setMediaGroupNodeSelection: setMediaGroupNodeSelection
+      setMediaGroupNodeSelection: setMediaGroupNodeSelection,
+      featureFlags: featureFlags
     });
-  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection]);
+  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
   var items = (0, _react.useMemo)(function () {
     return mediaNodesWithOffsets.map(function (_ref4) {
       var node = _ref4.node,

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

@@ -18,6 +18,7 @@ var _uuid = require("uuid");
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
+var _mediaInline = require("@atlaskit/editor-common/media-inline");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -29,12 +30,13 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaCommon = require("@atlaskit/media-common");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _mediaNodeUpdater = require("../nodeviews/mediaNodeUpdater");
 var _helpers = _interopRequireWildcard(require("../pm-plugins/commands/helpers"));
 var helpers = _helpers;
 var _mediaCommon2 = require("../pm-plugins/utils/media-common");
 var _mediaFiles = require("../pm-plugins/utils/media-files");
-var _mediaInline = require("../pm-plugins/utils/media-inline");
+var _mediaInline2 = require("../pm-plugins/utils/media-inline");
 var _mediaSingle2 = require("../pm-plugins/utils/media-single");
 var _DropPlaceholder = _interopRequireDefault(require("../ui/Media/DropPlaceholder"));
 var _actions = require("./actions");
@@ -76,8 +78,7 @@ var createDropPlaceholder = function createDropPlaceholder(intl, nodeViewPortalP
 var MEDIA_RESOLVED_STATES = ['ready', 'error', 'cancelled'];
 var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*#__PURE__*/function () {
   function MediaPluginStateImplementation(_state, options, mediaOptions, _dispatch, pluginInjectionApi) {
-    var _this = this,
-      _this$mediaOptions2;
+    var _this = this;
     (0, _classCallCheck2.default)(this, MediaPluginStateImplementation);
     (0, _defineProperty2.default)(this, "allowsUploads", false);
     (0, _defineProperty2.default)(this, "uploadStatus", 'pending');
@@ -290,7 +291,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
         }
         return;
       }
-      switch ((0, _mediaInline.getMediaNodeInsertionType)(state, _this.mediaOptions, mediaStateWithContext.fileMimeType)) {
+      switch ((0, _mediaInline2.getMediaNodeInsertionType)(state, _this.mediaOptions, mediaStateWithContext.fileMimeType)) {
         case 'inline':
           (0, _mediaFiles.insertMediaInlineNode)(editorAnalyticsAPI)(_this.view, mediaStateWithContext, collection, _this.allowInlineImages, _this.getInputMethod(pickerType), insertMediaVia);
           break;
@@ -672,8 +673,16 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
-    if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
-      this.allowInlineImages = true;
+    if ((0, _fg.fg)('platform_editor_remove_media_inline_feature_flag')) {
+      var _this$mediaOptions2;
+      if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
+        this.allowInlineImages = true;
+      }
+    } else {
+      var _this$mediaOptions3, _this$mediaOptions4;
+      if ((0, _mediaInline.mediaInlineImagesEnabled)((0, _mediaCommon.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions3 = this.mediaOptions) === null || _this$mediaOptions3 === void 0 ? void 0 : _this$mediaOptions3.featureFlags), (_this$mediaOptions4 = this.mediaOptions) === null || _this$mediaOptions4 === void 0 ? void 0 : _this$mediaOptions4.allowMediaInlineImages)) {
+        this.allowInlineImages = true;
+      }
     }
     this.errorReporter = options.errorReporter || new _utils.ErrorReporter();
     this.singletonCreatedAt = (performance || Date).now();
@@ -896,10 +905,10 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
   }, {
     key: "selectLastAddedMediaNode",
     value: function selectLastAddedMediaNode() {
-      var _this$mediaOptions3,
+      var _this$mediaOptions5,
         _this2 = this;
       // if preventAutoFocusOnUpload is enabled, skip auto-selection and just clear the tracking array
-      if ((_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.preventAutoFocusOnUpload) {
+      if ((_this$mediaOptions5 = this.mediaOptions) !== null && _this$mediaOptions5 !== void 0 && _this$mediaOptions5.preventAutoFocusOnUpload) {
         this.lastAddedMediaSingleFileIds = [];
         return;
       }

package/dist/cjs/pm-plugins/utils/media-inline.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isInSupportedInlineImageParent = exports.getMediaNodeInsertionType = void 0;
+var _mediaInline = require("@atlaskit/editor-common/media-inline");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _mediaCommon = require("@atlaskit/media-common");
@@ -23,9 +24,17 @@ var getMediaNodeInsertionType = exports.getMediaNodeInsertionType = function get
     return 'group';
   }
   var canInsertInlineNode = (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags) && !(0, _utils.isInEmptyLine)(state) && (!(0, _mediaCommon2.isInsidePotentialEmptyParagraph)(state) || isInSupportedInlineImageParent(state)) && (0, _mediaFiles.canInsertMediaInline)(state);
-  if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
-    if (canInsertInlineNode && !(0, _isType.isVideo)(fileMimeType)) {
-      return 'inline';
+  if ((0, _fg.fg)('platform_editor_remove_media_inline_feature_flag')) {
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
+      if (canInsertInlineNode && !(0, _isType.isVideo)(fileMimeType)) {
+        return 'inline';
+      }
+    }
+  } else {
+    if ((0, _mediaInline.mediaInlineImagesEnabled)((0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags), mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.allowMediaInlineImages)) {
+      if (canInsertInlineNode && !(0, _isType.isVideo)(fileMimeType)) {
+        return 'inline';
+      }
     }
   }
   if ((0, _mediaSingle.isMediaSingle)(state.schema, fileMimeType)) {

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

@@ -13,6 +13,7 @@ var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _mediaInline = require("@atlaskit/editor-common/media-inline");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
@@ -50,7 +51,7 @@ var _imageBorder = require("./imageBorder");
 var _layoutGroup = require("./layout-group");
 var _linking3 = require("./linking");
 var _linkingToolbarAppearance = require("./linking-toolbar-appearance");
-var _mediaInline = require("./mediaInline");
+var _mediaInline2 = require("./mediaInline");
 var _pixelResizing2 = require("./pixel-resizing");
 var _utils2 = require("./utils");
 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); }
@@ -281,6 +282,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     allowCommentsOnMedia = options.allowCommentsOnMedia,
     allowResizingInTables = options.allowResizingInTables,
     allowAltTextOnImages = options.allowAltTextOnImages,
+    allowMediaInline = options.allowMediaInline,
     allowMediaInlineImages = options.allowMediaInlineImages,
     allowImageEditing = options.allowImageEditing,
     allowImagePreview = options.allowImagePreview,
@@ -380,14 +382,27 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         }
       }
     };
-    if (allowMediaInlineImages && selectedNode) {
-      addLayoutDropdownToToolbar();
+    if ((0, _fg.fg)('platform_editor_remove_media_inline_feature_flag')) {
+      if (allowMediaInlineImages && selectedNode) {
+        addLayoutDropdownToToolbar();
+      } else {
+        toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)(layoutButtons));
+        if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
+          toolbarButtons.push({
+            type: 'separator'
+          });
+        }
+      }
     } else {
-      toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)(layoutButtons));
-      if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
-        toolbarButtons.push({
-          type: 'separator'
-        });
+      if ((0, _mediaInline.mediaInlineImagesEnabled)(allowMediaInline, allowMediaInlineImages) && selectedNode) {
+        addLayoutDropdownToToolbar();
+      } else {
+        toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)(layoutButtons));
+        if (layoutButtons.length && !areAnyNewToolbarFlagsEnabled) {
+          toolbarButtons.push({
+            type: 'separator'
+          });
+        }
       }
     }
 
@@ -794,7 +809,8 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     allowResizingInTables = options.allowResizingInTables,
     allowAdvancedToolBarOptions = options.allowAdvancedToolBarOptions,
     allowPixelResizing = options.allowPixelResizing;
-  var allowMediaInline = allowMediaInlineImages;
+  var allowMediaInline = options.allowMediaInline;
+  allowMediaInline = (0, _fg.fg)('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : allowMediaInline;
   var mediaPluginState = _pluginKey.stateKey.getState(state);
   var mediaLinkingState = (0, _linking2.getMediaLinkingState)(state);
   var _ref4 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d4 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
@@ -871,7 +887,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     };
     items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector, isViewOnly);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
-    items = (0, _mediaInline.generateMediaInlineFloatingToolbar)(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
+    items = (0, _mediaInline2.generateMediaInlineFloatingToolbar)(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
   } else {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele3;

package/dist/es2019/mediaPlugin.js

@@ -6,7 +6,9 @@ import { IconImages } from '@atlaskit/editor-common/quick-insert';
 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { lazyMediaGroupView } from './nodeviews/lazy-media-group';
 import { lazyMediaInlineView } from './nodeviews/lazy-media-inline';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
@@ -181,9 +183,10 @@ export const mediaPlugin = ({
         allowMediaSingle = false,
         allowPixelResizing = false,
         allowCaptions,
-        allowMediaInlineImages
+        allowMediaInlineImages,
+        featureFlags: mediaFeatureFlags
       } = options || {};
-      const allowMediaInline = allowMediaInlineImages;
+      const allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
       const mediaSingleOption = {
         withCaption: allowCaptions,
         withExtendedWidthTypes: allowPixelResizing
@@ -395,6 +398,7 @@ export const mediaPlugin = ({
         var _api$editorViewMode, _api$editorViewMode$s;
         return floatingToolbar(state, intl, {
           providerFactory,
+          allowMediaInline: options && getMediaFeatureFlag('mediaInline', options.featureFlags),
           allowResizing: options && options.allowResizing,
           allowResizingInTables: options && options.allowResizingInTables,
           allowCommentsOnMedia: options && options.allowCommentsOnMedia,

package/dist/es2019/nodeviews/mediaGroupNext.js

@@ -4,7 +4,9 @@ import { usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeViewsMessages as messages } from '@atlaskit/editor-common/media';
 import { isNodeSelectedOrInRange, SelectedState, setNodeSelection } from '@atlaskit/editor-common/utils';
 import EditorCloseIcon from '@atlaskit/icon/core/cross';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { Filmstrip } from '@atlaskit/media-filmstrip';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { createMediaNodeUpdater } from './mediaNodeUpdater';
@@ -39,7 +41,8 @@ const prepareFilmstripItem = ({
   getPos,
   intl,
   isMediaItemSelected,
-  setMediaGroupNodeSelection
+  setMediaGroupNodeSelection,
+  featureFlags
 }) => (item, idx) => {
   // We declared this to get a fresh position every time
   const getNodePos = () => {
@@ -77,7 +80,7 @@ const prepareFilmstripItem = ({
     onClick: () => {
       setMediaGroupNodeSelection(getNodePos());
     },
-    ...mediaInlineOptions(allowMediaInlineImages)
+    ...mediaInlineOptions(fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', featureFlags))
   };
 };
 
@@ -186,9 +189,10 @@ export const MediaGroupNext = injectIntl( /*#__PURE__*/React.memo(props => {
       getPos,
       intl,
       isMediaItemSelected,
-      setMediaGroupNodeSelection
+      setMediaGroupNodeSelection,
+      featureFlags
     });
-  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection]);
+  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
   const items = useMemo(() => {
     return mediaNodesWithOffsets.map(({
       node,

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

@@ -7,6 +7,7 @@ import { v4 as uuid } from 'uuid';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import { CAPTION_PLACEHOLDER_ID, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { ErrorReporter } from '@atlaskit/editor-common/utils';
@@ -18,6 +19,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createMediaNodeUpdater } from '../nodeviews/mediaNodeUpdater';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
@@ -55,7 +57,6 @@ const createDropPlaceholder = (intl, nodeViewPortalProviderAPI, dropPlaceholderK
 const MEDIA_RESOLVED_STATES = ['ready', 'error', 'cancelled'];
 export class MediaPluginStateImplementation {
   constructor(_state, options, mediaOptions, _dispatch, pluginInjectionApi) {
-    var _this$mediaOptions2;
     _defineProperty(this, "allowsUploads", false);
     _defineProperty(this, "uploadStatus", 'pending');
     _defineProperty(this, "ignoreLinks", false);
@@ -663,8 +664,16 @@ export class MediaPluginStateImplementation {
     } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
-    if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
-      this.allowInlineImages = true;
+    if (fg('platform_editor_remove_media_inline_feature_flag')) {
+      var _this$mediaOptions2;
+      if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
+        this.allowInlineImages = true;
+      }
+    } else {
+      var _this$mediaOptions3, _this$mediaOptions4;
+      if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', (_this$mediaOptions3 = this.mediaOptions) === null || _this$mediaOptions3 === void 0 ? void 0 : _this$mediaOptions3.featureFlags), (_this$mediaOptions4 = this.mediaOptions) === null || _this$mediaOptions4 === void 0 ? void 0 : _this$mediaOptions4.allowMediaInlineImages)) {
+        this.allowInlineImages = true;
+      }
     }
     this.errorReporter = options.errorReporter || new ErrorReporter();
     this.singletonCreatedAt = (performance || Date).now();
@@ -821,9 +830,9 @@ export class MediaPluginStateImplementation {
     return (_this$pluginInjection10 = this.pluginInjectionApi) === null || _this$pluginInjection10 === void 0 ? void 0 : (_this$pluginInjection11 = _this$pluginInjection10.contextIdentifier) === null || _this$pluginInjection11 === void 0 ? void 0 : (_this$pluginInjection12 = _this$pluginInjection11.sharedState.currentState()) === null || _this$pluginInjection12 === void 0 ? void 0 : _this$pluginInjection12.contextIdentifierProvider;
   }
   selectLastAddedMediaNode() {
-    var _this$mediaOptions3;
+    var _this$mediaOptions5;
     // if preventAutoFocusOnUpload is enabled, skip auto-selection and just clear the tracking array
-    if ((_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.preventAutoFocusOnUpload) {
+    if ((_this$mediaOptions5 = this.mediaOptions) !== null && _this$mediaOptions5 !== void 0 && _this$mediaOptions5.preventAutoFocusOnUpload) {
       this.lastAddedMediaSingleFileIds = [];
       return;
     }

package/dist/es2019/pm-plugins/utils/media-inline.js

@@ -1,3 +1,4 @@
+import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import { isInEmptyLine } from '@atlaskit/editor-common/utils';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
@@ -17,9 +18,17 @@ export const getMediaNodeInsertionType = (state, mediaOptions, fileMimeType) =>
     return 'group';
   }
   const canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);
-  if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
-    if (canInsertInlineNode && !isVideo(fileMimeType)) {
-      return 'inline';
+  if (fg('platform_editor_remove_media_inline_feature_flag')) {
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
+      if (canInsertInlineNode && !isVideo(fileMimeType)) {
+        return 'inline';
+      }
+    }
+  } else {
+    if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags), mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.allowMediaInlineImages)) {
+      if (canInsertInlineNode && !isVideo(fileMimeType)) {
+        return 'inline';
+      }
     }
   }
   if (isMediaSingle(state.schema, fileMimeType)) {

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

@@ -3,6 +3,7 @@ import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { alignmentIcons, buildLayoutButtons, buildLayoutDropdown, layoutToMessages, wrappingIcons } from '@atlaskit/editor-common/card';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
@@ -270,6 +271,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     allowCommentsOnMedia,
     allowResizingInTables,
     allowAltTextOnImages,
+    allowMediaInline,
     allowMediaInlineImages,
     allowImageEditing,
     allowImagePreview,
@@ -373,14 +375,27 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         }
       }
     };
-    if (allowMediaInlineImages && selectedNode) {
-      addLayoutDropdownToToolbar();
+    if (fg('platform_editor_remove_media_inline_feature_flag')) {
+      if (allowMediaInlineImages && selectedNode) {
+        addLayoutDropdownToToolbar();
+      } else {
+        toolbarButtons = [...toolbarButtons, ...layoutButtons];
+        if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
+          toolbarButtons.push({
+            type: 'separator'
+          });
+        }
+      }
     } else {
-      toolbarButtons = [...toolbarButtons, ...layoutButtons];
-      if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
-        toolbarButtons.push({
-          type: 'separator'
-        });
+      if (mediaInlineImagesEnabled(allowMediaInline, allowMediaInlineImages) && selectedNode) {
+        addLayoutDropdownToToolbar();
+      } else {
+        toolbarButtons = [...toolbarButtons, ...layoutButtons];
+        if (layoutButtons.length && !areAnyNewToolbarFlagsEnabled) {
+          toolbarButtons.push({
+            type: 'separator'
+          });
+        }
       }
     }
 
@@ -787,7 +802,10 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     allowAdvancedToolBarOptions,
     allowPixelResizing
   } = options;
-  const allowMediaInline = allowMediaInlineImages;
+  let {
+    allowMediaInline
+  } = options;
+  allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : allowMediaInline;
   const mediaPluginState = stateKey.getState(state);
   const mediaLinkingState = getMediaLinkingState(state);
   const {

package/dist/esm/mediaPlugin.js

@@ -9,7 +9,9 @@ import { IconImages } from '@atlaskit/editor-common/quick-insert';
 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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { lazyMediaGroupView } from './nodeviews/lazy-media-group';
 import { lazyMediaInlineView } from './nodeviews/lazy-media-inline';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
@@ -184,8 +186,9 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
         _ref5$allowPixelResiz = _ref5.allowPixelResizing,
         allowPixelResizing = _ref5$allowPixelResiz === void 0 ? false : _ref5$allowPixelResiz,
         allowCaptions = _ref5.allowCaptions,
-        allowMediaInlineImages = _ref5.allowMediaInlineImages;
-      var allowMediaInline = allowMediaInlineImages;
+        allowMediaInlineImages = _ref5.allowMediaInlineImages,
+        mediaFeatureFlags = _ref5.featureFlags;
+      var allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
       var mediaSingleOption = {
         withCaption: allowCaptions,
         withExtendedWidthTypes: allowPixelResizing
@@ -395,6 +398,7 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
         var _api$editorViewMode;
         return _floatingToolbar(state, intl, {
           providerFactory: providerFactory,
+          allowMediaInline: options && getMediaFeatureFlag('mediaInline', options.featureFlags),
           allowResizing: options && options.allowResizing,
           allowResizingInTables: options && options.allowResizingInTables,
           allowCommentsOnMedia: options && options.allowCommentsOnMedia,

package/dist/esm/nodeviews/mediaGroupNext.js

@@ -10,7 +10,9 @@ import { usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeViewsMessages as messages } from '@atlaskit/editor-common/media';
 import { isNodeSelectedOrInRange, SelectedState, setNodeSelection } from '@atlaskit/editor-common/utils';
 import EditorCloseIcon from '@atlaskit/icon/core/cross';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { Filmstrip } from '@atlaskit/media-filmstrip';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { createMediaNodeUpdater } from './mediaNodeUpdater';
@@ -47,7 +49,8 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
     getPos = _ref.getPos,
     intl = _ref.intl,
     isMediaItemSelected = _ref.isMediaItemSelected,
-    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection;
+    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection,
+    featureFlags = _ref.featureFlags;
   return function (item, idx) {
     // We declared this to get a fresh position every time
     var getNodePos = function getNodePos() {
@@ -86,7 +89,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
       onClick: function onClick() {
         setMediaGroupNodeSelection(getNodePos());
       }
-    }, mediaInlineOptions(allowMediaInlineImages));
+    }, mediaInlineOptions(fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', featureFlags)));
   };
 };
 
@@ -222,9 +225,10 @@ export var MediaGroupNext = injectIntl( /*#__PURE__*/React.memo(function (props)
       getPos: _getPos,
       intl: intl,
       isMediaItemSelected: isMediaItemSelected,
-      setMediaGroupNodeSelection: setMediaGroupNodeSelection
+      setMediaGroupNodeSelection: setMediaGroupNodeSelection,
+      featureFlags: featureFlags
     });
-  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection]);
+  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
   var items = useMemo(function () {
     return mediaNodesWithOffsets.map(function (_ref4) {
       var node = _ref4.node,

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

@@ -16,6 +16,7 @@ import { v4 as uuid } from 'uuid';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import { CAPTION_PLACEHOLDER_ID, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { ErrorReporter } from '@atlaskit/editor-common/utils';
@@ -27,6 +28,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createMediaNodeUpdater } from '../nodeviews/mediaNodeUpdater';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
@@ -68,8 +70,7 @@ var createDropPlaceholder = function createDropPlaceholder(intl, nodeViewPortalP
 var MEDIA_RESOLVED_STATES = ['ready', 'error', 'cancelled'];
 export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   function MediaPluginStateImplementation(_state, options, mediaOptions, _dispatch, pluginInjectionApi) {
-    var _this = this,
-      _this$mediaOptions2;
+    var _this = this;
     _classCallCheck(this, MediaPluginStateImplementation);
     _defineProperty(this, "allowsUploads", false);
     _defineProperty(this, "uploadStatus", 'pending');
@@ -664,8 +665,16 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
-    if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
-      this.allowInlineImages = true;
+    if (fg('platform_editor_remove_media_inline_feature_flag')) {
+      var _this$mediaOptions2;
+      if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
+        this.allowInlineImages = true;
+      }
+    } else {
+      var _this$mediaOptions3, _this$mediaOptions4;
+      if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', (_this$mediaOptions3 = this.mediaOptions) === null || _this$mediaOptions3 === void 0 ? void 0 : _this$mediaOptions3.featureFlags), (_this$mediaOptions4 = this.mediaOptions) === null || _this$mediaOptions4 === void 0 ? void 0 : _this$mediaOptions4.allowMediaInlineImages)) {
+        this.allowInlineImages = true;
+      }
     }
     this.errorReporter = options.errorReporter || new ErrorReporter();
     this.singletonCreatedAt = (performance || Date).now();
@@ -888,10 +897,10 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "selectLastAddedMediaNode",
     value: function selectLastAddedMediaNode() {
-      var _this$mediaOptions3,
+      var _this$mediaOptions5,
         _this2 = this;
       // if preventAutoFocusOnUpload is enabled, skip auto-selection and just clear the tracking array
-      if ((_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.preventAutoFocusOnUpload) {
+      if ((_this$mediaOptions5 = this.mediaOptions) !== null && _this$mediaOptions5 !== void 0 && _this$mediaOptions5.preventAutoFocusOnUpload) {
         this.lastAddedMediaSingleFileIds = [];
         return;
       }

package/dist/esm/pm-plugins/utils/media-inline.js

@@ -1,3 +1,4 @@
+import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import { isInEmptyLine } from '@atlaskit/editor-common/utils';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
@@ -17,9 +18,17 @@ export var getMediaNodeInsertionType = function getMediaNodeInsertionType(state,
     return 'group';
   }
   var canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);
-  if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
-    if (canInsertInlineNode && !isVideo(fileMimeType)) {
-      return 'inline';
+  if (fg('platform_editor_remove_media_inline_feature_flag')) {
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
+      if (canInsertInlineNode && !isVideo(fileMimeType)) {
+        return 'inline';
+      }
+    }
+  } else {
+    if (mediaInlineImagesEnabled(getMediaFeatureFlag('mediaInline', mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.featureFlags), mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.allowMediaInlineImages)) {
+      if (canInsertInlineNode && !isVideo(fileMimeType)) {
+        return 'inline';
+      }
     }
   }
   if (isMediaSingle(state.schema, fileMimeType)) {

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

@@ -7,6 +7,7 @@ import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { alignmentIcons, buildLayoutButtons, buildLayoutDropdown, layoutToMessages, wrappingIcons } from '@atlaskit/editor-common/card';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
@@ -272,6 +273,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     allowCommentsOnMedia = options.allowCommentsOnMedia,
     allowResizingInTables = options.allowResizingInTables,
     allowAltTextOnImages = options.allowAltTextOnImages,
+    allowMediaInline = options.allowMediaInline,
     allowMediaInlineImages = options.allowMediaInlineImages,
     allowImageEditing = options.allowImageEditing,
     allowImagePreview = options.allowImagePreview,
@@ -371,14 +373,27 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         }
       }
     };
-    if (allowMediaInlineImages && selectedNode) {
-      addLayoutDropdownToToolbar();
+    if (fg('platform_editor_remove_media_inline_feature_flag')) {
+      if (allowMediaInlineImages && selectedNode) {
+        addLayoutDropdownToToolbar();
+      } else {
+        toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
+        if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
+          toolbarButtons.push({
+            type: 'separator'
+          });
+        }
+      }
     } else {
-      toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
-      if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
-        toolbarButtons.push({
-          type: 'separator'
-        });
+      if (mediaInlineImagesEnabled(allowMediaInline, allowMediaInlineImages) && selectedNode) {
+        addLayoutDropdownToToolbar();
+      } else {
+        toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
+        if (layoutButtons.length && !areAnyNewToolbarFlagsEnabled) {
+          toolbarButtons.push({
+            type: 'separator'
+          });
+        }
       }
     }
 
@@ -785,7 +800,8 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     allowResizingInTables = options.allowResizingInTables,
     allowAdvancedToolBarOptions = options.allowAdvancedToolBarOptions,
     allowPixelResizing = options.allowPixelResizing;
-  var allowMediaInline = allowMediaInlineImages;
+  var allowMediaInline = options.allowMediaInline;
+  allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : allowMediaInline;
   var mediaPluginState = stateKey.getState(state);
   var mediaLinkingState = getMediaLinkingState(state);
   var _ref4 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d4 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "24.1.0",
+	"version": "25.0.1",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,22 +27,22 @@
 		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/editor-palette": "^3.5.0",
-		"@atlaskit/editor-plugin-analytics": "^22.0.0",
-		"@atlaskit/editor-plugin-annotation": "^22.0.0",
-		"@atlaskit/editor-plugin-connectivity": "^22.0.0",
-		"@atlaskit/editor-plugin-decorations": "^22.0.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^22.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^24.0.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^24.0.0",
-		"@atlaskit/editor-plugin-focus": "^21.0.0",
-		"@atlaskit/editor-plugin-grid": "^22.0.0",
-		"@atlaskit/editor-plugin-guideline": "^22.0.0",
-		"@atlaskit/editor-plugin-interaction": "^36.0.0",
-		"@atlaskit/editor-plugin-limited-mode": "^19.0.0",
-		"@atlaskit/editor-plugin-media-editing": "^16.0.0",
-		"@atlaskit/editor-plugin-selection": "^22.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^19.0.0",
-		"@atlaskit/editor-plugin-width": "^23.0.0",
+		"@atlaskit/editor-plugin-analytics": "^23.0.0",
+		"@atlaskit/editor-plugin-annotation": "^23.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^23.0.0",
+		"@atlaskit/editor-plugin-decorations": "^23.0.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^23.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^25.0.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^25.0.0",
+		"@atlaskit/editor-plugin-focus": "^22.0.0",
+		"@atlaskit/editor-plugin-grid": "^23.0.0",
+		"@atlaskit/editor-plugin-guideline": "^23.0.0",
+		"@atlaskit/editor-plugin-interaction": "^37.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^20.0.0",
+		"@atlaskit/editor-plugin-media-editing": "^17.0.0",
+		"@atlaskit/editor-plugin-selection": "^23.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^20.0.0",
+		"@atlaskit/editor-plugin-width": "^24.1.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
 		"@atlaskit/editor-tables": "^3.2.0",
@@ -61,9 +61,9 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^218.0.0",
+		"@atlaskit/tmp-editor-statsig": "^219.0.0",
 		"@atlaskit/tokens": "^20.1.0",
-		"@atlaskit/tooltip": "^24.3.0",
+		"@atlaskit/tooltip": "^24.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"@emotion/react": "^11.7.1",
@@ -74,7 +74,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^126.4.0",
+		"@atlaskit/editor-common": "^127.1.0",
 		"@atlaskit/media-core": "^39.0.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
@@ -102,6 +102,9 @@
 		"platform_editor_safari_media_clipboard_fix": {
 			"type": "boolean"
 		},
+		"platform_editor_remove_media_inline_feature_flag": {
+			"type": "boolean"
+		},
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},