npm - @atlaskit/editor-plugin-media - Versions diffs - 24.0.9 → 24.1.0 - Mend

@atlaskit/editor-plugin-media 24.0.9 → 24.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/CHANGELOG.md +25 -0
package/dist/cjs/mediaPlugin.js +5 -9
package/dist/cjs/nodeviews/mediaGroupNext.js +4 -8
package/dist/cjs/pm-plugins/main.js +66 -43
package/dist/cjs/pm-plugins/utils/media-inline.js +3 -12
package/dist/cjs/ui/toolbar/index.js +10 -26
package/dist/es2019/mediaPlugin.js +2 -6
package/dist/es2019/nodeviews/mediaGroupNext.js +4 -8
package/dist/es2019/pm-plugins/main.js +33 -22
package/dist/es2019/pm-plugins/utils/media-inline.js +3 -12
package/dist/es2019/ui/toolbar/index.js +8 -26
package/dist/esm/mediaPlugin.js +2 -6
package/dist/esm/nodeviews/mediaGroupNext.js +4 -8
package/dist/esm/pm-plugins/main.js +63 -40
package/dist/esm/pm-plugins/utils/media-inline.js +3 -12
package/dist/esm/ui/toolbar/index.js +8 -24
package/dist/types/pm-plugins/main.d.ts +1 -0
package/dist/types/pm-plugins/types.d.ts +2 -0
package/package.json +1 -4

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-media
+## 24.1.0
+### Minor Changes
+- [`051cd10867eae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/051cd10867eae) -
+  Expose uploadStatus and mentionProviderStatus to distinguish pending providers from unavailable
+  capabilities. Under platform_editor_ssr_toolbar_optimistic, keep mention and media toolbar buttons
+  enabled while providers are pending, avoiding class changes on successful initialization while
+  preserving existing insertion restrictions.
+  When a view-only synchronous SSR media provider accompanies a pending full provider, keep uploads
+  pending until the full provider resolves instead of treating the SSR config as a permission
+  denial.
+### Patch Changes
+- Updated dependencies
+## 24.0.10
+### Patch Changes
+- [`b67e12494653e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b67e12494653e) -
+  Clean up feature gate `platform_editor_remove_media_inline_feature_flag`
 ## 24.0.9
 ### Patch Changes

package/dist/cjs/mediaPlugin.js CHANGED Viewed

@@ -15,9 +15,7 @@ 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");
@@ -37,7 +35,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 _mediaCommon2 = require("./pm-plugins/utils/media-common");
+var _mediaCommon = 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");
@@ -92,8 +90,8 @@ var MediaViewerFunctionalComponent = function MediaViewerFunctionalComponent(_re
     mediaClientConfig = _useSharedPluginState2.mediaClientConfig;
   var mediaItems = (0, _react.useMemo)(function () {
     if (isMediaViewerVisible) {
-      var mediaNodes = (0, _mediaCommon2.extractMediaNodes)(editorView.state.doc);
-      return (0, _mediaCommon2.createMediaIdentifierArray)(mediaNodes);
+      var mediaNodes = (0, _mediaCommon.extractMediaNodes)(editorView.state.doc);
+      return (0, _mediaCommon.createMediaIdentifierArray)(mediaNodes);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps -- only update mediaItems once when media viewer is visible
   }, [isMediaViewerVisible]);
@@ -195,9 +193,8 @@ 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,
-        mediaFeatureFlags = _ref5.featureFlags;
-      var allowMediaInline = (0, _fg.fg)('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaFeatureFlags);
+        allowMediaInlineImages = _ref5.allowMediaInlineImages;
+      var allowMediaInline = allowMediaInlineImages;
       var mediaSingleOption = {
         withCaption: allowCaptions,
         withExtendedWidthTypes: allowPixelResizing
@@ -407,7 +404,6 @@ 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 CHANGED Viewed

@@ -16,9 +16,7 @@ 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");
@@ -58,8 +56,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
     getPos = _ref.getPos,
     intl = _ref.intl,
     isMediaItemSelected = _ref.isMediaItemSelected,
-    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection,
-    featureFlags = _ref.featureFlags;
+    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection;
   return function (item, idx) {
     // We declared this to get a fresh position every time
     var getNodePos = function getNodePos() {
@@ -98,7 +95,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
       onClick: function onClick() {
         setMediaGroupNodeSelection(getNodePos());
       }
-    }, mediaInlineOptions((0, _fg.fg)('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', featureFlags)));
+    }, mediaInlineOptions(allowMediaInlineImages));
   };
 };
@@ -234,10 +231,9 @@ var MediaGroupNext = exports.MediaGroupNext = (0, _reactIntl.injectIntl)( /*#__P
       getPos: _getPos,
       intl: intl,
       isMediaItemSelected: isMediaItemSelected,
-      setMediaGroupNodeSelection: setMediaGroupNodeSelection,
-      featureFlags: featureFlags
+      setMediaGroupNodeSelection: setMediaGroupNodeSelection
     });
-  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
+  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection]);
   var items = (0, _react.useMemo)(function () {
     return mediaNodesWithOffsets.map(function (_ref4) {
       var node = _ref4.node,

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

@@ -18,7 +18,6 @@ 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,20 +28,20 @@ var _view3 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaCommon = require("@atlaskit/media-common");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 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 _mediaInline2 = require("../pm-plugins/utils/media-inline");
+var _mediaInline = 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");
 var _mediaTaskManager = require("./mediaTaskManager");
 var _pickerFacade = _interopRequireDefault(require("./picker-facade"));
 var _pluginKey = require("./plugin-key");
-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 _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
+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 _t4 in e) "default" !== _t4 && {}.hasOwnProperty.call(e, _t4) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t4)) && (i.get || i.set) ? o(f, _t4, i) : f[_t4] = e[_t4]); return f; })(e, t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -77,9 +76,11 @@ 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;
+    var _this = this,
+      _this$mediaOptions2;
     (0, _classCallCheck2.default)(this, MediaPluginStateImplementation);
     (0, _defineProperty2.default)(this, "allowsUploads", false);
+    (0, _defineProperty2.default)(this, "uploadStatus", 'pending');
     (0, _defineProperty2.default)(this, "ignoreLinks", false);
     (0, _defineProperty2.default)(this, "waitForMediaUpload", true);
     (0, _defineProperty2.default)(this, "allUploadsFinished", true);
@@ -289,7 +290,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
         }
         return;
       }
-      switch ((0, _mediaInline2.getMediaNodeInsertionType)(state, _this.mediaOptions, mediaStateWithContext.fileMimeType)) {
+      switch ((0, _mediaInline.getMediaNodeInsertionType)(state, _this.mediaOptions, mediaStateWithContext.fileMimeType)) {
         case 'inline':
           (0, _mediaFiles.insertMediaInlineNode)(editorAnalyticsAPI)(_this.view, mediaStateWithContext, collection, _this.allowInlineImages, _this.getInputMethod(pickerType), insertMediaVia);
           break;
@@ -659,20 +660,20 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     var nodes = _state.schema.nodes;
     (0, _assert.default)(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');
     if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.syncProvider) {
-      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.syncProvider);
+      this.setMediaProvider(mediaOptions.syncProvider);
+      if (mediaOptions.provider && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic')) {
+        // The synchronous SSR provider may only support viewing. Keep its view
+        // config, but wait for the full provider before deciding upload availability.
+        if (!this.allowsUploads) {
+          this.uploadStatus = 'pending';
+        }
+        this.setMediaProvider(mediaOptions.provider);
+      }
     } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
-    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;
-      }
+    if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
+      this.allowInlineImages = true;
     }
     this.errorReporter = options.errorReporter || new _utils.ErrorReporter();
     this.singletonCreatedAt = (performance || Date).now();
@@ -715,11 +716,11 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     key: "setMediaProvider",
     value: function () {
       var _setMediaProvider = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(mediaProvider) {
-        var viewMediaClientConfig, wrappedError, view, allowsUploads, _t;
+        var resolvedProvider, viewMediaClientConfig, wrappedError, view, allowsUploads, _t, _t2;
         return _regenerator.default.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(this.previousMediaProvider === mediaProvider)) {
+              if (!(this.previousMediaProvider === mediaProvider && !((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic') && this.uploadStatus === 'pending' && !mediaProvider))) {
                 _context.next = 1;
                 break;
               }
@@ -732,7 +733,8 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
               }
               this.destroyPickers();
               this.allowsUploads = false;
-              if (!this.destroyed) {
+              this.uploadStatus = 'unavailable';
+              if (!this.destroyed && (this.view || !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic'))) {
                 this.view.dispatch(this.view.state.tr.setMeta(_pluginKey.stateKey, {
                   allowsUploads: this.allowsUploads
                 }));
@@ -747,12 +749,21 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
               _context.next = 3;
               return mediaProvider;
             case 3:
-              this.mediaProvider = _context.sent;
+              _t = _context.sent;
               _context.next = 5;
               break;
             case 4:
-              this.mediaProvider = mediaProvider;
+              _t = mediaProvider;
             case 5:
+              resolvedProvider = _t;
+              if (!((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic') && (this.destroyed || this.previousMediaProvider !== mediaProvider))) {
+                _context.next = 6;
+                break;
+              }
+              return _context.abrupt("return");
+            case 6:
+              this.mediaProvider = resolvedProvider;
               // Ignored via go/ees007
               // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
               // TODO [MS-2038]: remove once context api is removed
@@ -765,24 +776,32 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
                 }
               }
               (0, _assert.default)(this.mediaProvider.viewMediaClientConfig, "MediaProvider promise did not resolve to a valid instance of MediaProvider - ".concat(this.mediaProvider));
-              _context.next = 7;
+              _context.next = 9;
               break;
-            case 6:
-              _context.prev = 6;
-              _t = _context["catch"](2);
-              wrappedError = new Error("Media functionality disabled due to rejected provider: ".concat(_t instanceof Error ? _t.message : String(_t)));
+            case 7:
+              _context.prev = 7;
+              _t2 = _context["catch"](2);
+              if (!((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic') && (this.destroyed || this.previousMediaProvider !== mediaProvider))) {
+                _context.next = 8;
+                break;
+              }
+              return _context.abrupt("return");
+            case 8:
+              wrappedError = new Error("Media functionality disabled due to rejected provider: ".concat(_t2 instanceof Error ? _t2.message : String(_t2)));
               this.errorReporter.captureException(wrappedError);
               this.destroyPickers();
               this.allowsUploads = false;
-              if (!this.destroyed) {
+              this.uploadStatus = 'unavailable';
+              if (!this.destroyed && (this.view || !(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic'))) {
                 this.view.dispatch(this.view.state.tr.setMeta(_pluginKey.stateKey, {
                   allowsUploads: this.allowsUploads
                 }));
               }
               return _context.abrupt("return");
-            case 7:
+            case 9:
               this.mediaClientConfig = this.mediaProvider.viewMediaClientConfig;
               this.allowsUploads = !!this.mediaProvider.uploadMediaClientConfig;
+              this.uploadStatus = this.allowsUploads ? 'available' : 'unavailable';
               view = this.view, allowsUploads = this.allowsUploads; // make sure editable DOM node is mounted
               if (!this.destroyed && view && view.dom.parentNode) {
                 // make PM plugin aware of the state change to update UI during 'apply' hook
@@ -791,31 +810,31 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
                 }));
               }
               if (!this.allowsUploads) {
-                _context.next = 11;
+                _context.next = 13;
                 break;
               }
               this.uploadMediaClientConfig = this.mediaProvider.uploadMediaClientConfig;
               if (!(this.mediaProvider.uploadParams && this.uploadMediaClientConfig)) {
-                _context.next = 9;
+                _context.next = 11;
                 break;
               }
-              _context.next = 8;
-              return this.initPickers(this.mediaProvider.uploadParams, _pickerFacade.default);
-            case 8:
               _context.next = 10;
-              break;
-            case 9:
-              this.destroyPickers();
+              return this.initPickers(this.mediaProvider.uploadParams, _pickerFacade.default);
             case 10:
               _context.next = 12;
               break;
             case 11:
               this.destroyPickers();
             case 12:
+              _context.next = 14;
+              break;
+            case 13:
+              this.destroyPickers();
+            case 14:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[2, 6]]);
+        }, _callee, this, [[2, 7]]);
       }));
       function setMediaProvider(_x) {
         return _setMediaProvider.apply(this, arguments);
@@ -877,10 +896,10 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
   }, {
     key: "selectLastAddedMediaNode",
     value: function selectLastAddedMediaNode() {
-      var _this$mediaOptions5,
+      var _this$mediaOptions3,
         _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) {
+      if ((_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.preventAutoFocusOnUpload) {
         this.lastAddedMediaSingleFileIds = [];
         return;
       }
@@ -915,6 +934,10 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     key: "setView",
     value: function setView(view) {
       this.view = view;
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic') && this.uploadStatus === 'pending' && !this.previousMediaProvider) {
+        // No provider was configured for this client editor. SSR has no view and stays pending.
+        this.uploadStatus = 'unavailable';
+      }
     }
   }, {
     key: "destroy",
@@ -933,7 +956,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     value: function () {
       var _initPickers = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(uploadParams, Picker) {
         var _this3 = this;
-        var errorReporter, pickers, pickerPromises, pickerFacadeConfig, customPicker, _t2;
+        var errorReporter, pickers, pickerPromises, pickerFacadeConfig, customPicker, _t3;
         return _regenerator.default.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -958,11 +981,11 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
               }
               customPicker = new Picker('customMediaPicker', pickerFacadeConfig, this.options.customMediaPicker).init();
               pickerPromises.push(customPicker);
-              _t2 = pickers;
+              _t3 = pickers;
               _context2.next = 2;
               return customPicker;
             case 2:
-              _t2.push.call(_t2, this.customPicker = _context2.sent);
+              _t3.push.call(_t3, this.customPicker = _context2.sent);
             case 3:
               pickers.forEach(function (picker) {
                 picker.onNewMedia(_this3.insertFile);

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

@@ -4,7 +4,6 @@ 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");
@@ -24,17 +23,9 @@ 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 ((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 (mediaOptions !== null && mediaOptions !== 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 CHANGED Viewed

@@ -13,7 +13,6 @@ 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");
@@ -51,7 +50,7 @@ var _imageBorder = require("./imageBorder");
 var _layoutGroup = require("./layout-group");
 var _linking3 = require("./linking");
 var _linkingToolbarAppearance = require("./linking-toolbar-appearance");
-var _mediaInline2 = require("./mediaInline");
+var _mediaInline = 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); }
@@ -282,7 +281,6 @@ 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,
@@ -382,27 +380,14 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         }
       }
     };
-    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'
-          });
-        }
-      }
+    if (allowMediaInlineImages && selectedNode) {
+      addLayoutDropdownToToolbar();
     } else {
-      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'
-          });
-        }
+      toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)(layoutButtons));
+      if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
+        toolbarButtons.push({
+          type: 'separator'
+        });
       }
     }
@@ -809,8 +794,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     allowResizingInTables = options.allowResizingInTables,
     allowAdvancedToolBarOptions = options.allowAdvancedToolBarOptions,
     allowPixelResizing = options.allowPixelResizing;
-  var allowMediaInline = options.allowMediaInline;
-  allowMediaInline = (0, _fg.fg)('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : allowMediaInline;
+  var allowMediaInline = allowMediaInlineImages;
   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 : {},
@@ -887,7 +871,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, _mediaInline2.generateMediaInlineFloatingToolbar)(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
+    items = (0, _mediaInline.generateMediaInlineFloatingToolbar)(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
   } else {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele3;

package/dist/es2019/mediaPlugin.js CHANGED Viewed

@@ -6,9 +6,7 @@ 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';
@@ -183,10 +181,9 @@ export const mediaPlugin = ({
         allowMediaSingle = false,
         allowPixelResizing = false,
         allowCaptions,
-        allowMediaInlineImages,
-        featureFlags: mediaFeatureFlags
+        allowMediaInlineImages
       } = options || {};
-      const allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
+      const allowMediaInline = allowMediaInlineImages;
       const mediaSingleOption = {
         withCaption: allowCaptions,
         withExtendedWidthTypes: allowPixelResizing
@@ -398,7 +395,6 @@ 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 CHANGED Viewed

@@ -4,9 +4,7 @@ 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';
@@ -41,8 +39,7 @@ const prepareFilmstripItem = ({
   getPos,
   intl,
   isMediaItemSelected,
-  setMediaGroupNodeSelection,
-  featureFlags
+  setMediaGroupNodeSelection
 }) => (item, idx) => {
   // We declared this to get a fresh position every time
   const getNodePos = () => {
@@ -80,7 +77,7 @@ const prepareFilmstripItem = ({
     onClick: () => {
       setMediaGroupNodeSelection(getNodePos());
     },
-    ...mediaInlineOptions(fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', featureFlags))
+    ...mediaInlineOptions(allowMediaInlineImages)
   };
 };
@@ -189,10 +186,9 @@ export const MediaGroupNext = injectIntl( /*#__PURE__*/React.memo(props => {
       getPos,
       intl,
       isMediaItemSelected,
-      setMediaGroupNodeSelection,
-      featureFlags
+      setMediaGroupNodeSelection
     });
-  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
+  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection]);
   const items = useMemo(() => {
     return mediaNodesWithOffsets.map(({
       node,

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

@@ -7,7 +7,6 @@ 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,7 +17,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { createMediaNodeUpdater } from '../nodeviews/mediaNodeUpdater';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
@@ -56,7 +55,9 @@ 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);
     _defineProperty(this, "waitForMediaUpload", true);
     _defineProperty(this, "allUploadsFinished", true);
@@ -650,20 +651,20 @@ export class MediaPluginStateImplementation {
     } = _state.schema;
     assert(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');
     if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.syncProvider) {
-      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.syncProvider);
+      this.setMediaProvider(mediaOptions.syncProvider);
+      if (mediaOptions.provider && isExperimentEnabled('platform_editor_ssr_toolbar_optimistic')) {
+        // The synchronous SSR provider may only support viewing. Keep its view
+        // config, but wait for the full provider before deciding upload availability.
+        if (!this.allowsUploads) {
+          this.uploadStatus = 'pending';
+        }
+        this.setMediaProvider(mediaOptions.provider);
+      }
     } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
-    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;
-      }
+    if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
+      this.allowInlineImages = true;
     }
     this.errorReporter = options.errorReporter || new ErrorReporter();
     this.singletonCreatedAt = (performance || Date).now();
@@ -696,14 +697,15 @@ export class MediaPluginStateImplementation {
   }
   async setMediaProvider(mediaProvider) {
     // Prevent someone trying to set the exact same provider twice for performance reasons
-    if (this.previousMediaProvider === mediaProvider) {
+    if (this.previousMediaProvider === mediaProvider && !(isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && this.uploadStatus === 'pending' && !mediaProvider)) {
       return;
     }
     this.previousMediaProvider = mediaProvider;
     if (!mediaProvider) {
       this.destroyPickers();
       this.allowsUploads = false;
-      if (!this.destroyed) {
+      this.uploadStatus = 'unavailable';
+      if (!this.destroyed && (this.view || !isExperimentEnabled('platform_editor_ssr_toolbar_optimistic'))) {
         this.view.dispatch(this.view.state.tr.setMeta(stateKey, {
           allowsUploads: this.allowsUploads
         }));
@@ -715,11 +717,11 @@ export class MediaPluginStateImplementation {
     // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
     // TODO disable (not destroy!) pickers until mediaProvider is resolved
     try {
-      if (mediaProvider instanceof Promise) {
-        this.mediaProvider = await mediaProvider;
-      } else {
-        this.mediaProvider = mediaProvider;
+      const resolvedProvider = mediaProvider instanceof Promise ? await mediaProvider : mediaProvider;
+      if (isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && (this.destroyed || this.previousMediaProvider !== mediaProvider)) {
+        return;
       }
+      this.mediaProvider = resolvedProvider;
       // Ignored via go/ees007
       // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
@@ -734,11 +736,15 @@ export class MediaPluginStateImplementation {
       }
       assert(this.mediaProvider.viewMediaClientConfig, `MediaProvider promise did not resolve to a valid instance of MediaProvider - ${this.mediaProvider}`);
     } catch (err) {
+      if (isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && (this.destroyed || this.previousMediaProvider !== mediaProvider)) {
+        return;
+      }
       const wrappedError = new Error(`Media functionality disabled due to rejected provider: ${err instanceof Error ? err.message : String(err)}`);
       this.errorReporter.captureException(wrappedError);
       this.destroyPickers();
       this.allowsUploads = false;
-      if (!this.destroyed) {
+      this.uploadStatus = 'unavailable';
+      if (!this.destroyed && (this.view || !isExperimentEnabled('platform_editor_ssr_toolbar_optimistic'))) {
         this.view.dispatch(this.view.state.tr.setMeta(stateKey, {
           allowsUploads: this.allowsUploads
         }));
@@ -747,6 +753,7 @@ export class MediaPluginStateImplementation {
     }
     this.mediaClientConfig = this.mediaProvider.viewMediaClientConfig;
     this.allowsUploads = !!this.mediaProvider.uploadMediaClientConfig;
+    this.uploadStatus = this.allowsUploads ? 'available' : 'unavailable';
     const {
       view,
       allowsUploads
@@ -814,9 +821,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$mediaOptions5;
+    var _this$mediaOptions3;
     // 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) {
+    if ((_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.preventAutoFocusOnUpload) {
       this.lastAddedMediaSingleFileIds = [];
       return;
     }
@@ -850,6 +857,10 @@ export class MediaPluginStateImplementation {
   }
   setView(view) {
     this.view = view;
+    if (isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && this.uploadStatus === 'pending' && !this.previousMediaProvider) {
+      // No provider was configured for this client editor. SSR has no view and stays pending.
+      this.uploadStatus = 'unavailable';
+    }
   }
   destroy() {
     if (this.destroyed) {

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

@@ -1,4 +1,3 @@
-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';
@@ -18,17 +17,9 @@ 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 (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 (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
+    if (canInsertInlineNode && !isVideo(fileMimeType)) {
+      return 'inline';
     }
   }
   if (isMediaSingle(state.schema, fileMimeType)) {

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

@@ -3,7 +3,6 @@ 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';
@@ -271,7 +270,6 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     allowCommentsOnMedia,
     allowResizingInTables,
     allowAltTextOnImages,
-    allowMediaInline,
     allowMediaInlineImages,
     allowImageEditing,
     allowImagePreview,
@@ -375,27 +373,14 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         }
       }
     };
-    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'
-          });
-        }
-      }
+    if (allowMediaInlineImages && selectedNode) {
+      addLayoutDropdownToToolbar();
     } else {
-      if (mediaInlineImagesEnabled(allowMediaInline, allowMediaInlineImages) && selectedNode) {
-        addLayoutDropdownToToolbar();
-      } else {
-        toolbarButtons = [...toolbarButtons, ...layoutButtons];
-        if (layoutButtons.length && !areAnyNewToolbarFlagsEnabled) {
-          toolbarButtons.push({
-            type: 'separator'
-          });
-        }
+      toolbarButtons = [...toolbarButtons, ...layoutButtons];
+      if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
+        toolbarButtons.push({
+          type: 'separator'
+        });
       }
     }
@@ -802,10 +787,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     allowAdvancedToolBarOptions,
     allowPixelResizing
   } = options;
-  let {
-    allowMediaInline
-  } = options;
-  allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : allowMediaInline;
+  const allowMediaInline = allowMediaInlineImages;
   const mediaPluginState = stateKey.getState(state);
   const mediaLinkingState = getMediaLinkingState(state);
   const {

package/dist/esm/mediaPlugin.js CHANGED Viewed

@@ -9,9 +9,7 @@ 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';
@@ -186,9 +184,8 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
         _ref5$allowPixelResiz = _ref5.allowPixelResizing,
         allowPixelResizing = _ref5$allowPixelResiz === void 0 ? false : _ref5$allowPixelResiz,
         allowCaptions = _ref5.allowCaptions,
-        allowMediaInlineImages = _ref5.allowMediaInlineImages,
-        mediaFeatureFlags = _ref5.featureFlags;
-      var allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
+        allowMediaInlineImages = _ref5.allowMediaInlineImages;
+      var allowMediaInline = allowMediaInlineImages;
       var mediaSingleOption = {
         withCaption: allowCaptions,
         withExtendedWidthTypes: allowPixelResizing
@@ -398,7 +395,6 @@ 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 CHANGED Viewed

@@ -10,9 +10,7 @@ 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';
@@ -49,8 +47,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
     getPos = _ref.getPos,
     intl = _ref.intl,
     isMediaItemSelected = _ref.isMediaItemSelected,
-    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection,
-    featureFlags = _ref.featureFlags;
+    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection;
   return function (item, idx) {
     // We declared this to get a fresh position every time
     var getNodePos = function getNodePos() {
@@ -89,7 +86,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
       onClick: function onClick() {
         setMediaGroupNodeSelection(getNodePos());
       }
-    }, mediaInlineOptions(fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : getMediaFeatureFlag('mediaInline', featureFlags)));
+    }, mediaInlineOptions(allowMediaInlineImages));
   };
 };
@@ -225,10 +222,9 @@ export var MediaGroupNext = injectIntl( /*#__PURE__*/React.memo(function (props)
       getPos: _getPos,
       intl: intl,
       isMediaItemSelected: isMediaItemSelected,
-      setMediaGroupNodeSelection: setMediaGroupNodeSelection,
-      featureFlags: featureFlags
+      setMediaGroupNodeSelection: setMediaGroupNodeSelection
     });
-  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
+  }, [allowLazyLoading, allowMediaInlineImages, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection]);
   var items = useMemo(function () {
     return mediaNodesWithOffsets.map(function (_ref4) {
       var node = _ref4.node,

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

@@ -16,7 +16,6 @@ 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,7 +26,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { createMediaNodeUpdater } from '../nodeviews/mediaNodeUpdater';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
@@ -69,9 +68,11 @@ 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;
+    var _this = this,
+      _this$mediaOptions2;
     _classCallCheck(this, MediaPluginStateImplementation);
     _defineProperty(this, "allowsUploads", false);
+    _defineProperty(this, "uploadStatus", 'pending');
     _defineProperty(this, "ignoreLinks", false);
     _defineProperty(this, "waitForMediaUpload", true);
     _defineProperty(this, "allUploadsFinished", true);
@@ -651,20 +652,20 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     var nodes = _state.schema.nodes;
     assert(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');
     if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.syncProvider) {
-      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.syncProvider);
+      this.setMediaProvider(mediaOptions.syncProvider);
+      if (mediaOptions.provider && isExperimentEnabled('platform_editor_ssr_toolbar_optimistic')) {
+        // The synchronous SSR provider may only support viewing. Keep its view
+        // config, but wait for the full provider before deciding upload availability.
+        if (!this.allowsUploads) {
+          this.uploadStatus = 'pending';
+        }
+        this.setMediaProvider(mediaOptions.provider);
+      }
     } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
-    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;
-      }
+    if ((_this$mediaOptions2 = this.mediaOptions) !== null && _this$mediaOptions2 !== void 0 && _this$mediaOptions2.allowMediaInlineImages) {
+      this.allowInlineImages = true;
     }
     this.errorReporter = options.errorReporter || new ErrorReporter();
     this.singletonCreatedAt = (performance || Date).now();
@@ -707,11 +708,11 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     key: "setMediaProvider",
     value: function () {
       var _setMediaProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(mediaProvider) {
-        var viewMediaClientConfig, wrappedError, view, allowsUploads, _t;
+        var resolvedProvider, viewMediaClientConfig, wrappedError, view, allowsUploads, _t, _t2;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(this.previousMediaProvider === mediaProvider)) {
+              if (!(this.previousMediaProvider === mediaProvider && !(isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && this.uploadStatus === 'pending' && !mediaProvider))) {
                 _context.next = 1;
                 break;
               }
@@ -724,7 +725,8 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
               }
               this.destroyPickers();
               this.allowsUploads = false;
-              if (!this.destroyed) {
+              this.uploadStatus = 'unavailable';
+              if (!this.destroyed && (this.view || !isExperimentEnabled('platform_editor_ssr_toolbar_optimistic'))) {
                 this.view.dispatch(this.view.state.tr.setMeta(stateKey, {
                   allowsUploads: this.allowsUploads
                 }));
@@ -739,12 +741,21 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
               _context.next = 3;
               return mediaProvider;
             case 3:
-              this.mediaProvider = _context.sent;
+              _t = _context.sent;
               _context.next = 5;
               break;
             case 4:
-              this.mediaProvider = mediaProvider;
+              _t = mediaProvider;
             case 5:
+              resolvedProvider = _t;
+              if (!(isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && (this.destroyed || this.previousMediaProvider !== mediaProvider))) {
+                _context.next = 6;
+                break;
+              }
+              return _context.abrupt("return");
+            case 6:
+              this.mediaProvider = resolvedProvider;
               // Ignored via go/ees007
               // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
               // TODO [MS-2038]: remove once context api is removed
@@ -757,24 +768,32 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
                 }
               }
               assert(this.mediaProvider.viewMediaClientConfig, "MediaProvider promise did not resolve to a valid instance of MediaProvider - ".concat(this.mediaProvider));
-              _context.next = 7;
+              _context.next = 9;
               break;
-            case 6:
-              _context.prev = 6;
-              _t = _context["catch"](2);
-              wrappedError = new Error("Media functionality disabled due to rejected provider: ".concat(_t instanceof Error ? _t.message : String(_t)));
+            case 7:
+              _context.prev = 7;
+              _t2 = _context["catch"](2);
+              if (!(isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && (this.destroyed || this.previousMediaProvider !== mediaProvider))) {
+                _context.next = 8;
+                break;
+              }
+              return _context.abrupt("return");
+            case 8:
+              wrappedError = new Error("Media functionality disabled due to rejected provider: ".concat(_t2 instanceof Error ? _t2.message : String(_t2)));
               this.errorReporter.captureException(wrappedError);
               this.destroyPickers();
               this.allowsUploads = false;
-              if (!this.destroyed) {
+              this.uploadStatus = 'unavailable';
+              if (!this.destroyed && (this.view || !isExperimentEnabled('platform_editor_ssr_toolbar_optimistic'))) {
                 this.view.dispatch(this.view.state.tr.setMeta(stateKey, {
                   allowsUploads: this.allowsUploads
                 }));
               }
               return _context.abrupt("return");
-            case 7:
+            case 9:
               this.mediaClientConfig = this.mediaProvider.viewMediaClientConfig;
               this.allowsUploads = !!this.mediaProvider.uploadMediaClientConfig;
+              this.uploadStatus = this.allowsUploads ? 'available' : 'unavailable';
               view = this.view, allowsUploads = this.allowsUploads; // make sure editable DOM node is mounted
               if (!this.destroyed && view && view.dom.parentNode) {
                 // make PM plugin aware of the state change to update UI during 'apply' hook
@@ -783,31 +802,31 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
                 }));
               }
               if (!this.allowsUploads) {
-                _context.next = 11;
+                _context.next = 13;
                 break;
               }
               this.uploadMediaClientConfig = this.mediaProvider.uploadMediaClientConfig;
               if (!(this.mediaProvider.uploadParams && this.uploadMediaClientConfig)) {
-                _context.next = 9;
+                _context.next = 11;
                 break;
               }
-              _context.next = 8;
-              return this.initPickers(this.mediaProvider.uploadParams, PickerFacade);
-            case 8:
               _context.next = 10;
-              break;
-            case 9:
-              this.destroyPickers();
+              return this.initPickers(this.mediaProvider.uploadParams, PickerFacade);
             case 10:
               _context.next = 12;
               break;
             case 11:
               this.destroyPickers();
             case 12:
+              _context.next = 14;
+              break;
+            case 13:
+              this.destroyPickers();
+            case 14:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[2, 6]]);
+        }, _callee, this, [[2, 7]]);
       }));
       function setMediaProvider(_x) {
         return _setMediaProvider.apply(this, arguments);
@@ -869,10 +888,10 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "selectLastAddedMediaNode",
     value: function selectLastAddedMediaNode() {
-      var _this$mediaOptions5,
+      var _this$mediaOptions3,
         _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) {
+      if ((_this$mediaOptions3 = this.mediaOptions) !== null && _this$mediaOptions3 !== void 0 && _this$mediaOptions3.preventAutoFocusOnUpload) {
         this.lastAddedMediaSingleFileIds = [];
         return;
       }
@@ -907,6 +926,10 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     key: "setView",
     value: function setView(view) {
       this.view = view;
+      if (isExperimentEnabled('platform_editor_ssr_toolbar_optimistic') && this.uploadStatus === 'pending' && !this.previousMediaProvider) {
+        // No provider was configured for this client editor. SSR has no view and stays pending.
+        this.uploadStatus = 'unavailable';
+      }
     }
   }, {
     key: "destroy",
@@ -925,7 +948,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     value: function () {
       var _initPickers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(uploadParams, Picker) {
         var _this3 = this;
-        var errorReporter, pickers, pickerPromises, pickerFacadeConfig, customPicker, _t2;
+        var errorReporter, pickers, pickerPromises, pickerFacadeConfig, customPicker, _t3;
         return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -950,11 +973,11 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
               }
               customPicker = new Picker('customMediaPicker', pickerFacadeConfig, this.options.customMediaPicker).init();
               pickerPromises.push(customPicker);
-              _t2 = pickers;
+              _t3 = pickers;
               _context2.next = 2;
               return customPicker;
             case 2:
-              _t2.push.call(_t2, this.customPicker = _context2.sent);
+              _t3.push.call(_t3, this.customPicker = _context2.sent);
             case 3:
               pickers.forEach(function (picker) {
                 picker.onNewMedia(_this3.insertFile);

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

@@ -1,4 +1,3 @@
-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';
@@ -18,17 +17,9 @@ 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 (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 (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
+    if (canInsertInlineNode && !isVideo(fileMimeType)) {
+      return 'inline';
     }
   }
   if (isMediaSingle(state.schema, fileMimeType)) {

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

@@ -7,7 +7,6 @@ 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';
@@ -273,7 +272,6 @@ 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,
@@ -373,27 +371,14 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         }
       }
     };
-    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'
-          });
-        }
-      }
+    if (allowMediaInlineImages && selectedNode) {
+      addLayoutDropdownToToolbar();
     } else {
-      if (mediaInlineImagesEnabled(allowMediaInline, allowMediaInlineImages) && selectedNode) {
-        addLayoutDropdownToToolbar();
-      } else {
-        toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
-        if (layoutButtons.length && !areAnyNewToolbarFlagsEnabled) {
-          toolbarButtons.push({
-            type: 'separator'
-          });
-        }
+      toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
+      if (layoutButtons.length && !mauiToolbarSeparatorsUpdateEnabled) {
+        toolbarButtons.push({
+          type: 'separator'
+        });
       }
     }
@@ -800,8 +785,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     allowResizingInTables = options.allowResizingInTables,
     allowAdvancedToolBarOptions = options.allowAdvancedToolBarOptions,
     allowPixelResizing = options.allowPixelResizing;
-  var allowMediaInline = options.allowMediaInline;
-  allowMediaInline = fg('platform_editor_remove_media_inline_feature_flag') ? allowMediaInlineImages : allowMediaInline;
+  var allowMediaInline = allowMediaInlineImages;
   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/dist/types/pm-plugins/main.d.ts CHANGED Viewed

@@ -21,6 +21,7 @@ export declare const MEDIA_PLUGIN_IS_RESIZING_KEY = "mediaSinglePlugin.isResizin
 export declare const MEDIA_PLUGIN_RESIZING_WIDTH_KEY = "mediaSinglePlugin.resizing-width";
 export declare class MediaPluginStateImplementation implements MediaPluginState {
     allowsUploads: boolean;
+    uploadStatus: 'pending' | 'available' | 'unavailable';
     mediaClientConfig?: MediaClientConfig;
     uploadMediaClientConfig?: MediaClientConfig;
     ignoreLinks: boolean;

package/dist/types/pm-plugins/types.d.ts CHANGED Viewed

@@ -76,6 +76,8 @@ export interface MediaPluginState {
     updateElement: () => void;
     updateMediaSingleNodeAttrs: (id: string, attrs: object) => undefined | boolean;
     uploadMediaClientConfig?: MediaClientConfig;
+    /** Initial upload capability resolution; does not grant permission to upload. */
+    uploadStatus?: 'pending' | 'available' | 'unavailable';
     videoControlsWrapperRef?: HTMLElement;
     waitForMediaUpload: boolean;
     waitForPendingTasks: (timeout?: number, lastTask?: Promise<MediaState | null>) => Promise<MediaState | null>;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "24.0.9",
+	"version": "24.1.0",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -102,9 +102,6 @@
 		"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"
 		},