@atlaskit/editor-plugin-media 8.1.4 → 8.2.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-media
 
+## 8.2.0
+
+### Minor Changes
+
+- [`5167552fe1a93`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5167552fe1a93) -
+  [EDITOR-2339] Bump @atlaskit/adf-schema to 51.3.0
+
+### Patch Changes
+
+- [`2bdec5e9ec1c9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2bdec5e9ec1c9) -
+  [EDITOR-442] Cleans up FG platform_editor_add_media_from_url_rollout
+- Updated dependencies
+
+## 8.1.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.1.4
 
 ### Patch Changes

package/dist/cjs/mediaPlugin.js

@@ -7,10 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mediaPlugin = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _mediaCommon = require("@atlaskit/media-common");
@@ -326,33 +323,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
     pluginsOptions: {
       quickInsert: function quickInsert(_ref12) {
         var formatMessage = _ref12.formatMessage;
-        return (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') || options !== null && options !== void 0 && options.disableQuickInsert ? [] : [{
-          id: 'media',
-          title: formatMessage(_messages.toolbarInsertBlockMessages.mediaFiles),
-          description: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
-          priority: 400,
-          keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video', 'file'],
-          icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconImages, null);
-          },
-          isDisabledOffline: true,
-          action: function action(insert, state) {
-            var _api$analytics4;
-            var pluginState = _pluginKey.stateKey.getState(state);
-            pluginState === null || pluginState === void 0 || pluginState.showMediaPicker();
-            var tr = insert('');
-            api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || _api$analytics4.actions.attachAnalyticsEvent({
-              action: _analytics.ACTION.OPENED,
-              actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_CLOUD,
-              attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: _analytics.EVENT_TYPE.UI
-            })(tr);
-            return tr;
-          }
-        }];
+        return [];
       },
       floatingToolbar: function floatingToolbar(state, intl, providerFactory) {
         var _api$editorViewMode;

package/dist/cjs/nodeviews/mediaSingleNext.js

@@ -396,15 +396,6 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
     var disabledNode = !!(0, _utils2.findParentNodeOfTypeClosestToPos)($pos, [table]);
     return Boolean(result && !disabledNode);
   }, [mediaOptions, pos, view, editorDisabled, editorViewMode]);
-  var badgeOffsetRight = _react.default.useMemo(function () {
-    if (typeof pos !== 'number') {
-      return undefined;
-    }
-    var $pos = view.state.doc.resolve(pos);
-    var table = view.state.schema.nodes.table;
-    var foundTableNode = (0, _utils2.findParentNodeOfTypeClosestToPos)($pos, [table]);
-    return foundTableNode ? '2px' : '14px';
-  }, [pos, view]);
   var shouldShowPlaceholder = _react.default.useMemo(function () {
     var result = mediaOptions.allowCaptions && mediaNode.childCount !== 2 && isSelected && view.state.selection instanceof _state.NodeSelection;
     return !editorDisabled && result;
@@ -474,7 +465,7 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
     ,
     className: _styles.MediaSingleNodeSelector,
     onClick: onMediaSingleClicked
-  }, (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout') && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
+  }, (0, _react2.jsx)(_mediaSingle.MediaBadges, {
     mediaElement: currentMediaElement(),
     mediaHeight: height,
     mediaWidth: width,
@@ -484,20 +475,13 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
     return (0, _react2.jsx)(_react.default.Fragment, null, visible && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
       type: childMediaNodeAttrs.type,
       url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
-    }), mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadgeNextWrapper, {
+    }), mediaOptions.allowCommentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadgeWrapper, {
       view: view,
       api: pluginInjectionApi,
       mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
       getPos: getPos,
       isDrafting: isCurrentNodeDrafting
     }));
-  }), !(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,
-    badgeOffsetRight: badgeOffsetRight,
-    getPos: getPos,
-    isDrafting: isCurrentNodeDrafting
   }), (0, _react2.jsx)("div", {
     ref: forwardRef
   }), shouldShowPlaceholder && ((0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? (0, _react2.jsx)(_CaptionPlaceholder.CaptionPlaceholderButton

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

@@ -14,7 +14,6 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _mediaCommon = require("../utils/media-common");
 var _analytics2 = require("./analytics");
 var _isType = require("./is-type");
@@ -95,8 +94,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
   if (node.type !== media || !(0, _isType.isImage)(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
     return false;
   }
-  var insertMediaPopup = (0, _platformFeatureFlags.fg)('platform_editor_add_media_from_url_rollout');
-  var mediaSingleAttrs = allowPixelResizing && insertMediaPopup ? {
+  var mediaSingleAttrs = allowPixelResizing ? {
     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),
     layout: 'center'

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

@@ -5,10 +5,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CommentBadgeNextWrapper = exports.CommentBadge = void 0;
+exports.CommentBadgeWrapper = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
@@ -21,22 +20,20 @@ var selector = function selector(states) {
     annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
 };
-var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
+var CommentBadgeWrapper = exports.CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
   var api = _ref.api,
     mediaNode = _ref.mediaNode,
     view = _ref.view,
     getPos = _ref.getPos,
-    intl = _ref.intl,
-    isDrafting = _ref.isDrafting,
-    badgeOffsetRight = _ref.badgeOffsetRight;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector),
-    selectedAnnotations = _useSharedPluginState.selectedAnnotations,
-    isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
-    annotations = _useSharedPluginState.annotations;
+    isDrafting = _ref.isDrafting;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     entered = _useState2[0],
     setEntered = _useState2[1];
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector),
+    selectedAnnotations = _useSharedPluginState.selectedAnnotations,
+    isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
+    annotations = _useSharedPluginState.annotations;
   var _view$state$schema = view.state.schema,
     media = _view$state$schema.nodes.media,
     annotation = _view$state$schema.marks.annotation,
@@ -65,80 +62,6 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-
-  /**
-   * After performing certain operations like drag and drop,
-   * the position may momentarily shift. It will NOT always be an HTML element;
-   * it could also be plain text.
-   */
-  var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
-  var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
-  return /*#__PURE__*/_react.default.createElement(_mediaSingle.CommentBadge, {
-    badgeOffsetRight: badgeOffsetRight,
-    width: mediaNode.attrs.width,
-    height: mediaNode.attrs.height,
-    onClick: onClick,
-    mediaSingleElement: mediaSingleElement,
-    intl: intl,
-    status: entered ? 'entered' : status,
-    onMouseEnter: function onMouseEnter() {
-      return setEntered(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      return setEntered(false);
-    }
-  });
-};
-var CommentBadge = exports.CommentBadge = (0, _reactIntlNext.injectIntl)(CommentBadgeWrapper);
-
-/**
- * Remove CommentBadgeWrapper component above
- * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url_rollout feature flag
- */
-
-var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
-  var api = _ref2.api,
-    mediaNode = _ref2.mediaNode,
-    view = _ref2.view,
-    getPos = _ref2.getPos,
-    isDrafting = _ref2.isDrafting;
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    entered = _useState4[0],
-    setEntered = _useState4[1];
-  var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector),
-    selectedAnnotations = _useSharedPluginState2.selectedAnnotations,
-    isInlineCommentViewClosed = _useSharedPluginState2.isInlineCommentViewClosed,
-    annotations = _useSharedPluginState2.annotations;
-  var _view$state$schema2 = view.state.schema,
-    media = _view$state$schema2.nodes.media,
-    annotation = _view$state$schema2.marks.annotation,
-    state = view.state,
-    dispatch = view.dispatch;
-  var status = (0, _react.useMemo)(function () {
-    if (!selectedAnnotations || !mediaNode) {
-      return 'default';
-    }
-    return selectedAnnotations.some(function (annotation) {
-      return !!mediaNode.marks.find(function (mark) {
-        return mark.attrs.id === annotation.id;
-      });
-    }) && !isInlineCommentViewClosed ? 'active' : 'default';
-  }, [selectedAnnotations, isInlineCommentViewClosed, mediaNode]);
-  var onClick = (0, _react.useCallback)(function () {
-    if (api.annotation && mediaNode) {
-      var showCommentForBlockNode = api.annotation.actions.showCommentForBlockNode;
-      showCommentForBlockNode(mediaNode, _analytics.VIEW_METHOD.BADGE)(state, dispatch);
-    }
-  }, [api.annotation, dispatch, mediaNode, state]);
-  var pos = getPos();
-  var hasNoComments = !Number.isFinite(pos) || !annotations || !mediaNode || mediaNode.type !== media || mediaNode.marks.every(function (maybeAnnotation) {
-    return maybeAnnotation.type !== annotation || !(maybeAnnotation.attrs.id in annotations) || annotations[maybeAnnotation.attrs.id];
-  });
-  if (!isDrafting && hasNoComments || !mediaNode) {
-    return null;
-  }
   var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
   var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/_react.default.createElement(_mediaSingle.CommentBadgeNext, {

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

@@ -8,7 +8,6 @@ exports.RenderMediaViewer = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _mediaViewer = require("@atlaskit/media-viewer");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../../ui/toolbar/utils");
 var getIdentifier = function getIdentifier(attrs) {
   if ((0, _utils.isExternalMedia)(attrs)) {
@@ -33,32 +32,11 @@ var RenderMediaViewer = exports.RenderMediaViewer = function RenderMediaViewer(_
     selectedNodeAttrs = _ref.selectedNodeAttrs,
     _ref$items = _ref.items,
     items = _ref$items === void 0 ? [] : _ref$items;
-  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, {
-      collectionName: collectionName,
-      items: items
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ,
-      mediaClientConfig: mediaClientConfig,
-      selectedItem: _identifier,
-      onClose: onClose
-    }), document.body);
-  }
-  var _ref2 = selectedNodeAttrs,
-    id = _ref2.id,
-    _ref2$collection = _ref2.collection,
-    collection = _ref2$collection === void 0 ? '' : _ref2$collection;
-  var identifier = {
-    id: id,
-    mediaItemType: 'file',
-    collectionName: collection
-  };
+  var identifier = getIdentifier(selectedNodeAttrs);
+  var collectionName = (0, _utils.isExternalMedia)(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
   return /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(_mediaViewer.MediaViewer, {
-    collectionName: collection,
-    items: []
+    collectionName: collectionName,
+    items: items
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ,

package/dist/es2019/mediaPlugin.js

@@ -1,8 +1,5 @@
 import React, { useMemo } from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { IconImages } from '@atlaskit/editor-common/quick-insert';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
@@ -325,31 +322,7 @@ export const mediaPlugin = ({
     pluginsOptions: {
       quickInsert: ({
         formatMessage
-      }) => fg('platform_editor_add_media_from_url_rollout') || options !== null && options !== void 0 && options.disableQuickInsert ? [] : [{
-        id: 'media',
-        title: formatMessage(messages.mediaFiles),
-        description: formatMessage(messages.mediaFilesDescription),
-        priority: 400,
-        keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video', 'file'],
-        icon: () => /*#__PURE__*/React.createElement(IconImages, null),
-        isDisabledOffline: true,
-        action(insert, state) {
-          var _api$analytics4;
-          const pluginState = stateKey.getState(state);
-          pluginState === null || pluginState === void 0 ? void 0 : pluginState.showMediaPicker();
-          const tr = insert('');
-          api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions.attachAnalyticsEvent({
-            action: ACTION.OPENED,
-            actionSubject: ACTION_SUBJECT.PICKER,
-            actionSubjectId: ACTION_SUBJECT_ID.PICKER_CLOUD,
-            attributes: {
-              inputMethod: INPUT_METHOD.QUICK_INSERT
-            },
-            eventType: EVENT_TYPE.UI
-          })(tr);
-          return tr;
-        }
-      }],
+      }) => [],
       floatingToolbar: (state, intl, providerFactory) => {
         var _api$editorViewMode, _api$editorViewMode$s;
         return floatingToolbar(state, intl, {

package/dist/es2019/nodeviews/mediaSingleNext.js

@@ -19,7 +19,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../pm-plugins/commands/captions';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
 import { CaptionPlaceholder, CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
-import { CommentBadge, CommentBadgeNextWrapper } from '../ui/CommentBadge';
+import { CommentBadgeWrapper } from '../ui/CommentBadge';
 import ResizableMediaSingle from '../ui/ResizableMediaSingle';
 import ResizableMediaSingleNext from '../ui/ResizableMediaSingle/ResizableMediaSingleNext';
 import { hasPrivateAttrsChanged } from './helpers';
@@ -356,17 +356,6 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
     const disabledNode = !!findParentNodeOfTypeClosestToPos($pos, [table]);
     return Boolean(result && !disabledNode);
   }, [mediaOptions, pos, view, editorDisabled, editorViewMode]);
-  const badgeOffsetRight = React.useMemo(() => {
-    if (typeof pos !== 'number') {
-      return undefined;
-    }
-    const $pos = view.state.doc.resolve(pos);
-    const {
-      table
-    } = view.state.schema.nodes;
-    const foundTableNode = findParentNodeOfTypeClosestToPos($pos, [table]);
-    return foundTableNode ? '2px' : '14px';
-  }, [pos, view]);
   const shouldShowPlaceholder = React.useMemo(() => {
     const result = mediaOptions.allowCaptions && mediaNode.childCount !== 2 && isSelected && view.state.selection instanceof NodeSelection;
     return !editorDisabled && result;
@@ -436,7 +425,7 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
     ,
     className: MediaSingleNodeSelector,
     onClick: onMediaSingleClicked
-  }, fg('platform_editor_add_media_from_url_rollout') && jsx(MediaBadges, {
+  }, jsx(MediaBadges, {
     mediaElement: currentMediaElement(),
     mediaHeight: height,
     mediaWidth: width,
@@ -446,20 +435,13 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
   }) => jsx(React.Fragment, null, visible && jsx(ExternalImageBadge, {
     type: childMediaNodeAttrs.type,
     url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
-  }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
-    view: view,
-    api: pluginInjectionApi,
-    mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
-    getPos: getPos,
-    isDrafting: isCurrentNodeDrafting
-  }))), !fg('platform_editor_add_media_from_url_rollout') && mediaOptions.allowCommentsOnMedia && jsx(CommentBadge, {
+  }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeWrapper, {
     view: view,
     api: pluginInjectionApi,
     mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
-    badgeOffsetRight: badgeOffsetRight,
     getPos: getPos,
     isDrafting: isCurrentNodeDrafting
-  }), jsx("div", {
+  }))), jsx("div", {
     ref: forwardRef
   }), shouldShowPlaceholder && (fg('platform_editor_typography_ugc') ? jsx(CaptionPlaceholderButton
   // platform_editor_typography_ugc clean up

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

@@ -6,7 +6,6 @@ import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
 import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -88,8 +87,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
   if (node.type !== media || !isImage(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
     return false;
   }
-  const insertMediaPopup = fg('platform_editor_add_media_from_url_rollout');
-  const mediaSingleAttrs = allowPixelResizing && insertMediaPopup ? {
+  const mediaSingleAttrs = allowPixelResizing ? {
     widthType: 'pixel',
     width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),
     layout: 'center'

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

@@ -1,8 +1,7 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { injectIntl } from 'react-intl-next';
 import { VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { CommentBadge as CommentBadgeComponent, CommentBadgeNext } from '@atlaskit/editor-common/media-single';
+import { CommentBadgeNext } from '@atlaskit/editor-common/media-single';
 const selector = states => {
   var _states$annotationSta, _states$annotationSta2, _states$annotationSta3;
   return {
@@ -11,83 +10,7 @@ const selector = states => {
     annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
 };
-const CommentBadgeWrapper = ({
-  api,
-  mediaNode,
-  view,
-  getPos,
-  intl,
-  isDrafting,
-  badgeOffsetRight
-}) => {
-  const {
-    selectedAnnotations,
-    isInlineCommentViewClosed,
-    annotations
-  } = useSharedPluginStateWithSelector(api, ['annotation'], selector);
-  const [entered, setEntered] = useState(false);
-  const {
-    state: {
-      schema: {
-        nodes: {
-          media
-        },
-        marks: {
-          annotation
-        }
-      }
-    },
-    state,
-    dispatch
-  } = view;
-  const status = useMemo(() => {
-    if (!selectedAnnotations || !mediaNode) {
-      return 'default';
-    }
-    return selectedAnnotations.some(annotation => !!mediaNode.marks.find(mark => mark.attrs.id === annotation.id)) && !isInlineCommentViewClosed ? 'active' : 'default';
-  }, [selectedAnnotations, isInlineCommentViewClosed, mediaNode]);
-  const onClick = useCallback(() => {
-    if (api.annotation && mediaNode) {
-      const {
-        showCommentForBlockNode
-      } = api.annotation.actions;
-      showCommentForBlockNode(mediaNode, VIEW_METHOD.BADGE)(state, dispatch);
-    }
-  }, [api.annotation, dispatch, mediaNode, state]);
-  const pos = getPos();
-  const hasNoComments = !Number.isFinite(pos) || !annotations || !mediaNode || mediaNode.type !== media || mediaNode.marks.every(maybeAnnotation => maybeAnnotation.type !== annotation || !(maybeAnnotation.attrs.id in annotations) || annotations[maybeAnnotation.attrs.id]);
-  if (!isDrafting && hasNoComments || !mediaNode) {
-    return null;
-  }
-
-  /**
-   * After performing certain operations like drag and drop,
-   * the position may momentarily shift. It will NOT always be an HTML element;
-   * it could also be plain text.
-   */
-  const maybeMediaSingleElement = view.domAtPos(pos + 1).node;
-  const mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
-  return /*#__PURE__*/React.createElement(CommentBadgeComponent, {
-    badgeOffsetRight: badgeOffsetRight,
-    width: mediaNode.attrs.width,
-    height: mediaNode.attrs.height,
-    onClick: onClick,
-    mediaSingleElement: mediaSingleElement,
-    intl: intl,
-    status: entered ? 'entered' : status,
-    onMouseEnter: () => setEntered(true),
-    onMouseLeave: () => setEntered(false)
-  });
-};
-export const CommentBadge = injectIntl(CommentBadgeWrapper);
-
-/**
- * Remove CommentBadgeWrapper component above
- * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url_rollout feature flag
- */
-
-export const CommentBadgeNextWrapper = ({
+export const CommentBadgeWrapper = ({
   api,
   mediaNode,
   view,

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { MediaViewer } from '@atlaskit/media-viewer';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isExternalMedia } from '../../ui/toolbar/utils';
 const getIdentifier = attrs => {
   if (isExternalMedia(attrs)) {
@@ -27,32 +26,11 @@ export const RenderMediaViewer = ({
   selectedNodeAttrs,
   items = []
 }) => {
-  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, {
-      collectionName: collectionName,
-      items: items
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ,
-      mediaClientConfig: mediaClientConfig,
-      selectedItem: identifier,
-      onClose: onClose
-    }), document.body);
-  }
-  const {
-    id,
-    collection = ''
-  } = selectedNodeAttrs;
-  const identifier = {
-    id,
-    mediaItemType: 'file',
-    collectionName: collection
-  };
+  const identifier = getIdentifier(selectedNodeAttrs);
+  const collectionName = isExternalMedia(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
   return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(MediaViewer, {
-    collectionName: collection,
-    items: []
+    collectionName: collectionName,
+    items: items
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ,

package/dist/esm/mediaPlugin.js

@@ -1,8 +1,5 @@
 import React, { useMemo } from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { IconImages } from '@atlaskit/editor-common/quick-insert';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
@@ -317,33 +314,7 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
     pluginsOptions: {
       quickInsert: function quickInsert(_ref12) {
         var formatMessage = _ref12.formatMessage;
-        return fg('platform_editor_add_media_from_url_rollout') || options !== null && options !== void 0 && options.disableQuickInsert ? [] : [{
-          id: 'media',
-          title: formatMessage(messages.mediaFiles),
-          description: formatMessage(messages.mediaFilesDescription),
-          priority: 400,
-          keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video', 'file'],
-          icon: function icon() {
-            return /*#__PURE__*/React.createElement(IconImages, null);
-          },
-          isDisabledOffline: true,
-          action: function action(insert, state) {
-            var _api$analytics4;
-            var pluginState = stateKey.getState(state);
-            pluginState === null || pluginState === void 0 || pluginState.showMediaPicker();
-            var tr = insert('');
-            api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || _api$analytics4.actions.attachAnalyticsEvent({
-              action: ACTION.OPENED,
-              actionSubject: ACTION_SUBJECT.PICKER,
-              actionSubjectId: ACTION_SUBJECT_ID.PICKER_CLOUD,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: EVENT_TYPE.UI
-            })(tr);
-            return tr;
-          }
-        }];
+        return [];
       },
       floatingToolbar: function floatingToolbar(state, intl, providerFactory) {
         var _api$editorViewMode;

package/dist/esm/nodeviews/mediaSingleNext.js

@@ -25,7 +25,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../pm-plugins/commands/captions';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
 import { CaptionPlaceholder, CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
-import { CommentBadge, CommentBadgeNextWrapper } from '../ui/CommentBadge';
+import { CommentBadgeWrapper } from '../ui/CommentBadge';
 import ResizableMediaSingle from '../ui/ResizableMediaSingle';
 import ResizableMediaSingleNext from '../ui/ResizableMediaSingle/ResizableMediaSingleNext';
 import { hasPrivateAttrsChanged } from './helpers';
@@ -390,15 +390,6 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     var disabledNode = !!findParentNodeOfTypeClosestToPos($pos, [table]);
     return Boolean(result && !disabledNode);
   }, [mediaOptions, pos, view, editorDisabled, editorViewMode]);
-  var badgeOffsetRight = React.useMemo(function () {
-    if (typeof pos !== 'number') {
-      return undefined;
-    }
-    var $pos = view.state.doc.resolve(pos);
-    var table = view.state.schema.nodes.table;
-    var foundTableNode = findParentNodeOfTypeClosestToPos($pos, [table]);
-    return foundTableNode ? '2px' : '14px';
-  }, [pos, view]);
   var shouldShowPlaceholder = React.useMemo(function () {
     var result = mediaOptions.allowCaptions && mediaNode.childCount !== 2 && isSelected && view.state.selection instanceof NodeSelection;
     return !editorDisabled && result;
@@ -468,7 +459,7 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     ,
     className: MediaSingleNodeSelector,
     onClick: onMediaSingleClicked
-  }, fg('platform_editor_add_media_from_url_rollout') && jsx(MediaBadges, {
+  }, jsx(MediaBadges, {
     mediaElement: currentMediaElement(),
     mediaHeight: height,
     mediaWidth: width,
@@ -478,20 +469,13 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     return jsx(React.Fragment, null, visible && jsx(ExternalImageBadge, {
       type: childMediaNodeAttrs.type,
       url: childMediaNodeAttrs.type === 'external' ? childMediaNodeAttrs.url : undefined
-    }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeNextWrapper, {
+    }), mediaOptions.allowCommentsOnMedia && jsx(CommentBadgeWrapper, {
       view: view,
       api: pluginInjectionApi,
       mediaNode: mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.firstChild,
       getPos: getPos,
       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,
-    badgeOffsetRight: badgeOffsetRight,
-    getPos: getPos,
-    isDrafting: isCurrentNodeDrafting
   }), jsx("div", {
     ref: forwardRef
   }), shouldShowPlaceholder && (fg('platform_editor_typography_ugc') ? jsx(CaptionPlaceholderButton

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

@@ -9,7 +9,6 @@ import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
 import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -88,8 +87,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
   if (node.type !== media || !isImage(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
     return false;
   }
-  var insertMediaPopup = fg('platform_editor_add_media_from_url_rollout');
-  var mediaSingleAttrs = allowPixelResizing && insertMediaPopup ? {
+  var mediaSingleAttrs = allowPixelResizing ? {
     widthType: 'pixel',
     width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),
     layout: 'center'

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

@@ -1,9 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useMemo, useState } from 'react';
-import { injectIntl } from 'react-intl-next';
 import { VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { CommentBadge as CommentBadgeComponent, CommentBadgeNext } from '@atlaskit/editor-common/media-single';
+import { CommentBadgeNext } from '@atlaskit/editor-common/media-single';
 var selector = function selector(states) {
   var _states$annotationSta, _states$annotationSta2, _states$annotationSta3;
   return {
@@ -12,22 +11,20 @@ var selector = function selector(states) {
     annotations: (_states$annotationSta3 = states.annotationState) === null || _states$annotationSta3 === void 0 ? void 0 : _states$annotationSta3.annotations
   };
 };
-var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
+export var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
   var api = _ref.api,
     mediaNode = _ref.mediaNode,
     view = _ref.view,
     getPos = _ref.getPos,
-    intl = _ref.intl,
-    isDrafting = _ref.isDrafting,
-    badgeOffsetRight = _ref.badgeOffsetRight;
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['annotation'], selector),
-    selectedAnnotations = _useSharedPluginState.selectedAnnotations,
-    isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
-    annotations = _useSharedPluginState.annotations;
+    isDrafting = _ref.isDrafting;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     entered = _useState2[0],
     setEntered = _useState2[1];
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['annotation'], selector),
+    selectedAnnotations = _useSharedPluginState.selectedAnnotations,
+    isInlineCommentViewClosed = _useSharedPluginState.isInlineCommentViewClosed,
+    annotations = _useSharedPluginState.annotations;
   var _view$state$schema = view.state.schema,
     media = _view$state$schema.nodes.media,
     annotation = _view$state$schema.marks.annotation,
@@ -56,80 +53,6 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-
-  /**
-   * After performing certain operations like drag and drop,
-   * the position may momentarily shift. It will NOT always be an HTML element;
-   * it could also be plain text.
-   */
-  var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
-  var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
-  return /*#__PURE__*/React.createElement(CommentBadgeComponent, {
-    badgeOffsetRight: badgeOffsetRight,
-    width: mediaNode.attrs.width,
-    height: mediaNode.attrs.height,
-    onClick: onClick,
-    mediaSingleElement: mediaSingleElement,
-    intl: intl,
-    status: entered ? 'entered' : status,
-    onMouseEnter: function onMouseEnter() {
-      return setEntered(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      return setEntered(false);
-    }
-  });
-};
-export var CommentBadge = injectIntl(CommentBadgeWrapper);
-
-/**
- * Remove CommentBadgeWrapper component above
- * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url_rollout feature flag
- */
-
-export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
-  var api = _ref2.api,
-    mediaNode = _ref2.mediaNode,
-    view = _ref2.view,
-    getPos = _ref2.getPos,
-    isDrafting = _ref2.isDrafting;
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    entered = _useState4[0],
-    setEntered = _useState4[1];
-  var _useSharedPluginState2 = useSharedPluginStateWithSelector(api, ['annotation'], selector),
-    selectedAnnotations = _useSharedPluginState2.selectedAnnotations,
-    isInlineCommentViewClosed = _useSharedPluginState2.isInlineCommentViewClosed,
-    annotations = _useSharedPluginState2.annotations;
-  var _view$state$schema2 = view.state.schema,
-    media = _view$state$schema2.nodes.media,
-    annotation = _view$state$schema2.marks.annotation,
-    state = view.state,
-    dispatch = view.dispatch;
-  var status = useMemo(function () {
-    if (!selectedAnnotations || !mediaNode) {
-      return 'default';
-    }
-    return selectedAnnotations.some(function (annotation) {
-      return !!mediaNode.marks.find(function (mark) {
-        return mark.attrs.id === annotation.id;
-      });
-    }) && !isInlineCommentViewClosed ? 'active' : 'default';
-  }, [selectedAnnotations, isInlineCommentViewClosed, mediaNode]);
-  var onClick = useCallback(function () {
-    if (api.annotation && mediaNode) {
-      var showCommentForBlockNode = api.annotation.actions.showCommentForBlockNode;
-      showCommentForBlockNode(mediaNode, VIEW_METHOD.BADGE)(state, dispatch);
-    }
-  }, [api.annotation, dispatch, mediaNode, state]);
-  var pos = getPos();
-  var hasNoComments = !Number.isFinite(pos) || !annotations || !mediaNode || mediaNode.type !== media || mediaNode.marks.every(function (maybeAnnotation) {
-    return maybeAnnotation.type !== annotation || !(maybeAnnotation.attrs.id in annotations) || annotations[maybeAnnotation.attrs.id];
-  });
-  if (!isDrafting && hasNoComments || !mediaNode) {
-    return null;
-  }
   var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
   var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/React.createElement(CommentBadgeNext, {

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { MediaViewer } from '@atlaskit/media-viewer';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { isExternalMedia } from '../../ui/toolbar/utils';
 var getIdentifier = function getIdentifier(attrs) {
   if (isExternalMedia(attrs)) {
@@ -26,32 +25,11 @@ export var RenderMediaViewer = function RenderMediaViewer(_ref) {
     selectedNodeAttrs = _ref.selectedNodeAttrs,
     _ref$items = _ref.items,
     items = _ref$items === void 0 ? [] : _ref$items;
-  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, {
-      collectionName: collectionName,
-      items: items
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ,
-      mediaClientConfig: mediaClientConfig,
-      selectedItem: _identifier,
-      onClose: onClose
-    }), document.body);
-  }
-  var _ref2 = selectedNodeAttrs,
-    id = _ref2.id,
-    _ref2$collection = _ref2.collection,
-    collection = _ref2$collection === void 0 ? '' : _ref2$collection;
-  var identifier = {
-    id: id,
-    mediaItemType: 'file',
-    collectionName: collection
-  };
+  var identifier = getIdentifier(selectedNodeAttrs);
+  var collectionName = isExternalMedia(selectedNodeAttrs) ? '' : selectedNodeAttrs.collection;
   return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(MediaViewer, {
-    collectionName: collection,
-    items: []
+    collectionName: collectionName,
+    items: items
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ,

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

@@ -1,29 +1,11 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
 import type { AnnotationMarkDefinition } from '@atlaskit/adf-schema';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import type { getPosHandler } from '../../types';
-type CommentBadgeProps = {
-    api: ExtractInjectionAPI<MediaNextEditorPluginType>;
-    badgeOffsetRight?: string;
-    getPos: getPosHandler;
-    intl: IntlShape;
-    isDrafting: boolean;
-    mediaNode: PMNode | null;
-    view: EditorView;
-};
-export declare const CommentBadge: React.FC<import("react-intl-next").WithIntlProps<CommentBadgeProps>> & {
-    WrappedComponent: React.ComponentType<CommentBadgeProps>;
-};
-/**
- * Remove CommentBadgeWrapper component above
- * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url_rollout feature flag
- */
-type CommentBadgeNextWrapperProps = {
+type CommentBadgeWrapperProps = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType>;
     getPos: getPosHandler;
     isDrafting?: boolean;
@@ -32,5 +14,5 @@ type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;
     view: EditorView;
 };
-export declare const CommentBadgeNextWrapper: ({ api, mediaNode, view, getPos, isDrafting, }: CommentBadgeNextWrapperProps) => React.JSX.Element | null;
+export declare const CommentBadgeWrapper: ({ api, mediaNode, view, getPos, isDrafting, }: CommentBadgeWrapperProps) => React.JSX.Element | null;
 export {};

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

@@ -1,29 +1,11 @@
 import React from 'react';
-import type { IntlShape } from 'react-intl-next';
 import type { AnnotationMarkDefinition } from '@atlaskit/adf-schema';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import type { getPosHandler } from '../../types';
-type CommentBadgeProps = {
-    api: ExtractInjectionAPI<MediaNextEditorPluginType>;
-    badgeOffsetRight?: string;
-    getPos: getPosHandler;
-    intl: IntlShape;
-    isDrafting: boolean;
-    mediaNode: PMNode | null;
-    view: EditorView;
-};
-export declare const CommentBadge: React.FC<import("react-intl-next").WithIntlProps<CommentBadgeProps>> & {
-    WrappedComponent: React.ComponentType<CommentBadgeProps>;
-};
-/**
- * Remove CommentBadgeWrapper component above
- * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_add_media_from_url_rollout feature flag
- */
-type CommentBadgeNextWrapperProps = {
+type CommentBadgeWrapperProps = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType>;
     getPos: getPosHandler;
     isDrafting?: boolean;
@@ -32,5 +14,5 @@ type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;
     view: EditorView;
 };
-export declare const CommentBadgeNextWrapper: ({ api, mediaNode, view, getPos, isDrafting, }: CommentBadgeNextWrapperProps) => React.JSX.Element | null;
+export declare const CommentBadgeWrapper: ({ api, mediaNode, view, getPos, isDrafting, }: CommentBadgeWrapperProps) => React.JSX.Element | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "8.1.4",
+	"version": "8.2.0",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,13 +29,13 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.2.0",
+		"@atlaskit/adf-schema": "^51.3.0",
 		"@atlaskit/analytics-namespaced-context": "^7.1.0",
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/button": "^23.5.0",
 		"@atlaskit/editor-palette": "^2.1.0",
-		"@atlaskit/editor-plugin-analytics": "^6.1.0",
-		"@atlaskit/editor-plugin-annotation": "^6.1.0",
+		"@atlaskit/editor-plugin-analytics": "^6.2.0",
+		"@atlaskit/editor-plugin-annotation": "^6.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^6.0.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/editor-plugin-focus": "^5.0.0",
 		"@atlaskit/editor-plugin-grid": "^6.0.0",
 		"@atlaskit/editor-plugin-guideline": "^6.0.0",
-		"@atlaskit/editor-plugin-interaction": "^8.0.0",
+		"@atlaskit/editor-plugin-interaction": "^9.0.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.3.0",
 		"@atlaskit/editor-plugin-width": "^7.0.0",
@@ -63,11 +63,11 @@
 		"@atlaskit/media-ui": "^28.7.0",
 		"@atlaskit/media-viewer": "^52.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^15.0.0",
+		"@atlaskit/primitives": "^16.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.12.0",
-		"@atlaskit/tokens": "^6.5.0",
+		"@atlaskit/tmp-editor-statsig": "^13.13.0",
+		"@atlaskit/tokens": "^7.0.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -78,7 +78,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.13.0",
+		"@atlaskit/editor-common": "^110.14.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -142,9 +142,6 @@
 		"platform_editor_safari_media_clipboard_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_add_media_from_url_rollout": {
-			"type": "boolean"
-		},
 		"platform_editor_remove_media_inline_feature_flag": {
 			"type": "boolean"
 		},