@atlaskit/editor-core 187.31.7 → 187.32.1

package/dist/esm/plugins/media/index.js

@@ -24,11 +24,12 @@ import { ReactMediaInlineNode } from './nodeviews/mediaInline';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { stateKey } from './pm-plugins/plugin-key';
 export { insertMediaSingleNode } from './utils/media-single';
-var mediaPlugin = function mediaPlugin() {
-  var _api$dependencies, _api$dependencies$fea;
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var api = arguments.length > 1 ? arguments[1] : undefined;
-  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
+var mediaPlugin = function mediaPlugin(_ref) {
+  var _api$featureFlags;
+  var _ref$config = _ref.config,
+    options = _ref$config === void 0 ? {} : _ref$config,
+    api = _ref.api;
+  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'media',
     getSharedState: function getSharedState(editorState) {
@@ -38,12 +39,12 @@ var mediaPlugin = function mediaPlugin() {
       return stateKey.getState(editorState) || null;
     },
     nodes: function nodes() {
-      var _ref = options || {},
-        _ref$allowMediaGroup = _ref.allowMediaGroup,
-        allowMediaGroup = _ref$allowMediaGroup === void 0 ? true : _ref$allowMediaGroup,
-        _ref$allowMediaSingle = _ref.allowMediaSingle,
-        allowMediaSingle = _ref$allowMediaSingle === void 0 ? false : _ref$allowMediaSingle,
-        mediaFeatureFlags = _ref.featureFlags;
+      var _ref2 = options || {},
+        _ref2$allowMediaGroup = _ref2.allowMediaGroup,
+        allowMediaGroup = _ref2$allowMediaGroup === void 0 ? true : _ref2$allowMediaGroup,
+        _ref2$allowMediaSingl = _ref2.allowMediaSingle,
+        allowMediaSingle = _ref2$allowMediaSingl === void 0 ? false : _ref2$allowMediaSingl,
+        mediaFeatureFlags = _ref2.featureFlags;
       var captions = getMediaFeatureFlag('captions', mediaFeatureFlags);
       var allowMediaInline = getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
       var mediaSingleOption = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
@@ -82,16 +83,16 @@ var mediaPlugin = function mediaPlugin() {
     pmPlugins: function pmPlugins() {
       var pmPlugins = [{
         name: 'media',
-        plugin: function plugin(_ref2) {
-          var schema = _ref2.schema,
-            dispatch = _ref2.dispatch,
-            getIntl = _ref2.getIntl,
-            eventDispatcher = _ref2.eventDispatcher,
-            providerFactory = _ref2.providerFactory,
-            errorReporter = _ref2.errorReporter,
-            portalProviderAPI = _ref2.portalProviderAPI,
-            reactContext = _ref2.reactContext,
-            dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref3) {
+          var schema = _ref3.schema,
+            dispatch = _ref3.dispatch,
+            getIntl = _ref3.getIntl,
+            eventDispatcher = _ref3.eventDispatcher,
+            providerFactory = _ref3.providerFactory,
+            errorReporter = _ref3.errorReporter,
+            portalProviderAPI = _ref3.portalProviderAPI,
+            reactContext = _ref3.reactContext,
+            dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
           return createPlugin(schema, {
             providerFactory: providerFactory,
             nodeViews: {
@@ -111,15 +112,15 @@ var mediaPlugin = function mediaPlugin() {
       }, {
         name: 'mediaKeymap',
         plugin: function plugin() {
-          var _api$dependencies$ana;
-          return keymapPlugin(options, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
+          var _api$analytics;
+          return keymapPlugin(options, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }];
       if (options && options.allowMediaSingle) {
         pmPlugins.push({
           name: 'mediaSingleKeymap',
-          plugin: function plugin(_ref3) {
-            var schema = _ref3.schema;
+          plugin: function plugin(_ref4) {
+            var schema = _ref4.schema;
             return keymapMediaSinglePlugin(schema);
           }
         });
@@ -131,25 +132,25 @@ var mediaPlugin = function mediaPlugin() {
         });
         pmPlugins.push({
           name: 'mediaAltTextKeymap',
-          plugin: function plugin(_ref4) {
-            var _api$dependencies$ana2;
-            var schema = _ref4.schema;
-            return keymapMediaAltTextPlugin(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
+          plugin: function plugin(_ref5) {
+            var _api$analytics2;
+            var schema = _ref5.schema;
+            return keymapMediaAltTextPlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
           }
         });
       }
       if (options && options.allowLinking) {
         pmPlugins.push({
           name: 'mediaLinking',
-          plugin: function plugin(_ref5) {
-            var dispatch = _ref5.dispatch;
+          plugin: function plugin(_ref6) {
+            var dispatch = _ref6.dispatch;
             return linkingPlugin(dispatch);
           }
         });
         pmPlugins.push({
           name: 'mediaLinkingKeymap',
-          plugin: function plugin(_ref6) {
-            var schema = _ref6.schema;
+          plugin: function plugin(_ref7) {
+            var schema = _ref7.schema;
             return keymapLinkingPlugin(schema);
           }
         });
@@ -185,16 +186,16 @@ var mediaPlugin = function mediaPlugin() {
       });
       return pmPlugins;
     },
-    contentComponent: function contentComponent(_ref7) {
-      var editorView = _ref7.editorView,
-        appearance = _ref7.appearance;
+    contentComponent: function contentComponent(_ref8) {
+      var editorView = _ref8.editorView,
+        appearance = _ref8.appearance;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WithPluginState, {
         editorView: editorView,
         plugins: {
           mediaState: pluginKey
         },
-        render: function render(_ref8) {
-          var mediaState = _ref8.mediaState;
+        render: function render(_ref9) {
+          var mediaState = _ref9.mediaState;
           return /*#__PURE__*/React.createElement(MediaPickerComponents, {
             editorDomElement: editorView.dom,
             mediaState: mediaState,
@@ -204,10 +205,10 @@ var mediaPlugin = function mediaPlugin() {
         }
       }));
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref9) {
-      var editorView = _ref9.editorView,
-        eventDispatcher = _ref9.eventDispatcher,
-        disabled = _ref9.disabled;
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref10) {
+      var editorView = _ref10.editorView,
+        eventDispatcher = _ref10.eventDispatcher,
+        disabled = _ref10.disabled;
       return /*#__PURE__*/React.createElement(ToolbarMedia, {
         editorView: editorView,
         eventDispatcher: eventDispatcher,
@@ -217,8 +218,8 @@ var mediaPlugin = function mediaPlugin() {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref10) {
-        var formatMessage = _ref10.formatMessage;
+      quickInsert: function quickInsert(_ref11) {
+        var formatMessage = _ref11.formatMessage;
         return [{
           id: 'media',
           title: formatMessage(messages.mediaFiles),
@@ -229,11 +230,11 @@ var mediaPlugin = function mediaPlugin() {
             return /*#__PURE__*/React.createElement(IconImages, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana3;
+            var _api$analytics3;
             var pluginState = pluginKey.getState(state);
             pluginState === null || pluginState === void 0 ? void 0 : pluginState.showMediaPicker();
             var tr = insert('');
-            api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions.attachAnalyticsEvent({
+            api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
               action: ACTION.OPENED,
               actionSubject: ACTION_SUBJECT.PICKER,
               actionSubjectId: ACTION_SUBJECT_ID.PICKER_CLOUD,
@@ -255,7 +256,8 @@ var mediaPlugin = function mediaPlugin() {
           allowLinking: options && options.allowLinking,
           allowAdvancedToolBarOptions: options && options.allowAdvancedToolBarOptions,
           allowAltTextOnImages: options && options.allowAltTextOnImages,
-          altTextValidator: options && options.altTextValidator
+          altTextValidator: options && options.altTextValidator,
+          fullWidthEnabled: options && options.fullWidthEnabled
         }, api);
       }
     }

package/dist/esm/plugins/media/nodeviews/mediaSingle.js

@@ -230,7 +230,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       (_this$captionPlaceHol = _this.captionPlaceHolderRef.current) === null || _this$captionPlaceHol === void 0 ? void 0 : _this$captionPlaceHol.click();
     });
     _defineProperty(_assertThisInitialized(_this), "clickPlaceholder", function () {
-      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+      var _pluginInjectionApi$a;
       var _this$props = _this.props,
         view = _this$props.view,
         getPos = _this$props.getPos,
@@ -239,7 +239,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       if (typeof getPos === 'boolean') {
         return;
       }
-      insertAndSelectCaptionFromMediaSinglePos(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(getPos(), node)(view.state, view.dispatch);
+      insertAndSelectCaptionFromMediaSinglePos(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(getPos(), node)(view.state, view.dispatch);
     });
     return _this;
   }

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

@@ -226,16 +226,16 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
         });
       }
       if (isMediaSingle(state.schema, mediaStateWithContext.fileMimeType)) {
-        var _this$pluginInjection, _pluginInjectionApi$d, _pluginInjectionApi$d2;
+        var _this$pluginInjection, _pluginInjectionApi$a;
         // read width state right before inserting to get up-to-date and define values
-        var widthPluginState = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.dependencies.width.sharedState.currentState();
-        insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions);
+        var widthPluginState = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.width.sharedState.currentState();
+        insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions);
       } else if (getMediaFeatureFlag('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInListItem(state)) && canInsertMediaInline(state)) {
-        var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
-        insertMediaInlineNode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.analytics) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
+        var _pluginInjectionApi$a2;
+        insertMediaInlineNode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
       } else {
-        var _pluginInjectionApi$d5, _pluginInjectionApi$d6;
-        insertMediaGroupNode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : (_pluginInjectionApi$d6 = _pluginInjectionApi$d5.analytics) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.actions)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
+        var _pluginInjectionApi$a3;
+        insertMediaGroupNode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
       }
 
       // do events when media state changes

package/dist/esm/plugins/media/toolbar/index.js

@@ -22,7 +22,7 @@ import { messages } from '@atlaskit/media-ui';
 import { cardMessages } from '@atlaskit/editor-common/messages';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { FilePreviewItem } from './filePreviewItem';
-import { downloadMedia, getSelectedMediaSingle, removeMediaGroupNode, getPixelWidthOfElement } from './utils';
+import { downloadMedia, getSelectedMediaSingle, removeMediaGroupNode, getPixelWidthOfElement, calcNewLayout } from './utils';
 import { isVideo } from '../utils/media-single';
 import { changeInlineToMediaCard, changeMediaCardToInline, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';
 import { MediaInlineNodeSelector, MediaSingleNodeSelector } from '../nodeviews/styles';
@@ -200,7 +200,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     allowResizingInTables = options.allowResizingInTables,
     allowAltTextOnImages = options.allowAltTextOnImages;
   var toolbarButtons = [];
-  var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
+  var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.decorations.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
     hoverDecoration = _ref.hoverDecoration;
   if (shouldShowImageBorder(state)) {
     toolbarButtons.push({
@@ -215,12 +215,12 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         var borderMark = currentMediaNodeBorderMark(state);
         return /*#__PURE__*/React.createElement(ImageBorderItem, {
           toggleBorder: function toggleBorder() {
-            var _pluginInjectionApi$d2, _pluginInjectionApi$d3;
-            toggleBorderMark(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : (_pluginInjectionApi$d3 = _pluginInjectionApi$d2.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.actions)(state, dispatch);
+            var _pluginInjectionApi$a;
+            toggleBorderMark(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(state, dispatch);
           },
           setBorder: function setBorder(attrs) {
-            var _pluginInjectionApi$d4, _pluginInjectionApi$d5;
-            setBorderMark(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.analytics) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions)(attrs)(state, dispatch);
+            var _pluginInjectionApi$a2;
+            setBorderMark(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(attrs)(state, dispatch);
           },
           showSomewhatSemanticTooltips: getEditorFeatureFlags === null || getEditorFeatureFlags === void 0 ? void 0 : getEditorFeatureFlags().useSomewhatSemanticTextColorNames,
           borderMark: borderMark,
@@ -233,8 +233,8 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     });
   }
   if (allowAdvancedToolBarOptions) {
-    var _pluginInjectionApi$d6;
-    var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width;
+    var _pluginInjectionApi$a3;
+    var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
     var isChangingLayoutDisabled = false;
     if (getBooleanFF('platform.editor.media.extended-resize-experience')) {
       var _widthPlugin$sharedSt;
@@ -247,7 +247,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         }
       }
     }
-    var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
+    var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
     toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
     if (layoutButtons.length) {
       toolbarButtons.push({
@@ -273,7 +273,10 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           if (!selectedMediaNode) {
             return null;
           }
-          var widthType = selectedMediaSingleNode.node.attrs.widthType;
+          var _selectedMediaSingleN = selectedMediaSingleNode.node.attrs,
+            mediaSingleWidth = _selectedMediaSingleN.width,
+            widthType = _selectedMediaSingleN.widthType,
+            layout = _selectedMediaSingleN.layout;
           var _selectedMediaNode$at = selectedMediaNode.attrs,
             mediaWidth = _selectedMediaNode$at.width,
             mediaHeight = _selectedMediaNode$at.height;
@@ -282,9 +285,10 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           var isVideoFile = isVideo(selectedMediaNode.attrs.__fileMimeType);
           var minWidth = calcMinWidth(isVideoFile, maxWidthForNestedNode || contentWidth);
           var isLegacy = widthType !== 'pixel';
-          var pixelWidth = getPixelWidthOfElement(editorView, selectedMediaSingleNode.pos + 1,
+          var pixelWidthFromElement = getPixelWidthOfElement(editorView, selectedMediaSingleNode.pos + 1,
           // get pos of media node
           mediaWidth || DEFAULT_IMAGE_WIDTH);
+          var pixelWidth = isLegacy ? pixelWidthFromElement : mediaSingleWidth;
           return /*#__PURE__*/React.createElement(PixelEntry, {
             intl: intl,
             width: pluginState.isResizing ? pluginState.resizingWidth : pixelWidth,
@@ -311,7 +315,8 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
               var width = _ref2.width;
               var tr = state.tr.setNodeMarkup(selectedMediaSingleNode.pos, undefined, _objectSpread(_objectSpread({}, selectedMediaSingleNode.node.attrs), {}, {
                 width: width,
-                widthType: 'pixel'
+                widthType: 'pixel',
+                layout: calcNewLayout(width, layout, contentWidth, options.fullWidthEnabled)
               }));
               tr.setMeta('scrollIntoView', false);
               tr.setSelection(NodeSelection.create(tr.doc, selectedMediaSingleNode.pos));
@@ -319,7 +324,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             },
             onMigrate: function onMigrate() {
               var tr = state.tr.setNodeMarkup(selectedMediaSingleNode.pos, undefined, _objectSpread(_objectSpread({}, selectedMediaSingleNode.node.attrs), {}, {
-                width: pixelWidth,
+                width: pixelWidthFromElement,
                 widthType: 'pixel'
               }));
               tr.setMeta('scrollIntoView', false);
@@ -370,10 +375,10 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             };
             var openLink = function openLink() {
               if (editorView) {
-                var _pluginInjectionApi$d7;
+                var _pluginInjectionApi$a4;
                 var tr = editorView.state.tr,
                   dispatch = editorView.dispatch;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d7 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d7 === void 0 ? void 0 : _pluginInjectionApi$d7.actions.attachAnalyticsEvent({
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
                   eventType: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
@@ -399,8 +404,8 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     }
   }
   if (allowAltTextOnImages) {
-    var _pluginInjectionApi$d8;
-    toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d8 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.actions), {
+    var _pluginInjectionApi$a5;
+    toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions), {
       type: 'separator'
     });
   }
@@ -431,7 +436,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
   return items;
 };
 export var floatingToolbar = function floatingToolbar(state, intl) {
-  var _pluginInjectionApi$d9;
+  var _pluginInjectionApi$d2;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var pluginInjectionApi = arguments.length > 3 ? arguments[3] : undefined;
   var _state$schema$nodes = state.schema.nodes,
@@ -447,7 +452,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     getEditorFeatureFlags = options.getEditorFeatureFlags;
   var mediaPluginState = stateKey.getState(state);
   var mediaLinkingState = getMediaLinkingState(state);
-  var _ref3 = (_pluginInjectionApi$d9 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d9 !== void 0 ? _pluginInjectionApi$d9 : {},
+  var _ref3 = (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.decorations.actions) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : {},
     hoverDecoration = _ref3.hoverDecoration;
   if (!mediaPluginState) {
     return;
@@ -469,10 +474,10 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
   if (allowAltTextOnImages) {
     var mediaAltTextPluginState = getMediaAltTextPluginState(state);
     if (mediaAltTextPluginState.isAltTextEditorOpen) {
-      var _pluginInjectionApi$d10;
+      var _pluginInjectionApi$f;
       return getAltTextToolbar(baseToolbar, {
         altTextValidator: altTextValidator,
-        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d10 = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d10 === void 0 ? void 0 : _pluginInjectionApi$d10.forceFocusSelector
+        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector
       });
     }
   }
@@ -483,22 +488,22 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$d11, _pluginInjectionApi$d12;
+    var _pluginInjectionApi$a6;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele;
       var selector = mediaFilmstripItemDOMSelector(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d11 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d11 === void 0 ? void 0 : (_pluginInjectionApi$d12 = _pluginInjectionApi$d11.analytics) === null || _pluginInjectionApi$d12 === void 0 ? void 0 : _pluginInjectionApi$d12.actions);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 ? void 0 : _pluginInjectionApi$a6.actions);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
-    var _pluginInjectionApi$d13, _pluginInjectionApi$d14;
+    var _pluginInjectionApi$a7;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
       var element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(".".concat(MediaInlineNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d13 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d13 === void 0 ? void 0 : (_pluginInjectionApi$d14 = _pluginInjectionApi$d13.analytics) === null || _pluginInjectionApi$d14 === void 0 ? void 0 : _pluginInjectionApi$d14.actions);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 ? void 0 : _pluginInjectionApi$a7.actions);
   } else {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele3;

package/dist/esm/plugins/media/toolbar/linking.js

@@ -50,8 +50,8 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
               intl: intl,
               editing: editing,
               onUnlink: function onUnlink() {
-                var _pluginInjectionApi$d, _pluginInjectionApi$d2;
-                return unlink(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(view.state, view.dispatch, view);
+                var _pluginInjectionApi$a;
+                return unlink(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(view.state, view.dispatch, view);
               },
               onBack: function onBack(href, meta) {
                 if (href.trim() && meta.inputMethod) {
@@ -60,14 +60,14 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
                 hideLinkingToolbar(view.state, view.dispatch, view);
               },
               onCancel: function onCancel() {
-                var _pluginInjectionApi$d3;
+                var _pluginInjectionApi$f;
                 hideLinkingToolbar(view.state, view.dispatch, view, true);
                 /** Focus should move to the 'Add link' button when the toolbar closes
                  * and not close the floating toolbar.
                  */
                 var tr = view.state.tr,
                   dispatch = view.dispatch;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.forceFocusSelector(FORCE_FOCUS_SELECTOR)(tr);
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector(FORCE_FOCUS_SELECTOR)(tr);
                 dispatch(tr);
               },
               onSubmit: function onSubmit(href, meta) {

package/dist/esm/plugins/media/toolbar/utils.js

@@ -2,6 +2,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getMediaClient } from '@atlaskit/media-client';
 import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
+import { wrappedLayouts } from '@atlaskit/editor-common/media-single';
 export var getSelectedMediaContainerNodeAttrs = function getSelectedMediaContainerNodeAttrs(mediaPluginState) {
   var selectedNode = mediaPluginState.selectedMediaContainerNode();
   if (selectedNode && selectedNode.attrs) {
@@ -69,4 +71,21 @@ export var getPixelWidthOfElement = function getPixelWidthOfElement(editorView,
     return domNode.offsetWidth;
   }
   return mediaWidth;
+};
+export var calcNewLayout = function calcNewLayout(width, layout, contentWidth) {
+  var fullWidthMode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var isWrappedLayout = wrappedLayouts.indexOf(layout) > -1;
+  if (width >= akEditorFullWidthLayoutWidth) {
+    // If width is greater than or equal to full editor width
+    return 'full-width';
+  }
+  if (fullWidthMode) {
+    // If under editor full width mode
+    return isWrappedLayout ? layout : 'center';
+  }
+  if (width > contentWidth) {
+    // If width is greater than content length and not nested
+    return 'wide';
+  }
+  return isWrappedLayout && width !== contentWidth ? layout : 'center';
 };

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

@@ -125,8 +125,8 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
       return _this.wrapper = wrapper;
     });
     _defineProperty(_assertThisInitialized(_this), "displayGuideline", function (guidelines) {
-      var _this$props$pluginInj, _this$props$pluginInj2, _this$props$pluginInj3, _this$props$pluginInj4;
-      return (_this$props$pluginInj = _this.props.pluginInjectionApi) === null || _this$props$pluginInj === void 0 ? void 0 : (_this$props$pluginInj2 = _this$props$pluginInj.dependencies) === null || _this$props$pluginInj2 === void 0 ? void 0 : (_this$props$pluginInj3 = _this$props$pluginInj2.guideline) === null || _this$props$pluginInj3 === void 0 ? void 0 : (_this$props$pluginInj4 = _this$props$pluginInj3.actions) === null || _this$props$pluginInj4 === void 0 ? void 0 : _this$props$pluginInj4.displayGuideline(_this.props.view)({
+      var _this$props$pluginInj, _this$props$pluginInj2, _this$props$pluginInj3;
+      return (_this$props$pluginInj = _this.props.pluginInjectionApi) === null || _this$props$pluginInj === void 0 ? void 0 : (_this$props$pluginInj2 = _this$props$pluginInj.guideline) === null || _this$props$pluginInj2 === void 0 ? void 0 : (_this$props$pluginInj3 = _this$props$pluginInj2.actions) === null || _this$props$pluginInj3 === void 0 ? void 0 : _this$props$pluginInj3.displayGuideline(_this.props.view)({
         guidelines: guidelines
       });
     });
@@ -156,8 +156,8 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
       return Math.min(contentWidth || akEditorDefaultLayoutWidth, isVideoFile ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH);
     }));
     _defineProperty(_assertThisInitialized(_this), "getRelativeGuides", function () {
-      var _this$props$pluginInj5, _this$props$pluginInj6, _this$props$pluginInj7, _this$props$pluginInj8;
-      var guidelinePluginState = (_this$props$pluginInj5 = _this.props.pluginInjectionApi) === null || _this$props$pluginInj5 === void 0 ? void 0 : (_this$props$pluginInj6 = _this$props$pluginInj5.dependencies) === null || _this$props$pluginInj6 === void 0 ? void 0 : (_this$props$pluginInj7 = _this$props$pluginInj6.guideline) === null || _this$props$pluginInj7 === void 0 ? void 0 : (_this$props$pluginInj8 = _this$props$pluginInj7.sharedState) === null || _this$props$pluginInj8 === void 0 ? void 0 : _this$props$pluginInj8.currentState();
+      var _this$props$pluginInj4, _this$props$pluginInj5, _this$props$pluginInj6;
+      var guidelinePluginState = (_this$props$pluginInj4 = _this.props.pluginInjectionApi) === null || _this$props$pluginInj4 === void 0 ? void 0 : (_this$props$pluginInj5 = _this$props$pluginInj4.guideline) === null || _this$props$pluginInj5 === void 0 ? void 0 : (_this$props$pluginInj6 = _this$props$pluginInj5.sharedState) === null || _this$props$pluginInj6 === void 0 ? void 0 : _this$props$pluginInj6.currentState();
       var _ref = (guidelinePluginState === null || guidelinePluginState === void 0 ? void 0 : guidelinePluginState.rect) || {
           top: 0,
           left: 0

package/dist/esm/plugins/media/ui/ResizableMediaSingle/index.js

@@ -36,11 +36,11 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       isVideoFile: true
     });
     _defineProperty(_assertThisInitialized(_this), "displayGrid", function (visible, gridType, highlight) {
-      var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3;
+      var _pluginInjectionApi$g, _pluginInjectionApi$g2;
       var _this$props = _this.props,
         pluginInjectionApi = _this$props.pluginInjectionApi,
         view = _this$props.view;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : (_pluginInjectionApi$d3 = _pluginInjectionApi$d2.actions) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.displayGrid(view)({
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$g = pluginInjectionApi.grid) === null || _pluginInjectionApi$g === void 0 ? void 0 : (_pluginInjectionApi$g2 = _pluginInjectionApi$g.actions) === null || _pluginInjectionApi$g2 === void 0 ? void 0 : _pluginInjectionApi$g2.displayGrid(view)({
         visible: visible,
         gridType: gridType,
         highlight: highlight

package/dist/esm/plugins/media/utils/media-single.js

@@ -171,14 +171,29 @@ export function transformSliceForMedia(slice, schema) {
     orderedList = _schema$nodes2.orderedList,
     media = _schema$nodes2.media,
     mediaInline = _schema$nodes2.mediaInline,
-    expand = _schema$nodes2.expand;
+    expand = _schema$nodes2.expand,
+    nestedExpand = _schema$nodes2.nestedExpand;
   return function (selection) {
     var newSlice = slice;
-    if (hasParentNodeOfType([layoutSection, table, bulletList, orderedList, expand])(selection)) {
+    if (hasParentNodeOfType([layoutSection, table, bulletList, orderedList, expand, nestedExpand])(selection)) {
       newSlice = mapSlice(newSlice, function (node) {
-        var attrs = hasParentNodeOfType([layoutSection, table])(selection) ? {
+        var extendedOrLegacyAttrs = getBooleanFF('platform.editor.media.extended-resize-experience') ? {
+          layout: node.attrs.layout,
+          widthType: node.attrs.widthType,
+          width: node.attrs.width
+        } : {
           layout: node.attrs.layout
-        } : {};
+        };
+        var attrs = {};
+        if (hasParentNodeOfType([layoutSection, table])(selection)) {
+          // Supports layouts
+          attrs = _objectSpread({}, extendedOrLegacyAttrs);
+        } else if (hasParentNodeOfType([bulletList, orderedList, expand, nestedExpand])(selection)) {
+          // does not support other layouts
+          attrs = _objectSpread(_objectSpread({}, extendedOrLegacyAttrs), {}, {
+            layout: 'center'
+          });
+        }
         return node.type.name === 'mediaSingle' ? mediaSingle.createChecked(attrs, node.content, node.marks) : node;
       });
     }