@atlaskit/editor-plugin-media 1.22.6 → 1.22.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-media
 
+## 1.22.7
+
+### Patch Changes
+
+- [`666ab2fb8703d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/666ab2fb8703d) -
+  Accept the media provider from the plugin rather than only from editor-core
+- Updated dependencies
+
 ## 1.22.6
 
 ### Patch Changes

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

@@ -32,6 +32,7 @@ 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"));
@@ -499,9 +500,13 @@ 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');
-    options.providerFactory.subscribe('mediaProvider', function (_name, provider) {
-      return _this.setMediaProvider(provider);
-    });
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider && (0, _platformFeatureFlags.fg)('platform_editor_media_provider_from_plugin_config')) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
+    } else {
+      options.providerFactory.subscribe('mediaProvider', function (_name, provider) {
+        return _this.setMediaProvider(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;
     }

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

@@ -17,6 +17,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(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 _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; })(); }
@@ -126,7 +127,12 @@ var PickerFacadeProvider = exports.default = /*#__PURE__*/function (_React$Compo
   (0, _createClass2.default)(PickerFacadeProvider, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.props.mediaState.options.providerFactory.subscribe('mediaProvider', this.handleMediaProvider);
+      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",

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

@@ -14,6 +14,7 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { fg } from '@atlaskit/platform-feature-flags';
 import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -444,7 +445,11 @@ export class MediaPluginStateImplementation {
       nodes
     } = _state.schema;
     assert(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');
-    options.providerFactory.subscribe('mediaProvider', (_name, provider) => this.setMediaProvider(provider));
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider && fg('platform_editor_media_provider_from_plugin_config')) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
+    } else {
+      options.providerFactory.subscribe('mediaProvider', (_name, provider) => this.setMediaProvider(provider));
+    }
     if (mediaInlineImagesEnabled(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;
     }

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

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { flushSync } from 'react-dom';
 import { ErrorReporter } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import PickerFacade from '../../picker-facade';
 const dummyMediaPickerObject = {
   on: () => {},
@@ -63,7 +64,14 @@ export default class PickerFacadeProvider extends React.Component {
     });
   }
   componentDidMount() {
-    this.props.mediaState.options.providerFactory.subscribe('mediaProvider', this.handleMediaProvider);
+    const {
+      mediaProvider
+    } = this.props.mediaState;
+    if (mediaProvider && fg('platform_editor_media_provider_from_plugin_config')) {
+      this.handleMediaProvider('mediaProvider', Promise.resolve(mediaProvider));
+    } else {
+      this.props.mediaState.options.providerFactory.subscribe('mediaProvider', this.handleMediaProvider);
+    }
   }
   componentWillUnmount() {
     this.props.mediaState.options.providerFactory.unsubscribe('mediaProvider', this.handleMediaProvider);

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

@@ -23,6 +23,7 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { fg } from '@atlaskit/platform-feature-flags';
 import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -484,9 +485,13 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;
     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');
-    options.providerFactory.subscribe('mediaProvider', function (_name, provider) {
-      return _this.setMediaProvider(provider);
-    });
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider && fg('platform_editor_media_provider_from_plugin_config')) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
+    } else {
+      options.providerFactory.subscribe('mediaProvider', function (_name, provider) {
+        return _this.setMediaProvider(provider);
+      });
+    }
     if (mediaInlineImagesEnabled(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;
     }

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

@@ -12,6 +12,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import { flushSync } from 'react-dom';
 import { ErrorReporter } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import PickerFacade from '../../picker-facade';
 var dummyMediaPickerObject = {
   on: function on() {},
@@ -119,7 +120,12 @@ var PickerFacadeProvider = /*#__PURE__*/function (_React$Component) {
   _createClass(PickerFacadeProvider, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.props.mediaState.options.providerFactory.subscribe('mediaProvider', this.handleMediaProvider);
+      var mediaProvider = this.props.mediaState.mediaProvider;
+      if (mediaProvider && 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",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.22.6",
+	"version": "1.22.7",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,8 +36,8 @@
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/button": "^18.1.0",
-		"@atlaskit/editor-common": "^84.0.0",
+		"@atlaskit/button": "^18.2.0",
+		"@atlaskit/editor-common": "^84.1.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-annotation": "1.14.1",
@@ -54,7 +54,7 @@
 		"@atlaskit/editor-shared-styles": "^2.12.0",
 		"@atlaskit/editor-tables": "^2.7.0",
 		"@atlaskit/form": "^10.4.0",
-		"@atlaskit/icon": "^22.5.0",
+		"@atlaskit/icon": "^22.6.0",
 		"@atlaskit/media-card": "^78.0.0",
 		"@atlaskit/media-client": "^27.3.0",
 		"@atlaskit/media-client-react": "^2.0.0",
@@ -64,7 +64,7 @@
 		"@atlaskit/media-ui": "^25.10.0",
 		"@atlaskit/media-viewer": "^48.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/primitives": "^10.0.0",
+		"@atlaskit/primitives": "^10.1.0",
 		"@atlaskit/textfield": "^6.4.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/tokens": "^1.53.0",
@@ -143,6 +143,9 @@
 		},
 		"platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
 			"type": "boolean"
+		},
+		"platform_editor_media_provider_from_plugin_config": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {