@atlaskit/editor-plugin-media 1.31.6 → 1.31.8

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-media
 
+## 1.31.8
+
+### Patch Changes
+
+- [#141594](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141594)
+  [`3f6b2eb7bd493`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f6b2eb7bd493) -
+  [ux] [ED-24867] This change moves nesting codeblocks and media in blockquotes via insertion
+  methods behind an experiment gate.
+- Updated dependencies
+
+## 1.31.7
+
+### Patch Changes
+
+- [#140707](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140707)
+  [`972fb840acf35`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/972fb840acf35) -
+  Switch from fg to experiment for media-from-url
+- Updated dependencies
+
 ## 1.31.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaSingle.js

@@ -30,6 +30,7 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaClient = require("@atlaskit/media-client");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _captions = require("../commands/captions");
 var _main = require("../pm-plugins/main");
 var _CaptionPlaceholder = _interopRequireDefault(require("../ui/CaptionPlaceholder"));
@@ -466,7 +467,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
         ,
         className: _styles.MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
-      }, (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one') && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
+      }, (0, _experiments.editorExperiment)('add-media-from-url', true) && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
         mediaElement: currentMediaElement(),
         mediaHeight: height,
         mediaWidth: width,
@@ -483,7 +484,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
           isDrafting: isCurrentNodeDrafting,
           badgeSize: badgeSize
         }));
-      }), !(0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one') && commentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
+      }), !(0, _experiments.editorExperiment)('add-media-from-url', true) && commentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
         commentsOnMediaBugFixEnabled: mediaOptions === null || mediaOptions === void 0 || (_mediaOptions$getEdit2 = mediaOptions.getEditorFeatureFlags) === null || _mediaOptions$getEdit2 === void 0 || (_mediaOptions$getEdit2 = _mediaOptions$getEdit2.call(mediaOptions)) === null || _mediaOptions$getEdit2 === void 0 ? void 0 : _mediaOptions$getEdit2.commentsOnMediaBugFix,
         view: view,
         api: pluginInjectionApi,

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

@@ -32,6 +32,8 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaCommon = require("@atlaskit/media-common");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _helpers = _interopRequireWildcard(require("../commands/helpers"));
 var helpers = _helpers;
 var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
@@ -125,9 +127,10 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
     (0, _defineProperty2.default)(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType) {
-      var _this$pluginInjection, _mediaState$collectio, _this$pluginInjection2;
+      var _this$pluginInjection, _this$pluginInjection2, _mediaState$collectio, _this$pluginInjection3;
       var state = _this.view.state;
       var editorAnalyticsAPI = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 || (_this$pluginInjection = _this$pluginInjection.analytics) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.actions;
+      var isNestingInQuoteSupported = ((_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.featureFlags) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.sharedState.currentState()) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.nestMediaAndCodeblockInQuote) || (0, _platformFeatureFlags.fg)('editor_nest_media_and_codeblock_in_quotes_jira');
       var mediaStateWithContext = _objectSpread(_objectSpread({}, mediaState), {}, {
         contextId: _this.contextIdentifierProvider ? _this.contextIdentifierProvider.objectId : undefined
       });
@@ -154,11 +157,11 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
           break;
         case 'block':
           // read width state right before inserting to get up-to-date and define values
-          var widthPluginState = (_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.width) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
-          (0, _mediaSingle2.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, _this.onNodeInserted);
+          var widthPluginState = (_this$pluginInjection3 = _this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.width) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.sharedState.currentState();
+          (0, _mediaSingle2.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, _this.onNodeInserted, isNestingInQuoteSupported);
           break;
         case 'group':
-          (0, _mediaFiles.insertMediaGroupNode)(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
+          (0, _mediaFiles.insertMediaGroupNode)(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType), isNestingInQuoteSupported);
           break;
       }
 
@@ -211,6 +214,9 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     });
     (0, _defineProperty2.default)(this, "showMediaPicker", function () {
       if (_this.openMediaPickerBrowser) {
+        (0, _experiments.editorExperiment)('add-media-from-url', false, {
+          exposure: true
+        });
         return _this.openMediaPickerBrowser();
       }
       _this.onPopupToggleCallback(true);
@@ -594,8 +600,8 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
   }, {
     key: "contextIdentifierProvider",
     get: function get() {
-      var _this$pluginInjection3;
-      return (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.contextIdentifier) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.sharedState.currentState()) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.contextIdentifierProvider;
+      var _this$pluginInjection4;
+      return (_this$pluginInjection4 = this.pluginInjectionApi) === null || _this$pluginInjection4 === void 0 || (_this$pluginInjection4 = _this$pluginInjection4.contextIdentifier) === null || _this$pluginInjection4 === void 0 || (_this$pluginInjection4 = _this$pluginInjection4.sharedState.currentState()) === null || _this$pluginInjection4 === void 0 ? void 0 : _this$pluginInjection4.contextIdentifierProvider;
     }
   }, {
     key: "selectLastAddedMediaNode",

package/dist/cjs/ui/CommentBadge/index.js

@@ -87,7 +87,7 @@ var CommentBadge = exports.CommentBadge = (0, _reactIntlNext.injectIntl)(Comment
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 
 var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {

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

@@ -146,7 +146,7 @@ var insertMediaInlineNode = exports.insertMediaInlineNode = function insertMedia
  * @param collection Collection for the media to be added
  */
 var insertMediaGroupNode = exports.insertMediaGroupNode = function insertMediaGroupNode(editorAnalyticsAPI) {
-  return function (view, mediaStates, collection, inputMethod) {
+  return function (view, mediaStates, collection, inputMethod, isNestingInQuoteSupported) {
     var state = view.state,
       dispatch = view.dispatch;
     var tr = state.tr,
@@ -168,6 +168,17 @@ var insertMediaGroupNode = exports.insertMediaGroupNode = function insertMediaGr
     var withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
     var content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
     : [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
+
+    /** we only allow the insertion of media groups inside a blockquote if nesting in quotes is supported */
+    var grandParentNode = state.selection.$from.node(-1);
+    var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+    if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+      var grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
+      (0, _utils2.safeInsert)(content[0], grandparentEndPos)(tr).scrollIntoView();
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
+      dispatch(tr);
+      return;
+    }
     if (shouldSplit) {
       content = withParagraph ? content.concat(paragraph.create()) : content;
       // delete the selection or empty paragraph

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

@@ -16,6 +16,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mediaCommon = require("../utils/media-common");
 var _analytics2 = require("./analytics");
 var _isType = require("./is-type");
@@ -40,6 +41,7 @@ function shouldAddParagraph(state) {
 function insertNodesWithOptionalParagraph(nodes) {
   var analyticsAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var editorAnalyticsAPI = arguments.length > 2 ? arguments[2] : undefined;
+  var isNestingInQuoteSupported = arguments.length > 3 ? arguments[3] : undefined;
   return function (state, dispatch) {
     var tr = state.tr,
       schema = state.schema;
@@ -53,7 +55,14 @@ function insertNodesWithOptionalParagraph(nodes) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
-    if (state.selection.empty) {
+
+    /** we only allow the insertion of media singles inside a blockquote if nesting in quotes is supported */
+    var grandParentNode = state.selection.$from.node(-1);
+    var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+    if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+      var grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
+      (0, _utils2.safeInsert)(nodes[0], grandparentEndPos)(tr).scrollIntoView();
+    } else if (state.selection.empty) {
       tr.insert(state.selection.from, nodes);
       // Set the cursor position at the end of the insertion
       var endPos = state.selection.from + nodes.reduce(function (totalSize, currNode) {
@@ -78,7 +87,7 @@ function insertNodesWithOptionalParagraph(nodes) {
 var isMediaSingle = exports.isMediaSingle = function isMediaSingle(schema, fileMimeType) {
   return !!schema.nodes.mediaSingle && (0, _isType.isImage)(fileMimeType);
 };
-var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, node, inputMethod, editorAnalyticsAPI) {
+var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, node, inputMethod, editorAnalyticsAPI, isNestingInQuoteSupported) {
   var _node$attrs$width;
   var state = view.state,
     dispatch = view.dispatch;
@@ -94,7 +103,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
     return false;
   }
   var resizeExperience = (0, _platformFeatureFlags.fg)('platform.editor.media.extended-resize-experience');
-  var insertMediaPopup = (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one');
+  var insertMediaPopup = (0, _experiments.editorExperiment)('add-media-from-url', true);
   var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
     widthType: 'pixel',
     width: (0, _mediaSingle.getMediaSingleInitialWidth)((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : _mediaSingle.DEFAULT_IMAGE_WIDTH),
@@ -106,7 +115,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
     inputMethod: inputMethod,
     fileExtension: node.attrs.__fileMimeType
   };
-  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI)(state, dispatch);
+  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
 };
 var getFileExtension = function getFileExtension(fileName) {
   if (fileName) {
@@ -115,7 +124,7 @@ var getFileExtension = function getFileExtension(fileName) {
   }
   return undefined;
 };
-var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted) {
+var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted, isNestingInQuoteSupported) {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -144,7 +153,7 @@ var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMedia
     insertNodesWithOptionalParagraph([node], {
       fileExtension: fileExtension,
       inputMethod: inputMethod
-    }, editorAnalyticsAPI)(state, dispatch);
+    }, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
   } else {
     var tr = null;
     tr = (0, _insert.safeInsert)(node, state.selection.from)(state.tr);

package/dist/es2019/nodeviews/mediaSingle.js

@@ -11,8 +11,7 @@ import React, { Component, Fragment, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE } from '@atlaskit/editor-common/media-single';
-import { ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
+import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, ExternalImageBadge, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { MediaSingle } from '@atlaskit/editor-common/ui';
@@ -22,6 +21,7 @@ import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/u
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import CaptionPlaceholder from '../ui/CaptionPlaceholder';
@@ -384,7 +384,7 @@ export default class MediaSingleNode extends Component {
       ,
       className: MediaSingleNodeSelector,
       onClick: this.onMediaSingleClicked
-    }, fg('platform_editor_insert_media_plugin_phase_one') && jsx(MediaBadges, {
+    }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
       mediaElement: currentMediaElement(),
       mediaHeight: height,
       mediaWidth: width,
@@ -400,7 +400,7 @@ export default class MediaSingleNode extends Component {
       getPos: getPos,
       isDrafting: isCurrentNodeDrafting,
       badgeSize: badgeSize
-    }))), !fg('platform_editor_insert_media_plugin_phase_one') && commentsOnMedia && jsx(CommentBadge, {
+    }))), !editorExperiment('add-media-from-url', true) && commentsOnMedia && jsx(CommentBadge, {
       commentsOnMediaBugFixEnabled: mediaOptions === null || mediaOptions === void 0 ? void 0 : (_mediaOptions$getEdit2 = mediaOptions.getEditorFeatureFlags) === null || _mediaOptions$getEdit2 === void 0 ? void 0 : (_mediaOptions$getEdit3 = _mediaOptions$getEdit2.call(mediaOptions)) === null || _mediaOptions$getEdit3 === void 0 ? void 0 : _mediaOptions$getEdit3.commentsOnMediaBugFix,
       view: view,
       api: pluginInjectionApi,

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

@@ -14,6 +14,8 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -98,11 +100,12 @@ export class MediaPluginStateImplementation {
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
     _defineProperty(this, "insertFile", (mediaState, onMediaStateChanged, pickerType) => {
-      var _this$pluginInjection, _this$pluginInjection2, _mediaState$collectio, _this$pluginInjection3, _this$pluginInjection4;
+      var _this$pluginInjection, _this$pluginInjection2, _this$pluginInjection3, _this$pluginInjection4, _this$pluginInjection5, _mediaState$collectio, _this$pluginInjection6, _this$pluginInjection7;
       const {
         state
       } = this.view;
       const editorAnalyticsAPI = (_this$pluginInjection = this.pluginInjectionApi) === null || _this$pluginInjection === void 0 ? void 0 : (_this$pluginInjection2 = _this$pluginInjection.analytics) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.actions;
+      const isNestingInQuoteSupported = ((_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 ? void 0 : (_this$pluginInjection4 = _this$pluginInjection3.featureFlags) === null || _this$pluginInjection4 === void 0 ? void 0 : (_this$pluginInjection5 = _this$pluginInjection4.sharedState.currentState()) === null || _this$pluginInjection5 === void 0 ? void 0 : _this$pluginInjection5.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
       const mediaStateWithContext = {
         ...mediaState,
         contextId: this.contextIdentifierProvider ? this.contextIdentifierProvider.objectId : undefined
@@ -128,11 +131,11 @@ export class MediaPluginStateImplementation {
           break;
         case 'block':
           // read width state right before inserting to get up-to-date and define values
-          const widthPluginState = (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 ? void 0 : (_this$pluginInjection4 = _this$pluginInjection3.width) === null || _this$pluginInjection4 === void 0 ? void 0 : _this$pluginInjection4.sharedState.currentState();
-          insertMediaSingleNode(this.view, mediaStateWithContext, this.getInputMethod(pickerType), collection, this.mediaOptions && this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, this.onNodeInserted);
+          const widthPluginState = (_this$pluginInjection6 = this.pluginInjectionApi) === null || _this$pluginInjection6 === void 0 ? void 0 : (_this$pluginInjection7 = _this$pluginInjection6.width) === null || _this$pluginInjection7 === void 0 ? void 0 : _this$pluginInjection7.sharedState.currentState();
+          insertMediaSingleNode(this.view, mediaStateWithContext, this.getInputMethod(pickerType), collection, this.mediaOptions && this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, this.onNodeInserted, isNestingInQuoteSupported);
           break;
         case 'group':
-          insertMediaGroupNode(editorAnalyticsAPI)(this.view, [mediaStateWithContext], collection, this.getInputMethod(pickerType));
+          insertMediaGroupNode(editorAnalyticsAPI)(this.view, [mediaStateWithContext], collection, this.getInputMethod(pickerType), isNestingInQuoteSupported);
           break;
       }
 
@@ -181,6 +184,9 @@ export class MediaPluginStateImplementation {
     });
     _defineProperty(this, "showMediaPicker", () => {
       if (this.openMediaPickerBrowser) {
+        editorExperiment('add-media-from-url', false, {
+          exposure: true
+        });
         return this.openMediaPickerBrowser();
       }
       this.onPopupToggleCallback(true);
@@ -518,8 +524,8 @@ export class MediaPluginStateImplementation {
     return;
   }
   get contextIdentifierProvider() {
-    var _this$pluginInjection5, _this$pluginInjection6, _this$pluginInjection7;
-    return (_this$pluginInjection5 = this.pluginInjectionApi) === null || _this$pluginInjection5 === void 0 ? void 0 : (_this$pluginInjection6 = _this$pluginInjection5.contextIdentifier) === null || _this$pluginInjection6 === void 0 ? void 0 : (_this$pluginInjection7 = _this$pluginInjection6.sharedState.currentState()) === null || _this$pluginInjection7 === void 0 ? void 0 : _this$pluginInjection7.contextIdentifierProvider;
+    var _this$pluginInjection8, _this$pluginInjection9, _this$pluginInjection10;
+    return (_this$pluginInjection8 = this.pluginInjectionApi) === null || _this$pluginInjection8 === void 0 ? void 0 : (_this$pluginInjection9 = _this$pluginInjection8.contextIdentifier) === null || _this$pluginInjection9 === void 0 ? void 0 : (_this$pluginInjection10 = _this$pluginInjection9.sharedState.currentState()) === null || _this$pluginInjection10 === void 0 ? void 0 : _this$pluginInjection10.contextIdentifierProvider;
   }
   selectLastAddedMediaNode() {
     // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected

package/dist/es2019/ui/CommentBadge/index.js

@@ -76,7 +76,7 @@ export const CommentBadge = injectIntl(CommentBadgeWrapper);
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 
 export const CommentBadgeNextWrapper = ({

package/dist/es2019/utils/media-files.js

@@ -153,7 +153,7 @@ export const insertMediaInlineNode = editorAnalyticsAPI => (view, mediaState, co
  * @param mediaStates Media files to be added to the editor
  * @param collection Collection for the media to be added
  */
-export const insertMediaGroupNode = editorAnalyticsAPI => (view, mediaStates, collection, inputMethod) => {
+export const insertMediaGroupNode = editorAnalyticsAPI => (view, mediaStates, collection, inputMethod, isNestingInQuoteSupported) => {
   const {
     state,
     dispatch
@@ -180,6 +180,17 @@ export const insertMediaGroupNode = editorAnalyticsAPI => (view, mediaStates, co
   const withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
   let content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
   : [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
+
+  /** we only allow the insertion of media groups inside a blockquote if nesting in quotes is supported */
+  const grandParentNode = state.selection.$from.node(-1);
+  const grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+  if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+    const grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
+    safeInsert(content[0], grandparentEndPos)(tr).scrollIntoView();
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
+    dispatch(tr);
+    return;
+  }
   if (shouldSplit) {
     content = withParagraph ? content.concat(paragraph.create()) : content;
     // delete the selection or empty paragraph

package/dist/es2019/utils/media-single.js

@@ -8,6 +8,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -25,7 +26,7 @@ const getInsertMediaAnalytics = (inputMethod, fileExtension) => ({
 function shouldAddParagraph(state) {
   return atTheBeginningOfBlock(state) && !checkNodeDown(state.selection, state.doc, isEmptyParagraph);
 }
-function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, editorAnalyticsAPI) {
+function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, editorAnalyticsAPI, isNestingInQuoteSupported) {
   return function (state, dispatch) {
     const {
       tr,
@@ -45,7 +46,14 @@ function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, edito
       nodes.push(paragraph.create());
       openEnd = 1;
     }
-    if (state.selection.empty) {
+
+    /** we only allow the insertion of media singles inside a blockquote if nesting in quotes is supported */
+    const grandParentNode = state.selection.$from.node(-1);
+    const grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+    if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+      const grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
+      pmSafeInsert(nodes[0], grandparentEndPos)(tr).scrollIntoView();
+    } else if (state.selection.empty) {
       tr.insert(state.selection.from, nodes);
       // Set the cursor position at the end of the insertion
       const endPos = state.selection.from + nodes.reduce((totalSize, currNode) => totalSize + currNode.nodeSize, 0);
@@ -66,7 +74,7 @@ function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, edito
   };
 }
 export const isMediaSingle = (schema, fileMimeType) => !!schema.nodes.mediaSingle && isImage(fileMimeType);
-export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalyticsAPI) => {
+export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalyticsAPI, isNestingInQuoteSupported) => {
   var _node$attrs$width;
   const {
     state,
@@ -85,7 +93,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
     return false;
   }
   const resizeExperience = fg('platform.editor.media.extended-resize-experience');
-  const insertMediaPopup = fg('platform_editor_insert_media_plugin_phase_one');
+  const insertMediaPopup = editorExperiment('add-media-from-url', true);
   const mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
     widthType: 'pixel',
     width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),
@@ -97,7 +105,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
     inputMethod,
     fileExtension: node.attrs.__fileMimeType
   };
-  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI)(state, dispatch);
+  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
 };
 const getFileExtension = fileName => {
   if (fileName) {
@@ -106,7 +114,7 @@ const getFileExtension = fileName => {
   }
   return undefined;
 };
-export const insertMediaSingleNode = (view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted) => {
+export const insertMediaSingleNode = (view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted, isNestingInQuoteSupported) => {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -137,7 +145,7 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
     insertNodesWithOptionalParagraph([node], {
       fileExtension,
       inputMethod
-    }, editorAnalyticsAPI)(state, dispatch);
+    }, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
   } else {
     let tr = null;
     tr = safeInsert(node, state.selection.from)(state.tr);

package/dist/esm/nodeviews/mediaSingle.js

@@ -24,8 +24,7 @@ import React, { Component, Fragment, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE } from '@atlaskit/editor-common/media-single';
-import { ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
+import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, ExternalImageBadge, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { MediaSingle } from '@atlaskit/editor-common/ui';
@@ -35,6 +34,7 @@ import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/u
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import CaptionPlaceholder from '../ui/CaptionPlaceholder';
@@ -461,7 +461,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         ,
         className: MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
-      }, fg('platform_editor_insert_media_plugin_phase_one') && jsx(MediaBadges, {
+      }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
         mediaElement: currentMediaElement(),
         mediaHeight: height,
         mediaWidth: width,
@@ -478,7 +478,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
           isDrafting: isCurrentNodeDrafting,
           badgeSize: badgeSize
         }));
-      }), !fg('platform_editor_insert_media_plugin_phase_one') && commentsOnMedia && jsx(CommentBadge, {
+      }), !editorExperiment('add-media-from-url', true) && commentsOnMedia && jsx(CommentBadge, {
         commentsOnMediaBugFixEnabled: mediaOptions === null || mediaOptions === void 0 || (_mediaOptions$getEdit2 = mediaOptions.getEditorFeatureFlags) === null || _mediaOptions$getEdit2 === void 0 || (_mediaOptions$getEdit2 = _mediaOptions$getEdit2.call(mediaOptions)) === null || _mediaOptions$getEdit2 === void 0 ? void 0 : _mediaOptions$getEdit2.commentsOnMediaBugFix,
         view: view,
         api: pluginInjectionApi,

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

@@ -23,6 +23,8 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -110,9 +112,10 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
     _defineProperty(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType) {
-      var _this$pluginInjection, _mediaState$collectio, _this$pluginInjection2;
+      var _this$pluginInjection, _this$pluginInjection2, _mediaState$collectio, _this$pluginInjection3;
       var state = _this.view.state;
       var editorAnalyticsAPI = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 || (_this$pluginInjection = _this$pluginInjection.analytics) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.actions;
+      var isNestingInQuoteSupported = ((_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.featureFlags) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.sharedState.currentState()) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.nestMediaAndCodeblockInQuote) || fg('editor_nest_media_and_codeblock_in_quotes_jira');
       var mediaStateWithContext = _objectSpread(_objectSpread({}, mediaState), {}, {
         contextId: _this.contextIdentifierProvider ? _this.contextIdentifierProvider.objectId : undefined
       });
@@ -139,11 +142,11 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
           break;
         case 'block':
           // read width state right before inserting to get up-to-date and define values
-          var widthPluginState = (_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.width) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
-          insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, _this.onNodeInserted);
+          var widthPluginState = (_this$pluginInjection3 = _this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.width) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.sharedState.currentState();
+          insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, _this.onNodeInserted, isNestingInQuoteSupported);
           break;
         case 'group':
-          insertMediaGroupNode(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
+          insertMediaGroupNode(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType), isNestingInQuoteSupported);
           break;
       }
 
@@ -196,6 +199,9 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     });
     _defineProperty(this, "showMediaPicker", function () {
       if (_this.openMediaPickerBrowser) {
+        editorExperiment('add-media-from-url', false, {
+          exposure: true
+        });
         return _this.openMediaPickerBrowser();
       }
       _this.onPopupToggleCallback(true);
@@ -579,8 +585,8 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "contextIdentifierProvider",
     get: function get() {
-      var _this$pluginInjection3;
-      return (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.contextIdentifier) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.sharedState.currentState()) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.contextIdentifierProvider;
+      var _this$pluginInjection4;
+      return (_this$pluginInjection4 = this.pluginInjectionApi) === null || _this$pluginInjection4 === void 0 || (_this$pluginInjection4 = _this$pluginInjection4.contextIdentifier) === null || _this$pluginInjection4 === void 0 || (_this$pluginInjection4 = _this$pluginInjection4.sharedState.currentState()) === null || _this$pluginInjection4 === void 0 ? void 0 : _this$pluginInjection4.contextIdentifierProvider;
     }
   }, {
     key: "selectLastAddedMediaNode",

package/dist/esm/ui/CommentBadge/index.js

@@ -77,7 +77,7 @@ export var CommentBadge = injectIntl(CommentBadgeWrapper);
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 
 export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {

package/dist/esm/utils/media-files.js

@@ -140,7 +140,7 @@ export var insertMediaInlineNode = function insertMediaInlineNode(editorAnalytic
  * @param collection Collection for the media to be added
  */
 export var insertMediaGroupNode = function insertMediaGroupNode(editorAnalyticsAPI) {
-  return function (view, mediaStates, collection, inputMethod) {
+  return function (view, mediaStates, collection, inputMethod, isNestingInQuoteSupported) {
     var state = view.state,
       dispatch = view.dispatch;
     var tr = state.tr,
@@ -162,6 +162,17 @@ export var insertMediaGroupNode = function insertMediaGroupNode(editorAnalyticsA
     var withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
     var content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
     : [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
+
+    /** we only allow the insertion of media groups inside a blockquote if nesting in quotes is supported */
+    var grandParentNode = state.selection.$from.node(-1);
+    var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+    if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+      var grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
+      safeInsert(content[0], grandparentEndPos)(tr).scrollIntoView();
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
+      dispatch(tr);
+      return;
+    }
     if (shouldSplit) {
       content = withParagraph ? content.concat(paragraph.create()) : content;
       // delete the selection or empty paragraph

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

@@ -11,6 +11,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -33,6 +34,7 @@ function shouldAddParagraph(state) {
 function insertNodesWithOptionalParagraph(nodes) {
   var analyticsAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var editorAnalyticsAPI = arguments.length > 2 ? arguments[2] : undefined;
+  var isNestingInQuoteSupported = arguments.length > 3 ? arguments[3] : undefined;
   return function (state, dispatch) {
     var tr = state.tr,
       schema = state.schema;
@@ -46,7 +48,14 @@ function insertNodesWithOptionalParagraph(nodes) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
-    if (state.selection.empty) {
+
+    /** we only allow the insertion of media singles inside a blockquote if nesting in quotes is supported */
+    var grandParentNode = state.selection.$from.node(-1);
+    var grandParentNodeType = grandParentNode === null || grandParentNode === void 0 ? void 0 : grandParentNode.type.name;
+    if (grandParentNodeType === 'blockquote' && !isNestingInQuoteSupported) {
+      var grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
+      pmSafeInsert(nodes[0], grandparentEndPos)(tr).scrollIntoView();
+    } else if (state.selection.empty) {
       tr.insert(state.selection.from, nodes);
       // Set the cursor position at the end of the insertion
       var endPos = state.selection.from + nodes.reduce(function (totalSize, currNode) {
@@ -71,7 +80,7 @@ function insertNodesWithOptionalParagraph(nodes) {
 export var isMediaSingle = function isMediaSingle(schema, fileMimeType) {
   return !!schema.nodes.mediaSingle && isImage(fileMimeType);
 };
-export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, node, inputMethod, editorAnalyticsAPI) {
+export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, node, inputMethod, editorAnalyticsAPI, isNestingInQuoteSupported) {
   var _node$attrs$width;
   var state = view.state,
     dispatch = view.dispatch;
@@ -87,7 +96,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
     return false;
   }
   var resizeExperience = fg('platform.editor.media.extended-resize-experience');
-  var insertMediaPopup = fg('platform_editor_insert_media_plugin_phase_one');
+  var insertMediaPopup = editorExperiment('add-media-from-url', true);
   var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
     widthType: 'pixel',
     width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),
@@ -99,7 +108,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
     inputMethod: inputMethod,
     fileExtension: node.attrs.__fileMimeType
   };
-  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI)(state, dispatch);
+  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
 };
 var getFileExtension = function getFileExtension(fileName) {
   if (fileName) {
@@ -108,7 +117,7 @@ var getFileExtension = function getFileExtension(fileName) {
   }
   return undefined;
 };
-export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted) {
+export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted, isNestingInQuoteSupported) {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -137,7 +146,7 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
     insertNodesWithOptionalParagraph([node], {
       fileExtension: fileExtension,
       inputMethod: inputMethod
-    }, editorAnalyticsAPI)(state, dispatch);
+    }, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
   } else {
     var tr = null;
     tr = safeInsert(node, state.selection.from)(state.tr);

package/dist/types/next-plugin-type.d.ts

@@ -6,6 +6,7 @@ import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-id
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
 import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
@@ -29,7 +30,8 @@ export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
         EditorDisabledPlugin,
         FocusPlugin,
         SelectionPlugin,
-        OptionalPlugin<AnnotationPlugin>
+        OptionalPlugin<AnnotationPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     sharedState: MediaPluginState | null;
     actions: {

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

@@ -22,7 +22,7 @@ export declare const CommentBadge: React.FC<import("react-intl-next").WithIntlPr
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;

package/dist/types/utils/media-files.d.ts

@@ -18,7 +18,7 @@ export declare const insertMediaInlineNode: (editorAnalyticsAPI: EditorAnalytics
  * @param mediaStates Media files to be added to the editor
  * @param collection Collection for the media to be added
  */
-export declare const insertMediaGroupNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, mediaStates: MediaState[], collection: string, inputMethod?: InputMethodInsertMedia) => void;
+export declare const insertMediaGroupNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, mediaStates: MediaState[], collection: string, inputMethod?: InputMethodInsertMedia, isNestingInQuoteSupported?: boolean) => void;
 /**
  * Return position of media to be inserted, if it is inside a list
  * @param content Content to be inserted

package/dist/types/utils/media-single.d.ts

@@ -4,8 +4,8 @@ import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model'
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaState } from '../types';
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
-export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia) => boolean;
-export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => boolean;
-export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: ((id: string, selectionPosition: number) => void) | undefined) => boolean;
+export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, isNestingInQuoteSupported?: boolean) => boolean;
+export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingInQuoteSupported?: boolean) => boolean;
+export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: ((id: string, selectionPosition: number) => void) | undefined, isNestingInQuoteSupported?: boolean) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const isVideo: import("memoize-one").MemoizedFn<(fileType?: string) => boolean>;

package/dist/types-ts4.5/next-plugin-type.d.ts

@@ -6,6 +6,7 @@ import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-id
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
 import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
@@ -29,7 +30,8 @@ export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
         EditorDisabledPlugin,
         FocusPlugin,
         SelectionPlugin,
-        OptionalPlugin<AnnotationPlugin>
+        OptionalPlugin<AnnotationPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     sharedState: MediaPluginState | null;
     actions: {

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

@@ -22,7 +22,7 @@ export declare const CommentBadge: React.FC<import("react-intl-next").WithIntlPr
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;

package/dist/types-ts4.5/utils/media-files.d.ts

@@ -18,7 +18,7 @@ export declare const insertMediaInlineNode: (editorAnalyticsAPI: EditorAnalytics
  * @param mediaStates Media files to be added to the editor
  * @param collection Collection for the media to be added
  */
-export declare const insertMediaGroupNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, mediaStates: MediaState[], collection: string, inputMethod?: InputMethodInsertMedia) => void;
+export declare const insertMediaGroupNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (view: EditorView, mediaStates: MediaState[], collection: string, inputMethod?: InputMethodInsertMedia, isNestingInQuoteSupported?: boolean) => void;
 /**
  * Return position of media to be inserted, if it is inside a list
  * @param content Content to be inserted

package/dist/types-ts4.5/utils/media-single.d.ts

@@ -4,8 +4,8 @@ import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model'
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaState } from '../types';
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
-export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia) => boolean;
-export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => boolean;
-export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: ((id: string, selectionPosition: number) => void) | undefined) => boolean;
+export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, isNestingInQuoteSupported?: boolean) => boolean;
+export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingInQuoteSupported?: boolean) => boolean;
+export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: ((id: string, selectionPosition: number) => void) | undefined, isNestingInQuoteSupported?: boolean) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const isVideo: import("memoize-one").MemoizedFn<(fileType?: string) => boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.31.6",
+	"version": "1.31.8",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,7 +36,7 @@
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^89.1.0",
+		"@atlaskit/editor-common": "^89.2.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "1.19.6",
@@ -44,7 +44,7 @@
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^1.13.0",
-		"@atlaskit/editor-plugin-focus": "^1.3.0",
+		"@atlaskit/editor-plugin-focus": "^1.4.0",
 		"@atlaskit/editor-plugin-grid": "^1.2.0",
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",
 		"@atlaskit/editor-plugin-selection": "^1.4.0",
@@ -53,21 +53,21 @@
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/form": "^10.5.0",
-		"@atlaskit/icon": "^22.17.0",
-		"@atlaskit/media-card": "^78.3.0",
+		"@atlaskit/icon": "^22.18.0",
+		"@atlaskit/media-card": "^78.4.0",
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-client-react": "^2.2.0",
 		"@atlaskit/media-common": "^11.4.0",
 		"@atlaskit/media-filmstrip": "^47.2.0",
-		"@atlaskit/media-picker": "^66.5.0",
-		"@atlaskit/media-ui": "^25.11.0",
-		"@atlaskit/media-viewer": "^48.8.0",
+		"@atlaskit/media-picker": "^66.6.0",
+		"@atlaskit/media-ui": "^25.12.0",
+		"@atlaskit/media-viewer": "^48.9.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^12.1.0",
 		"@atlaskit/textfield": "^6.5.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.1.8",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -144,10 +144,10 @@
 		"platform-editor-a11y-image-border-options-dropdown": {
 			"type": "boolean"
 		},
-		"platform_editor_insert_media_plugin_phase_one": {
+		"platform_editor_media_batch_updates": {
 			"type": "boolean"
 		},
-		"platform_editor_media_batch_updates": {
+		"editor_nest_media_and_codeblock_in_quotes_jira": {
 			"type": "boolean"
 		}
 	},