@atlaskit/editor-plugin-media 2.7.2 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-media
 
+## 3.0.0
+
+### Patch Changes
+
+- [#149482](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149482)
+  [`1f1f73876c3c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f1f73876c3c8) -
+  ED-27860 Add analytics for copy and delete button in floating toolbars
+- Updated dependencies
+
+## 2.7.3
+
+### Patch Changes
+
+- [#148591](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/148591)
+  [`035d279540218`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/035d279540218) -
+  Clean up platform_editor_render_media_viewer_as_inline
+- Updated dependencies
+
 ## 2.7.2
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaInline.js

@@ -25,7 +25,6 @@ var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-
 var _mediaCard = require("@atlaskit/media-card");
 var _mediaClientReact = require("@atlaskit/media-client-react");
 var _mediaUi = require("@atlaskit/media-ui");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _isType = require("../pm-plugins/utils/is-type");
 var _MediaViewerContainer = require("../ui/MediaViewer/MediaViewerContainer");
@@ -217,7 +216,7 @@ var MediaInline = exports.MediaInline = function MediaInline(props) {
     mediaClientConfig: props.mediaClientConfig,
     isEditorViewMode: props.editorViewMode,
     isSelected: props.isSelected,
-    isInline: (0, _platformFeatureFlags.fg)('platform_editor_render_media_viewer_as_inline')
+    isInline: true
   }, (0, _react2.jsx)(_mediaCard.MediaInlineCard, {
     isSelected: props.isSelected,
     identifier: identifier,

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

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateMediaSingleWidthTr = exports.updateMediaSingleWidth = exports.toggleBorderMark = exports.setBorderMark = exports.removeInlineCard = exports.getNodeType = exports.changeMediaSingleToMediaInline = exports.changeMediaInlineToMediaSingle = exports.changeMediaCardToInline = exports.changeInlineToMediaCard = exports.DEFAULT_BORDER_SIZE = exports.DEFAULT_BORDER_COLOR = void 0;
+exports.updateMediaSingleWidthTr = exports.updateMediaSingleWidth = exports.toggleBorderMark = exports.setBorderMark = exports.removeInlineCardWithAnalytics = exports.removeInlineCard = exports.getNodeType = exports.changeMediaSingleToMediaInline = exports.changeMediaInlineToMediaSingle = exports.changeMediaCardToInline = exports.changeInlineToMediaCard = exports.DEFAULT_BORDER_SIZE = exports.DEFAULT_BORDER_COLOR = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -143,6 +144,16 @@ var changeMediaInlineToMediaSingle = exports.changeMediaInlineToMediaSingle = fu
     return true;
   };
 };
+var removeInlineCardWithAnalytics = exports.removeInlineCardWithAnalytics = function removeInlineCardWithAnalytics(editorAnalyticsAPI) {
+  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
+    action: _analytics.ACTION.DELETED,
+    actionSubject: _analytics.ACTION_SUBJECT.MEDIA_INLINE,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+    },
+    eventType: _analytics.EVENT_TYPE.TRACK
+  })(removeInlineCard);
+};
 var removeInlineCard = exports.removeInlineCard = function removeInlineCard(state, dispatch) {
   if ((0, _utils.isNodeSelection)(state.selection)) {
     if (dispatch) {

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

@@ -12,6 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _mediaInline = require("@atlaskit/editor-common/media-inline");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _state2 = require("@atlaskit/editor-prosemirror/state");
@@ -62,12 +63,32 @@ var mediaTypeMessages = {
   archive: _mediaUi.messages.file_archive_is_selected,
   unknown: _mediaUi.messages.file_unknown_is_selected
 };
+var removeWithAnalytics = function removeWithAnalytics(editorAnalyticsApi) {
+  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
+    action: _analytics.ACTION.DELETED,
+    actionSubject: _analytics.ACTION_SUBJECT.MEDIA_SINGLE,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+    },
+    eventType: _analytics.EVENT_TYPE.TRACK
+  })(remove);
+};
 var remove = function remove(state, dispatch) {
   if (dispatch) {
     dispatch((0, _utils.removeSelectedNode)(state.tr));
   }
   return true;
 };
+var handleRemoveMediaGroupWithAnalytics = function handleRemoveMediaGroupWithAnalytics(editorAnalyticsApi) {
+  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
+    action: _analytics.ACTION.DELETED,
+    actionSubject: _analytics.ACTION_SUBJECT.MEDIA_GROUP,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+    },
+    eventType: _analytics.EVENT_TYPE.TRACK
+  })(handleRemoveMediaGroup);
+};
 var handleRemoveMediaGroup = function handleRemoveMediaGroup(state, dispatch) {
   var tr = (0, _utils2.removeMediaGroupNode)(state);
   if (dispatch) {
@@ -179,7 +200,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
       title: intl.formatMessage(_messages.default.remove),
-      onClick: handleRemoveMediaGroup,
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? handleRemoveMediaGroupWithAnalytics(editorAnalyticsAPI) : handleRemoveMediaGroup,
       testId: 'media-toolbar-remove-button'
     });
   } else {
@@ -407,7 +428,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             icon: /*#__PURE__*/_react.default.createElement(_imageInline.default, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineTitle,
+              label: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') ? '' : inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: _card.IconInline
             }),
@@ -426,7 +447,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             }) : /*#__PURE__*/_react.default.createElement(_imageFullscreen.default, {
               color: "currentColor",
               spacing: "spacious",
-              label: floatingSwitcherTitle,
+              label: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') ? '' : floatingSwitcherTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: _card.IconEmbed
             })
@@ -609,6 +630,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     });
   }
   if (!isEditorControlsEnabled) {
+    var _pluginInjectionApi$a9;
     if (allowAltTextOnImages) {
       var _pluginInjectionApi$a8;
       toolbarButtons.push((0, _altText2.altTextButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions), {
@@ -627,7 +649,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
       title: intl.formatMessage(_messages.default.remove),
-      onClick: remove,
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? removeWithAnalytics(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions) : remove,
       testId: 'media-toolbar-remove-button',
       supportsViewMode: false
     };
@@ -785,7 +807,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$a9, _pluginInjectionApi$f2;
+    var _pluginInjectionApi$a10, _pluginInjectionApi$f2;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
@@ -794,7 +816,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       return (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector, isViewOnly);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector, isViewOnly);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     items = (0, _mediaInline2.generateMediaInlineFloatingToolbar)(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
   } else {
@@ -808,9 +830,9 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
   if (!mediaPluginState.isResizing && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-    var _pluginInjectionApi$a10;
+    var _pluginInjectionApi$a11, _pluginInjectionApi$a12;
     (0, _utils2.updateToFullHeightSeparator)(items);
-    var customOptions = [].concat((0, _toConsumableArray2.default)((0, _linking3.getLinkingDropdownOptions)(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly)), (0, _toConsumableArray2.default)((0, _altText2.getAltTextDropdownOption)(state, intl.formatMessage, allowAltTextOnImages, selectedNodeType, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions)), (0, _toConsumableArray2.default)((0, _pixelResizing2.getResizeDropdownOption)(options, state, intl.formatMessage, selectedNodeType)));
+    var customOptions = [].concat((0, _toConsumableArray2.default)((0, _linking3.getLinkingDropdownOptions)(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly)), (0, _toConsumableArray2.default)((0, _altText2.getAltTextDropdownOption)(state, intl.formatMessage, allowAltTextOnImages, selectedNodeType, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a11 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a11 === void 0 ? void 0 : _pluginInjectionApi$a11.actions)), (0, _toConsumableArray2.default)((0, _pixelResizing2.getResizeDropdownOption)(options, state, intl.formatMessage, selectedNodeType)));
     if (customOptions.length) {
       customOptions.push({
         type: 'separator'
@@ -832,7 +854,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
         onClick: function onClick() {
           var _pluginInjectionApi$c4, _pluginInjectionApi$f3;
           pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.core) === null || _pluginInjectionApi$c4 === void 0 || _pluginInjectionApi$c4.actions.execute( // @ts-ignore
-          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : _pluginInjectionApi$f3.commands.copyNode(nodeType));
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : _pluginInjectionApi$f3.commands.copyNode(nodeType, _analytics.INPUT_METHOD.FLOATING_TB));
           return true;
         },
         icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
@@ -840,7 +862,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
         })
       }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
         title: intl === null || intl === void 0 ? void 0 : intl.formatMessage(_messages.default.delete),
-        onClick: remove,
+        onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? removeWithAnalytics(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a12 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a12 === void 0 ? void 0 : _pluginInjectionApi$a12.actions) : remove,
         icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
           label: ""
         })

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

@@ -14,6 +14,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _link = _interopRequireDefault(require("@atlaskit/icon/core/link"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _linking = require("../../pm-plugins/commands/linking");
 var _linking2 = require("../../pm-plugins/linking");
 var _currentMediaNode = require("../../pm-plugins/utils/current-media-node");
@@ -136,7 +137,7 @@ var getLinkingDropdownOptions = exports.getLinkingDropdownOptions = function get
         return true;
       },
       icon: /*#__PURE__*/_react.default.createElement(_link.default, {
-        label: title
+        label: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') ? '' : title
       })
     }];
   } else {

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

@@ -137,7 +137,7 @@ var generateMediaInlineFloatingToolbar = exports.generateMediaInlineFloatingTool
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
       title: intl.formatMessage(_messages.default.remove),
-      onClick: _commands.removeInlineCard,
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? (0, _commands.removeInlineCardWithAnalytics)(editorAnalyticsAPI) : _commands.removeInlineCard,
       testId: 'media-toolbar-remove-button'
     });
   } else {
@@ -333,7 +333,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       icon: /*#__PURE__*/_react.default.createElement(_imageInline.default, {
         color: "currentColor",
         spacing: "spacious",
-        label: mediaInlineImageTitle,
+        label: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') ? '' : mediaInlineImageTitle,
         LEGACY_size: "medium",
         LEGACY_fallbackIcon: _card.IconInline
       })
@@ -348,7 +348,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       }) : /*#__PURE__*/_react.default.createElement(_imageFullscreen.default, {
         color: "currentColor",
         spacing: "spacious",
-        label: mediaSingleTitle,
+        label: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') ? '' : mediaSingleTitle,
         LEGACY_size: "medium",
         LEGACY_fallbackIcon: _card.IconEmbed
       })
@@ -450,7 +450,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
       title: intl.formatMessage(_messages.default.remove),
-      onClick: _commands.removeInlineCard,
+      onClick: (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_analytics_2') ? (0, _commands.removeInlineCardWithAnalytics)(editorAnalyticsAPI) : _commands.removeInlineCard,
       testId: 'media-toolbar-remove-button'
     });
   }

package/dist/es2019/nodeviews/mediaInline.js

@@ -14,7 +14,6 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { getMediaClient } from '@atlaskit/media-client-react';
 import { MediaInlineCardLoadingView } from '@atlaskit/media-ui';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isImage } from '../pm-plugins/utils/is-type';
 import { MediaViewerContainer } from '../ui/MediaViewer/MediaViewerContainer';
@@ -149,7 +148,7 @@ export const MediaInline = props => {
     mediaClientConfig: props.mediaClientConfig,
     isEditorViewMode: props.editorViewMode,
     isSelected: props.isSelected,
-    isInline: fg('platform_editor_render_media_viewer_as_inline')
+    isInline: true
   }, jsx(MediaInlineCard, {
     isSelected: props.isSelected,
     identifier: identifier,

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

@@ -1,4 +1,5 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -133,6 +134,16 @@ export const changeMediaInlineToMediaSingle = (editorAnalyticsAPI, widthPluginSt
   }
   return true;
 };
+export const removeInlineCardWithAnalytics = editorAnalyticsAPI => {
+  return withAnalytics(editorAnalyticsAPI, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.MEDIA_INLINE,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(removeInlineCard);
+};
 export const removeInlineCard = (state, dispatch) => {
   if (isNodeSelection(state.selection)) {
     if (dispatch) {

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

@@ -1,7 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { alignmentIcons, buildLayoutButtons, buildLayoutDropdown, IconCard, IconEmbed, IconInline, layoutToMessages, wrappingIcons } from '@atlaskit/editor-common/card';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
@@ -48,12 +49,32 @@ const mediaTypeMessages = {
   archive: messages.file_archive_is_selected,
   unknown: messages.file_unknown_is_selected
 };
+const removeWithAnalytics = editorAnalyticsApi => {
+  return withAnalytics(editorAnalyticsApi, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.MEDIA_SINGLE,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(remove);
+};
 const remove = (state, dispatch) => {
   if (dispatch) {
     dispatch(removeSelectedNode(state.tr));
   }
   return true;
 };
+const handleRemoveMediaGroupWithAnalytics = editorAnalyticsApi => {
+  return withAnalytics(editorAnalyticsApi, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.MEDIA_GROUP,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(handleRemoveMediaGroup);
+};
 const handleRemoveMediaGroup = (state, dispatch) => {
   const tr = removeMediaGroupNode(state);
   if (dispatch) {
@@ -167,7 +188,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDe
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: handleRemoveMediaGroup,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? handleRemoveMediaGroupWithAnalytics(editorAnalyticsAPI) : handleRemoveMediaGroup,
       testId: 'media-toolbar-remove-button'
     });
   } else {
@@ -394,7 +415,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineTitle,
+              label: fg('platform_editor_controls_patch_7') ? '' : inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconInline
             }),
@@ -413,7 +434,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             }) : /*#__PURE__*/React.createElement(ImageFullscreenIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: floatingSwitcherTitle,
+              label: fg('platform_editor_controls_patch_7') ? '' : floatingSwitcherTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconEmbed
             })
@@ -604,6 +625,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     });
   }
   if (!isEditorControlsEnabled) {
+    var _pluginInjectionApi$a9;
     if (allowAltTextOnImages) {
       var _pluginInjectionApi$a8;
       toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions), {
@@ -622,7 +644,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: remove,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeWithAnalytics(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions) : remove,
       testId: 'media-toolbar-remove-button',
       supportsViewMode: false
     };
@@ -784,7 +806,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$a9, _pluginInjectionApi$f3, _pluginInjectionApi$f4;
+    var _pluginInjectionApi$a10, _pluginInjectionApi$f3, _pluginInjectionApi$f4;
     const mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele2;
@@ -793,7 +815,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       return (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.actions) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.forceFocusSelector, isViewOnly);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.actions) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.forceFocusSelector, isViewOnly);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
   } else {
@@ -807,9 +829,9 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
   if (!mediaPluginState.isResizing && editorExperiment('platform_editor_controls', 'variant1')) {
-    var _pluginInjectionApi$a10;
+    var _pluginInjectionApi$a11, _pluginInjectionApi$a12;
     updateToFullHeightSeparator(items);
-    const customOptions = [...getLinkingDropdownOptions(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly), ...getAltTextDropdownOption(state, intl.formatMessage, allowAltTextOnImages, selectedNodeType, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions), ...getResizeDropdownOption(options, state, intl.formatMessage, selectedNodeType)];
+    const customOptions = [...getLinkingDropdownOptions(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly), ...getAltTextDropdownOption(state, intl.formatMessage, allowAltTextOnImages, selectedNodeType, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a11 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a11 === void 0 ? void 0 : _pluginInjectionApi$a11.actions), ...getResizeDropdownOption(options, state, intl.formatMessage, selectedNodeType)];
     if (customOptions.length) {
       customOptions.push({
         type: 'separator'
@@ -829,7 +851,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
         onClick: () => {
           var _pluginInjectionApi$c10, _pluginInjectionApi$f5;
           pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c10 = pluginInjectionApi.core) === null || _pluginInjectionApi$c10 === void 0 ? void 0 : _pluginInjectionApi$c10.actions.execute( // @ts-ignore
-          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f5 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f5 === void 0 ? void 0 : _pluginInjectionApi$f5.commands.copyNode(nodeType));
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f5 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f5 === void 0 ? void 0 : _pluginInjectionApi$f5.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
           return true;
         },
         icon: /*#__PURE__*/React.createElement(CopyIcon, {
@@ -838,7 +860,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
         ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
       }, {
         title: intl === null || intl === void 0 ? void 0 : intl.formatMessage(commonMessages.delete),
-        onClick: remove,
+        onClick: fg('platform_editor_controls_patch_analytics_2') ? removeWithAnalytics(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a12 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a12 === void 0 ? void 0 : _pluginInjectionApi$a12.actions) : remove,
         icon: /*#__PURE__*/React.createElement(DeleteIcon, {
           label: ""
         }),

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

@@ -5,6 +5,7 @@ import { linkMessages, linkToolbarMessages } from '@atlaskit/editor-common/messa
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import LinkIcon from '@atlaskit/icon/core/link';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { hideLinkingToolbar, setUrlToMedia, showLinkingToolbar, unlink } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
 import { currentMediaInlineNode, currentMediaNode } from '../../pm-plugins/utils/current-media-node';
@@ -137,7 +138,7 @@ export const getLinkingDropdownOptions = (editorState, intl, mediaLinkingState,
         return true;
       },
       icon: /*#__PURE__*/React.createElement(LinkIcon, {
-        label: title
+        label: fg('platform_editor_controls_patch_7') ? '' : title
       })
     }];
   } else {

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

@@ -20,7 +20,7 @@ import { currentMediaOrInlineNodeBorderMark } from '../../pm-plugins/utils/curre
 import { isImage } from '../../pm-plugins/utils/is-type';
 import ImageBorderItem from '../../ui/ImageBorder';
 import { altTextButton } from './alt-text';
-import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';
+import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCard, removeInlineCardWithAnalytics, setBorderMark, toggleBorderMark } from './commands';
 import { shouldShowImageBorder } from './imageBorder';
 import { getOpenLinkToolbarButtonOption, shouldShowMediaLinkToolbar } from './linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
@@ -125,7 +125,7 @@ export const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: removeInlineCard,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeInlineCardWithAnalytics(editorAnalyticsAPI) : removeInlineCard,
       testId: 'media-toolbar-remove-button'
     });
   } else {
@@ -324,7 +324,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
       icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
         color: "currentColor",
         spacing: "spacious",
-        label: mediaInlineImageTitle,
+        label: fg('platform_editor_controls_patch_7') ? '' : mediaInlineImageTitle,
         LEGACY_size: "medium",
         LEGACY_fallbackIcon: IconInline
       })
@@ -339,7 +339,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
       }) : /*#__PURE__*/React.createElement(ImageFullscreenIcon, {
         color: "currentColor",
         spacing: "spacious",
-        label: mediaSingleTitle,
+        label: fg('platform_editor_controls_patch_7') ? '' : mediaSingleTitle,
         LEGACY_size: "medium",
         LEGACY_fallbackIcon: IconEmbed
       })
@@ -439,7 +439,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: removeInlineCard,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeInlineCardWithAnalytics(editorAnalyticsAPI) : removeInlineCard,
       testId: 'media-toolbar-remove-button'
     });
   }

package/dist/esm/nodeviews/mediaInline.js

@@ -29,7 +29,6 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { getMediaClient } from '@atlaskit/media-client-react';
 import { MediaInlineCardLoadingView } from '@atlaskit/media-ui';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isImage } from '../pm-plugins/utils/is-type';
 import { MediaViewerContainer } from '../ui/MediaViewer/MediaViewerContainer';
@@ -213,7 +212,7 @@ export var MediaInline = function MediaInline(props) {
     mediaClientConfig: props.mediaClientConfig,
     isEditorViewMode: props.editorViewMode,
     isSelected: props.isSelected,
-    isInline: fg('platform_editor_render_media_viewer_as_inline')
+    isInline: true
   }, jsx(MediaInlineCard, {
     isSelected: props.isSelected,
     identifier: identifier,

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

@@ -1,7 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -136,6 +137,16 @@ export var changeMediaInlineToMediaSingle = function changeMediaInlineToMediaSin
     return true;
   };
 };
+export var removeInlineCardWithAnalytics = function removeInlineCardWithAnalytics(editorAnalyticsAPI) {
+  return withAnalytics(editorAnalyticsAPI, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.MEDIA_INLINE,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(removeInlineCard);
+};
 export var removeInlineCard = function removeInlineCard(state, dispatch) {
   if (isNodeSelection(state.selection)) {
     if (dispatch) {

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

@@ -4,8 +4,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { alignmentIcons, buildLayoutButtons, buildLayoutDropdown, IconCard, IconEmbed, IconInline, layoutToMessages, wrappingIcons } from '@atlaskit/editor-common/card';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
@@ -52,12 +53,32 @@ var mediaTypeMessages = {
   archive: messages.file_archive_is_selected,
   unknown: messages.file_unknown_is_selected
 };
+var removeWithAnalytics = function removeWithAnalytics(editorAnalyticsApi) {
+  return withAnalytics(editorAnalyticsApi, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.MEDIA_SINGLE,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(remove);
+};
 var remove = function remove(state, dispatch) {
   if (dispatch) {
     dispatch(removeSelectedNode(state.tr));
   }
   return true;
 };
+var handleRemoveMediaGroupWithAnalytics = function handleRemoveMediaGroupWithAnalytics(editorAnalyticsApi) {
+  return withAnalytics(editorAnalyticsApi, {
+    action: ACTION.DELETED,
+    actionSubject: ACTION_SUBJECT.MEDIA_GROUP,
+    attributes: {
+      inputMethod: INPUT_METHOD.FLOATING_TB
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(handleRemoveMediaGroup);
+};
 var handleRemoveMediaGroup = function handleRemoveMediaGroup(state, dispatch) {
   var tr = removeMediaGroupNode(state);
   if (dispatch) {
@@ -169,7 +190,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: handleRemoveMediaGroup,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? handleRemoveMediaGroupWithAnalytics(editorAnalyticsAPI) : handleRemoveMediaGroup,
       testId: 'media-toolbar-remove-button'
     });
   } else {
@@ -397,7 +418,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineTitle,
+              label: fg('platform_editor_controls_patch_7') ? '' : inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconInline
             }),
@@ -416,7 +437,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             }) : /*#__PURE__*/React.createElement(ImageFullscreenIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: floatingSwitcherTitle,
+              label: fg('platform_editor_controls_patch_7') ? '' : floatingSwitcherTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconEmbed
             })
@@ -599,6 +620,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     });
   }
   if (!isEditorControlsEnabled) {
+    var _pluginInjectionApi$a9;
     if (allowAltTextOnImages) {
       var _pluginInjectionApi$a8;
       toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions), {
@@ -617,7 +639,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: remove,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeWithAnalytics(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions) : remove,
       testId: 'media-toolbar-remove-button',
       supportsViewMode: false
     };
@@ -775,7 +797,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$a9, _pluginInjectionApi$f2;
+    var _pluginInjectionApi$a10, _pluginInjectionApi$f2;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
@@ -784,7 +806,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       return (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector, isViewOnly);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector, isViewOnly);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options);
   } else {
@@ -798,9 +820,9 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
   if (!mediaPluginState.isResizing && editorExperiment('platform_editor_controls', 'variant1')) {
-    var _pluginInjectionApi$a10;
+    var _pluginInjectionApi$a11, _pluginInjectionApi$a12;
     updateToFullHeightSeparator(items);
-    var customOptions = [].concat(_toConsumableArray(getLinkingDropdownOptions(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly)), _toConsumableArray(getAltTextDropdownOption(state, intl.formatMessage, allowAltTextOnImages, selectedNodeType, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions)), _toConsumableArray(getResizeDropdownOption(options, state, intl.formatMessage, selectedNodeType)));
+    var customOptions = [].concat(_toConsumableArray(getLinkingDropdownOptions(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly)), _toConsumableArray(getAltTextDropdownOption(state, intl.formatMessage, allowAltTextOnImages, selectedNodeType, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a11 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a11 === void 0 ? void 0 : _pluginInjectionApi$a11.actions)), _toConsumableArray(getResizeDropdownOption(options, state, intl.formatMessage, selectedNodeType)));
     if (customOptions.length) {
       customOptions.push({
         type: 'separator'
@@ -822,7 +844,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
         onClick: function onClick() {
           var _pluginInjectionApi$c4, _pluginInjectionApi$f3;
           pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c4 = pluginInjectionApi.core) === null || _pluginInjectionApi$c4 === void 0 || _pluginInjectionApi$c4.actions.execute( // @ts-ignore
-          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : _pluginInjectionApi$f3.commands.copyNode(nodeType));
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : _pluginInjectionApi$f3.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
           return true;
         },
         icon: /*#__PURE__*/React.createElement(CopyIcon, {
@@ -830,7 +852,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
         })
       }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)), _objectSpread({
         title: intl === null || intl === void 0 ? void 0 : intl.formatMessage(commonMessages.delete),
-        onClick: remove,
+        onClick: fg('platform_editor_controls_patch_analytics_2') ? removeWithAnalytics(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a12 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a12 === void 0 ? void 0 : _pluginInjectionApi$a12.actions) : remove,
         icon: /*#__PURE__*/React.createElement(DeleteIcon, {
           label: ""
         })

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

@@ -8,6 +8,7 @@ import { linkMessages, linkToolbarMessages } from '@atlaskit/editor-common/messa
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import LinkIcon from '@atlaskit/icon/core/link';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { hideLinkingToolbar, setUrlToMedia, showLinkingToolbar, unlink } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
 import { currentMediaInlineNode, currentMediaNode } from '../../pm-plugins/utils/current-media-node';
@@ -128,7 +129,7 @@ export var getLinkingDropdownOptions = function getLinkingDropdownOptions(editor
         return true;
       },
       icon: /*#__PURE__*/React.createElement(LinkIcon, {
-        label: title
+        label: fg('platform_editor_controls_patch_7') ? '' : title
       })
     }];
   } else {

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

@@ -23,7 +23,7 @@ import { currentMediaOrInlineNodeBorderMark } from '../../pm-plugins/utils/curre
 import { isImage } from '../../pm-plugins/utils/is-type';
 import ImageBorderItem from '../../ui/ImageBorder';
 import { altTextButton } from './alt-text';
-import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';
+import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCard, removeInlineCardWithAnalytics, setBorderMark, toggleBorderMark } from './commands';
 import { shouldShowImageBorder } from './imageBorder';
 import { getOpenLinkToolbarButtonOption, shouldShowMediaLinkToolbar } from './linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
@@ -127,7 +127,7 @@ export var generateMediaInlineFloatingToolbar = function generateMediaInlineFloa
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: removeInlineCard,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeInlineCardWithAnalytics(editorAnalyticsAPI) : removeInlineCard,
       testId: 'media-toolbar-remove-button'
     });
   } else {
@@ -323,7 +323,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
         color: "currentColor",
         spacing: "spacious",
-        label: mediaInlineImageTitle,
+        label: fg('platform_editor_controls_patch_7') ? '' : mediaInlineImageTitle,
         LEGACY_size: "medium",
         LEGACY_fallbackIcon: IconInline
       })
@@ -338,7 +338,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       }) : /*#__PURE__*/React.createElement(ImageFullscreenIcon, {
         color: "currentColor",
         spacing: "spacious",
-        label: mediaSingleTitle,
+        label: fg('platform_editor_controls_patch_7') ? '' : mediaSingleTitle,
         LEGACY_size: "medium",
         LEGACY_fallbackIcon: IconEmbed
       })
@@ -440,7 +440,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
       onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
       title: intl.formatMessage(commonMessages.remove),
-      onClick: removeInlineCard,
+      onClick: fg('platform_editor_controls_patch_analytics_2') ? removeInlineCardWithAnalytics(editorAnalyticsAPI) : removeInlineCard,
       testId: 'media-toolbar-remove-button'
     });
   }

package/dist/types/ui/toolbar/commands.d.ts

@@ -11,6 +11,7 @@ export declare const getNodeType: (state: EditorState) => "mediaSingle" | "media
 export declare const changeInlineToMediaCard: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, forceFocusSelector: ForceFocusSelector | undefined) => Command;
 export declare const changeMediaCardToInline: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, forceFocusSelector: ForceFocusSelector | undefined) => Command;
 export declare const changeMediaInlineToMediaSingle: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, widthPluginState: WidthPluginState | undefined, allowPixelResizing?: boolean) => Command;
+export declare const removeInlineCardWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const removeInlineCard: Command;
 export declare const toggleBorderMark: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const setBorderMark: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (attrs: Partial<BorderMarkAttributes>) => Command;

package/dist/types-ts4.5/ui/toolbar/commands.d.ts

@@ -11,6 +11,7 @@ export declare const getNodeType: (state: EditorState) => "mediaSingle" | "media
 export declare const changeInlineToMediaCard: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, forceFocusSelector: ForceFocusSelector | undefined) => Command;
 export declare const changeMediaCardToInline: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, forceFocusSelector: ForceFocusSelector | undefined) => Command;
 export declare const changeMediaInlineToMediaSingle: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, widthPluginState: WidthPluginState | undefined, allowPixelResizing?: boolean) => Command;
+export declare const removeInlineCardWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const removeInlineCard: Command;
 export declare const toggleBorderMark: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;
 export declare const setBorderMark: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (attrs: Partial<BorderMarkAttributes>) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "2.7.2",
+	"version": "3.0.0",
 	"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": "^23.0.0",
-		"@atlaskit/editor-common": "^103.22.0",
+		"@atlaskit/editor-common": "^104.0.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-annotation": "^2.7.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^4.0.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^4.1.0",
 		"@atlaskit/editor-plugin-focus": "^1.5.0",
 		"@atlaskit/editor-plugin-grid": "^2.0.0",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
@@ -59,18 +59,18 @@
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/media-card": "^79.2.0",
-		"@atlaskit/media-client": "^32.0.0",
+		"@atlaskit/media-client": "^33.0.0",
 		"@atlaskit/media-client-react": "^4.0.0",
 		"@atlaskit/media-common": "^12.0.0",
-		"@atlaskit/media-filmstrip": "^49.0.0",
-		"@atlaskit/media-picker": "^68.0.0",
+		"@atlaskit/media-filmstrip": "^50.0.0",
+		"@atlaskit/media-picker": "^69.0.0",
 		"@atlaskit/media-ui": "^28.1.0",
 		"@atlaskit/media-viewer": "^52.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.6.0",
+		"@atlaskit/primitives": "^14.7.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.15.0",
+		"@atlaskit/tmp-editor-statsig": "^4.16.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -85,7 +85,7 @@
 		"typescript": "~5.4.2"
 	},
 	"peerDependencies": {
-		"@atlaskit/media-core": "^35.0.0",
+		"@atlaskit/media-core": "^36.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -166,9 +166,6 @@
 		"platform_editor_add_media_from_url_rollout": {
 			"type": "boolean"
 		},
-		"platform_editor_render_media_viewer_as_inline": {
-			"type": "boolean"
-		},
 		"platform_editor_multi_images_overridden_upload_fix": {
 			"type": "boolean"
 		},
@@ -195,6 +192,9 @@
 		},
 		"platform_editor_track_media_fail_to_insert": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_analytics_2": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {