@atlaskit/editor-plugin-media 2.3.3 → 2.3.5

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-media
 
+## 2.3.5
+
+### Patch Changes
+
+- [#122997](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122997)
+  [`791cc6fffe214`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/791cc6fffe214) -
+  Cleanup FF platform_editor_fix_edit_caption_on_edge
+- [#122924](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122924)
+  [`cf36dece8da78`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cf36dece8da78) -
+  [ED-26945] Hide overflow menu when resizing media single
+
+## 2.3.4
+
+### Patch Changes
+
+- [#122831](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122831)
+  [`002ac06bd6251`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/002ac06bd6251) -
+  [ED-26937] Fix broken typeaheads in inline comment editor
+- [#122309](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122309)
+  [`7042c11d59f4c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7042c11d59f4c) -
+  [ux] Add linking buttons to media
+- Updated dependencies
+
 ## 2.3.3
 
 ### Patch Changes

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

@@ -12,7 +12,6 @@ var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _media = require("@atlaskit/editor-common/media");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _colors = require("@atlaskit/theme/colors");
 var _templateObject;
@@ -42,27 +41,12 @@ var CaptionPlaceholder = exports.CaptionPlaceholder = /*#__PURE__*/_react.defaul
 
   // 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
-      , computedPlaceholderMessage))
-    );
-  }
   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,
-      onClick: onClick,
+      onPointerDown: handlePointerDown,
       "data-id": _mediaSingle.CAPTION_PLACEHOLDER_ID,
       "data-testid": "caption-placeholder"
     }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage

package/dist/cjs/ui/PixelEntry/styles.js

@@ -45,7 +45,9 @@ var pixelEntryHiddenSubmit = exports.pixelEntryHiddenSubmit = (0, _react.css)({
   gridArea: 'submit',
   visibility: 'hidden',
   width: 0,
-  height: 0
+  height: 0,
+  // this is needed so that this button doesn't contribute to scroll width of media floating toolbar and display scroll buttons unnecessarily
+  padding: 0
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

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

@@ -622,6 +622,15 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         });
       }
     }
+
+    // open link
+    if (allowLinking && (0, _linking3.shouldShowMediaLinkToolbar)(state) && mediaLinkingState && mediaLinkingState.editable) {
+      toolbarButtons.push((0, _linking3.getOpenLinkToolbarButtonOption)(intl, mediaLinkingState, pluginInjectionApi), {
+        type: 'separator',
+        supportsViewMode: true,
+        fullHeight: true
+      });
+    }
     isViewOnly && toolbarButtons.push({
       type: 'copy-button',
       items: [{
@@ -738,12 +747,12 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     };
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if (!mediaPluginState.isResizing && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     var _pluginInjectionApi$a10;
-    if (items[items.length - 1].type === 'separator') {
-      var separatorItem = items[items.length - 1];
-      separatorItem.fullHeight = true;
-    } else {
+    var lastItem = items.at(-1);
+    if ((lastItem === null || lastItem === void 0 ? void 0 : lastItem.type) === 'separator') {
+      lastItem.fullHeight = true;
+    } else if (items.length) {
       items.push({
         type: 'separator',
         fullHeight: true
@@ -752,7 +761,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     var altTextTitle = intl.formatMessage(_media.altTextMessages.addAltText);
     items.push({
       type: 'overflow-dropdown',
-      options: [{
+      options: [].concat((0, _toConsumableArray2.default)((0, _linking3.getLinkingDropdownOptions)(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly)), [{
         title: altTextTitle,
         onClick: (0, _commands.openMediaAltTextMenu)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions),
         icon: /*#__PURE__*/_react.default.createElement(_text.default, {
@@ -786,7 +795,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
         icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
           label: "Delete"
         })
-      }]
+      }])
     });
   }
 

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

@@ -4,13 +4,19 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLinkingToolbar = void 0;
+exports.getOpenLinkToolbarButtonOption = exports.getLinkingToolbar = exports.getLinkingDropdownOptions = void 0;
 exports.shouldShowMediaLinkToolbar = shouldShowMediaLinkToolbar;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
+var _adfSchema = require("@atlaskit/adf-schema");
+var _analytics = require("@atlaskit/editor-common/analytics");
+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 _linking = require("../../pm-plugins/commands/linking");
 var _linking2 = require("../../pm-plugins/linking");
+var _currentMediaNode = require("../../pm-plugins/utils/current-media-node");
 var _MediaLinkingToolbar = _interopRequireDefault(require("../../ui/MediaLinkingToolbar"));
 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) { (0, _defineProperty2.default)(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; }
@@ -95,4 +101,87 @@ var getLinkingToolbar = exports.getLinkingToolbar = function getLinkingToolbar(t
       });
     }
   }
+};
+var mediaTypes = ['image', 'video', 'audio', 'doc', 'archive', 'unknown'];
+var getMediaType = function getMediaType(selectedNodeTypeSingle) {
+  return mediaTypes.find(function (type) {
+    return selectedNodeTypeSingle === null || selectedNodeTypeSingle === void 0 ? void 0 : selectedNodeTypeSingle.includes(type);
+  });
+};
+var getLinkingDropdownOptions = exports.getLinkingDropdownOptions = function getLinkingDropdownOptions(editorState, intl, mediaLinkingState, isInlineNode, allowLinking, isViewOnly) {
+  if (isViewOnly || !allowLinking || !shouldShowMediaLinkToolbar(editorState)) {
+    return [];
+  }
+  var mediaType;
+  var mediaNode = isInlineNode ? (0, _currentMediaNode.currentMediaInlineNode)(editorState) : (0, _currentMediaNode.currentMediaNode)(editorState);
+  if (mediaNode) {
+    var selectedNodeTypeSingle = mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.attrs.__fileMimeType;
+    mediaType = getMediaType(selectedNodeTypeSingle);
+  }
+  if (mediaType !== 'external' && mediaType !== 'image') {
+    return [];
+  }
+  if (mediaLinkingState && mediaLinkingState.editable) {
+    var title = intl.formatMessage(_messages.linkToolbarMessages.editLink);
+    return [{
+      title: title,
+      onClick: function onClick(editorState, dispatch, editorView) {
+        if (editorView) {
+          var state = editorView.state,
+            _dispatch = editorView.dispatch;
+          (0, _linking.showLinkingToolbar)(state, _dispatch);
+        }
+        return true;
+      },
+      icon: /*#__PURE__*/_react.default.createElement(_link.default, {
+        label: title
+      })
+    }];
+  } else {
+    var _title = intl.formatMessage(_messages.linkToolbarMessages.addLink);
+    return [{
+      title: _title,
+      onClick: function onClick(editorState, dispatch, editorView) {
+        if (editorView) {
+          var state = editorView.state,
+            _dispatch2 = editorView.dispatch;
+          (0, _linking.showLinkingToolbar)(state, _dispatch2);
+        }
+        return true;
+      },
+      icon: /*#__PURE__*/_react.default.createElement(_link.default, {
+        label: _title
+      })
+    }];
+  }
+};
+var getOpenLinkToolbarButtonOption = exports.getOpenLinkToolbarButtonOption = function getOpenLinkToolbarButtonOption(intl, mediaLinkingState, pluginInjectionApi) {
+  var isValidUrl = (0, _adfSchema.isSafeUrl)(mediaLinkingState.link);
+  var linkTitle = intl.formatMessage(isValidUrl ? _messages.linkMessages.openLink : _messages.linkToolbarMessages.unableToOpenLink);
+  return {
+    id: 'editor.media.open-link',
+    testId: 'open-link-toolbar-button',
+    type: 'button',
+    icon: _linkExternal.default,
+    title: linkTitle,
+    target: '_blank',
+    href: isValidUrl ? mediaLinkingState.link : undefined,
+    disabled: !isValidUrl,
+    onClick: function onClick(state, dispatch, editorView) {
+      if (editorView) {
+        var _pluginInjectionApi$a4;
+        var tr = editorView.state.tr,
+          _dispatch3 = editorView.dispatch;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          action: _analytics.ACTION.VISITED,
+          actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.LINK
+        })(tr);
+        _dispatch3(tr);
+      }
+      return true;
+    },
+    supportsViewMode: true
+  };
 };

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

@@ -29,6 +29,7 @@ var _ImageBorder = _interopRequireDefault(require("../../ui/ImageBorder"));
 var _altText = require("./alt-text");
 var _commands = require("./commands");
 var _imageBorder = require("./imageBorder");
+var _linking3 = require("./linking");
 var _linkingToolbarAppearance = require("./linking-toolbar-appearance");
 var _utils = require("./utils");
 var _index = require("./index");
@@ -322,6 +323,15 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       fullHeight: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')
     });
   }
+
+  // open link
+  if (options.allowLinking && (0, _linking3.shouldShowMediaLinkToolbar)(state) && mediaLinkingState && mediaLinkingState.editable && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+    inlineImageItems.push((0, _linking3.getOpenLinkToolbarButtonOption)(intl, mediaLinkingState, pluginInjectionApi), {
+      type: 'separator',
+      supportsViewMode: true,
+      fullHeight: true
+    });
+  }
   if (options.isViewOnly) {
     inlineImageItems.push({
       id: 'editor.media.image.download',

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

@@ -9,7 +9,6 @@ import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { captionMessages as messages } from '@atlaskit/editor-common/media';
 import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Pressable, Text, xcss } from '@atlaskit/primitives';
 import { N200 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
@@ -38,27 +37,12 @@ export const CaptionPlaceholder = /*#__PURE__*/React.forwardRef(({
 
   // 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
-      , computedPlaceholderMessage))
-    );
-  }
   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,
-      onClick: onClick,
+      onPointerDown: handlePointerDown,
       "data-id": CAPTION_PLACEHOLDER_ID,
       "data-testid": "caption-placeholder"
     }, jsx(FormattedMessage

package/dist/es2019/ui/PixelEntry/styles.js

@@ -50,7 +50,9 @@ export const pixelEntryHiddenSubmit = css({
   gridArea: 'submit',
   visibility: 'hidden',
   width: 0,
-  height: 0
+  height: 0,
+  // this is needed so that this button doesn't contribute to scroll width of media floating toolbar and display scroll buttons unnecessarily
+  padding: 0
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

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

@@ -40,7 +40,7 @@ import { changeMediaCardToInline, changeMediaSingleToMediaInline, setBorderMark,
 import { commentButton } from './comments';
 import { shouldShowImageBorder } from './imageBorder';
 import { LayoutGroup } from './layout-group';
-import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
+import { getLinkingDropdownOptions, getLinkingToolbar, getOpenLinkToolbarButtonOption, shouldShowMediaLinkToolbar } from './linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { generateMediaInlineFloatingToolbar } from './mediaInline';
 import { calcNewLayout, canShowSwitchButtons, downloadMedia, getMaxToolbarWidth, getPixelWidthOfElement, getSelectedLayoutIcon, getSelectedMediaSingle, getSelectedNearestMediaContainerNodeAttrs, removeMediaGroupNode } from './utils';
@@ -624,6 +624,15 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         });
       }
     }
+
+    // open link
+    if (allowLinking && shouldShowMediaLinkToolbar(state) && mediaLinkingState && mediaLinkingState.editable) {
+      toolbarButtons.push(getOpenLinkToolbarButtonOption(intl, mediaLinkingState, pluginInjectionApi), {
+        type: 'separator',
+        supportsViewMode: true,
+        fullHeight: true
+      });
+    }
     isViewOnly && toolbarButtons.push({
       type: 'copy-button',
       items: [{
@@ -738,12 +747,12 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     };
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (!mediaPluginState.isResizing && editorExperiment('platform_editor_controls', 'variant1')) {
     var _pluginInjectionApi$a10;
-    if (items[items.length - 1].type === 'separator') {
-      const separatorItem = items[items.length - 1];
-      separatorItem.fullHeight = true;
-    } else {
+    const lastItem = items.at(-1);
+    if ((lastItem === null || lastItem === void 0 ? void 0 : lastItem.type) === 'separator') {
+      lastItem.fullHeight = true;
+    } else if (items.length) {
       items.push({
         type: 'separator',
         fullHeight: true
@@ -752,7 +761,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     const altTextTitle = intl.formatMessage(altTextMessages.addAltText);
     items.push({
       type: 'overflow-dropdown',
-      options: [{
+      options: [...getLinkingDropdownOptions(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly), {
         title: altTextTitle,
         onClick: openMediaAltTextMenu(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions),
         icon: /*#__PURE__*/React.createElement(TextIcon, {

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

@@ -1,7 +1,13 @@
 import React from 'react';
+import { isSafeUrl } from '@atlaskit/adf-schema';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { linkMessages, linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
-import { hideLinkingToolbar, setUrlToMedia, unlink } from '../../pm-plugins/commands/linking';
+import LinkIcon from '@atlaskit/icon/core/link';
+import LinkExternalIcon from '@atlaskit/icon/core/link-external';
+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';
 import MediaLinkingToolbar from '../../ui/MediaLinkingToolbar';
 const FORCE_FOCUS_SELECTOR = '[data-testid="add-link-button"],[data-testid="edit-link-button"]';
 export function shouldShowMediaLinkToolbar(editorState) {
@@ -96,4 +102,93 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
       };
     }
   }
+};
+const mediaTypes = ['image', 'video', 'audio', 'doc', 'archive', 'unknown'];
+const getMediaType = selectedNodeTypeSingle => {
+  return mediaTypes.find(type => selectedNodeTypeSingle === null || selectedNodeTypeSingle === void 0 ? void 0 : selectedNodeTypeSingle.includes(type));
+};
+export const getLinkingDropdownOptions = (editorState, intl, mediaLinkingState, isInlineNode, allowLinking, isViewOnly) => {
+  if (isViewOnly || !allowLinking || !shouldShowMediaLinkToolbar(editorState)) {
+    return [];
+  }
+  let mediaType;
+  const mediaNode = isInlineNode ? currentMediaInlineNode(editorState) : currentMediaNode(editorState);
+  if (mediaNode) {
+    const selectedNodeTypeSingle = mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.attrs.__fileMimeType;
+    mediaType = getMediaType(selectedNodeTypeSingle);
+  }
+  if (mediaType !== 'external' && mediaType !== 'image') {
+    return [];
+  }
+  if (mediaLinkingState && mediaLinkingState.editable) {
+    const title = intl.formatMessage(linkToolbarMessages.editLink);
+    return [{
+      title,
+      onClick: (editorState, dispatch, editorView) => {
+        if (editorView) {
+          const {
+            state,
+            dispatch
+          } = editorView;
+          showLinkingToolbar(state, dispatch);
+        }
+        return true;
+      },
+      icon: /*#__PURE__*/React.createElement(LinkIcon, {
+        label: title
+      })
+    }];
+  } else {
+    const title = intl.formatMessage(linkToolbarMessages.addLink);
+    return [{
+      title,
+      onClick: (editorState, dispatch, editorView) => {
+        if (editorView) {
+          const {
+            state,
+            dispatch
+          } = editorView;
+          showLinkingToolbar(state, dispatch);
+        }
+        return true;
+      },
+      icon: /*#__PURE__*/React.createElement(LinkIcon, {
+        label: title
+      })
+    }];
+  }
+};
+export const getOpenLinkToolbarButtonOption = (intl, mediaLinkingState, pluginInjectionApi) => {
+  const isValidUrl = isSafeUrl(mediaLinkingState.link);
+  const linkTitle = intl.formatMessage(isValidUrl ? linkMessages.openLink : linkToolbarMessages.unableToOpenLink);
+  return {
+    id: 'editor.media.open-link',
+    testId: 'open-link-toolbar-button',
+    type: 'button',
+    icon: LinkExternalIcon,
+    title: linkTitle,
+    target: '_blank',
+    href: isValidUrl ? mediaLinkingState.link : undefined,
+    disabled: !isValidUrl,
+    onClick: (state, dispatch, editorView) => {
+      if (editorView) {
+        var _pluginInjectionApi$a4;
+        const {
+          state: {
+            tr
+          },
+          dispatch
+        } = editorView;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
+          eventType: EVENT_TYPE.TRACK,
+          action: ACTION.VISITED,
+          actionSubject: ACTION_SUBJECT.MEDIA,
+          actionSubjectId: ACTION_SUBJECT_ID.LINK
+        })(tr);
+        dispatch(tr);
+      }
+      return true;
+    },
+    supportsViewMode: true
+  };
 };

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

@@ -21,6 +21,7 @@ import ImageBorderItem from '../../ui/ImageBorder';
 import { altTextButton } from './alt-text';
 import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';
 import { shouldShowImageBorder } from './imageBorder';
+import { getOpenLinkToolbarButtonOption, shouldShowMediaLinkToolbar } from './linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { downloadMedia } from './utils';
 import { handleShowMediaViewer } from './index';
@@ -314,6 +315,15 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
       fullHeight: editorExperiment('platform_editor_controls', 'variant1')
     });
   }
+
+  // open link
+  if (options.allowLinking && shouldShowMediaLinkToolbar(state) && mediaLinkingState && mediaLinkingState.editable && editorExperiment('platform_editor_controls', 'variant1')) {
+    inlineImageItems.push(getOpenLinkToolbarButtonOption(intl, mediaLinkingState, pluginInjectionApi), {
+      type: 'separator',
+      supportsViewMode: true,
+      fullHeight: true
+    });
+  }
   if (options.isViewOnly) {
     inlineImageItems.push({
       id: 'editor.media.image.download',

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

@@ -11,7 +11,6 @@ import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { captionMessages as messages } from '@atlaskit/editor-common/media';
 import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Pressable, Text, xcss } from '@atlaskit/primitives';
 import { N200 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
@@ -33,27 +32,12 @@ export var CaptionPlaceholder = /*#__PURE__*/React.forwardRef(function (_ref, re
 
   // 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
-      , computedPlaceholderMessage))
-    );
-  }
   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,
-      onClick: onClick,
+      onPointerDown: handlePointerDown,
       "data-id": CAPTION_PLACEHOLDER_ID,
       "data-testid": "caption-placeholder"
     }, jsx(FormattedMessage

package/dist/esm/ui/PixelEntry/styles.js

@@ -39,7 +39,9 @@ export var pixelEntryHiddenSubmit = css({
   gridArea: 'submit',
   visibility: 'hidden',
   width: 0,
-  height: 0
+  height: 0,
+  // this is needed so that this button doesn't contribute to scroll width of media floating toolbar and display scroll buttons unnecessarily
+  padding: 0
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

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

@@ -44,7 +44,7 @@ import { changeMediaCardToInline, changeMediaSingleToMediaInline, setBorderMark,
 import { commentButton } from './comments';
 import { shouldShowImageBorder } from './imageBorder';
 import { LayoutGroup } from './layout-group';
-import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
+import { getLinkingDropdownOptions, getLinkingToolbar, getOpenLinkToolbarButtonOption, shouldShowMediaLinkToolbar } from './linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { generateMediaInlineFloatingToolbar } from './mediaInline';
 import { calcNewLayout, canShowSwitchButtons, downloadMedia, getMaxToolbarWidth, getPixelWidthOfElement, getSelectedLayoutIcon, getSelectedMediaSingle, getSelectedNearestMediaContainerNodeAttrs, removeMediaGroupNode } from './utils';
@@ -612,6 +612,15 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         });
       }
     }
+
+    // open link
+    if (allowLinking && shouldShowMediaLinkToolbar(state) && mediaLinkingState && mediaLinkingState.editable) {
+      toolbarButtons.push(getOpenLinkToolbarButtonOption(intl, mediaLinkingState, pluginInjectionApi), {
+        type: 'separator',
+        supportsViewMode: true,
+        fullHeight: true
+      });
+    }
     isViewOnly && toolbarButtons.push({
       type: 'copy-button',
       items: [{
@@ -728,12 +737,12 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     };
     items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (!mediaPluginState.isResizing && editorExperiment('platform_editor_controls', 'variant1')) {
     var _pluginInjectionApi$a10;
-    if (items[items.length - 1].type === 'separator') {
-      var separatorItem = items[items.length - 1];
-      separatorItem.fullHeight = true;
-    } else {
+    var lastItem = items.at(-1);
+    if ((lastItem === null || lastItem === void 0 ? void 0 : lastItem.type) === 'separator') {
+      lastItem.fullHeight = true;
+    } else if (items.length) {
       items.push({
         type: 'separator',
         fullHeight: true
@@ -742,7 +751,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     var altTextTitle = intl.formatMessage(altTextMessages.addAltText);
     items.push({
       type: 'overflow-dropdown',
-      options: [{
+      options: [].concat(_toConsumableArray(getLinkingDropdownOptions(state, intl, mediaLinkingState, allowMediaInline && selectedNodeType && selectedNodeType === mediaInline, allowLinking, isViewOnly)), [{
         title: altTextTitle,
         onClick: openMediaAltTextMenu(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a10 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a10 === void 0 ? void 0 : _pluginInjectionApi$a10.actions),
         icon: /*#__PURE__*/React.createElement(TextIcon, {
@@ -776,7 +785,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
         icon: /*#__PURE__*/React.createElement(DeleteIcon, {
           label: "Delete"
         })
-      }]
+      }])
     });
   }
 

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

@@ -2,9 +2,15 @@ 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 { isSafeUrl } from '@atlaskit/adf-schema';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { linkMessages, linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
-import { hideLinkingToolbar, setUrlToMedia, unlink } from '../../pm-plugins/commands/linking';
+import LinkIcon from '@atlaskit/icon/core/link';
+import LinkExternalIcon from '@atlaskit/icon/core/link-external';
+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';
 import MediaLinkingToolbar from '../../ui/MediaLinkingToolbar';
 var FORCE_FOCUS_SELECTOR = '[data-testid="add-link-button"],[data-testid="edit-link-button"]';
 export function shouldShowMediaLinkToolbar(editorState) {
@@ -87,4 +93,87 @@ export var getLinkingToolbar = function getLinkingToolbar(toolbarBaseConfig, med
       });
     }
   }
+};
+var mediaTypes = ['image', 'video', 'audio', 'doc', 'archive', 'unknown'];
+var getMediaType = function getMediaType(selectedNodeTypeSingle) {
+  return mediaTypes.find(function (type) {
+    return selectedNodeTypeSingle === null || selectedNodeTypeSingle === void 0 ? void 0 : selectedNodeTypeSingle.includes(type);
+  });
+};
+export var getLinkingDropdownOptions = function getLinkingDropdownOptions(editorState, intl, mediaLinkingState, isInlineNode, allowLinking, isViewOnly) {
+  if (isViewOnly || !allowLinking || !shouldShowMediaLinkToolbar(editorState)) {
+    return [];
+  }
+  var mediaType;
+  var mediaNode = isInlineNode ? currentMediaInlineNode(editorState) : currentMediaNode(editorState);
+  if (mediaNode) {
+    var selectedNodeTypeSingle = mediaNode === null || mediaNode === void 0 ? void 0 : mediaNode.attrs.__fileMimeType;
+    mediaType = getMediaType(selectedNodeTypeSingle);
+  }
+  if (mediaType !== 'external' && mediaType !== 'image') {
+    return [];
+  }
+  if (mediaLinkingState && mediaLinkingState.editable) {
+    var title = intl.formatMessage(linkToolbarMessages.editLink);
+    return [{
+      title: title,
+      onClick: function onClick(editorState, dispatch, editorView) {
+        if (editorView) {
+          var state = editorView.state,
+            _dispatch = editorView.dispatch;
+          showLinkingToolbar(state, _dispatch);
+        }
+        return true;
+      },
+      icon: /*#__PURE__*/React.createElement(LinkIcon, {
+        label: title
+      })
+    }];
+  } else {
+    var _title = intl.formatMessage(linkToolbarMessages.addLink);
+    return [{
+      title: _title,
+      onClick: function onClick(editorState, dispatch, editorView) {
+        if (editorView) {
+          var state = editorView.state,
+            _dispatch2 = editorView.dispatch;
+          showLinkingToolbar(state, _dispatch2);
+        }
+        return true;
+      },
+      icon: /*#__PURE__*/React.createElement(LinkIcon, {
+        label: _title
+      })
+    }];
+  }
+};
+export var getOpenLinkToolbarButtonOption = function getOpenLinkToolbarButtonOption(intl, mediaLinkingState, pluginInjectionApi) {
+  var isValidUrl = isSafeUrl(mediaLinkingState.link);
+  var linkTitle = intl.formatMessage(isValidUrl ? linkMessages.openLink : linkToolbarMessages.unableToOpenLink);
+  return {
+    id: 'editor.media.open-link',
+    testId: 'open-link-toolbar-button',
+    type: 'button',
+    icon: LinkExternalIcon,
+    title: linkTitle,
+    target: '_blank',
+    href: isValidUrl ? mediaLinkingState.link : undefined,
+    disabled: !isValidUrl,
+    onClick: function onClick(state, dispatch, editorView) {
+      if (editorView) {
+        var _pluginInjectionApi$a4;
+        var tr = editorView.state.tr,
+          _dispatch3 = editorView.dispatch;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
+          eventType: EVENT_TYPE.TRACK,
+          action: ACTION.VISITED,
+          actionSubject: ACTION_SUBJECT.MEDIA,
+          actionSubjectId: ACTION_SUBJECT_ID.LINK
+        })(tr);
+        _dispatch3(tr);
+      }
+      return true;
+    },
+    supportsViewMode: true
+  };
 };

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

@@ -21,6 +21,7 @@ import ImageBorderItem from '../../ui/ImageBorder';
 import { altTextButton } from './alt-text';
 import { changeInlineToMediaCard, changeMediaInlineToMediaSingle, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';
 import { shouldShowImageBorder } from './imageBorder';
+import { getOpenLinkToolbarButtonOption, shouldShowMediaLinkToolbar } from './linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { downloadMedia } from './utils';
 import { handleShowMediaViewer } from './index';
@@ -312,6 +313,15 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       fullHeight: editorExperiment('platform_editor_controls', 'variant1')
     });
   }
+
+  // open link
+  if (options.allowLinking && shouldShowMediaLinkToolbar(state) && mediaLinkingState && mediaLinkingState.editable && editorExperiment('platform_editor_controls', 'variant1')) {
+    inlineImageItems.push(getOpenLinkToolbarButtonOption(intl, mediaLinkingState, pluginInjectionApi), {
+      type: 'separator',
+      supportsViewMode: true,
+      fullHeight: true
+    });
+  }
   if (options.isViewOnly) {
     inlineImageItems.push({
       id: 'editor.media.image.download',

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

@@ -1,9 +1,11 @@
 import type { IntlShape } from 'react-intl-next';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
+import type { Command, ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarItem, FloatingToolbarOverflowDropdownOptions } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import type { MediaLinkingState } from '../../pm-plugins/linking/types';
 import type { MediaToolbarBaseConfig } from '../../types';
 export declare function shouldShowMediaLinkToolbar(editorState: EditorState): boolean;
 export declare const getLinkingToolbar: (toolbarBaseConfig: MediaToolbarBaseConfig, mediaLinkingState: MediaLinkingState, state: EditorState, intl: IntlShape, pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined, providerFactory?: ProviderFactory) => FloatingToolbarConfig | undefined;
+export declare const getLinkingDropdownOptions: (editorState: EditorState, intl: IntlShape, mediaLinkingState: MediaLinkingState, isInlineNode?: boolean, allowLinking?: boolean, isViewOnly?: boolean) => FloatingToolbarOverflowDropdownOptions<Command>;
+export declare const getOpenLinkToolbarButtonOption: (intl: IntlShape, mediaLinkingState: MediaLinkingState, pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined) => FloatingToolbarItem<Command>;

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

@@ -1,9 +1,11 @@
 import type { IntlShape } from 'react-intl-next';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI, FloatingToolbarConfig } from '@atlaskit/editor-common/types';
+import type { Command, ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarItem, FloatingToolbarOverflowDropdownOptions } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import type { MediaLinkingState } from '../../pm-plugins/linking/types';
 import type { MediaToolbarBaseConfig } from '../../types';
 export declare function shouldShowMediaLinkToolbar(editorState: EditorState): boolean;
 export declare const getLinkingToolbar: (toolbarBaseConfig: MediaToolbarBaseConfig, mediaLinkingState: MediaLinkingState, state: EditorState, intl: IntlShape, pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined, providerFactory?: ProviderFactory) => FloatingToolbarConfig | undefined;
+export declare const getLinkingDropdownOptions: (editorState: EditorState, intl: IntlShape, mediaLinkingState: MediaLinkingState, isInlineNode?: boolean, allowLinking?: boolean, isViewOnly?: boolean) => FloatingToolbarOverflowDropdownOptions<Command>;
+export declare const getOpenLinkToolbarButtonOption: (intl: IntlShape, mediaLinkingState: MediaLinkingState, pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined) => FloatingToolbarItem<Command>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "2.3.3",
+	"version": "2.3.5",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -68,7 +68,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/textfield": "^8.0.0",
-		"@atlaskit/theme": "^17.0.0",
+		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^3.4.0",
 		"@atlaskit/tokens": "^4.3.0",
 		"@atlaskit/tooltip": "^20.0.0",