@atlaskit/editor-plugin-media 1.29.3 → 1.29.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-media
 
+## 1.29.4
+
+### Patch Changes
+
+- [#133207](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133207)
+  [`1f50735af1144`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1f50735af1144) -
+  Cleanup feature flag to stop using provider factory for media provider. This should be an under
+  the hood change to decouple editor from the media provider.
+
 ## 1.29.3
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaGroup.js

@@ -24,7 +24,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _close = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/close"));
 var _mediaCommon = require("@atlaskit/media-common");
 var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useMediaProvider = require("../hooks/useMediaProvider");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _mediaNodeUpdater = require("./mediaNodeUpdater");
@@ -334,40 +333,16 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
         mediaOptions = props.mediaOptions,
         pluginInjectionApi = props.pluginInjectionApi;
       var getPos = this.getPos;
-      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders
-      // Cleanup: `platform_editor_media_provider_from_plugin_config`
-      // Remove `mediaProvider`
-      , {
-        providers: ['mediaProvider', 'contextIdentifierProvider'],
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+        providers: ['contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref4) {
-          var mediaProvider = _ref4.mediaProvider,
-            contextIdentifierProvider = _ref4.contextIdentifierProvider;
+          var contextIdentifierProvider = _ref4.contextIdentifierProvider;
           var renderFn = function renderFn(_ref5) {
             var editorDisabledPlugin = _ref5.editorDisabledPlugin,
               editorViewModePlugin = _ref5.editorViewModePlugin,
               mediaProviderFromState = _ref5.mediaProvider;
-            if ((0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
-              var newMediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
-              if (!newMediaProvider) {
-                return null;
-              }
-              return /*#__PURE__*/_react.default.createElement(IntlMediaGroup, {
-                node: _this3.node,
-                getPos: getPos,
-                view: _this3.view,
-                forwardRef: forwardRef,
-                disabled: (editorDisabledPlugin || {}).editorDisabled,
-                allowLazyLoading: mediaOptions.allowLazyLoading,
-                mediaProvider: newMediaProvider,
-                contextIdentifierProvider: contextIdentifierProvider,
-                isCopyPasteEnabled: mediaOptions.isCopyPasteEnabled,
-                anchorPos: _this3.view.state.selection.$anchor.pos,
-                headPos: _this3.view.state.selection.$head.pos,
-                mediaOptions: mediaOptions,
-                editorViewMode: (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view'
-              });
-            }
+            var mediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
             if (!mediaProvider) {
               return null;
             }

package/dist/cjs/nodeviews/mediaInline.js

@@ -24,7 +24,6 @@ var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-n
 var _mediaCard = require("@atlaskit/media-card");
 var _mediaClientReact = require("@atlaskit/media-client-react");
 var _mediaUi = require("@atlaskit/media-ui");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _MediaViewerContainer = require("../ui/MediaViewer/MediaViewerContainer");
 var _isType = require("../utils/is-type");
 var _mediaNodeUpdater = require("./mediaNodeUpdater");
@@ -218,7 +217,6 @@ var MediaInline = exports.MediaInline = function MediaInline(props) {
 };
 var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
   var identifier = _ref3.identifier,
-    mediaProvider = _ref3.mediaProvider,
     node = _ref3.node,
     isSelected = _ref3.isSelected,
     getPos = _ref3.getPos,
@@ -231,28 +229,12 @@ var MediaInlineSharedState = function MediaInlineSharedState(_ref3) {
   var newMediaProvider = (0, _react.useMemo)(function () {
     return mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined;
   }, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider]);
-  if ((0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
-    if (!mediaState || !newMediaProvider) {
-      return null;
-    }
-    return (0, _react2.jsx)(MediaInline, {
-      identifier: identifier,
-      mediaProvider: newMediaProvider,
-      mediaPluginState: mediaState,
-      node: node,
-      isSelected: isSelected,
-      view: view,
-      getPos: getPos,
-      contextIdentifierProvider: contextIdentifierProvider,
-      editorViewMode: (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view'
-    });
-  }
-  if (!mediaState || !mediaProvider) {
+  if (!mediaState || !newMediaProvider) {
     return null;
   }
   return (0, _react2.jsx)(MediaInline, {
     identifier: identifier,
-    mediaProvider: mediaProvider,
+    mediaProvider: newMediaProvider,
     mediaPluginState: mediaState,
     node: node,
     isSelected: isSelected,
@@ -297,21 +279,14 @@ var MediaInlineNodeView = exports.MediaInlineNodeView = /*#__PURE__*/function (_
         api = props.api;
       var view = this.view;
       var getPos = this.getPos;
-      return (0, _react2.jsx)(_providerFactory.WithProviders
-      // Cleanup: `platform_editor_media_provider_from_plugin_config`
-      // Remove `mediaProvider`
-      , {
-        providers: ['mediaProvider', 'contextIdentifierProvider'],
+      return (0, _react2.jsx)(_providerFactory.WithProviders, {
+        providers: ['contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref4) {
           var mediaProvider = _ref4.mediaProvider,
             contextIdentifierProvider = _ref4.contextIdentifierProvider;
-          if (!mediaProvider && !(0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
-            return null;
-          }
           return (0, _react2.jsx)(MediaInlineSharedState, {
             identifier: _this.node.attrs.id,
-            mediaProvider: mediaProvider,
             node: _this.node,
             isSelected: _this.nodeInsideSelection(),
             view: view,

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

@@ -20,7 +20,6 @@ var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-node-view");
 var _mediaClient = require("@atlaskit/media-client");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _helpers = require("../../commands/helpers");
 var _mediaCommon = require("../../utils/media-common");
 var _media = _interopRequireDefault(require("./media"));
@@ -37,7 +36,7 @@ var MediaNodeWithProviders = function MediaNodeWithProviders(_ref) {
     mediaState = _useSharedPluginState.mediaState;
   return innerComponent({
     width: widthState,
-    newMediaProvider: mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined
+    mediaProvider: mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined
   });
 };
 function isMediaDecorationSpec(decoration) {
@@ -70,10 +69,10 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
         })(_this.view.state, _this.view.dispatch);
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderMediaNodeWithState", function (mediaProvider, contextIdentifierProvider) {
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderMediaNodeWithState", function (contextIdentifierProvider) {
       return function (_ref2) {
         var editorWidth = _ref2.width,
-          newMediaProvider = _ref2.newMediaProvider;
+          mediaProvider = _ref2.mediaProvider;
         var getPos = _this.getPos;
         var mediaOptions = _this.reactComponentProps.mediaOptions;
         var attrs = _this.getAttrs();
@@ -109,7 +108,7 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
           originalDimensions: originalDimensions,
           maxDimensions: maxDimensions,
           url: url,
-          mediaProvider: (0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config') ? newMediaProvider : mediaProvider,
+          mediaProvider: mediaProvider,
           contextIdentifierProvider: contextIdentifierProvider,
           mediaOptions: mediaOptions,
           onExternalImageLoaded: _this.onExternalImageLoaded
@@ -117,12 +116,11 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       };
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderMediaNodeWithProviders", function (_ref3) {
-      var mediaProvider = _ref3.mediaProvider,
-        contextIdentifierProvider = _ref3.contextIdentifierProvider;
+      var contextIdentifierProvider = _ref3.contextIdentifierProvider;
       var pluginInjectionApi = _this.reactComponentProps.pluginInjectionApi;
       return /*#__PURE__*/_react.default.createElement(MediaNodeWithProviders, {
         pluginInjectionApi: pluginInjectionApi,
-        innerComponent: _this.renderMediaNodeWithState(mediaProvider, contextIdentifierProvider)
+        innerComponent: _this.renderMediaNodeWithState(contextIdentifierProvider)
       });
     });
     return _this;
@@ -181,11 +179,8 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     key: "render",
     value: function render() {
       var providerFactory = this.reactComponentProps.providerFactory;
-      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders
-      // Cleanup: `platform_editor_media_provider_from_plugin_config`
-      // Remove `mediaProvider`
-      , {
-        providers: ['mediaProvider', 'contextIdentifierProvider'],
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+        providers: ['contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: this.renderMediaNodeWithProviders
       });

package/dist/cjs/nodeviews/mediaSingle.js

@@ -539,7 +539,6 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
 (0, _defineProperty2.default)(MediaSingleNode, "displayName", 'MediaSingleNode');
 var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
   var pluginInjectionApi = _ref6.pluginInjectionApi,
-    mediaProvider = _ref6.mediaProvider,
     contextIdentifierProvider = _ref6.contextIdentifierProvider,
     node = _ref6.node,
     getPos = _ref6.getPos,
@@ -557,7 +556,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
     annotationState = _useSharedPluginState.annotationState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
     editorViewModeState = _useSharedPluginState.editorViewModeState;
-  var newMediaProvider = (0, _react.useMemo)(function () {
+  var mediaProvider = (0, _react.useMemo)(function () {
     return mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined;
   }, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider]);
   return (0, _react2.jsx)(MediaSingleNode, {
@@ -565,7 +564,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
     lineLength: widthState.lineLength,
     node: node,
     getPos: getPos,
-    mediaProvider: (0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config') ? newMediaProvider : mediaProvider,
+    mediaProvider: mediaProvider,
     contextIdentifierProvider: contextIdentifierProvider,
     mediaOptions: mediaOptions,
     view: view,
@@ -706,18 +705,13 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
 
       // getPos is a boolean for marks, since this is a node we know it must be a function
       var getPos = this.getPos;
-      return (0, _react2.jsx)(_providerFactory.WithProviders
-      // Cleanup: `platform_editor_media_provider_from_plugin_config`
-      // Remove `mediaProvider`
-      , {
-        providers: ['mediaProvider', 'contextIdentifierProvider'],
+      return (0, _react2.jsx)(_providerFactory.WithProviders, {
+        providers: ['contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref7) {
-          var mediaProvider = _ref7.mediaProvider,
-            contextIdentifierProvider = _ref7.contextIdentifierProvider;
+          var contextIdentifierProvider = _ref7.contextIdentifierProvider;
           return (0, _react2.jsx)(MediaSingleNodeWrapper, {
             pluginInjectionApi: pluginInjectionApi,
-            mediaProvider: mediaProvider,
             contextIdentifierProvider: contextIdentifierProvider,
             node: _this5.node,
             getPos: getPos,

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

@@ -32,7 +32,6 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaCommon = require("@atlaskit/media-common");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _helpers = _interopRequireWildcard(require("../commands/helpers"));
 var helpers = _helpers;
 var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
@@ -410,14 +409,8 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;
     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 ((0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
-      if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
-        this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
-      }
-    } else {
-      options.providerFactory.subscribe('mediaProvider', function (_name, provider) {
-        return _this.setMediaProvider(provider);
-      });
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
     if ((0, _mediaInline.mediaInlineImagesEnabled)((0, _mediaCommon.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags), (_this$mediaOptions3 = this.mediaOptions) === null || _this$mediaOptions3 === void 0 ? void 0 : _this$mediaOptions3.allowMediaInlineImages)) {
       this.allowInlineImages = true;
@@ -754,7 +747,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
           pluginState.setIsResizing(isResizing);
           nextPluginState = nextPluginState.clone();
         }
-        if (mediaProvider && (0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
+        if (mediaProvider) {
           pluginState.setMediaProvider(mediaProvider);
         }
         if (resizingWidth) {

package/dist/cjs/ui/MediaPicker/PickerFacadeProvider.js

@@ -1,30 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = PickerFacadeProvider;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _reactDom = require("react-dom");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _pickerFacade = _interopRequireDefault(require("../../picker-facade"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var dummyMediaPickerObject = {
   on: function on() {},
   removeAllListeners: function removeAllListeners() {},
@@ -32,7 +19,7 @@ var dummyMediaPickerObject = {
   destroy: function destroy() {},
   setUploadParams: function setUploadParams() {}
 };
-function PickerFacadeProviderNew(_ref) {
+function PickerFacadeProvider(_ref) {
   var mediaState = _ref.mediaState,
     analyticsName = _ref.analyticsName,
     children = _ref.children;
@@ -130,137 +117,4 @@ function PickerFacadeProviderNew(_ref) {
     config: config,
     pickerFacadeInstance: pickerFacadeInstance
   });
-}
-
-// eslint-disable-next-line @repo/internal/react/no-class-components
-var PickerFacadeProviderOld = /*#__PURE__*/function (_React$Component) {
-  (0, _inherits2.default)(PickerFacadeProviderOld, _React$Component);
-  var _super = _createSuper(PickerFacadeProviderOld);
-  function PickerFacadeProviderOld() {
-    var _this;
-    (0, _classCallCheck2.default)(this, PickerFacadeProviderOld);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMediaProvider", /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_name, provider) {
-        var _this$props, mediaState, analyticsName, mediaProvider, resolvedMediaClientConfig, pickerFacadeConfig, pickerFacadeInstance, config;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _this$props = _this.props, mediaState = _this$props.mediaState, analyticsName = _this$props.analyticsName;
-              _context2.next = 3;
-              return provider;
-            case 3:
-              mediaProvider = _context2.sent;
-              if (!(!mediaProvider || !mediaProvider.uploadParams)) {
-                _context2.next = 6;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 6:
-              _context2.next = 8;
-              return mediaProvider.uploadMediaClientConfig;
-            case 8:
-              _context2.t0 = _context2.sent;
-              if (_context2.t0) {
-                _context2.next = 13;
-                break;
-              }
-              _context2.next = 12;
-              return mediaProvider.viewMediaClientConfig;
-            case 12:
-              _context2.t0 = _context2.sent;
-            case 13:
-              resolvedMediaClientConfig = _context2.t0;
-              if (resolvedMediaClientConfig) {
-                _context2.next = 16;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 16:
-              pickerFacadeConfig = {
-                mediaClientConfig: resolvedMediaClientConfig,
-                errorReporter: mediaState.options.errorReporter || new _utils.ErrorReporter(),
-                featureFlags: mediaState.mediaOptions && mediaState.mediaOptions.featureFlags
-              };
-              /**
-               * As the first MediaPicker component to be migrated to React, we want to scope the amount of changes logic changed/moved on Editor side.
-               * To achieve this we agreed on using `PickerFacade` 'customMediaPicker' type, since we only need this instance to reuse the logic when we subscribe
-               * for all the different events in MediaPicker (onPreviewUpdate, onError, onProcessing, etc).
-               * The `dummyMediaPickerObject` provided here serves as a workaround for the old picker api that `PickerFacade` will try to use.
-               * But we don't want this to do anything since it's all part of the new React component (`Clipboard` component in this case).
-               * Eventually PickerFacade will be removed and replaced with a new abstraction explained here https://product-fabric.atlassian.net/browse/MS-1937
-               */
-              _context2.next = 19;
-              return new _pickerFacade.default('customMediaPicker', pickerFacadeConfig, dummyMediaPickerObject, analyticsName).init();
-            case 19:
-              pickerFacadeInstance = _context2.sent;
-              /**
-               * Based on the `initPickers` method in `MediaPluginState` we need these 2 `onNewMedia` subscriptions.
-               * First one in order to trigger the entire process of uploading a file for when `onPreviewUpdate` is called
-               * Second one in order to track all analytics as before.
-               */
-              pickerFacadeInstance.onNewMedia(mediaState.insertFile);
-              pickerFacadeInstance.setUploadParams(mediaProvider.uploadParams);
-              config = {
-                uploadParams: mediaProvider.uploadParams
-              };
-              (0, _reactDom.flushSync)(function () {
-                return _this.setState({
-                  pickerFacadeInstance: pickerFacadeInstance,
-                  config: config,
-                  mediaClientConfig: resolvedMediaClientConfig
-                });
-              });
-            case 24:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x3, _x4) {
-        return _ref3.apply(this, arguments);
-      };
-    }());
-    return _this;
-  }
-  (0, _createClass2.default)(PickerFacadeProviderOld, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var mediaProvider = this.props.mediaState.mediaProvider;
-      if (mediaProvider && (0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
-        this.handleMediaProvider('mediaProvider', Promise.resolve(mediaProvider));
-      } else {
-        this.props.mediaState.options.providerFactory.subscribe('mediaProvider', this.handleMediaProvider);
-      }
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.props.mediaState.options.providerFactory.unsubscribe('mediaProvider', this.handleMediaProvider);
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$state = this.state,
-        mediaClientConfig = _this$state.mediaClientConfig,
-        config = _this$state.config,
-        pickerFacadeInstance = _this$state.pickerFacadeInstance;
-      if (!mediaClientConfig || !config || !pickerFacadeInstance) {
-        return null;
-      }
-      return this.props.children({
-        mediaClientConfig: mediaClientConfig,
-        config: config,
-        pickerFacadeInstance: pickerFacadeInstance
-      });
-    }
-  }]);
-  return PickerFacadeProviderOld;
-}(_react.default.Component);
-function PickerFacadeProvider(props) {
-  return (0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config') ? /*#__PURE__*/_react.default.createElement(PickerFacadeProviderNew, props) : /*#__PURE__*/_react.default.createElement(PickerFacadeProviderOld, props);
 }

package/dist/es2019/nodeviews/mediaGroup.js

@@ -9,7 +9,6 @@ import { isNodeSelectedOrInRange, SelectedState, setNodeSelection } from '@atlas
 import EditorCloseIcon from '@atlaskit/icon/glyph/editor/close';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { Filmstrip } from '@atlaskit/media-filmstrip';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useMediaProvider } from '../hooks/useMediaProvider';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
@@ -276,14 +275,10 @@ class MediaGroupNodeView extends ReactNodeView {
       pluginInjectionApi
     } = props;
     const getPos = this.getPos;
-    return /*#__PURE__*/React.createElement(WithProviders
-    // Cleanup: `platform_editor_media_provider_from_plugin_config`
-    // Remove `mediaProvider`
-    , {
-      providers: ['mediaProvider', 'contextIdentifierProvider'],
+    return /*#__PURE__*/React.createElement(WithProviders, {
+      providers: ['contextIdentifierProvider'],
       providerFactory: providerFactory,
       renderNode: ({
-        mediaProvider,
         contextIdentifierProvider
       }) => {
         const renderFn = ({
@@ -291,27 +286,7 @@ class MediaGroupNodeView extends ReactNodeView {
           editorViewModePlugin,
           mediaProvider: mediaProviderFromState
         }) => {
-          if (fg('platform_editor_media_provider_from_plugin_config')) {
-            const newMediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
-            if (!newMediaProvider) {
-              return null;
-            }
-            return /*#__PURE__*/React.createElement(IntlMediaGroup, {
-              node: this.node,
-              getPos: getPos,
-              view: this.view,
-              forwardRef: forwardRef,
-              disabled: (editorDisabledPlugin || {}).editorDisabled,
-              allowLazyLoading: mediaOptions.allowLazyLoading,
-              mediaProvider: newMediaProvider,
-              contextIdentifierProvider: contextIdentifierProvider,
-              isCopyPasteEnabled: mediaOptions.isCopyPasteEnabled,
-              anchorPos: this.view.state.selection.$anchor.pos,
-              headPos: this.view.state.selection.$head.pos,
-              mediaOptions: mediaOptions,
-              editorViewMode: (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view'
-            });
-          }
+          const mediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
           if (!mediaProvider) {
             return null;
           }

package/dist/es2019/nodeviews/mediaInline.js

@@ -13,7 +13,6 @@ import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { getMediaClient } from '@atlaskit/media-client-react';
 import { MediaInlineCardLoadingView } from '@atlaskit/media-ui';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { MediaViewerContainer } from '../ui/MediaViewer/MediaViewerContainer';
 import { isImage } from '../utils/is-type';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
@@ -151,7 +150,6 @@ export const MediaInline = props => {
 };
 const MediaInlineSharedState = ({
   identifier,
-  mediaProvider,
   node,
   isSelected,
   getPos,
@@ -164,28 +162,12 @@ const MediaInlineSharedState = ({
     mediaState
   } = useSharedPluginState(api, ['editorViewMode', 'media']);
   const newMediaProvider = useMemo(() => mediaState !== null && mediaState !== void 0 && mediaState.mediaProvider ? Promise.resolve(mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider) : undefined, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaProvider]);
-  if (fg('platform_editor_media_provider_from_plugin_config')) {
-    if (!mediaState || !newMediaProvider) {
-      return null;
-    }
-    return jsx(MediaInline, {
-      identifier: identifier,
-      mediaProvider: newMediaProvider,
-      mediaPluginState: mediaState,
-      node: node,
-      isSelected: isSelected,
-      view: view,
-      getPos: getPos,
-      contextIdentifierProvider: contextIdentifierProvider,
-      editorViewMode: (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view'
-    });
-  }
-  if (!mediaState || !mediaProvider) {
+  if (!mediaState || !newMediaProvider) {
     return null;
   }
   return jsx(MediaInline, {
     identifier: identifier,
-    mediaProvider: mediaProvider,
+    mediaProvider: newMediaProvider,
     mediaPluginState: mediaState,
     node: node,
     isSelected: isSelected,
@@ -219,22 +201,15 @@ export class MediaInlineNodeView extends SelectionBasedNodeView {
       view
     } = this;
     const getPos = this.getPos;
-    return jsx(WithProviders
-    // Cleanup: `platform_editor_media_provider_from_plugin_config`
-    // Remove `mediaProvider`
-    , {
-      providers: ['mediaProvider', 'contextIdentifierProvider'],
+    return jsx(WithProviders, {
+      providers: ['contextIdentifierProvider'],
       providerFactory: providerFactory,
       renderNode: ({
         mediaProvider,
         contextIdentifierProvider
       }) => {
-        if (!mediaProvider && !fg('platform_editor_media_provider_from_plugin_config')) {
-          return null;
-        }
         return jsx(MediaInlineSharedState, {
           identifier: this.node.attrs.id,
-          mediaProvider: mediaProvider,
           node: this.node,
           isSelected: this.nodeInsideSelection(),
           view: view,