@atlaskit/editor-plugin-media 2.3.11 → 2.3.13

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-media
 
+## 2.3.13
+
+### Patch Changes
+
+- [#130882](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130882)
+  [`df1c29f476539`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df1c29f476539) -
+  [ux] Adds a new i18n message and updates icons and tooltips on links, media and extensions.
+- Updated dependencies
+
+## 2.3.12
+
+### Patch Changes
+
+- [#128664](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/128664)
+  [`abca3266336d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/abca3266336d9) -
+  [ED-23250] Remove form element from MediaFromUrl and consolidate experiments and feature flags in
+  prepartion for jira release
+- Updated dependencies
+
 ## 2.3.11
 
 ### Patch Changes

package/dist/cjs/mediaPlugin.js

@@ -307,7 +307,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
     pluginsOptions: {
       quickInsert: function quickInsert(_ref14) {
         var formatMessage = _ref14.formatMessage;
-        return (0, _experiments.editorExperiment)('add-media-from-url', true) ? [] : [{
+        return (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') ? [] : [{
           id: 'media',
           title: formatMessage(_messages.toolbarInsertBlockMessages.mediaFiles),
           description: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),

package/dist/cjs/nodeviews/mediaSingle.js

@@ -30,7 +30,6 @@ 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("../pm-plugins/commands/captions");
 var _main = require("../pm-plugins/main");
 var _mediaCommon = require("../pm-plugins/utils/media-common");
@@ -315,7 +314,6 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var _this$props$node$firs2;
         var contextIdentifierProvider;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -334,20 +332,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
                 contextIdentifierProvider: _context3.t1
               };
               _context3.t0.setState.call(_context3.t0, _context3.t2);
-              // No-op but logging an exposure when an external image is rendered
-              // Remove this block when cleaning up platform_editor_add_media_from_url
-              if (((_this$props$node$firs2 = this.props.node.firstChild) === null || _this$props$node$firs2 === void 0 ? void 0 : _this$props$node$firs2.attrs.type) === 'external') {
-                if ((0, _experiments.editorExperiment)('add-media-from-url', true)) {
-                  (0, _experiments.editorExperiment)('add-media-from-url', true, {
-                    exposure: true
-                  });
-                } else {
-                  (0, _experiments.editorExperiment)('add-media-from-url', false, {
-                    exposure: true
-                  });
-                }
-              }
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -474,7 +459,6 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
       var shouldShowPlaceholder = mediaOptions.allowCaptions && node.childCount !== 2 && isSelected && state.selection instanceof _state.NodeSelection;
       shouldShowPlaceholder = !editorDisabled && shouldShowPlaceholder;
       var isCurrentNodeDrafting = (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (node === null || node === void 0 || (_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.attrs.id);
-      var shouldShowExternalMediaBadge = attrs.type === 'external';
       var pos = getPos();
       var isInsideTable = pos !== undefined && (0, _utils2.findParentNodeOfTypeClosestToPos)(state.doc.resolve(pos), [state.schema.nodes.table]);
       var currentMediaElement = function currentMediaElement() {
@@ -493,29 +477,24 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
         ,
         className: _styles.MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
-      }, (0, _experiments.editorExperiment)('add-media-from-url', true) && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
+      }, (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
         mediaElement: currentMediaElement(),
         mediaHeight: height,
         mediaWidth: width,
         extendedResizeOffset: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') && !isInsideTable
       }, function (_ref5) {
-        var badgeSize = _ref5.badgeSize,
-          visible = _ref5.visible;
-        return (0, _react2.jsx)(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('platform_editor_hide_external_media_badge') ? visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
-          badgeSize: badgeSize,
+        var visible = _ref5.visible;
+        return (0, _react2.jsx)(_react.default.Fragment, null, visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
           type: attrs.type,
           url: attrs.type === 'external' ? attrs.url : undefined
-        }) : shouldShowExternalMediaBadge && visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
-          badgeSize: badgeSize
         }), mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadgeNextWrapper, {
           view: view,
           api: pluginInjectionApi,
           mediaNode: node === null || node === void 0 ? void 0 : node.firstChild,
           getPos: getPos,
-          isDrafting: isCurrentNodeDrafting,
-          badgeSize: badgeSize
+          isDrafting: isCurrentNodeDrafting
         }));
-      }), !(0, _experiments.editorExperiment)('add-media-from-url', true) && mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
+      }), !(0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
         view: view,
         api: pluginInjectionApi,
         mediaNode: node === null || node === void 0 ? void 0 : node.firstChild,

package/dist/cjs/nodeviews/mediaSingleNext.js

@@ -21,7 +21,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _mediaClient = require("@atlaskit/media-client");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _captions = require("../pm-plugins/commands/captions");
 var _mediaCommon = require("../pm-plugins/utils/media-common");
 var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
@@ -288,7 +287,7 @@ var useUpdateSizeCallback = function useUpdateSizeCallback(_ref5) {
  */
 var FALLBACK_MOST_COMMON_WIDTH = 760;
 var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNextProps) {
-  var _pluginInjectionApi$m, _mediaNode$firstChild2;
+  var _pluginInjectionApi$m, _mediaNode$firstChild;
   var selected = mediaSingleNodeNextProps.selected,
     getPos = mediaSingleNodeNextProps.getPos,
     nextMediaNode = mediaSingleNodeNextProps.node,
@@ -364,22 +363,6 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
       }
     });
   }, [contextIdentifierProviderPromise]);
-  _react.default.useEffect(function () {
-    var _mediaNode$firstChild;
-    // No-op but logging an exposure when an external image is rendered
-    // Remove this block when cleaning up platform_editor_add_media_from_url
-    if (((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.type) === 'external') {
-      if ((0, _experiments.editorExperiment)('add-media-from-url', true)) {
-        (0, _experiments.editorExperiment)('add-media-from-url', true, {
-          exposure: true
-        });
-      } else {
-        (0, _experiments.editorExperiment)('add-media-from-url', false, {
-          exposure: true
-        });
-      }
-    }
-  }, [mediaNode]);
   var _ref6 = mediaNode.attrs,
     layout = _ref6.layout,
     widthType = _ref6.widthType,
@@ -454,8 +437,7 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
   }, [mediaSingleWidthAttribute, widthType, width, layout, contentWidthForLegacyExperience, containerWidth]);
   var currentMaxWidth = isSelected ? pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$m = pluginInjectionApi.media) === null || _pluginInjectionApi$m === void 0 || (_pluginInjectionApi$m = _pluginInjectionApi$m.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth : undefined;
   var contentWidth = currentMaxWidth || lineLength;
-  var isCurrentNodeDrafting = Boolean((annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (mediaNode === null || mediaNode === void 0 || (_mediaNode$firstChild2 = mediaNode.firstChild) === null || _mediaNode$firstChild2 === void 0 ? void 0 : _mediaNode$firstChild2.attrs.id));
-  var shouldShowExternalMediaBadge = childMediaNodeAttrs.type === 'external';
+  var isCurrentNodeDrafting = Boolean((annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (mediaNode === null || mediaNode === void 0 || (_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.id));
   var mediaSingleWrapperRef = /*#__PURE__*/_react.default.createRef();
   var captionPlaceHolderRef = /*#__PURE__*/_react.default.createRef();
   var onMediaSingleClicked = _react.default.useCallback(function (event) {
@@ -492,29 +474,24 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
     ,
     className: _styles.MediaSingleNodeSelector,
     onClick: onMediaSingleClicked
-  }, (0, _experiments.editorExperiment)('add-media-from-url', true) && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
+  }, (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
     mediaElement: currentMediaElement(),
     mediaHeight: height,
     mediaWidth: width,
     extendedResizeOffset: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') && !isInsideTable
   }, function (_ref7) {
-    var badgeSize = _ref7.badgeSize,
-      visible = _ref7.visible;
-    return (0, _react2.jsx)(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('platform_editor_hide_external_media_badge') ? visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
-      badgeSize: badgeSize,
+    var visible = _ref7.visible;
+    return (0, _react2.jsx)(_react.default.Fragment, null, visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
       type: childMediaNodeAttrs.type,
       url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
-    }) : shouldShowExternalMediaBadge && visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
-      badgeSize: badgeSize
     }), mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadgeNextWrapper, {
       view: view,
       api: pluginInjectionApi,
       mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
       getPos: getPos,
-      isDrafting: isCurrentNodeDrafting,
-      badgeSize: badgeSize
+      isDrafting: isCurrentNodeDrafting
     }));
-  }), !(0, _experiments.editorExperiment)('add-media-from-url', true) && mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
+  }), !(0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
     view: view,
     api: pluginInjectionApi,
     mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,

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

@@ -27,7 +27,6 @@ var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaCommon = require("@atlaskit/media-common");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _helpers = _interopRequireWildcard(require("../pm-plugins/commands/helpers"));
 var helpers = _helpers;
 var _mediaCommon2 = require("../pm-plugins/utils/media-common");
@@ -218,9 +217,6 @@ 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);

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

@@ -16,7 +16,6 @@ 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");
@@ -107,7 +106,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
     return false;
   }
   var resizeExperience = (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience');
-  var insertMediaPopup = (0, _experiments.editorExperiment)('add-media-from-url', true);
+  var insertMediaPopup = (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout');
   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),

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

@@ -85,7 +85,7 @@ var CommentBadge = exports.CommentBadge = (0, _reactIntlNext.injectIntl)(Comment
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url feature flag
+ * when clean up platform_editor_add_media_from_url_rollout feature flag
  */
 
 var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
@@ -93,8 +93,7 @@ var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function Comment
     mediaNode = _ref2.mediaNode,
     view = _ref2.view,
     getPos = _ref2.getPos,
-    isDrafting = _ref2.isDrafting,
-    badgeSize = _ref2.badgeSize;
+    isDrafting = _ref2.isDrafting;
   var _useState3 = (0, _react.useState)(false),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     entered = _useState4[0],
@@ -140,7 +139,6 @@ var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function Comment
     },
     onMouseLeave: function onMouseLeave() {
       return setEntered(false);
-    },
-    badgeSize: badgeSize
+    }
   });
 };

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

@@ -8,7 +8,7 @@ exports.RenderMediaViewer = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _mediaViewer = require("@atlaskit/media-viewer");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../../ui/toolbar/utils");
 var getIdentifier = function getIdentifier(attrs) {
   if ((0, _utils.isExternalMedia)(attrs)) {
@@ -33,7 +33,7 @@ var RenderMediaViewer = exports.RenderMediaViewer = function RenderMediaViewer(_
     selectedNodeAttrs = _ref.selectedNodeAttrs,
     _ref$items = _ref.items,
     items = _ref$items === void 0 ? [] : _ref$items;
-  if ((0, _experiments.editorExperiment)('add-media-from-url', true)) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout')) {
     var _identifier = getIdentifier(selectedNodeAttrs);
     var collectionName = (0, _utils.isExternalMedia)(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
     return /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(_mediaViewer.MediaViewer, {

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

@@ -377,17 +377,19 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           });
         } else {
           var _pluginInjectionApi$a5;
+          var inlineTitle = intl.formatMessage(_messages.mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
           var _options2 = [{
             id: 'editor.media.convert.mediainline',
-            title: inlineSwitcherTitle,
+            title: inlineTitle,
             onClick: (0, _commands3.changeMediaSingleToMediaInline)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions),
             icon: /*#__PURE__*/_react.default.createElement(_imageInline.default, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineSwitcherTitle,
+              label: inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: _card.IconInline
-            })
+            }),
+            tooltip: hasCaption ? inlineSwitcherTitle : undefined
           }, {
             id: 'editor.media.convert.mediasingle',
             title: floatingSwitcherTitle,

package/dist/es2019/mediaPlugin.js

@@ -306,7 +306,7 @@ export const mediaPlugin = ({
     pluginsOptions: {
       quickInsert: ({
         formatMessage
-      }) => editorExperiment('add-media-from-url', true) ? [] : [{
+      }) => fg('platform_editor_add_media_from_url_rollout') ? [] : [{
         id: 'media',
         title: formatMessage(messages.mediaFiles),
         description: formatMessage(messages.mediaFilesDescription),

package/dist/es2019/nodeviews/mediaSingle.js

@@ -22,7 +22,6 @@ 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 '../pm-plugins/commands/captions';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
@@ -240,7 +239,6 @@ export default class MediaSingleNode extends Component {
     }
   }
   async componentDidMount() {
-    var _this$props$node$firs2;
     const {
       contextIdentifierProvider
     } = this.props;
@@ -249,20 +247,6 @@ export default class MediaSingleNode extends Component {
     this.setState({
       contextIdentifierProvider: await contextIdentifierProvider
     });
-
-    // No-op but logging an exposure when an external image is rendered
-    // Remove this block when cleaning up platform_editor_add_media_from_url
-    if (((_this$props$node$firs2 = this.props.node.firstChild) === null || _this$props$node$firs2 === void 0 ? void 0 : _this$props$node$firs2.attrs.type) === 'external') {
-      if (editorExperiment('add-media-from-url', true)) {
-        editorExperiment('add-media-from-url', true, {
-          exposure: true
-        });
-      } else {
-        editorExperiment('add-media-from-url', false, {
-          exposure: true
-        });
-      }
-    }
   }
   render() {
     var _pluginInjectionApi$m, _pluginInjectionApi$m2, _node$firstChild;
@@ -392,7 +376,6 @@ export default class MediaSingleNode extends Component {
     let shouldShowPlaceholder = mediaOptions.allowCaptions && node.childCount !== 2 && isSelected && state.selection instanceof NodeSelection;
     shouldShowPlaceholder = !editorDisabled && shouldShowPlaceholder;
     const isCurrentNodeDrafting = (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (node === null || node === void 0 ? void 0 : (_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.attrs.id);
-    const shouldShowExternalMediaBadge = attrs.type === 'external';
     const pos = getPos();
     const isInsideTable = pos !== undefined && findParentNodeOfTypeClosestToPos(state.doc.resolve(pos), [state.schema.nodes.table]);
     const currentMediaElement = () => {
@@ -411,28 +394,23 @@ export default class MediaSingleNode extends Component {
       ,
       className: MediaSingleNodeSelector,
       onClick: this.onMediaSingleClicked
-    }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
+    }, fg('platform_editor_add_media_from_url_rollout') && jsx(MediaBadges, {
       mediaElement: currentMediaElement(),
       mediaHeight: height,
       mediaWidth: width,
       extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
     }, ({
-      badgeSize,
       visible
-    }) => jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? visible && jsx(ExternalImageBadge, {
-      badgeSize: badgeSize,
+    }) => jsx(React.Fragment, null, visible && jsx(ExternalImageBadge, {
       type: attrs.type,
       url: attrs.type === 'external' ? attrs.url : undefined
-    }) : shouldShowExternalMediaBadge && visible && jsx(ExternalImageBadge, {
-      badgeSize: badgeSize
     }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
       view: view,
       api: pluginInjectionApi,
       mediaNode: node === null || node === void 0 ? void 0 : node.firstChild,
       getPos: getPos,
-      isDrafting: isCurrentNodeDrafting,
-      badgeSize: badgeSize
-    }))), !editorExperiment('add-media-from-url', true) && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
+      isDrafting: isCurrentNodeDrafting
+    }))), !fg('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
       view: view,
       api: pluginInjectionApi,
       mediaNode: node === null || node === void 0 ? void 0 : node.firstChild,

package/dist/es2019/nodeviews/mediaSingleNext.js

@@ -16,7 +16,6 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../pm-plugins/commands/captions';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
 import { CaptionPlaceholder, CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
@@ -248,7 +247,7 @@ const useUpdateSizeCallback = ({
  */
 const FALLBACK_MOST_COMMON_WIDTH = 760;
 export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
-  var _pluginInjectionApi$m, _pluginInjectionApi$m2, _mediaNode$firstChild2;
+  var _pluginInjectionApi$m, _pluginInjectionApi$m2, _mediaNode$firstChild;
   const {
     selected,
     getPos,
@@ -319,22 +318,6 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
       }
     });
   }, [contextIdentifierProviderPromise]);
-  React.useEffect(() => {
-    var _mediaNode$firstChild;
-    // No-op but logging an exposure when an external image is rendered
-    // Remove this block when cleaning up platform_editor_add_media_from_url
-    if (((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.type) === 'external') {
-      if (editorExperiment('add-media-from-url', true)) {
-        editorExperiment('add-media-from-url', true, {
-          exposure: true
-        });
-      } else {
-        editorExperiment('add-media-from-url', false, {
-          exposure: true
-        });
-      }
-    }
-  }, [mediaNode]);
   const {
     layout,
     widthType,
@@ -415,8 +398,7 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
   }, [mediaSingleWidthAttribute, widthType, width, layout, contentWidthForLegacyExperience, containerWidth]);
   const currentMaxWidth = isSelected ? pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media) === null || _pluginInjectionApi$m === void 0 ? void 0 : (_pluginInjectionApi$m2 = _pluginInjectionApi$m.sharedState.currentState()) === null || _pluginInjectionApi$m2 === void 0 ? void 0 : _pluginInjectionApi$m2.currentMaxWidth : undefined;
   const contentWidth = currentMaxWidth || lineLength;
-  const isCurrentNodeDrafting = Boolean((annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (mediaNode === null || mediaNode === void 0 ? void 0 : (_mediaNode$firstChild2 = mediaNode.firstChild) === null || _mediaNode$firstChild2 === void 0 ? void 0 : _mediaNode$firstChild2.attrs.id));
-  const shouldShowExternalMediaBadge = childMediaNodeAttrs.type === 'external';
+  const isCurrentNodeDrafting = Boolean((annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (mediaNode === null || mediaNode === void 0 ? void 0 : (_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.id));
   const mediaSingleWrapperRef = /*#__PURE__*/React.createRef();
   const captionPlaceHolderRef = /*#__PURE__*/React.createRef();
   const onMediaSingleClicked = React.useCallback(event => {
@@ -453,28 +435,23 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
     ,
     className: MediaSingleNodeSelector,
     onClick: onMediaSingleClicked
-  }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
+  }, fg('platform_editor_add_media_from_url_rollout') && jsx(MediaBadges, {
     mediaElement: currentMediaElement(),
     mediaHeight: height,
     mediaWidth: width,
     extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
   }, ({
-    badgeSize,
     visible
-  }) => jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? visible && jsx(ExternalImageBadge, {
-    badgeSize: badgeSize,
+  }) => jsx(React.Fragment, null, visible && jsx(ExternalImageBadge, {
     type: childMediaNodeAttrs.type,
     url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
-  }) : shouldShowExternalMediaBadge && visible && jsx(ExternalImageBadge, {
-    badgeSize: badgeSize
   }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
     view: view,
     api: pluginInjectionApi,
     mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
     getPos: getPos,
-    isDrafting: isCurrentNodeDrafting,
-    badgeSize: badgeSize
-  }))), !editorExperiment('add-media-from-url', true) && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
+    isDrafting: isCurrentNodeDrafting
+  }))), !fg('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
     view: view,
     api: pluginInjectionApi,
     mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,

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

@@ -15,7 +15,6 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
@@ -190,9 +189,6 @@ export class MediaPluginStateImplementation {
     });
     _defineProperty(this, "showMediaPicker", () => {
       if (this.openMediaPickerBrowser) {
-        editorExperiment('add-media-from-url', false, {
-          exposure: true
-        });
         return this.openMediaPickerBrowser();
       }
       this.onPopupToggleCallback(true);

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

@@ -8,7 +8,6 @@ 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, isInsidePotentialEmptyParagraph } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -100,7 +99,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
     return false;
   }
   const resizeExperience = fg('platform_editor_media_extended_resize_experience');
-  const insertMediaPopup = editorExperiment('add-media-from-url', true);
+  const insertMediaPopup = fg('platform_editor_add_media_from_url_rollout');
   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),

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

@@ -74,7 +74,7 @@ export const CommentBadge = injectIntl(CommentBadgeWrapper);
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url feature flag
+ * when clean up platform_editor_add_media_from_url_rollout feature flag
  */
 
 export const CommentBadgeNextWrapper = ({
@@ -82,8 +82,7 @@ export const CommentBadgeNextWrapper = ({
   mediaNode,
   view,
   getPos,
-  isDrafting,
-  badgeSize
+  isDrafting
 }) => {
   const [entered, setEntered] = useState(false);
   const {
@@ -129,7 +128,6 @@ export const CommentBadgeNextWrapper = ({
     mediaSingleElement: mediaSingleElement,
     status: entered ? 'entered' : status,
     onMouseEnter: () => setEntered(true),
-    onMouseLeave: () => setEntered(false),
-    badgeSize: badgeSize
+    onMouseLeave: () => setEntered(false)
   });
 };

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { MediaViewer } from '@atlaskit/media-viewer';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isExternalMedia } from '../../ui/toolbar/utils';
 const getIdentifier = attrs => {
   if (isExternalMedia(attrs)) {
@@ -27,7 +27,7 @@ export const RenderMediaViewer = ({
   selectedNodeAttrs,
   items = []
 }) => {
-  if (editorExperiment('add-media-from-url', true)) {
+  if (fg('platform_editor_add_media_from_url_rollout')) {
     const identifier = getIdentifier(selectedNodeAttrs);
     const collectionName = isExternalMedia(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
     return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(MediaViewer, {

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

@@ -364,17 +364,19 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
           });
         } else {
           var _pluginInjectionApi$a5;
+          const inlineTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
           const options = [{
             id: 'editor.media.convert.mediainline',
-            title: inlineSwitcherTitle,
+            title: inlineTitle,
             onClick: changeMediaSingleToMediaInline(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions),
             icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineSwitcherTitle,
+              label: inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconInline
-            })
+            }),
+            tooltip: hasCaption ? inlineSwitcherTitle : undefined
           }, {
             id: 'editor.media.convert.mediasingle',
             title: floatingSwitcherTitle,

package/dist/esm/mediaPlugin.js

@@ -297,7 +297,7 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
     pluginsOptions: {
       quickInsert: function quickInsert(_ref14) {
         var formatMessage = _ref14.formatMessage;
-        return editorExperiment('add-media-from-url', true) ? [] : [{
+        return fg('platform_editor_add_media_from_url_rollout') ? [] : [{
           id: 'media',
           title: formatMessage(messages.mediaFiles),
           description: formatMessage(messages.mediaFilesDescription),

package/dist/esm/nodeviews/mediaSingle.js

@@ -35,7 +35,6 @@ 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 '../pm-plugins/commands/captions';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
@@ -309,7 +308,6 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var _this$props$node$firs2;
         var contextIdentifierProvider;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -328,20 +326,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
                 contextIdentifierProvider: _context3.t1
               };
               _context3.t0.setState.call(_context3.t0, _context3.t2);
-              // No-op but logging an exposure when an external image is rendered
-              // Remove this block when cleaning up platform_editor_add_media_from_url
-              if (((_this$props$node$firs2 = this.props.node.firstChild) === null || _this$props$node$firs2 === void 0 ? void 0 : _this$props$node$firs2.attrs.type) === 'external') {
-                if (editorExperiment('add-media-from-url', true)) {
-                  editorExperiment('add-media-from-url', true, {
-                    exposure: true
-                  });
-                } else {
-                  editorExperiment('add-media-from-url', false, {
-                    exposure: true
-                  });
-                }
-              }
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -468,7 +453,6 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       var shouldShowPlaceholder = mediaOptions.allowCaptions && node.childCount !== 2 && isSelected && state.selection instanceof NodeSelection;
       shouldShowPlaceholder = !editorDisabled && shouldShowPlaceholder;
       var isCurrentNodeDrafting = (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (node === null || node === void 0 || (_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.attrs.id);
-      var shouldShowExternalMediaBadge = attrs.type === 'external';
       var pos = getPos();
       var isInsideTable = pos !== undefined && findParentNodeOfTypeClosestToPos(state.doc.resolve(pos), [state.schema.nodes.table]);
       var currentMediaElement = function currentMediaElement() {
@@ -487,29 +471,24 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         ,
         className: MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
-      }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
+      }, fg('platform_editor_add_media_from_url_rollout') && jsx(MediaBadges, {
         mediaElement: currentMediaElement(),
         mediaHeight: height,
         mediaWidth: width,
         extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
       }, function (_ref5) {
-        var badgeSize = _ref5.badgeSize,
-          visible = _ref5.visible;
-        return jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? visible && jsx(ExternalImageBadge, {
-          badgeSize: badgeSize,
+        var visible = _ref5.visible;
+        return jsx(React.Fragment, null, visible && jsx(ExternalImageBadge, {
           type: attrs.type,
           url: attrs.type === 'external' ? attrs.url : undefined
-        }) : shouldShowExternalMediaBadge && visible && jsx(ExternalImageBadge, {
-          badgeSize: badgeSize
         }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
           view: view,
           api: pluginInjectionApi,
           mediaNode: node === null || node === void 0 ? void 0 : node.firstChild,
           getPos: getPos,
-          isDrafting: isCurrentNodeDrafting,
-          badgeSize: badgeSize
+          isDrafting: isCurrentNodeDrafting
         }));
-      }), !editorExperiment('add-media-from-url', true) && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
+      }), !fg('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
         view: view,
         api: pluginInjectionApi,
         mediaNode: node === null || node === void 0 ? void 0 : node.firstChild,

package/dist/esm/nodeviews/mediaSingleNext.js

@@ -22,7 +22,6 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../pm-plugins/commands/captions';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
 import { CaptionPlaceholder, CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
@@ -281,7 +280,7 @@ var useUpdateSizeCallback = function useUpdateSizeCallback(_ref5) {
  */
 var FALLBACK_MOST_COMMON_WIDTH = 760;
 export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNextProps) {
-  var _pluginInjectionApi$m, _mediaNode$firstChild2;
+  var _pluginInjectionApi$m, _mediaNode$firstChild;
   var selected = mediaSingleNodeNextProps.selected,
     getPos = mediaSingleNodeNextProps.getPos,
     nextMediaNode = mediaSingleNodeNextProps.node,
@@ -357,22 +356,6 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
       }
     });
   }, [contextIdentifierProviderPromise]);
-  React.useEffect(function () {
-    var _mediaNode$firstChild;
-    // No-op but logging an exposure when an external image is rendered
-    // Remove this block when cleaning up platform_editor_add_media_from_url
-    if (((_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.type) === 'external') {
-      if (editorExperiment('add-media-from-url', true)) {
-        editorExperiment('add-media-from-url', true, {
-          exposure: true
-        });
-      } else {
-        editorExperiment('add-media-from-url', false, {
-          exposure: true
-        });
-      }
-    }
-  }, [mediaNode]);
   var _ref6 = mediaNode.attrs,
     layout = _ref6.layout,
     widthType = _ref6.widthType,
@@ -447,8 +430,7 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
   }, [mediaSingleWidthAttribute, widthType, width, layout, contentWidthForLegacyExperience, containerWidth]);
   var currentMaxWidth = isSelected ? pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$m = pluginInjectionApi.media) === null || _pluginInjectionApi$m === void 0 || (_pluginInjectionApi$m = _pluginInjectionApi$m.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth : undefined;
   var contentWidth = currentMaxWidth || lineLength;
-  var isCurrentNodeDrafting = Boolean((annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (mediaNode === null || mediaNode === void 0 || (_mediaNode$firstChild2 = mediaNode.firstChild) === null || _mediaNode$firstChild2 === void 0 ? void 0 : _mediaNode$firstChild2.attrs.id));
-  var shouldShowExternalMediaBadge = childMediaNodeAttrs.type === 'external';
+  var isCurrentNodeDrafting = Boolean((annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.isDrafting) && (annotationPluginState === null || annotationPluginState === void 0 ? void 0 : annotationPluginState.targetNodeId) === (mediaNode === null || mediaNode === void 0 || (_mediaNode$firstChild = mediaNode.firstChild) === null || _mediaNode$firstChild === void 0 ? void 0 : _mediaNode$firstChild.attrs.id));
   var mediaSingleWrapperRef = /*#__PURE__*/React.createRef();
   var captionPlaceHolderRef = /*#__PURE__*/React.createRef();
   var onMediaSingleClicked = React.useCallback(function (event) {
@@ -485,29 +467,24 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     ,
     className: MediaSingleNodeSelector,
     onClick: onMediaSingleClicked
-  }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
+  }, fg('platform_editor_add_media_from_url_rollout') && jsx(MediaBadges, {
     mediaElement: currentMediaElement(),
     mediaHeight: height,
     mediaWidth: width,
     extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
   }, function (_ref7) {
-    var badgeSize = _ref7.badgeSize,
-      visible = _ref7.visible;
-    return jsx(React.Fragment, null, fg('platform_editor_hide_external_media_badge') ? visible && jsx(ExternalImageBadge, {
-      badgeSize: badgeSize,
+    var visible = _ref7.visible;
+    return jsx(React.Fragment, null, visible && jsx(ExternalImageBadge, {
       type: childMediaNodeAttrs.type,
       url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
-    }) : shouldShowExternalMediaBadge && visible && jsx(ExternalImageBadge, {
-      badgeSize: badgeSize
     }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
       view: view,
       api: pluginInjectionApi,
       mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
       getPos: getPos,
-      isDrafting: isCurrentNodeDrafting,
-      badgeSize: badgeSize
+      isDrafting: isCurrentNodeDrafting
     }));
-  }), !editorExperiment('add-media-from-url', true) && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
+  }), !fg('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
     view: view,
     api: pluginInjectionApi,
     mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,

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

@@ -24,7 +24,6 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
@@ -209,9 +208,6 @@ 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);

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

@@ -11,7 +11,6 @@ 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, isInsidePotentialEmptyParagraph } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -100,7 +99,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
     return false;
   }
   var resizeExperience = fg('platform_editor_media_extended_resize_experience');
-  var insertMediaPopup = editorExperiment('add-media-from-url', true);
+  var insertMediaPopup = fg('platform_editor_add_media_from_url_rollout');
   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),

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

@@ -75,7 +75,7 @@ export var CommentBadge = injectIntl(CommentBadgeWrapper);
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url feature flag
+ * when clean up platform_editor_add_media_from_url_rollout feature flag
  */
 
 export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
@@ -83,8 +83,7 @@ export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
     mediaNode = _ref2.mediaNode,
     view = _ref2.view,
     getPos = _ref2.getPos,
-    isDrafting = _ref2.isDrafting,
-    badgeSize = _ref2.badgeSize;
+    isDrafting = _ref2.isDrafting;
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     entered = _useState4[0],
@@ -130,7 +129,6 @@ export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
     },
     onMouseLeave: function onMouseLeave() {
       return setEntered(false);
-    },
-    badgeSize: badgeSize
+    }
   });
 };

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { MediaViewer } from '@atlaskit/media-viewer';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isExternalMedia } from '../../ui/toolbar/utils';
 var getIdentifier = function getIdentifier(attrs) {
   if (isExternalMedia(attrs)) {
@@ -26,7 +26,7 @@ export var RenderMediaViewer = function RenderMediaViewer(_ref) {
     selectedNodeAttrs = _ref.selectedNodeAttrs,
     _ref$items = _ref.items,
     items = _ref$items === void 0 ? [] : _ref$items;
-  if (editorExperiment('add-media-from-url', true)) {
+  if (fg('platform_editor_add_media_from_url_rollout')) {
     var _identifier = getIdentifier(selectedNodeAttrs);
     var collectionName = isExternalMedia(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
     return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(MediaViewer, {

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

@@ -367,17 +367,19 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           });
         } else {
           var _pluginInjectionApi$a5;
+          var inlineTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
           var _options2 = [{
             id: 'editor.media.convert.mediainline',
-            title: inlineSwitcherTitle,
+            title: inlineTitle,
             onClick: changeMediaSingleToMediaInline(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions),
             icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineSwitcherTitle,
+              label: inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconInline
-            })
+            }),
+            tooltip: hasCaption ? inlineSwitcherTitle : undefined
           }, {
             id: 'editor.media.convert.mediasingle',
             title: floatingSwitcherTitle,

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

@@ -21,7 +21,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_add_media_from_url feature flag
+ * when clean up platform_editor_add_media_from_url_rollout feature flag
  */
 type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;
@@ -31,7 +31,6 @@ type CommentBadgeNextWrapperProps = {
     mediaNode: PMNode | null;
     view: EditorView;
     getPos: getPosHandler;
-    badgeSize: 'small' | 'medium';
 };
-export declare const CommentBadgeNextWrapper: ({ api, mediaNode, view, getPos, isDrafting, badgeSize, }: CommentBadgeNextWrapperProps) => React.JSX.Element | null;
+export declare const CommentBadgeNextWrapper: ({ api, mediaNode, view, getPos, isDrafting, }: CommentBadgeNextWrapperProps) => React.JSX.Element | null;
 export {};

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

@@ -21,7 +21,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_add_media_from_url feature flag
+ * when clean up platform_editor_add_media_from_url_rollout feature flag
  */
 type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;
@@ -31,7 +31,6 @@ type CommentBadgeNextWrapperProps = {
     mediaNode: PMNode | null;
     view: EditorView;
     getPos: getPosHandler;
-    badgeSize: 'small' | 'medium';
 };
-export declare const CommentBadgeNextWrapper: ({ api, mediaNode, view, getPos, isDrafting, badgeSize, }: CommentBadgeNextWrapperProps) => React.JSX.Element | null;
+export declare const CommentBadgeNextWrapper: ({ api, mediaNode, view, getPos, isDrafting, }: CommentBadgeNextWrapperProps) => React.JSX.Element | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "2.3.11",
+	"version": "2.3.13",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,7 +38,7 @@
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^21.1.0",
-		"@atlaskit/editor-common": "^102.12.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-annotation": "^2.1.0",
@@ -69,7 +69,7 @@
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.3.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -150,9 +150,6 @@
 		"confluence_frontend_media_scroll_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_hide_external_media_badge": {
-			"type": "boolean"
-		},
 		"platform_editor_media_block_default": {
 			"type": "boolean"
 		},
@@ -165,6 +162,9 @@
 		"platform_editor_safari_media_clipboard_fix": {
 			"type": "boolean"
 		},
+		"platform_editor_add_media_from_url_rollout": {
+			"type": "boolean"
+		},
 		"platform_editor_render_media_viewer_as_inline": {
 			"type": "boolean"
 		}