@atlaskit/editor-plugin-media 2.5.0 → 2.6.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-media
 
+## 2.6.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.6.0
+
+### Minor Changes
+
+- [#123268](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/123268)
+  [`f47a830143188`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f47a830143188) -
+  Allow for passing in a resolved media provider to enable SSR'ing media in the editor
+
+### Patch Changes
+
+- [#140448](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/140448)
+  [`1bbf6b1e2ade5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bbf6b1e2ade5) -
+  [HOT-116646] Fix inline media check
+- Updated dependencies
+
 ## 2.5.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/lazy-media-single.js

@@ -7,13 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.lazyMediaSingleView = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mediaSingle = require("./mediaSingle");
 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" != (0, _typeof2.default)(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 && {}.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; }
 var lazyMediaSingleView = exports.lazyMediaSingleView = function lazyMediaSingleView(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
   var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-  if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_ssr_media') || (0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
     return (0, _mediaSingle.ReactMediaSingleNode)(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options);
   }
   return (0, _lazyNodeView.withLazyLoading)({

package/dist/cjs/nodeviews/lazy-media.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.lazyMediaView = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mediaNodeView = require("./mediaNodeView");
 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); }
@@ -14,7 +15,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var lazyMediaView = exports.lazyMediaView = function lazyMediaView(portalProviderAPI, eventDispatcher, providerFactory) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var api = arguments.length > 4 ? arguments[4] : undefined;
-  if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_ssr_media') || (0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
     return (0, _mediaNodeView.ReactMediaNode)(portalProviderAPI, eventDispatcher, providerFactory, options, api);
   }
   return (0, _lazyNodeView.withLazyLoading)({

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

@@ -21,6 +21,7 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _utils = require("@atlaskit/editor-common/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaCard = require("@atlaskit/media-card");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginKey = require("../../pm-plugins/plugin-key");
 var _styles = require("../styles");
@@ -285,6 +286,10 @@ var MediaNode = exports.MediaNode = /*#__PURE__*/function (_Component) {
           return {};
         }
       };
+      var ssr;
+      if ((0, _platformFeatureFlags.fg)('platform_editor_ssr_media')) {
+        ssr = process.env.REACT_SSR ? 'server' : 'client';
+      }
       return /*#__PURE__*/_react.default.createElement(_styles.MediaCardWrapper, {
         dimensions: originalDimensions,
         onContextMenu: this.selectMediaSingle,
@@ -310,7 +315,8 @@ var MediaNode = exports.MediaNode = /*#__PURE__*/function (_Component) {
         featureFlags: mediaOptions && mediaOptions.featureFlags,
         contextId: contextId,
         alt: alt,
-        videoControlsWrapperRef: this.videoControlsWrapperRef
+        videoControlsWrapperRef: this.videoControlsWrapperRef,
+        ssr: ssr
       })));
     }
   }]);

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

@@ -461,7 +461,9 @@ 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 (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.syncProvider) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.syncProvider);
+    } else if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
       this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.provider);
     }
     if ((0, _platformFeatureFlags.fg)('platform_editor_remove_media_inline_feature_flag')) {
@@ -532,10 +534,19 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
               return _context.abrupt("return");
             case 8:
               _context.prev = 8;
-              _context.next = 11;
+              if (!(mediaProvider instanceof Promise)) {
+                _context.next = 15;
+                break;
+              }
+              _context.next = 12;
               return mediaProvider;
-            case 11:
+            case 12:
               this.mediaProvider = _context.sent;
+              _context.next = 16;
+              break;
+            case 15:
+              this.mediaProvider = mediaProvider;
+            case 16:
               // Ignored via go/ees007
               // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
               // TODO [MS-2038]: remove once context api is removed
@@ -548,10 +559,10 @@ 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 = 24;
+              _context.next = 28;
               break;
-            case 16:
-              _context.prev = 16;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](8);
               wrappedError = new Error("Media functionality disabled due to rejected provider: ".concat(_context.t0 instanceof Error ? _context.t0.message : String(_context.t0)));
               this.errorReporter.captureException(wrappedError);
@@ -563,7 +574,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
                 }));
               }
               return _context.abrupt("return");
-            case 24:
+            case 28:
               this.mediaClientConfig = this.mediaProvider.viewMediaClientConfig;
               this.allowsUploads = !!this.mediaProvider.uploadMediaClientConfig;
               view = this.view, allowsUploads = this.allowsUploads; // make sure editable DOM node is mounted
@@ -574,31 +585,31 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
                 }));
               }
               if (!this.allowsUploads) {
-                _context.next = 38;
+                _context.next = 42;
                 break;
               }
               this.uploadMediaClientConfig = this.mediaProvider.uploadMediaClientConfig;
               if (!(this.mediaProvider.uploadParams && this.uploadMediaClientConfig)) {
-                _context.next = 35;
+                _context.next = 39;
                 break;
               }
-              _context.next = 33;
+              _context.next = 37;
               return this.initPickers(this.mediaProvider.uploadParams, _pickerFacade.default);
-            case 33:
-              _context.next = 36;
+            case 37:
+              _context.next = 40;
               break;
-            case 35:
+            case 39:
               this.destroyPickers();
-            case 36:
-              _context.next = 39;
+            case 40:
+              _context.next = 43;
               break;
-            case 38:
+            case 42:
               this.destroyPickers();
-            case 39:
+            case 43:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[8, 16]]);
+        }, _callee, this, [[8, 20]]);
       }));
       function setMediaProvider(_x) {
         return _setMediaProvider.apply(this, arguments);

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

@@ -26,7 +26,9 @@ var getMediaNodeInsertionType = exports.getMediaNodeInsertionType = function get
   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, _platformFeatureFlags.fg)('platform_editor_remove_media_inline_feature_flag')) {
     if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.allowMediaInlineImages) {
-      return 'inline';
+      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)) {

package/dist/cjs/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -734,7 +734,7 @@ var ResizableMediaSingleNextFunctional = exports.ResizableMediaSingleNextFunctio
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     isResizing = _useState6[0],
     setIsResizing = _useState6[1];
-  var _useState7 = (0, _react.useState)(true),
+  var _useState7 = (0, _react.useState)(!(0, _platformFeatureFlags.fg)('platform_editor_ssr_media')),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     isVideoFile = _useState8[0],
     setIsVideoFile = _useState8[1];

package/dist/es2019/nodeviews/lazy-media-single.js

@@ -1,8 +1,9 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ReactMediaSingleNode } from './mediaSingle';
 export const lazyMediaSingleView = (portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options = {}) => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  if (fg('platform_editor_ssr_media') || editorExperiment('platform_editor_exp_lazy_node_views', false)) {
     return ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options);
   }
   return withLazyLoading({

package/dist/es2019/nodeviews/lazy-media.js

@@ -1,8 +1,9 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ReactMediaNode } from './mediaNodeView';
 export const lazyMediaView = (portalProviderAPI, eventDispatcher, providerFactory, options = {}, api) => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  if (fg('platform_editor_ssr_media') || editorExperiment('platform_editor_exp_lazy_node_views', false)) {
     return ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
   }
   return withLazyLoading({

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

@@ -6,6 +6,7 @@ import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { setNodeSelection, setTextSelection, withImageLoader } from '@atlaskit/editor-common/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Card, CardLoading } from '@atlaskit/media-card';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { stateKey as mediaStateKey } from '../../pm-plugins/plugin-key';
 import { MediaCardWrapper } from '../styles';
@@ -224,6 +225,10 @@ export class MediaNode extends Component {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       authProvider: () => ({})
     };
+    let ssr;
+    if (fg('platform_editor_ssr_media')) {
+      ssr = process.env.REACT_SSR ? 'server' : 'client';
+    }
     return /*#__PURE__*/React.createElement(MediaCardWrapper, {
       dimensions: originalDimensions,
       onContextMenu: this.selectMediaSingle,
@@ -251,7 +256,8 @@ export class MediaNode extends Component {
       featureFlags: mediaOptions && mediaOptions.featureFlags,
       contextId: contextId,
       alt: alt,
-      videoControlsWrapperRef: this.videoControlsWrapperRef
+      videoControlsWrapperRef: this.videoControlsWrapperRef,
+      ssr: ssr
     })));
   }
 }

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

@@ -439,7 +439,9 @@ 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');
-    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.syncProvider) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.syncProvider);
+    } 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')) {
@@ -494,7 +496,11 @@ export class MediaPluginStateImplementation {
     // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
     // TODO disable (not destroy!) pickers until mediaProvider is resolved
     try {
-      this.mediaProvider = await mediaProvider;
+      if (mediaProvider instanceof Promise) {
+        this.mediaProvider = await mediaProvider;
+      } else {
+        this.mediaProvider = mediaProvider;
+      }
 
       // Ignored via go/ees007
       // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format

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

@@ -20,7 +20,9 @@ export const getMediaNodeInsertionType = (state, mediaOptions, fileMimeType) =>
   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) {
-      return 'inline';
+      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)) {

package/dist/es2019/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -642,7 +642,7 @@ export const ResizableMediaSingleNextFunctional = props => {
   const lastSnappedGuidelineKeysRef = useRef([]);
   const [snaps, setSnaps] = useState({});
   const [isResizing, setIsResizing] = useState(false);
-  const [isVideoFile, setIsVideoFile] = useState(true);
+  const [isVideoFile, setIsVideoFile] = useState(!fg('platform_editor_ssr_media'));
   const nodePosition = useMemo(() => {
     if (typeof getPos !== 'function') {
       return null;

package/dist/esm/nodeviews/lazy-media-single.js

@@ -1,9 +1,10 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ReactMediaSingleNode } from './mediaSingle';
 export var lazyMediaSingleView = function lazyMediaSingleView(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
   var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  if (fg('platform_editor_ssr_media') || editorExperiment('platform_editor_exp_lazy_node_views', false)) {
     return ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options);
   }
   return withLazyLoading({

package/dist/esm/nodeviews/lazy-media.js

@@ -1,10 +1,11 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ReactMediaNode } from './mediaNodeView';
 export var lazyMediaView = function lazyMediaView(portalProviderAPI, eventDispatcher, providerFactory) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var api = arguments.length > 4 ? arguments[4] : undefined;
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  if (fg('platform_editor_ssr_media') || editorExperiment('platform_editor_exp_lazy_node_views', false)) {
     return ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
   }
   return withLazyLoading({

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

@@ -15,6 +15,7 @@ import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { setNodeSelection, setTextSelection, withImageLoader } from '@atlaskit/editor-common/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { Card, CardLoading } from '@atlaskit/media-card';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { stateKey as mediaStateKey } from '../../pm-plugins/plugin-key';
 import { MediaCardWrapper } from '../styles';
@@ -276,6 +277,10 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
           return {};
         }
       };
+      var ssr;
+      if (fg('platform_editor_ssr_media')) {
+        ssr = process.env.REACT_SSR ? 'server' : 'client';
+      }
       return /*#__PURE__*/React.createElement(MediaCardWrapper, {
         dimensions: originalDimensions,
         onContextMenu: this.selectMediaSingle,
@@ -301,7 +306,8 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
         featureFlags: mediaOptions && mediaOptions.featureFlags,
         contextId: contextId,
         alt: alt,
-        videoControlsWrapperRef: this.videoControlsWrapperRef
+        videoControlsWrapperRef: this.videoControlsWrapperRef,
+        ssr: ssr
       })));
     }
   }]);

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

@@ -452,7 +452,9 @@ 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');
-    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.provider) {
+    if (mediaOptions !== null && mediaOptions !== void 0 && mediaOptions.syncProvider) {
+      this.setMediaProvider(mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.syncProvider);
+    } 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')) {
@@ -523,10 +525,19 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
               return _context.abrupt("return");
             case 8:
               _context.prev = 8;
-              _context.next = 11;
+              if (!(mediaProvider instanceof Promise)) {
+                _context.next = 15;
+                break;
+              }
+              _context.next = 12;
               return mediaProvider;
-            case 11:
+            case 12:
               this.mediaProvider = _context.sent;
+              _context.next = 16;
+              break;
+            case 15:
+              this.mediaProvider = mediaProvider;
+            case 16:
               // Ignored via go/ees007
               // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
               // TODO [MS-2038]: remove once context api is removed
@@ -539,10 +550,10 @@ 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 = 24;
+              _context.next = 28;
               break;
-            case 16:
-              _context.prev = 16;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](8);
               wrappedError = new Error("Media functionality disabled due to rejected provider: ".concat(_context.t0 instanceof Error ? _context.t0.message : String(_context.t0)));
               this.errorReporter.captureException(wrappedError);
@@ -554,7 +565,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
                 }));
               }
               return _context.abrupt("return");
-            case 24:
+            case 28:
               this.mediaClientConfig = this.mediaProvider.viewMediaClientConfig;
               this.allowsUploads = !!this.mediaProvider.uploadMediaClientConfig;
               view = this.view, allowsUploads = this.allowsUploads; // make sure editable DOM node is mounted
@@ -565,31 +576,31 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
                 }));
               }
               if (!this.allowsUploads) {
-                _context.next = 38;
+                _context.next = 42;
                 break;
               }
               this.uploadMediaClientConfig = this.mediaProvider.uploadMediaClientConfig;
               if (!(this.mediaProvider.uploadParams && this.uploadMediaClientConfig)) {
-                _context.next = 35;
+                _context.next = 39;
                 break;
               }
-              _context.next = 33;
+              _context.next = 37;
               return this.initPickers(this.mediaProvider.uploadParams, PickerFacade);
-            case 33:
-              _context.next = 36;
+            case 37:
+              _context.next = 40;
               break;
-            case 35:
+            case 39:
               this.destroyPickers();
-            case 36:
-              _context.next = 39;
+            case 40:
+              _context.next = 43;
               break;
-            case 38:
+            case 42:
               this.destroyPickers();
-            case 39:
+            case 43:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[8, 16]]);
+        }, _callee, this, [[8, 20]]);
       }));
       function setMediaProvider(_x) {
         return _setMediaProvider.apply(this, arguments);

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

@@ -20,7 +20,9 @@ export var getMediaNodeInsertionType = function getMediaNodeInsertionType(state,
   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) {
-      return 'inline';
+      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)) {

package/dist/esm/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -727,7 +727,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
     _useState6 = _slicedToArray(_useState5, 2),
     isResizing = _useState6[0],
     setIsResizing = _useState6[1];
-  var _useState7 = useState(true),
+  var _useState7 = useState(!fg('platform_editor_ssr_media')),
     _useState8 = _slicedToArray(_useState7, 2),
     isVideoFile = _useState8[0],
     setIsVideoFile = _useState8[1];

package/dist/types/pm-plugins/main.d.ts

@@ -68,7 +68,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     subscribeToUploadInProgressState(fn: (isUploading: boolean) => void): void;
     unsubscribeFromUploadInProgressState(fn: (isUploading: boolean) => void): void;
     private previousMediaProvider;
-    setMediaProvider(mediaProvider?: Promise<MediaProvider>): Promise<void>;
+    setMediaProvider(mediaProvider?: Promise<MediaProvider> | MediaProvider): Promise<void>;
     getMediaOptions: () => MediaPluginOptions;
     setIsResizing(isResizing: boolean): void;
     setResizingWidth(width: number): void;

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

@@ -1,5 +1,5 @@
 import type { MediaADFAttrs, MediaInlineAttributes } from '@atlaskit/adf-schema';
-import type { ProviderFactory, Providers } from '@atlaskit/editor-common/provider-factory';
+import type { MediaProvider, ProviderFactory, Providers } from '@atlaskit/editor-common/provider-factory';
 import type { HandlePositioning } from '@atlaskit/editor-common/resizer';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { EditorAppearance, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
@@ -17,6 +17,7 @@ export type MediaSingleWithType = 'pixel' | 'percentage';
 export type MediaCopyScope = 'editor' | 'context';
 export interface MediaPluginOptions {
     provider?: Providers['mediaProvider'];
+    syncProvider?: MediaProvider;
     /**
      * @experimental
      * Still under development. Use with caution.

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -68,7 +68,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     subscribeToUploadInProgressState(fn: (isUploading: boolean) => void): void;
     unsubscribeFromUploadInProgressState(fn: (isUploading: boolean) => void): void;
     private previousMediaProvider;
-    setMediaProvider(mediaProvider?: Promise<MediaProvider>): Promise<void>;
+    setMediaProvider(mediaProvider?: Promise<MediaProvider> | MediaProvider): Promise<void>;
     getMediaOptions: () => MediaPluginOptions;
     setIsResizing(isResizing: boolean): void;
     setResizingWidth(width: number): void;

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

@@ -1,5 +1,5 @@
 import type { MediaADFAttrs, MediaInlineAttributes } from '@atlaskit/adf-schema';
-import type { ProviderFactory, Providers } from '@atlaskit/editor-common/provider-factory';
+import type { MediaProvider, ProviderFactory, Providers } from '@atlaskit/editor-common/provider-factory';
 import type { HandlePositioning } from '@atlaskit/editor-common/resizer';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { EditorAppearance, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
@@ -17,6 +17,7 @@ export type MediaSingleWithType = 'pixel' | 'percentage';
 export type MediaCopyScope = 'editor' | 'context';
 export interface MediaPluginOptions {
     provider?: Providers['mediaProvider'];
+    syncProvider?: MediaProvider;
     /**
      * @experimental
      * Still under development. Use with caution.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "2.5.0",
+	"version": "2.6.1",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,15 +38,15 @@
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.0.0",
-		"@atlaskit/editor-common": "^103.6.0",
+		"@atlaskit/editor-common": "^103.11.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
-		"@atlaskit/editor-plugin-annotation": "^2.5.0",
+		"@atlaskit/editor-plugin-annotation": "^2.7.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^3.6.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^4.0.0",
 		"@atlaskit/editor-plugin-focus": "^1.5.0",
 		"@atlaskit/editor-plugin-grid": "^2.0.0",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
@@ -56,8 +56,8 @@
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/form": "^12.0.0",
-		"@atlaskit/icon": "^25.5.0",
-		"@atlaskit/media-card": "^79.0.0",
+		"@atlaskit/icon": "^25.6.0",
+		"@atlaskit/media-card": "^79.2.0",
 		"@atlaskit/media-client": "^32.0.0",
 		"@atlaskit/media-client-react": "^4.0.0",
 		"@atlaskit/media-common": "^12.0.0",
@@ -69,8 +69,8 @@
 		"@atlaskit/primitives": "^14.4.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
-		"@atlaskit/tokens": "^4.7.0",
+		"@atlaskit/tmp-editor-statsig": "^4.12.0",
+		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -176,6 +176,9 @@
 		},
 		"platform_editor_media_single_toolbar_target": {
 			"type": "boolean"
+		},
+		"platform_editor_ssr_media": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {