@atlaskit/editor-plugin-media 1.36.5 → 1.37.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-media
 
+## 1.37.1
+
+### Patch Changes
+
+- [#155195](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/155195)
+  [`086e77aecf6e5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/086e77aecf6e5) -
+  [ux] ED-25202 Support Preview in media files
+- Updated dependencies
+
+## 1.37.0
+
+### Minor Changes
+
+- [#154775](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/154775)
+  [`1b353693c3119`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1b353693c3119) -
+  [ED-25348] Refactor Media Group React Class component into Function Component
+
+### Patch Changes
+
+- [#154186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/154186)
+  [`5c316170d29dd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5c316170d29dd) -
+  Bump @atlaskit/adf-schema to 42.3.1
+- Updated dependencies
+
 ## 1.36.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaGroup.js

@@ -24,8 +24,10 @@ 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 _mediaGroupNext = require("./mediaGroupNext");
 var _mediaNodeUpdater = require("./mediaNodeUpdater");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -346,6 +348,23 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
             if (!mediaProvider) {
               return null;
             }
+            if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2__media_single')) {
+              return /*#__PURE__*/_react.default.createElement(_mediaGroupNext.MediaGroupNext, {
+                node: _this3.node,
+                getPos: getPos,
+                view: _this3.view,
+                forwardRef: forwardRef,
+                disabled: (editorDisabledPlugin || {}).editorDisabled,
+                allowLazyLoading: mediaOptions.allowLazyLoading,
+                mediaProvider: mediaProvider,
+                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'
+              });
+            }
             return /*#__PURE__*/_react.default.createElement(IntlMediaGroup, {
               node: _this3.node,
               getPos: getPos,

package/dist/cjs/nodeviews/mediaGroupNext.js

@@ -0,0 +1,295 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MediaGroupNext = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _media = require("@atlaskit/editor-common/media");
+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 _pluginKey = require("../pm-plugins/plugin-key");
+var _mediaNodeUpdater = require("./mediaNodeUpdater");
+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 && {}.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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var getIdentifier = function getIdentifier(item) {
+  if (item.attrs.type === 'external') {
+    return {
+      mediaItemType: 'external-image',
+      dataURI: item.attrs.url
+    };
+  }
+  return {
+    id: item.attrs.id,
+    mediaItemType: 'file',
+    collectionName: item.attrs.collection
+  };
+};
+var isNodeSelected = function isNodeSelected(props) {
+  return function (mediaItemPos, mediaGroupPos) {
+    var selected = (0, _utils.isNodeSelectedOrInRange)(props.anchorPos, props.headPos, mediaGroupPos, props.nodeSize);
+    if (selected === _utils.SelectedState.selectedInRange) {
+      return true;
+    }
+    if (selected === _utils.SelectedState.selectedInside && props.anchorPos === mediaItemPos) {
+      return true;
+    }
+    return false;
+  };
+};
+var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
+  var allowLazyLoading = _ref.allowLazyLoading,
+    enableDownloadButton = _ref.enableDownloadButton,
+    handleMediaNodeRemoval = _ref.handleMediaNodeRemoval,
+    getPos = _ref.getPos,
+    intl = _ref.intl,
+    isMediaItemSelected = _ref.isMediaItemSelected,
+    setMediaGroupNodeSelection = _ref.setMediaGroupNodeSelection,
+    featureFlags = _ref.featureFlags;
+  return function (item, idx) {
+    // We declared this to get a fresh position every time
+    var getNodePos = function getNodePos() {
+      var pos = getPos();
+      if (typeof pos !== 'number') {
+        // That may seems weird, but the previous type wasn't match with the real ProseMirror code. And a lot of Media API was built expecting a number
+        // Because the original code would return NaN on runtime
+        // We are just make it explict now.
+        // We may run a deep investagation on Media code to figure out a better fix. But, for now, we want to keep the current behavior.
+        // TODO: ED-13910 prosemirror-bump leftovers
+        return NaN;
+      }
+      return pos + idx + 1;
+    };
+
+    // Media Inline creates a floating toolbar with the same options, excludes these options if enabled
+    var mediaInlineOptions = function mediaInlineOptions() {
+      var allowMediaInline = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      if (!allowMediaInline) {
+        return {
+          shouldEnableDownloadButton: enableDownloadButton,
+          actions: [{
+            handler: handleMediaNodeRemoval.bind(null, undefined, getNodePos),
+            icon: /*#__PURE__*/_react.default.createElement(_close.default, {
+              label: intl.formatMessage(_media.nodeViewsMessages.mediaGroupDeleteLabel)
+            })
+          }]
+        };
+      }
+    };
+    var mediaGroupPos = getPos();
+    return _objectSpread({
+      identifier: getIdentifier(item),
+      isLazy: allowLazyLoading,
+      selected: isMediaItemSelected(getNodePos(), typeof mediaGroupPos === 'number' ? mediaGroupPos : NaN),
+      onClick: function onClick() {
+        setMediaGroupNodeSelection(getNodePos());
+      }
+    }, mediaInlineOptions((0, _mediaCommon.getMediaFeatureFlag)('mediaInline', featureFlags)));
+  };
+};
+
+/**
+ * Keep returning the same ProseMirror Node, unless the node content changed.
+ *
+ * React uses shallow comparation with `Object.is`,
+ * but that can cause multiple re-renders when the same node is given in a different instance.
+ *
+ * To avoid unnecessary re-renders, this hook uses the `Node.eq` from ProseMirror API to compare
+ * previous and new values.
+ */
+var useLatestMediaGroupNode = function useLatestMediaGroupNode(nextMediaNode) {
+  var previousMediaNode = (0, _hooks.usePreviousState)(nextMediaNode);
+  var _React$useState = _react.default.useState(nextMediaNode),
+    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
+    mediaNode = _React$useState2[0],
+    setMediaNode = _React$useState2[1];
+  _react.default.useEffect(function () {
+    if (!previousMediaNode) {
+      return;
+    }
+    if (!previousMediaNode.eq(nextMediaNode)) {
+      setMediaNode(nextMediaNode);
+    }
+  }, [previousMediaNode, nextMediaNode]);
+  return mediaNode;
+};
+var runMediaNodeUpdate = /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref2) {
+    var mediaNodeUpdater, getPos, node, updateAttrs, contextId, hasDifferentContextId;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          mediaNodeUpdater = _ref2.mediaNodeUpdater, getPos = _ref2.getPos, node = _ref2.node, updateAttrs = _ref2.updateAttrs;
+          if (!updateAttrs) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return mediaNodeUpdater.updateNodeAttrs(getPos);
+        case 4:
+          contextId = mediaNodeUpdater.getNodeContextId();
+          if (contextId) {
+            _context.next = 8;
+            break;
+          }
+          _context.next = 8;
+          return mediaNodeUpdater.updateNodeContextId(getPos);
+        case 8:
+          _context.next = 10;
+          return mediaNodeUpdater.hasDifferentContextId();
+        case 10:
+          hasDifferentContextId = _context.sent;
+          if (!hasDifferentContextId) {
+            _context.next = 14;
+            break;
+          }
+          _context.next = 14;
+          return mediaNodeUpdater.copyNodeFromPos(getPos, {
+            traceId: node.attrs.__mediaTraceId
+          });
+        case 14:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function runMediaNodeUpdate(_x) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+var noop = function noop() {};
+var MediaGroupNext = exports.MediaGroupNext = (0, _reactIntlNext.injectIntl)( /*#__PURE__*/_react.default.memo(function (props) {
+  var _props$mediaOptions = props.mediaOptions,
+    allowLazyLoading = _props$mediaOptions.allowLazyLoading,
+    enableDownloadButton = _props$mediaOptions.enableDownloadButton,
+    featureFlags = _props$mediaOptions.featureFlags,
+    intl = props.intl,
+    _getPos = props.getPos,
+    anchorPos = props.anchorPos,
+    headPos = props.headPos,
+    view = props.view,
+    disabled = props.disabled,
+    editorViewMode = props.editorViewMode,
+    mediaProvider = props.mediaProvider,
+    contextIdentifierProvider = props.contextIdentifierProvider,
+    isCopyPasteEnabled = props.isCopyPasteEnabled;
+  var mediaGroupNode = useLatestMediaGroupNode(props.node);
+  var mediaPluginState = (0, _react.useMemo)(function () {
+    return _pluginKey.stateKey.getState(view.state);
+  }, [view.state]);
+  var mediaClientConfig = mediaPluginState === null || mediaPluginState === void 0 ? void 0 : mediaPluginState.mediaClientConfig;
+  var handleMediaGroupUpdate = mediaPluginState === null || mediaPluginState === void 0 ? void 0 : mediaPluginState.handleMediaGroupUpdate;
+  var _useState = (0, _react.useState)(undefined),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    viewMediaClientConfig = _useState2[0],
+    setViewMediaClientConfig = _useState2[1];
+  var nodeSize = mediaGroupNode.nodeSize;
+  var mediaNodesWithOffsets = (0, _react.useMemo)(function () {
+    var result = [];
+    mediaGroupNode.forEach(function (item, childOffset) {
+      result.push({
+        node: item,
+        offset: childOffset
+      });
+    });
+    return result;
+  }, [mediaGroupNode]);
+  var previousMediaNodesWithOffsets = (0, _hooks.usePreviousState)(mediaNodesWithOffsets);
+  var handleMediaNodeRemoval = (0, _react.useMemo)(function () {
+    return disabled || !mediaPluginState ? noop : mediaPluginState.handleMediaNodeRemoval;
+  }, [disabled, mediaPluginState]);
+  var setMediaGroupNodeSelection = (0, _react.useCallback)(function (pos) {
+    (0, _utils.setNodeSelection)(view, pos);
+  }, [view]);
+  var isMediaItemSelected = (0, _react.useMemo)(function () {
+    return isNodeSelected({
+      anchorPos: anchorPos,
+      headPos: headPos,
+      nodeSize: nodeSize
+    });
+  }, [anchorPos, headPos, nodeSize]);
+  var filmstripItem = (0, _react.useMemo)(function () {
+    return prepareFilmstripItem({
+      allowLazyLoading: allowLazyLoading,
+      enableDownloadButton: enableDownloadButton,
+      handleMediaNodeRemoval: handleMediaNodeRemoval,
+      getPos: _getPos,
+      intl: intl,
+      isMediaItemSelected: isMediaItemSelected,
+      setMediaGroupNodeSelection: setMediaGroupNodeSelection,
+      featureFlags: featureFlags
+    });
+  }, [allowLazyLoading, enableDownloadButton, handleMediaNodeRemoval, _getPos, intl, isMediaItemSelected, setMediaGroupNodeSelection, featureFlags]);
+  var items = (0, _react.useMemo)(function () {
+    return mediaNodesWithOffsets.map(function (_ref4) {
+      var node = _ref4.node,
+        offset = _ref4.offset;
+      return filmstripItem(node, offset);
+    });
+  }, [mediaNodesWithOffsets, filmstripItem]);
+  (0, _react.useEffect)(function () {
+    setViewMediaClientConfig(mediaClientConfig);
+  }, [mediaClientConfig]);
+  (0, _react.useEffect)(function () {
+    mediaNodesWithOffsets.forEach(function (_ref5) {
+      var node = _ref5.node,
+        offset = _ref5.offset;
+      var mediaNodeUpdater = (0, _mediaNodeUpdater.createMediaNodeUpdater)({
+        view: view,
+        mediaProvider: mediaProvider,
+        contextIdentifierProvider: contextIdentifierProvider,
+        node: node,
+        isMediaSingle: false
+      });
+      var updateAttrs = isCopyPasteEnabled || isCopyPasteEnabled === undefined;
+      runMediaNodeUpdate({
+        mediaNodeUpdater: mediaNodeUpdater,
+        node: node,
+        updateAttrs: updateAttrs,
+        getPos: function getPos() {
+          var pos = _getPos();
+          if (typeof pos !== 'number') {
+            return undefined;
+          }
+          return pos + offset + 1;
+        }
+      });
+    });
+  }, [view, contextIdentifierProvider, _getPos, mediaProvider, mediaNodesWithOffsets, isCopyPasteEnabled]);
+  (0, _react.useEffect)(function () {
+    if (!handleMediaGroupUpdate || !previousMediaNodesWithOffsets) {
+      return;
+    }
+    var old = previousMediaNodesWithOffsets.map(function (_ref6) {
+      var node = _ref6.node;
+      return node;
+    });
+    var next = mediaNodesWithOffsets.map(function (_ref7) {
+      var node = _ref7.node;
+      return node;
+    });
+    handleMediaGroupUpdate(old, next);
+    return function () {
+      handleMediaGroupUpdate(next, []);
+    };
+  }, [handleMediaGroupUpdate, mediaNodesWithOffsets, previousMediaNodesWithOffsets]);
+  return /*#__PURE__*/_react.default.createElement(_mediaFilmstrip.Filmstrip, {
+    items: items,
+    mediaClientConfig: viewMediaClientConfig,
+    featureFlags: featureFlags,
+    shouldOpenMediaViewer: editorViewMode
+  });
+}));
+MediaGroupNext.displayName = 'MediaGroup';

package/dist/cjs/nodeviews/mediaNodeUpdater.js

@@ -779,8 +779,6 @@ var hasPrivateAttrsChanged = function hasPrivateAttrsChanged(currentAttrs, newAt
   return currentAttrs.__fileName !== newAttrs.__fileName || currentAttrs.__fileMimeType !== newAttrs.__fileMimeType || currentAttrs.__fileSize !== newAttrs.__fileSize || currentAttrs.__contextId !== newAttrs.__contextId;
 };
 var createMediaNodeUpdater = exports.createMediaNodeUpdater = function createMediaNodeUpdater(props) {
-  var updaterProps = _objectSpread(_objectSpread({}, props), {}, {
-    isMediaSingle: true
-  });
+  var updaterProps = _objectSpread({}, props);
   return new MediaNodeUpdater(updaterProps);
 };

package/dist/cjs/plugin.js

@@ -1,11 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mediaPlugin = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
@@ -35,7 +36,10 @@ var _toolbar = require("./toolbar");
 var _MediaPicker = require("./ui/MediaPicker");
 var _PortalWrapper = require("./ui/MediaViewer/PortalWrapper");
 var _ToolbarMedia = _interopRequireDefault(require("./ui/ToolbarMedia"));
+var _mediaCommon2 = require("./utils/media-common");
 var _mediaSingle2 = require("./utils/media-single");
+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 && {}.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 MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_ref) {
   var api = _ref.api,
     editorDomElement = _ref.editorDomElement,
@@ -53,10 +57,22 @@ var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_re
   });
 };
 var MediaViewerFunctionalComponent = function MediaViewerFunctionalComponent(_ref2) {
-  var api = _ref2.api;
+  var api = _ref2.api,
+    editorView = _ref2.editorView;
   var _useSharedPluginState2 = (0, _hooks.useSharedPluginState)(api, ['media']),
     mediaState = _useSharedPluginState2.mediaState;
 
+  // Only traverse document once when media viewer is visible, media viewer items will not update
+  // when document changes are made while media viewer is open
+
+  var mediaItems = (0, _react.useMemo)(function () {
+    if (mediaState !== null && mediaState !== void 0 && mediaState.isMediaViewerVisible && (0, _platformFeatureFlags.fg)('platform_editor_media_interaction_improvements')) {
+      var mediaNodes = (0, _mediaCommon2.extractMediaNodes)(editorView.state.doc);
+      return (0, _mediaCommon2.createMediaIdentifierArray)(mediaNodes);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- only update mediaItems once when media viewer is visible
+  }, [mediaState === null || mediaState === void 0 ? void 0 : mediaState.isMediaViewerVisible]);
+
   // Viewer does not have required attributes to render the media viewer
   if (!(mediaState !== null && mediaState !== void 0 && mediaState.isMediaViewerVisible) || !(mediaState !== null && mediaState !== void 0 && mediaState.mediaViewerSelectedMedia) || !(mediaState !== null && mediaState !== void 0 && mediaState.mediaClientConfig)) {
     return null;
@@ -68,7 +84,8 @@ var MediaViewerFunctionalComponent = function MediaViewerFunctionalComponent(_re
   return /*#__PURE__*/_react.default.createElement(_PortalWrapper.RenderMediaViewer, {
     mediaClientConfig: mediaState === null || mediaState === void 0 ? void 0 : mediaState.mediaClientConfig,
     onClose: handleOnClose,
-    selectedNodeAttrs: mediaState.mediaViewerSelectedMedia
+    selectedNodeAttrs: mediaState.mediaViewerSelectedMedia,
+    items: (0, _platformFeatureFlags.fg)('platform_editor_media_interaction_improvements') ? mediaItems : undefined
   });
 };
 var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
@@ -259,7 +276,8 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
       var editorView = _ref12.editorView,
         appearance = _ref12.appearance;
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') && /*#__PURE__*/_react.default.createElement(MediaViewerFunctionalComponent, {
-        api: api
+        api: api,
+        editorView: editorView
       }), /*#__PURE__*/_react.default.createElement(MediaPickerFunctionalComponent, {
         editorDomElement: editorView.dom,
         appearance: appearance,

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

@@ -786,11 +786,12 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
         switch (meta === null || meta === void 0 ? void 0 : meta.type) {
           case _actions.ACTIONS.SHOW_MEDIA_VIEWER:
             pluginState.mediaViewerSelectedMedia = meta.mediaViewerSelectedMedia;
-            pluginState.isMediaViewerVisible = true;
+            pluginState.isMediaViewerVisible = meta.isMediaViewerVisible;
             nextPluginState = nextPluginState.clone();
             break;
           case _actions.ACTIONS.HIDE_MEDIA_VIEWER:
             pluginState.mediaViewerSelectedMedia = undefined;
+            pluginState.isMediaViewerVisible = meta.isMediaViewerVisible;
             nextPluginState = nextPluginState.clone();
             break;
         }

package/dist/cjs/ui/MediaViewer/PortalWrapper.js

@@ -30,13 +30,15 @@ var getIdentifier = function getIdentifier(attrs) {
 var RenderMediaViewer = exports.RenderMediaViewer = function RenderMediaViewer(_ref) {
   var mediaClientConfig = _ref.mediaClientConfig,
     onClose = _ref.onClose,
-    selectedNodeAttrs = _ref.selectedNodeAttrs;
+    selectedNodeAttrs = _ref.selectedNodeAttrs,
+    _ref$items = _ref.items,
+    items = _ref$items === void 0 ? [] : _ref$items;
   if ((0, _experiments.editorExperiment)('add-media-from-url', true)) {
     var _identifier = getIdentifier(selectedNodeAttrs);
     var collectionName = (0, _utils.isExternalMedia)(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
     return /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(_mediaViewer.MediaViewer, {
       collectionName: collectionName,
-      items: [],
+      items: items,
       mediaClientConfig: mediaClientConfig,
       selectedItem: _identifier,
       onClose: onClose

package/dist/cjs/utils/media-common.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.splitMediaGroup = exports.removeMediaNode = exports.posOfPrecedingMediaGroup = exports.posOfParentMediaGroup = exports.posOfMediaGroupNearby = exports.isSelectionNonMediaBlockNode = exports.isSelectionMediaSingleNode = exports.isMediaSingleOrInlineNodeSelected = exports.isMediaBlobUrlFromAttrs = exports.isInsidePotentialEmptyParagraph = exports.getMediaSingleOrInlineNodeFromSelection = exports.getMediaNodeFromSelection = exports.getMediaFromSupportedMediaNodesFromSelection = exports.copyOptionalAttrsFromMediaState = void 0;
+exports.splitMediaGroup = exports.removeMediaNode = exports.posOfPrecedingMediaGroup = exports.posOfParentMediaGroup = exports.posOfMediaGroupNearby = exports.isSelectionNonMediaBlockNode = exports.isSelectionMediaSingleNode = exports.isMediaSingleOrInlineNodeSelected = exports.isMediaBlobUrlFromAttrs = exports.isInsidePotentialEmptyParagraph = exports.getMediaSingleOrInlineNodeFromSelection = exports.getMediaNodeFromSelection = exports.getMediaFromSupportedMediaNodesFromSelection = exports.getIdentifier = exports.extractMediaNodes = exports.createMediaIdentifierArray = exports.copyOptionalAttrsFromMediaState = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
@@ -11,6 +13,8 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _mediaClient = require("@atlaskit/media-client");
 var _main = require("../pm-plugins/main");
+var _utils3 = require("../toolbar/utils");
+var _mediaSingle = require("./media-single");
 var isTemporary = function isTemporary(id) {
   return id.indexOf('temporary:') === 0;
 };
@@ -218,4 +222,50 @@ var getMediaFromSupportedMediaNodesFromSelection = exports.getMediaFromSupported
     default:
       return null;
   }
+};
+var getIdentifier = exports.getIdentifier = function getIdentifier(attrs) {
+  if ((0, _utils3.isExternalMedia)(attrs)) {
+    return {
+      mediaItemType: 'external-image',
+      dataURI: attrs.url
+    };
+  } else {
+    var id = attrs.id,
+      _attrs$collection = attrs.collection,
+      collection = _attrs$collection === void 0 ? '' : _attrs$collection;
+    return {
+      id: id,
+      mediaItemType: 'file',
+      collectionName: collection
+    };
+  }
+};
+var extractMediaNodes = exports.extractMediaNodes = function extractMediaNodes(doc) {
+  var mediaNodes = [];
+  doc.descendants(function (node) {
+    if (node.type.name === 'media' || node.type.name === 'mediaInline') {
+      mediaNodes.push(node);
+    }
+  });
+  return mediaNodes;
+};
+var createMediaIdentifierArray = exports.createMediaIdentifierArray = function createMediaIdentifierArray(mediaNodes) {
+  var mediaIdentifierMap = new Map();
+  mediaNodes.forEach(function (item) {
+    var attrs = item.attrs;
+    if (!attrs) {
+      return;
+    }
+    if ((0, _mediaSingle.isVideo)(attrs.__fileMimeType)) {
+      return;
+    }
+    var identifier = getIdentifier(attrs);
+
+    // Add only if not already processed
+    var idKey = (0, _mediaClient.isExternalImageIdentifier)(identifier) ? identifier.dataURI : identifier.id;
+    if (!mediaIdentifierMap.has(idKey)) {
+      mediaIdentifierMap.set(idKey, identifier);
+    }
+  });
+  return (0, _toConsumableArray2.default)(mediaIdentifierMap.values());
 };

package/dist/es2019/nodeviews/mediaGroup.js

@@ -9,8 +9,10 @@ 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 { MediaGroupNext } from './mediaGroupNext';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 const isMediaGroupSelectedFromProps = props => {
   /**
@@ -290,6 +292,23 @@ class MediaGroupNodeView extends ReactNodeView {
           if (!mediaProvider) {
             return null;
           }
+          if (fg('platform_editor_react18_phase2__media_single')) {
+            return /*#__PURE__*/React.createElement(MediaGroupNext, {
+              node: this.node,
+              getPos: getPos,
+              view: this.view,
+              forwardRef: forwardRef,
+              disabled: (editorDisabledPlugin || {}).editorDisabled,
+              allowLazyLoading: mediaOptions.allowLazyLoading,
+              mediaProvider: mediaProvider,
+              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'
+            });
+          }
           return /*#__PURE__*/React.createElement(IntlMediaGroup, {
             node: this.node,
             getPos: getPos,