@atlaskit/editor-plugin-media 1.43.8 → 1.43.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-media
 
+## 1.43.10
+
+### Patch Changes
+
+- [#98950](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98950)
+  [`497556595c03a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/497556595c03a) -
+  ED-26125 remove fg platform_editor_media_previewer_bugfix
+
+## 1.43.9
+
+### Patch Changes
+
+- [#97992](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97992)
+  [`129bc0e5c4f11`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/129bc0e5c4f11) -
+  ED-26104 fix editing captions on edge browsers
+- Updated dependencies
+
 ## 1.43.8
 
 ### Patch Changes

package/dist/cjs/mediaPlugin.js

@@ -279,7 +279,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
     contentComponent: function contentComponent(_ref12) {
       var editorView = _ref12.editorView,
         appearance = _ref12.appearance;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') && /*#__PURE__*/_react.default.createElement(MediaViewerFunctionalComponent, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(MediaViewerFunctionalComponent, {
         api: api,
         editorView: editorView
       }), /*#__PURE__*/_react.default.createElement(MediaPickerFunctionalComponent, {

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

@@ -974,7 +974,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
       },
       handleDoubleClickOn: function handleDoubleClickOn(view) {
         var _pluginInjectionApi$e;
-        if (!(0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') || !(0, _platformFeatureFlags.fg)('platform_editor_media_interaction_improvements')) {
+        if (!(0, _platformFeatureFlags.fg)('platform_editor_media_interaction_improvements')) {
           return;
         }
         var isLivePagesViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) === 'view';

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

@@ -37,7 +37,29 @@ var placeholderButton = (0, _primitives.xcss)({
 // Remove this component
 var CaptionPlaceholder = exports.CaptionPlaceholder = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var onClick = _ref.onClick;
+  var handlePointerDown = (0, _react.useCallback)(function (e) {
+    e.preventDefault();
+    onClick();
+  }, [onClick]);
   var message = (0, _platformFeatureFlags.fg)('platform_editor_media_interaction_improvements') ? _objectSpread({}, _media.captionMessages.placeholderWithDoubleClickPrompt) : _objectSpread({}, _media.captionMessages.placeholder);
+
+  // This issue is a temporary fix for users being able to edit captions on edge browsers. This will be removed
+  // replaced with CaptionPlaceholderButton in the near future and this code can be removed.
+  if ((0, _platformFeatureFlags.fg)('platform_editor_fix_edit_caption_on_edge')) {
+    return (
+      // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+      (0, _react2.jsx)("span", {
+        ref: ref,
+        css: placeholder,
+        onPointerDown: handlePointerDown,
+        "data-id": _mediaSingle.CAPTION_PLACEHOLDER_ID,
+        "data-testid": "caption-placeholder"
+      }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      , message))
+    );
+  }
   return (
     // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
     (0, _react2.jsx)("span", {

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

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleShowMediaViewer = exports.generateFilePreviewItem = exports.floatingToolbar = void 0;
+exports.handleShowMediaViewer = exports.floatingToolbar = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -41,7 +41,6 @@ var _PixelEntry = require("../../ui/PixelEntry");
 var _altText2 = require("./alt-text");
 var _commands = require("./commands");
 var _comments = require("./comments");
-var _filePreviewItem = require("./filePreviewItem");
 var _imageBorder = require("./imageBorder");
 var _layoutGroup = require("./layout-group");
 var _linking3 = require("./linking");
@@ -73,20 +72,6 @@ var handleRemoveMediaGroup = function handleRemoveMediaGroup(state, dispatch) {
   }
   return true;
 };
-var generateFilePreviewItem = exports.generateFilePreviewItem = function generateFilePreviewItem(mediaPluginState, intl) {
-  return {
-    type: 'custom',
-    fallback: [],
-    render: function render() {
-      return /*#__PURE__*/_react.default.createElement(_filePreviewItem.FilePreviewItem, {
-        key: "editor.media.card.preview",
-        mediaPluginState: mediaPluginState,
-        intl: intl
-      });
-    },
-    supportsViewMode: true
-  };
-};
 var handleShowMediaViewer = exports.handleShowMediaViewer = function handleShowMediaViewer(_ref) {
   var api = _ref.api,
     mediaPluginState = _ref.mediaPluginState;
@@ -132,7 +117,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
     className: 'thumbnail-appearance' // a11y. uses to force focus on item
   }, {
     type: 'separator'
-  }, (0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') ? {
+  }, {
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
@@ -147,7 +132,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
       })) !== null && _handleShowMediaViewe !== void 0 ? _handleShowMediaViewe : false;
     },
     supportsViewMode: true
-  } : generateFilePreviewItem(mediaPluginState, intl), {
+  }, {
     type: 'separator'
   }, {
     id: 'editor.media.card.download',
@@ -489,7 +474,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       var _selectedMediaSingleNode = (0, _utils2.getSelectedMediaSingle)(state);
       var mediaNode = _selectedMediaSingleNode === null || _selectedMediaSingleNode === void 0 ? void 0 : _selectedMediaSingleNode.node.content.firstChild;
       if (!(0, _mediaSingle2.isVideo)(mediaNode === null || mediaNode === void 0 || (_mediaNode$attrs = mediaNode.attrs) === null || _mediaNode$attrs === void 0 ? void 0 : _mediaNode$attrs.__fileMimeType)) {
-        toolbarButtons.push((0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') ? {
+        toolbarButtons.push({
           id: 'editor.media.viewer',
           testId: 'file-preview-toolbar-button',
           type: 'button',
@@ -504,7 +489,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             })) !== null && _handleShowMediaViewe2 !== void 0 ? _handleShowMediaViewe2 : false;
           },
           supportsViewMode: true
-        } : generateFilePreviewItem(pluginState, intl), {
+        }, {
           type: 'separator',
           supportsViewMode: true
         });

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

@@ -73,7 +73,7 @@ var generateMediaInlineFloatingToolbar = exports.generateMediaInlineFloatingTool
     className: 'thumbnail-appearance' // a11y. uses to force focus on item
   }, {
     type: 'separator'
-  }, (0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') ? {
+  }, {
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
@@ -87,7 +87,7 @@ var generateMediaInlineFloatingToolbar = exports.generateMediaInlineFloatingTool
         api: pluginInjectionApi
       })) !== null && _handleShowMediaViewe !== void 0 ? _handleShowMediaViewe : false;
     }
-  } : (0, _index.generateFilePreviewItem)(mediaPluginState, intl), {
+  }, {
     type: 'separator'
   }, {
     id: 'editor.media.card.download',
@@ -245,7 +245,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
 
   //Image Preview
   if (options.allowImagePreview) {
-    inlineImageItems.push((0, _platformFeatureFlags.fg)('platform_editor_media_previewer_bugfix') ? {
+    inlineImageItems.push({
       id: 'editor.media.viewer',
       testId: 'file-preview-toolbar-button',
       type: 'button',
@@ -260,7 +260,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
         })) !== null && _handleShowMediaViewe2 !== void 0 ? _handleShowMediaViewe2 : false;
       },
       supportsViewMode: true
-    } : (0, _index.generateFilePreviewItem)(mediaPluginState, intl), {
+    }, {
       type: 'separator',
       supportsViewMode: true
     });

package/dist/es2019/mediaPlugin.js

@@ -277,7 +277,7 @@ export const mediaPlugin = ({
       editorView,
       appearance
     }) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, fg('platform_editor_media_previewer_bugfix') && /*#__PURE__*/React.createElement(MediaViewerFunctionalComponent, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MediaViewerFunctionalComponent, {
         api: api,
         editorView: editorView
       }), /*#__PURE__*/React.createElement(MediaPickerFunctionalComponent, {

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

@@ -362,7 +362,7 @@ export class MediaPluginStateImplementation {
       if (!selectedNode) {
         return false;
       }
-      let {
+      const {
         from
       } = view.state.selection;
       // Ignored via go/ees005
@@ -861,7 +861,7 @@ export const createPlugin = (_schema, options, getIntl, pluginInjectionApi, node
       },
       handleDoubleClickOn: view => {
         var _pluginInjectionApi$e, _pluginInjectionApi$e2;
-        if (!fg('platform_editor_media_previewer_bugfix') || !fg('platform_editor_media_interaction_improvements')) {
+        if (!fg('platform_editor_media_interaction_improvements')) {
           return;
         }
         const isLivePagesViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.mode) === 'view';
@@ -913,7 +913,7 @@ export const createPlugin = (_schema, options, getIntl, pluginInjectionApi, node
 
               // only if targeting interactive elements fe. button, slider, range, dropdown
               if (allowedTargets && allowedTargets in targetsAndButtons) {
-                let targetRelatedA11YKeys = targetsAndButtons[allowedTargets];
+                const targetRelatedA11YKeys = targetsAndButtons[allowedTargets];
                 const allowedKeys = new Set(targetRelatedA11YKeys);
                 if (allowedKeys.has(event.key) || allowedKeys.has(event.code)) {
                   // allow event to bubble to be handled by react handlers

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

@@ -30,11 +30,33 @@ const placeholderButton = xcss({
 export const CaptionPlaceholder = /*#__PURE__*/React.forwardRef(({
   onClick
 }, ref) => {
+  const handlePointerDown = useCallback(e => {
+    e.preventDefault();
+    onClick();
+  }, [onClick]);
   const message = fg('platform_editor_media_interaction_improvements') ? {
     ...messages.placeholderWithDoubleClickPrompt
   } : {
     ...messages.placeholder
   };
+
+  // This issue is a temporary fix for users being able to edit captions on edge browsers. This will be removed
+  // replaced with CaptionPlaceholderButton in the near future and this code can be removed.
+  if (fg('platform_editor_fix_edit_caption_on_edge')) {
+    return (
+      // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+      jsx("span", {
+        ref: ref,
+        css: placeholder,
+        onPointerDown: handlePointerDown,
+        "data-id": CAPTION_PLACEHOLDER_ID,
+        "data-testid": "caption-placeholder"
+      }, jsx(FormattedMessage
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      , message))
+    );
+  }
   return (
     // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
     jsx("span", {

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

@@ -31,7 +31,6 @@ import { FullWidthDisplay, PixelEntry } from '../../ui/PixelEntry';
 import { altTextButton, getAltTextToolbar } from './alt-text';
 import { changeMediaCardToInline, changeMediaSingleToMediaInline, setBorderMark, toggleBorderMark, updateMediaSingleWidth } from './commands';
 import { commentButton } from './comments';
-import { FilePreviewItem } from './filePreviewItem';
 import { shouldShowImageBorder } from './imageBorder';
 import { LayoutGroup } from './layout-group';
 import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
@@ -59,20 +58,6 @@ const handleRemoveMediaGroup = (state, dispatch) => {
   }
   return true;
 };
-export const generateFilePreviewItem = (mediaPluginState, intl) => {
-  return {
-    type: 'custom',
-    fallback: [],
-    render: () => {
-      return /*#__PURE__*/React.createElement(FilePreviewItem, {
-        key: "editor.media.card.preview",
-        mediaPluginState: mediaPluginState,
-        intl: intl
-      });
-    },
-    supportsViewMode: true
-  };
-};
 export const handleShowMediaViewer = ({
   api,
   mediaPluginState
@@ -119,7 +104,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDe
     className: 'thumbnail-appearance' // a11y. uses to force focus on item
   }, {
     type: 'separator'
-  }, fg('platform_editor_media_previewer_bugfix') ? {
+  }, {
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
@@ -134,7 +119,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDe
       })) !== null && _handleShowMediaViewe !== void 0 ? _handleShowMediaViewe : false;
     },
     supportsViewMode: true
-  } : generateFilePreviewItem(mediaPluginState, intl), {
+  }, {
     type: 'separator'
   }, {
     id: 'editor.media.card.download',
@@ -493,7 +478,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       const selectedMediaSingleNode = getSelectedMediaSingle(state);
       const mediaNode = selectedMediaSingleNode === null || selectedMediaSingleNode === void 0 ? void 0 : selectedMediaSingleNode.node.content.firstChild;
       if (!isVideo(mediaNode === null || mediaNode === void 0 ? void 0 : (_mediaNode$attrs = mediaNode.attrs) === null || _mediaNode$attrs === void 0 ? void 0 : _mediaNode$attrs.__fileMimeType)) {
-        toolbarButtons.push(fg('platform_editor_media_previewer_bugfix') ? {
+        toolbarButtons.push({
           id: 'editor.media.viewer',
           testId: 'file-preview-toolbar-button',
           type: 'button',
@@ -508,7 +493,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             })) !== null && _handleShowMediaViewe2 !== void 0 ? _handleShowMediaViewe2 : false;
           },
           supportsViewMode: true
-        } : generateFilePreviewItem(pluginState, intl), {
+        }, {
           type: 'separator',
           supportsViewMode: true
         });

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

@@ -23,7 +23,7 @@ import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCa
 import { shouldShowImageBorder } from './imageBorder';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { downloadMedia } from './utils';
-import { generateFilePreviewItem, handleShowMediaViewer } from './index';
+import { handleShowMediaViewer } from './index';
 export const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi, options = {}
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/max-params
@@ -65,7 +65,7 @@ export const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState
     className: 'thumbnail-appearance' // a11y. uses to force focus on item
   }, {
     type: 'separator'
-  }, fg('platform_editor_media_previewer_bugfix') ? {
+  }, {
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
@@ -79,7 +79,7 @@ export const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState
         api: pluginInjectionApi
       })) !== null && _handleShowMediaViewe !== void 0 ? _handleShowMediaViewe : false;
     }
-  } : generateFilePreviewItem(mediaPluginState, intl), {
+  }, {
     type: 'separator'
   }, {
     id: 'editor.media.card.download',
@@ -245,7 +245,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
 
   //Image Preview
   if (options.allowImagePreview) {
-    inlineImageItems.push(fg('platform_editor_media_previewer_bugfix') ? {
+    inlineImageItems.push({
       id: 'editor.media.viewer',
       testId: 'file-preview-toolbar-button',
       type: 'button',
@@ -260,7 +260,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
         })) !== null && _handleShowMediaViewe2 !== void 0 ? _handleShowMediaViewe2 : false;
       },
       supportsViewMode: true
-    } : generateFilePreviewItem(mediaPluginState, intl), {
+    }, {
       type: 'separator',
       supportsViewMode: true
     });

package/dist/esm/mediaPlugin.js

@@ -269,7 +269,7 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
     contentComponent: function contentComponent(_ref12) {
       var editorView = _ref12.editorView,
         appearance = _ref12.appearance;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, fg('platform_editor_media_previewer_bugfix') && /*#__PURE__*/React.createElement(MediaViewerFunctionalComponent, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MediaViewerFunctionalComponent, {
         api: api,
         editorView: editorView
       }), /*#__PURE__*/React.createElement(MediaPickerFunctionalComponent, {

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

@@ -965,7 +965,7 @@ export var createPlugin = function createPlugin(_schema, options, getIntl, plugi
       },
       handleDoubleClickOn: function handleDoubleClickOn(view) {
         var _pluginInjectionApi$e;
-        if (!fg('platform_editor_media_previewer_bugfix') || !fg('platform_editor_media_interaction_improvements')) {
+        if (!fg('platform_editor_media_interaction_improvements')) {
           return;
         }
         var isLivePagesViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) === 'view';

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

@@ -28,7 +28,29 @@ var placeholderButton = xcss({
 // Remove this component
 export var CaptionPlaceholder = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var onClick = _ref.onClick;
+  var handlePointerDown = useCallback(function (e) {
+    e.preventDefault();
+    onClick();
+  }, [onClick]);
   var message = fg('platform_editor_media_interaction_improvements') ? _objectSpread({}, messages.placeholderWithDoubleClickPrompt) : _objectSpread({}, messages.placeholder);
+
+  // This issue is a temporary fix for users being able to edit captions on edge browsers. This will be removed
+  // replaced with CaptionPlaceholderButton in the near future and this code can be removed.
+  if (fg('platform_editor_fix_edit_caption_on_edge')) {
+    return (
+      // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+      jsx("span", {
+        ref: ref,
+        css: placeholder,
+        onPointerDown: handlePointerDown,
+        "data-id": CAPTION_PLACEHOLDER_ID,
+        "data-testid": "caption-placeholder"
+      }, jsx(FormattedMessage
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      , message))
+    );
+  }
   return (
     // eslint-disable-next-line @atlaskit/design-system/use-primitives-text, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
     jsx("span", {

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

@@ -35,7 +35,6 @@ import { FullWidthDisplay, PixelEntry } from '../../ui/PixelEntry';
 import { altTextButton, getAltTextToolbar } from './alt-text';
 import { changeMediaCardToInline, changeMediaSingleToMediaInline, setBorderMark, toggleBorderMark, updateMediaSingleWidth } from './commands';
 import { commentButton } from './comments';
-import { FilePreviewItem } from './filePreviewItem';
 import { shouldShowImageBorder } from './imageBorder';
 import { LayoutGroup } from './layout-group';
 import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
@@ -63,20 +62,6 @@ var handleRemoveMediaGroup = function handleRemoveMediaGroup(state, dispatch) {
   }
   return true;
 };
-export var generateFilePreviewItem = function generateFilePreviewItem(mediaPluginState, intl) {
-  return {
-    type: 'custom',
-    fallback: [],
-    render: function render() {
-      return /*#__PURE__*/React.createElement(FilePreviewItem, {
-        key: "editor.media.card.preview",
-        mediaPluginState: mediaPluginState,
-        intl: intl
-      });
-    },
-    supportsViewMode: true
-  };
-};
 export var handleShowMediaViewer = function handleShowMediaViewer(_ref) {
   var api = _ref.api,
     mediaPluginState = _ref.mediaPluginState;
@@ -122,7 +107,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
     className: 'thumbnail-appearance' // a11y. uses to force focus on item
   }, {
     type: 'separator'
-  }, fg('platform_editor_media_previewer_bugfix') ? {
+  }, {
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
@@ -137,7 +122,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
       })) !== null && _handleShowMediaViewe !== void 0 ? _handleShowMediaViewe : false;
     },
     supportsViewMode: true
-  } : generateFilePreviewItem(mediaPluginState, intl), {
+  }, {
     type: 'separator'
   }, {
     id: 'editor.media.card.download',
@@ -479,7 +464,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       var _selectedMediaSingleNode = getSelectedMediaSingle(state);
       var mediaNode = _selectedMediaSingleNode === null || _selectedMediaSingleNode === void 0 ? void 0 : _selectedMediaSingleNode.node.content.firstChild;
       if (!isVideo(mediaNode === null || mediaNode === void 0 || (_mediaNode$attrs = mediaNode.attrs) === null || _mediaNode$attrs === void 0 ? void 0 : _mediaNode$attrs.__fileMimeType)) {
-        toolbarButtons.push(fg('platform_editor_media_previewer_bugfix') ? {
+        toolbarButtons.push({
           id: 'editor.media.viewer',
           testId: 'file-preview-toolbar-button',
           type: 'button',
@@ -494,7 +479,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             })) !== null && _handleShowMediaViewe2 !== void 0 ? _handleShowMediaViewe2 : false;
           },
           supportsViewMode: true
-        } : generateFilePreviewItem(pluginState, intl), {
+        }, {
           type: 'separator',
           supportsViewMode: true
         });

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

@@ -23,7 +23,7 @@ import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCa
 import { shouldShowImageBorder } from './imageBorder';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { downloadMedia } from './utils';
-import { generateFilePreviewItem, handleShowMediaViewer } from './index';
+import { handleShowMediaViewer } from './index';
 export var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi) {
   var _pluginInjectionApi$a, _pluginInjectionApi$f;
   var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
@@ -63,7 +63,7 @@ export var generateMediaInlineFloatingToolbar = function generateMediaInlineFloa
     className: 'thumbnail-appearance' // a11y. uses to force focus on item
   }, {
     type: 'separator'
-  }, fg('platform_editor_media_previewer_bugfix') ? {
+  }, {
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
@@ -77,7 +77,7 @@ export var generateMediaInlineFloatingToolbar = function generateMediaInlineFloa
         api: pluginInjectionApi
       })) !== null && _handleShowMediaViewe !== void 0 ? _handleShowMediaViewe : false;
     }
-  } : generateFilePreviewItem(mediaPluginState, intl), {
+  }, {
     type: 'separator'
   }, {
     id: 'editor.media.card.download',
@@ -235,7 +235,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
 
   //Image Preview
   if (options.allowImagePreview) {
-    inlineImageItems.push(fg('platform_editor_media_previewer_bugfix') ? {
+    inlineImageItems.push({
       id: 'editor.media.viewer',
       testId: 'file-preview-toolbar-button',
       type: 'button',
@@ -250,7 +250,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
         })) !== null && _handleShowMediaViewe2 !== void 0 ? _handleShowMediaViewe2 : false;
       },
       supportsViewMode: true
-    } : generateFilePreviewItem(mediaPluginState, intl), {
+    }, {
       type: 'separator',
       supportsViewMode: true
     });

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

@@ -1,10 +1,9 @@
 import type { IntlShape } from 'react-intl-next';
-import type { Command, ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarItem } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import type { MediaPluginState } from '../../pm-plugins/types';
 import type { MediaFloatingToolbarOptions } from '../../types';
-export declare const generateFilePreviewItem: (mediaPluginState: MediaPluginState, intl: IntlShape) => FloatingToolbarItem<Command>;
 export declare const handleShowMediaViewer: ({ api, mediaPluginState, }: {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     mediaPluginState: MediaPluginState;

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

@@ -1,10 +1,9 @@
 import type { IntlShape } from 'react-intl-next';
-import type { Command, ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarItem } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import type { MediaPluginState } from '../../pm-plugins/types';
 import type { MediaFloatingToolbarOptions } from '../../types';
-export declare const generateFilePreviewItem: (mediaPluginState: MediaPluginState, intl: IntlShape) => FloatingToolbarItem<Command>;
 export declare const handleShowMediaViewer: ({ api, mediaPluginState, }: {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     mediaPluginState: MediaPluginState;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.43.8",
+	"version": "1.43.10",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-common": "^97.2.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-annotation": "1.26.7",
+		"@atlaskit/editor-plugin-annotation": "1.26.8",
 		"@atlaskit/editor-plugin-connectivity": "^1.1.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -67,7 +67,7 @@
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/textfield": "^6.7.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.29.0",
+		"@atlaskit/tmp-editor-statsig": "^2.30.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -133,9 +133,6 @@
 		"platform_editor_media_batch_updates": {
 			"type": "boolean"
 		},
-		"platform_editor_media_previewer_bugfix": {
-			"type": "boolean"
-		},
 		"platform_editor_media_interaction_improvements": {
 			"type": "boolean"
 		},
@@ -162,6 +159,9 @@
 		},
 		"platform_editor_media_block_default": {
 			"type": "boolean"
+		},
+		"platform_editor_fix_edit_caption_on_edge": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {

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

@@ -1,55 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FilePreviewItem = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _ui = require("@atlaskit/editor-common/ui");
-var _maximize = _interopRequireDefault(require("@atlaskit/icon/core/maximize"));
-var _filePreview = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/file-preview"));
-var _mediaUi = require("@atlaskit/media-ui");
-var _PortalWrapper = require("../../ui/MediaViewer/PortalWrapper");
-var _utils = require("./utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// This function will eventially be removed when platform_editor_media_previewer_bugfix is cleaned up
-var FilePreviewItem = exports.FilePreviewItem = function FilePreviewItem(_ref) {
-  var mediaPluginState = _ref.mediaPluginState,
-    intl = _ref.intl;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    isMediaViewerVisible = _useState2[0],
-    setMediaViewerVisible = _useState2[1];
-  var showMediaViewer = function showMediaViewer() {
-    setMediaViewerVisible(true);
-  };
-  var onMediaViewerClose = function onMediaViewerClose() {
-    setMediaViewerVisible(false);
-  };
-  var selectedNodeAttrs = (0, _utils.getSelectedNearestMediaContainerNodeAttrs)(mediaPluginState);
-  var shouldRenderMediaViewer = selectedNodeAttrs && mediaPluginState.mediaClientConfig && isMediaViewerVisible;
-  var tooltipContent = intl.formatMessage(_mediaUi.messages.preview);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarButton, {
-    testId: "file-preview-toolbar-button",
-    key: "editor.media.card.preview",
-    onClick: showMediaViewer,
-    icon: /*#__PURE__*/_react.default.createElement(_maximize.default, {
-      color: "currentColor",
-      spacing: "spacious",
-      label: "file preview",
-      LEGACY_fallbackIcon: _filePreview.default
-    }),
-    tooltipContent: tooltipContent
-  }), shouldRenderMediaViewer && /*#__PURE__*/_react.default.createElement(_PortalWrapper.RenderMediaViewer
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  , {
-    mediaClientConfig: mediaPluginState.mediaClientConfig,
-    onClose: onMediaViewerClose,
-    selectedNodeAttrs: selectedNodeAttrs
-  }));
-};

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

@@ -1,42 +0,0 @@
-import React, { useState } from 'react';
-import { FloatingToolbarButton as ToolbarButton } from '@atlaskit/editor-common/ui';
-import MaximizeIcon from '@atlaskit/icon/core/maximize';
-import FilePreviewIcon from '@atlaskit/icon/glyph/editor/file-preview';
-import { messages } from '@atlaskit/media-ui';
-import { RenderMediaViewer } from '../../ui/MediaViewer/PortalWrapper';
-import { getSelectedNearestMediaContainerNodeAttrs } from './utils';
-// This function will eventially be removed when platform_editor_media_previewer_bugfix is cleaned up
-export const FilePreviewItem = ({
-  mediaPluginState,
-  intl
-}) => {
-  const [isMediaViewerVisible, setMediaViewerVisible] = useState(false);
-  const showMediaViewer = () => {
-    setMediaViewerVisible(true);
-  };
-  const onMediaViewerClose = () => {
-    setMediaViewerVisible(false);
-  };
-  const selectedNodeAttrs = getSelectedNearestMediaContainerNodeAttrs(mediaPluginState);
-  const shouldRenderMediaViewer = selectedNodeAttrs && mediaPluginState.mediaClientConfig && isMediaViewerVisible;
-  const tooltipContent = intl.formatMessage(messages.preview);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ToolbarButton, {
-    testId: "file-preview-toolbar-button",
-    key: "editor.media.card.preview",
-    onClick: showMediaViewer,
-    icon: /*#__PURE__*/React.createElement(MaximizeIcon, {
-      color: "currentColor",
-      spacing: "spacious",
-      label: "file preview",
-      LEGACY_fallbackIcon: FilePreviewIcon
-    }),
-    tooltipContent: tooltipContent
-  }), shouldRenderMediaViewer && /*#__PURE__*/React.createElement(RenderMediaViewer
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  , {
-    mediaClientConfig: mediaPluginState.mediaClientConfig,
-    onClose: onMediaViewerClose,
-    selectedNodeAttrs: selectedNodeAttrs
-  }));
-};

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

@@ -1,45 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useState } from 'react';
-import { FloatingToolbarButton as ToolbarButton } from '@atlaskit/editor-common/ui';
-import MaximizeIcon from '@atlaskit/icon/core/maximize';
-import FilePreviewIcon from '@atlaskit/icon/glyph/editor/file-preview';
-import { messages } from '@atlaskit/media-ui';
-import { RenderMediaViewer } from '../../ui/MediaViewer/PortalWrapper';
-import { getSelectedNearestMediaContainerNodeAttrs } from './utils';
-// This function will eventially be removed when platform_editor_media_previewer_bugfix is cleaned up
-export var FilePreviewItem = function FilePreviewItem(_ref) {
-  var mediaPluginState = _ref.mediaPluginState,
-    intl = _ref.intl;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isMediaViewerVisible = _useState2[0],
-    setMediaViewerVisible = _useState2[1];
-  var showMediaViewer = function showMediaViewer() {
-    setMediaViewerVisible(true);
-  };
-  var onMediaViewerClose = function onMediaViewerClose() {
-    setMediaViewerVisible(false);
-  };
-  var selectedNodeAttrs = getSelectedNearestMediaContainerNodeAttrs(mediaPluginState);
-  var shouldRenderMediaViewer = selectedNodeAttrs && mediaPluginState.mediaClientConfig && isMediaViewerVisible;
-  var tooltipContent = intl.formatMessage(messages.preview);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ToolbarButton, {
-    testId: "file-preview-toolbar-button",
-    key: "editor.media.card.preview",
-    onClick: showMediaViewer,
-    icon: /*#__PURE__*/React.createElement(MaximizeIcon, {
-      color: "currentColor",
-      spacing: "spacious",
-      label: "file preview",
-      LEGACY_fallbackIcon: FilePreviewIcon
-    }),
-    tooltipContent: tooltipContent
-  }), shouldRenderMediaViewer && /*#__PURE__*/React.createElement(RenderMediaViewer
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  , {
-    mediaClientConfig: mediaPluginState.mediaClientConfig,
-    onClose: onMediaViewerClose,
-    selectedNodeAttrs: selectedNodeAttrs
-  }));
-};

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

@@ -1,9 +0,0 @@
-/// <reference types="react" />
-import type { IntlShape } from 'react-intl-next';
-import type { MediaPluginState } from '../../pm-plugins/types';
-interface FilePreviewProps {
-    mediaPluginState: MediaPluginState;
-    intl: IntlShape;
-}
-export declare const FilePreviewItem: ({ mediaPluginState, intl }: FilePreviewProps) => JSX.Element;
-export {};

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

@@ -1,9 +0,0 @@
-/// <reference types="react" />
-import type { IntlShape } from 'react-intl-next';
-import type { MediaPluginState } from '../../pm-plugins/types';
-interface FilePreviewProps {
-    mediaPluginState: MediaPluginState;
-    intl: IntlShape;
-}
-export declare const FilePreviewItem: ({ mediaPluginState, intl }: FilePreviewProps) => JSX.Element;
-export {};