@atlaskit/editor-plugin-media 0.11.11 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-media
 
+## 0.12.0
+
+### Minor Changes
+
+- [#69175](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69175) [`1760b37895fd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1760b37895fd) - Added support for copy&pasting inline images between pages
+
+### Patch Changes
+
+- [#69008](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/69008) [`dbf9e9255cea`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dbf9e9255cea) - [ux] Show caption remove tooltip on media inline switcher in floating toolbar
+
 ## 0.11.11
 
 ### Patch Changes

package/dist/cjs/commands/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateMediaSingleNodeAttrs = exports.updateCurrentMediaNodeAttrs = exports.updateAllMediaSingleNodesAttrs = exports.replaceExternalMedia = exports.isMediaNode = exports.findMediaSingleNode = exports.findAllMediaSingleNodes = void 0;
+exports.updateMediaNodeAttrs = exports.updateCurrentMediaNodeAttrs = exports.updateAllMediaNodesAttrs = exports.replaceExternalMedia = exports.isMediaNode = exports.findMediaNode = exports.findAllMediaNodes = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _collab = require("@atlaskit/editor-common/collab");
@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
  *
  */
-var findMediaSingleNode = exports.findMediaSingleNode = function findMediaSingleNode(mediaPluginState, id) {
+var findMediaNode = exports.findMediaNode = function findMediaNode(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
 
   // Array#find... no IE support
@@ -31,7 +31,7 @@ var findMediaSingleNode = exports.findMediaSingleNode = function findMediaSingle
     return memo;
   }, null);
 };
-var findAllMediaSingleNodes = exports.findAllMediaSingleNodes = function findAllMediaSingleNodes(mediaPluginState, id) {
+var findAllMediaNodes = exports.findAllMediaNodes = function findAllMediaNodes(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
   return mediaNodes.filter(function (nodeWithHandler) {
     return nodeWithHandler.node.attrs.id === id;
@@ -41,14 +41,14 @@ var isMediaNode = exports.isMediaNode = function isMediaNode(pos, state) {
   var node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);
 };
-var updateAllMediaSingleNodesAttrs = exports.updateAllMediaSingleNodesAttrs = function updateAllMediaSingleNodesAttrs(id, attrs) {
+var updateAllMediaNodesAttrs = exports.updateAllMediaNodesAttrs = function updateAllMediaNodesAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = _pluginKey.stateKey.getState(state);
     if (!mediaPluginState) {
       return false;
     }
     var mediaNodes;
-    mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
+    mediaNodes = findAllMediaNodes(mediaPluginState, id);
     var validMediaNodePositions = mediaNodes.reduce(function (acc, _ref) {
       var getPos = _ref.getPos;
       var pos = getPos();
@@ -88,13 +88,13 @@ var updateCurrentMediaNodeAttrs = exports.updateCurrentMediaNodeAttrs = function
     return true;
   };
 };
-var updateMediaSingleNodeAttrs = exports.updateMediaSingleNodeAttrs = function updateMediaSingleNodeAttrs(id, attrs) {
+var updateMediaNodeAttrs = exports.updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = _pluginKey.stateKey.getState(state);
     if (!mediaPluginState) {
       return false;
     }
-    var mediaNodeWithPos = findMediaSingleNode(mediaPluginState, id);
+    var mediaNodeWithPos = findMediaNode(mediaPluginState, id);
     if (!mediaNodeWithPos) {
       return false;
     }

package/dist/cjs/commands/index.js

@@ -12,13 +12,13 @@ Object.defineProperty(exports, "replaceExternalMedia", {
 Object.defineProperty(exports, "updateAllMediaSingleNodesAttrs", {
   enumerable: true,
   get: function get() {
-    return _helpers.updateAllMediaSingleNodesAttrs;
+    return _helpers.updateAllMediaNodesAttrs;
   }
 });
 Object.defineProperty(exports, "updateMediaSingleNodeAttrs", {
   enumerable: true,
   get: function get() {
-    return _helpers.updateMediaSingleNodeAttrs;
+    return _helpers.updateMediaNodeAttrs;
   }
 });
 var _helpers = require("./helpers");

package/dist/cjs/nodeviews/mediaNodeUpdater.js

@@ -18,19 +18,24 @@ var _mediaClientReact = require("@atlaskit/media-client-react");
 var _helpers = require("../commands/helpers");
 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; }
+var isMediaTypeSupported = function isMediaTypeSupported(type) {
+  if (type) {
+    return ['image', 'file'].includes(type);
+  }
+  return false;
+};
 var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
   function MediaNodeUpdater(props) {
     var _this = this;
     (0, _classCallCheck2.default)(this, MediaNodeUpdater);
     // Updates the node with contextId if it doesn't have one already
-    // TODO [MS-2258]: remove updateContextId in order to only use updateMediaSingleFileAttrs
     (0, _defineProperty2.default)(this, "updateContextId", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var attrs, id, objectId;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             attrs = _this.getAttrs();
-            if (!(!attrs || attrs.type !== 'file')) {
+            if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
               _context.next = 3;
               break;
             }
@@ -41,7 +46,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
             return _this.getObjectId();
           case 6:
             objectId = _context.sent;
-            (0, _helpers.updateAllMediaSingleNodesAttrs)(id, {
+            (0, _helpers.updateAllMediaNodesAttrs)(id, {
               __contextId: objectId
             })(_this.props.view.state, _this.props.view.dispatch);
           case 8:
@@ -57,7 +62,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               attrs = _this.getAttrs();
-              if (!((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file')) {
+              if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
                 _context2.next = 3;
                 break;
               }
@@ -96,7 +101,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
             return _this.props.mediaProvider;
           case 3:
             mediaProvider = _context3.sent;
-            if (!(!mediaProvider || !mediaProvider.uploadParams || !attrs || attrs.type !== 'file' || _this.hasFileAttributesDefined(attrs))) {
+            if (!(!mediaProvider || !mediaProvider.uploadParams || !attrs || !isMediaTypeSupported(attrs.type) || _this.hasFileAttributesDefined(attrs))) {
               _context3.next = 6;
               break;
             }
@@ -167,7 +172,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
             newAttrs = _context4.sent;
             _ref5 = _this.getAttrs(), id = _ref5.id;
             if (id && newAttrs) {
-              (0, _helpers.updateAllMediaSingleNodesAttrs)(id, newAttrs)(_this.props.view.state, _this.props.view.dispatch);
+              (0, _helpers.updateAllMediaNodesAttrs)(id, newAttrs)(_this.props.view.state, _this.props.view.dispatch);
             }
           case 5:
           case "end":
@@ -293,13 +298,13 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
     }());
     (0, _defineProperty2.default)(this, "getNodeContextId", function () {
       var attrs = _this.getAttrs();
-      if (!attrs || attrs.type !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return null;
       }
       return attrs.__contextId || null;
     });
     (0, _defineProperty2.default)(this, "updateDimensions", function (dimensions) {
-      (0, _helpers.updateAllMediaSingleNodesAttrs)(dimensions.id, {
+      (0, _helpers.updateAllMediaNodesAttrs)(dimensions.id, {
         height: dimensions.height,
         width: dimensions.width
       })(_this.props.view.state, _this.props.view.dispatch);
@@ -344,7 +349,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
           case 5:
             currentCollectionName = mediaProvider.uploadParams.collection;
             attrs = _this.getAttrs();
-            if (!(!attrs || attrs.type !== 'file')) {
+            if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
               _context9.next = 9;
               break;
             }
@@ -470,7 +475,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               attrs = _this.getAttrs();
-              if (!((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file')) {
+              if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
                 _context11.next = 3;
                 break;
               }
@@ -509,7 +514,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
             case 0:
               attrs = _this.getAttrs();
               view = _this.props.view;
-              if (!((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file')) {
+              if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
                 _context12.next = 4;
                 break;
               }
@@ -525,7 +530,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
               }
               return _context12.abrupt("return");
             case 9:
-              (0, _helpers.updateMediaSingleNodeAttrs)(attrs.id, copiedAttrs)(view.state, view.dispatch);
+              (0, _helpers.updateMediaNodeAttrs)(attrs.id, copiedAttrs)(view.state, view.dispatch);
             case 10:
             case "end":
               return _context12.stop();

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

@@ -386,7 +386,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
       });
     });
     (0, _defineProperty2.default)(this, "findMediaNode", function (id) {
-      return helpers.findMediaSingleNode(_this, id);
+      return helpers.findMediaNode(_this, id);
     });
     (0, _defineProperty2.default)(this, "destroyAllPickers", function (pickers) {
       pickers.forEach(function (picker) {
@@ -424,7 +424,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
       if (!view) {
         return;
       }
-      return (0, _helpers.updateMediaSingleNodeAttrs)(id, attrs)(view.state, view.dispatch);
+      return (0, _helpers.updateMediaNodeAttrs)(id, attrs)(view.state, view.dispatch);
     });
     (0, _defineProperty2.default)(this, "handleMediaState", function (state) {
       switch (state.status) {

package/dist/cjs/toolbar/index.js

@@ -255,21 +255,16 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     // floating and inline switcher
     if (pluginState.allowInlineImages && selectedNode && (0, _utils2.canShowSwitchButtons)(selectedNode.node)) {
       var _selectedNode$node$fi;
-      var inlineSwitcherTitle = intl.formatMessage(_messages.mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
-      var floatingSwitcherTitle = intl.formatMessage(_messages.mediaAndEmbedToolbarMessages.changeToMediaSingle);
-
-      // This is temporary for PF release and can be removed once we have border and link support for inline images
-      // TODO: [ED-20261] remove this once both border and link marks are supported for inline image
-      var tempTooltipContent = /*#__PURE__*/_react.default.createElement("span", null, "Display inline ", /*#__PURE__*/_react.default.createElement("br", null), " \u26A0 This feature is being developed. The conversion process will not retain the image size, link, border, or any other data.");
-
       // mediaInlne doesn't suppprt external images, so hiding buttons to prevent conversion from mediaSingle to mediaInline
       if (((_selectedNode$node$fi = selectedNode.node.firstChild) === null || _selectedNode$node$fi === void 0 ? void 0 : _selectedNode$node$fi.attrs.type) !== 'external') {
         var _pluginInjectionApi$a4;
+        var hasCaption = (0, _utils.contains)(selectedNode.node, state.schema.nodes.caption);
+        var inlineSwitcherTitle = intl.formatMessage(hasCaption ? _messages.mediaAndEmbedToolbarMessages.changeToMediaInlineImageCaptionWanrning : _messages.mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
+        var floatingSwitcherTitle = intl.formatMessage(_messages.mediaAndEmbedToolbarMessages.changeToMediaSingle);
         toolbarButtons.push({
           type: 'button',
           id: 'editor.media.image.view.switcher.inline',
           title: inlineSwitcherTitle,
-          tooltipContent: tempTooltipContent,
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_card.IconInline, {
               size: "medium",

package/dist/es2019/commands/helpers.js

@@ -6,7 +6,7 @@ import { stateKey as mediaPluginKey } from '../pm-plugins/plugin-key';
  * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
  *
  */
-export const findMediaSingleNode = (mediaPluginState, id) => {
+export const findMediaNode = (mediaPluginState, id) => {
   const {
     mediaNodes
   } = mediaPluginState;
@@ -25,7 +25,7 @@ export const findMediaSingleNode = (mediaPluginState, id) => {
     return memo;
   }, null);
 };
-export const findAllMediaSingleNodes = (mediaPluginState, id) => {
+export const findAllMediaNodes = (mediaPluginState, id) => {
   const {
     mediaNodes
   } = mediaPluginState;
@@ -35,13 +35,13 @@ export const isMediaNode = (pos, state) => {
   const node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);
 };
-export const updateAllMediaSingleNodesAttrs = (id, attrs) => (state, dispatch) => {
+export const updateAllMediaNodesAttrs = (id, attrs) => (state, dispatch) => {
   const mediaPluginState = mediaPluginKey.getState(state);
   if (!mediaPluginState) {
     return false;
   }
   let mediaNodes;
-  mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
+  mediaNodes = findAllMediaNodes(mediaPluginState, id);
   const validMediaNodePositions = mediaNodes.reduce((acc, {
     getPos
   }) => {
@@ -77,12 +77,12 @@ export const updateCurrentMediaNodeAttrs = (attrs, mediaNode) => (state, dispatc
   }
   return true;
 };
-export const updateMediaSingleNodeAttrs = (id, attrs) => (state, dispatch) => {
+export const updateMediaNodeAttrs = (id, attrs) => (state, dispatch) => {
   const mediaPluginState = mediaPluginKey.getState(state);
   if (!mediaPluginState) {
     return false;
   }
-  const mediaNodeWithPos = findMediaSingleNode(mediaPluginState, id);
+  const mediaNodeWithPos = findMediaNode(mediaPluginState, id);
   if (!mediaNodeWithPos) {
     return false;
   }

package/dist/es2019/commands/index.js

@@ -1 +1 @@
-export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';
+export { updateMediaNodeAttrs as updateMediaSingleNodeAttrs, updateAllMediaNodesAttrs as updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';

package/dist/es2019/nodeviews/mediaNodeUpdater.js

@@ -4,27 +4,32 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { getAttrsFromUrl, isImageRepresentationReady, isMediaBlobUrl } from '@atlaskit/media-client';
 import { getMediaClient } from '@atlaskit/media-client-react';
-import { replaceExternalMedia, updateAllMediaSingleNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaSingleNodeAttrs } from '../commands/helpers';
+import { replaceExternalMedia, updateAllMediaNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaNodeAttrs } from '../commands/helpers';
+const isMediaTypeSupported = type => {
+  if (type) {
+    return ['image', 'file'].includes(type);
+  }
+  return false;
+};
 export class MediaNodeUpdater {
   constructor(props) {
     // Updates the node with contextId if it doesn't have one already
-    // TODO [MS-2258]: remove updateContextId in order to only use updateMediaSingleFileAttrs
     _defineProperty(this, "updateContextId", async () => {
       const attrs = this.getAttrs();
-      if (!attrs || attrs.type !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return;
       }
       const {
         id
       } = attrs;
       const objectId = await this.getObjectId();
-      updateAllMediaSingleNodesAttrs(id, {
+      updateAllMediaNodesAttrs(id, {
         __contextId: objectId
       })(this.props.view.state, this.props.view.dispatch);
     });
     _defineProperty(this, "updateNodeContextId", async getPos => {
       const attrs = this.getAttrs();
-      if ((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return;
       }
       const objectId = await this.getObjectId();
@@ -41,7 +46,7 @@ export class MediaNodeUpdater {
     _defineProperty(this, "getNewFileAttrsForNode", async () => {
       const attrs = this.getAttrs();
       const mediaProvider = await this.props.mediaProvider;
-      if (!mediaProvider || !mediaProvider.uploadParams || !attrs || attrs.type !== 'file' || this.hasFileAttributesDefined(attrs)) {
+      if (!mediaProvider || !mediaProvider.uploadParams || !attrs || !isMediaTypeSupported(attrs.type) || this.hasFileAttributesDefined(attrs)) {
         return;
       }
       const mediaClientConfig = mediaProvider.viewMediaClientConfig;
@@ -84,7 +89,7 @@ export class MediaNodeUpdater {
         id
       } = this.getAttrs();
       if (id && newAttrs) {
-        updateAllMediaSingleNodesAttrs(id, newAttrs)(this.props.view.state, this.props.view.dispatch);
+        updateAllMediaNodesAttrs(id, newAttrs)(this.props.view.state, this.props.view.dispatch);
       }
     });
     _defineProperty(this, "updateNodeAttrs", async getPos => {
@@ -152,13 +157,13 @@ export class MediaNodeUpdater {
     });
     _defineProperty(this, "getNodeContextId", () => {
       const attrs = this.getAttrs();
-      if (!attrs || attrs.type !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return null;
       }
       return attrs.__contextId || null;
     });
     _defineProperty(this, "updateDimensions", dimensions => {
-      updateAllMediaSingleNodesAttrs(dimensions.id, {
+      updateAllMediaNodesAttrs(dimensions.id, {
         height: dimensions.height,
         width: dimensions.width
       })(this.props.view.state, this.props.view.dispatch);
@@ -178,7 +183,7 @@ export class MediaNodeUpdater {
       }
       const currentCollectionName = mediaProvider.uploadParams.collection;
       const attrs = this.getAttrs();
-      if (!attrs || attrs.type !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return false;
       }
       const {
@@ -252,7 +257,7 @@ export class MediaNodeUpdater {
     // Copies the pasted node into the current collection using a getPos handler
     _defineProperty(this, "copyNodeFromPos", async (getPos, traceContext) => {
       const attrs = this.getAttrs();
-      if ((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return;
       }
       const copiedAttrs = await this.copyFile(attrs.id, attrs.collection, traceContext);
@@ -270,14 +275,14 @@ export class MediaNodeUpdater {
       const {
         view
       } = this.props;
-      if ((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return;
       }
       const copiedAttrs = await this.copyFile(attrs.id, attrs.collection, traceContext);
       if (!copiedAttrs) {
         return;
       }
-      updateMediaSingleNodeAttrs(attrs.id, copiedAttrs)(view.state, view.dispatch);
+      updateMediaNodeAttrs(attrs.id, copiedAttrs)(view.state, view.dispatch);
     });
     _defineProperty(this, "copyFile", async (id, collection, traceContext) => {
       const mediaProvider = await this.props.mediaProvider;

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

@@ -15,7 +15,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import * as helpers from '../commands/helpers';
-import { updateMediaSingleNodeAttrs } from '../commands/helpers';
+import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
 import DropPlaceholder from '../ui/Media/DropPlaceholder';
 import { removeMediaNode, splitMediaGroup } from '../utils/media-common';
@@ -306,7 +306,7 @@ export class MediaPluginStateImplementation {
       });
     });
     _defineProperty(this, "findMediaNode", id => {
-      return helpers.findMediaSingleNode(this, id);
+      return helpers.findMediaNode(this, id);
     });
     _defineProperty(this, "destroyAllPickers", pickers => {
       pickers.forEach(picker => picker.destroy());
@@ -344,7 +344,7 @@ export class MediaPluginStateImplementation {
       if (!view) {
         return;
       }
-      return updateMediaSingleNodeAttrs(id, attrs)(view.state, view.dispatch);
+      return updateMediaNodeAttrs(id, attrs)(view.state, view.dispatch);
     });
     _defineProperty(this, "handleMediaState", state => {
       switch (state.status) {

package/dist/es2019/toolbar/index.js

@@ -5,7 +5,7 @@ import { alignmentIcons, buildLayoutButtons, IconCard, IconEmbed, IconInline, la
 import { calcMinWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType, hasParentNode, hasParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import { contains, findParentNodeOfType, hasParentNode, hasParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 import DownloadIcon from '@atlaskit/icon/glyph/download';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
@@ -248,21 +248,16 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     // floating and inline switcher
     if (pluginState.allowInlineImages && selectedNode && canShowSwitchButtons(selectedNode.node)) {
       var _selectedNode$node$fi;
-      const inlineSwitcherTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
-      const floatingSwitcherTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaSingle);
-
-      // This is temporary for PF release and can be removed once we have border and link support for inline images
-      // TODO: [ED-20261] remove this once both border and link marks are supported for inline image
-      const tempTooltipContent = /*#__PURE__*/React.createElement("span", null, "Display inline ", /*#__PURE__*/React.createElement("br", null), " \u26A0 This feature is being developed. The conversion process will not retain the image size, link, border, or any other data.");
-
       // mediaInlne doesn't suppprt external images, so hiding buttons to prevent conversion from mediaSingle to mediaInline
       if (((_selectedNode$node$fi = selectedNode.node.firstChild) === null || _selectedNode$node$fi === void 0 ? void 0 : _selectedNode$node$fi.attrs.type) !== 'external') {
         var _pluginInjectionApi$a4;
+        const hasCaption = contains(selectedNode.node, state.schema.nodes.caption);
+        const inlineSwitcherTitle = intl.formatMessage(hasCaption ? mediaAndEmbedToolbarMessages.changeToMediaInlineImageCaptionWanrning : mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
+        const floatingSwitcherTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaSingle);
         toolbarButtons.push({
           type: 'button',
           id: 'editor.media.image.view.switcher.inline',
           title: inlineSwitcherTitle,
-          tooltipContent: tempTooltipContent,
           icon: () => /*#__PURE__*/React.createElement(IconInline, {
             size: "medium",
             label: inlineSwitcherTitle

package/dist/esm/commands/helpers.js

@@ -9,7 +9,7 @@ import { stateKey as mediaPluginKey } from '../pm-plugins/plugin-key';
  * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
  *
  */
-export var findMediaSingleNode = function findMediaSingleNode(mediaPluginState, id) {
+export var findMediaNode = function findMediaNode(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
 
   // Array#find... no IE support
@@ -24,7 +24,7 @@ export var findMediaSingleNode = function findMediaSingleNode(mediaPluginState,
     return memo;
   }, null);
 };
-export var findAllMediaSingleNodes = function findAllMediaSingleNodes(mediaPluginState, id) {
+export var findAllMediaNodes = function findAllMediaNodes(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
   return mediaNodes.filter(function (nodeWithHandler) {
     return nodeWithHandler.node.attrs.id === id;
@@ -34,14 +34,14 @@ export var isMediaNode = function isMediaNode(pos, state) {
   var node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);
 };
-export var updateAllMediaSingleNodesAttrs = function updateAllMediaSingleNodesAttrs(id, attrs) {
+export var updateAllMediaNodesAttrs = function updateAllMediaNodesAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = mediaPluginKey.getState(state);
     if (!mediaPluginState) {
       return false;
     }
     var mediaNodes;
-    mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
+    mediaNodes = findAllMediaNodes(mediaPluginState, id);
     var validMediaNodePositions = mediaNodes.reduce(function (acc, _ref) {
       var getPos = _ref.getPos;
       var pos = getPos();
@@ -81,13 +81,13 @@ export var updateCurrentMediaNodeAttrs = function updateCurrentMediaNodeAttrs(at
     return true;
   };
 };
-export var updateMediaSingleNodeAttrs = function updateMediaSingleNodeAttrs(id, attrs) {
+export var updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = mediaPluginKey.getState(state);
     if (!mediaPluginState) {
       return false;
     }
-    var mediaNodeWithPos = findMediaSingleNode(mediaPluginState, id);
+    var mediaNodeWithPos = findMediaNode(mediaPluginState, id);
     if (!mediaNodeWithPos) {
       return false;
     }

package/dist/esm/commands/index.js

@@ -1 +1 @@
-export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';
+export { updateMediaNodeAttrs as updateMediaSingleNodeAttrs, updateAllMediaNodesAttrs as updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';

package/dist/esm/nodeviews/mediaNodeUpdater.js

@@ -10,20 +10,25 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { getAttrsFromUrl, isImageRepresentationReady, isMediaBlobUrl as _isMediaBlobUrl } from '@atlaskit/media-client';
 import { getMediaClient } from '@atlaskit/media-client-react';
-import { replaceExternalMedia, updateAllMediaSingleNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaSingleNodeAttrs } from '../commands/helpers';
+import { replaceExternalMedia, updateAllMediaNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaNodeAttrs } from '../commands/helpers';
+var isMediaTypeSupported = function isMediaTypeSupported(type) {
+  if (type) {
+    return ['image', 'file'].includes(type);
+  }
+  return false;
+};
 export var MediaNodeUpdater = /*#__PURE__*/function () {
   function MediaNodeUpdater(props) {
     var _this = this;
     _classCallCheck(this, MediaNodeUpdater);
     // Updates the node with contextId if it doesn't have one already
-    // TODO [MS-2258]: remove updateContextId in order to only use updateMediaSingleFileAttrs
     _defineProperty(this, "updateContextId", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var attrs, id, objectId;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             attrs = _this.getAttrs();
-            if (!(!attrs || attrs.type !== 'file')) {
+            if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
               _context.next = 3;
               break;
             }
@@ -34,7 +39,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
             return _this.getObjectId();
           case 6:
             objectId = _context.sent;
-            updateAllMediaSingleNodesAttrs(id, {
+            updateAllMediaNodesAttrs(id, {
               __contextId: objectId
             })(_this.props.view.state, _this.props.view.dispatch);
           case 8:
@@ -50,7 +55,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               attrs = _this.getAttrs();
-              if (!((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file')) {
+              if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
                 _context2.next = 3;
                 break;
               }
@@ -89,7 +94,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
             return _this.props.mediaProvider;
           case 3:
             mediaProvider = _context3.sent;
-            if (!(!mediaProvider || !mediaProvider.uploadParams || !attrs || attrs.type !== 'file' || _this.hasFileAttributesDefined(attrs))) {
+            if (!(!mediaProvider || !mediaProvider.uploadParams || !attrs || !isMediaTypeSupported(attrs.type) || _this.hasFileAttributesDefined(attrs))) {
               _context3.next = 6;
               break;
             }
@@ -160,7 +165,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
             newAttrs = _context4.sent;
             _ref5 = _this.getAttrs(), id = _ref5.id;
             if (id && newAttrs) {
-              updateAllMediaSingleNodesAttrs(id, newAttrs)(_this.props.view.state, _this.props.view.dispatch);
+              updateAllMediaNodesAttrs(id, newAttrs)(_this.props.view.state, _this.props.view.dispatch);
             }
           case 5:
           case "end":
@@ -286,13 +291,13 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
     }());
     _defineProperty(this, "getNodeContextId", function () {
       var attrs = _this.getAttrs();
-      if (!attrs || attrs.type !== 'file') {
+      if (!attrs || attrs && !isMediaTypeSupported(attrs.type)) {
         return null;
       }
       return attrs.__contextId || null;
     });
     _defineProperty(this, "updateDimensions", function (dimensions) {
-      updateAllMediaSingleNodesAttrs(dimensions.id, {
+      updateAllMediaNodesAttrs(dimensions.id, {
         height: dimensions.height,
         width: dimensions.width
       })(_this.props.view.state, _this.props.view.dispatch);
@@ -337,7 +342,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
           case 5:
             currentCollectionName = mediaProvider.uploadParams.collection;
             attrs = _this.getAttrs();
-            if (!(!attrs || attrs.type !== 'file')) {
+            if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
               _context9.next = 9;
               break;
             }
@@ -463,7 +468,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               attrs = _this.getAttrs();
-              if (!((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file')) {
+              if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
                 _context11.next = 3;
                 break;
               }
@@ -502,7 +507,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
             case 0:
               attrs = _this.getAttrs();
               view = _this.props.view;
-              if (!((attrs === null || attrs === void 0 ? void 0 : attrs.type) !== 'file')) {
+              if (!(!attrs || attrs && !isMediaTypeSupported(attrs.type))) {
                 _context12.next = 4;
                 break;
               }
@@ -518,7 +523,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
               }
               return _context12.abrupt("return");
             case 9:
-              updateMediaSingleNodeAttrs(attrs.id, copiedAttrs)(view.state, view.dispatch);
+              updateMediaNodeAttrs(attrs.id, copiedAttrs)(view.state, view.dispatch);
             case 10:
             case "end":
               return _context12.stop();

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

@@ -24,7 +24,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import * as helpers from '../commands/helpers';
-import { updateMediaSingleNodeAttrs } from '../commands/helpers';
+import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
 import DropPlaceholder from '../ui/Media/DropPlaceholder';
 import { removeMediaNode, splitMediaGroup } from '../utils/media-common';
@@ -371,7 +371,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       });
     });
     _defineProperty(this, "findMediaNode", function (id) {
-      return helpers.findMediaSingleNode(_this, id);
+      return helpers.findMediaNode(_this, id);
     });
     _defineProperty(this, "destroyAllPickers", function (pickers) {
       pickers.forEach(function (picker) {
@@ -409,7 +409,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       if (!view) {
         return;
       }
-      return updateMediaSingleNodeAttrs(id, attrs)(view.state, view.dispatch);
+      return updateMediaNodeAttrs(id, attrs)(view.state, view.dispatch);
     });
     _defineProperty(this, "handleMediaState", function (state) {
       switch (state.status) {

package/dist/esm/toolbar/index.js

@@ -9,7 +9,7 @@ import { alignmentIcons, buildLayoutButtons, IconCard, IconEmbed, IconInline, la
 import { calcMinWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType, hasParentNode, hasParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import { contains, findParentNodeOfType, hasParentNode, hasParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 import DownloadIcon from '@atlaskit/icon/glyph/download';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
@@ -245,21 +245,16 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     // floating and inline switcher
     if (pluginState.allowInlineImages && selectedNode && canShowSwitchButtons(selectedNode.node)) {
       var _selectedNode$node$fi;
-      var inlineSwitcherTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
-      var floatingSwitcherTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaSingle);
-
-      // This is temporary for PF release and can be removed once we have border and link support for inline images
-      // TODO: [ED-20261] remove this once both border and link marks are supported for inline image
-      var tempTooltipContent = /*#__PURE__*/React.createElement("span", null, "Display inline ", /*#__PURE__*/React.createElement("br", null), " \u26A0 This feature is being developed. The conversion process will not retain the image size, link, border, or any other data.");
-
       // mediaInlne doesn't suppprt external images, so hiding buttons to prevent conversion from mediaSingle to mediaInline
       if (((_selectedNode$node$fi = selectedNode.node.firstChild) === null || _selectedNode$node$fi === void 0 ? void 0 : _selectedNode$node$fi.attrs.type) !== 'external') {
         var _pluginInjectionApi$a4;
+        var hasCaption = contains(selectedNode.node, state.schema.nodes.caption);
+        var inlineSwitcherTitle = intl.formatMessage(hasCaption ? mediaAndEmbedToolbarMessages.changeToMediaInlineImageCaptionWanrning : mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
+        var floatingSwitcherTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaSingle);
         toolbarButtons.push({
           type: 'button',
           id: 'editor.media.image.view.switcher.inline',
           title: inlineSwitcherTitle,
-          tooltipContent: tempTooltipContent,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconInline, {
               size: "medium",

package/dist/types/commands/helpers.d.ts

@@ -6,10 +6,10 @@ import type { MediaNodeWithPosHandler, MediaPluginState } from '../pm-plugins/ty
  * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
  *
  */
-export declare const findMediaSingleNode: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler | null;
-export declare const findAllMediaSingleNodes: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler[];
+export declare const findMediaNode: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler | null;
+export declare const findAllMediaNodes: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler[];
 export declare const isMediaNode: (pos: number, state: EditorState) => boolean | null;
-export declare const updateAllMediaSingleNodesAttrs: (id: string, attrs: object) => Command;
+export declare const updateAllMediaNodesAttrs: (id: string, attrs: object) => Command;
 export declare const updateCurrentMediaNodeAttrs: (attrs: object, mediaNode: MediaNodeWithPosHandler) => Command;
-export declare const updateMediaSingleNodeAttrs: (id: string, attrs: object) => Command;
+export declare const updateMediaNodeAttrs: (id: string, attrs: object) => Command;
 export declare const replaceExternalMedia: (pos: number, attrs: object) => Command;

package/dist/types/commands/index.d.ts

@@ -1 +1 @@
-export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia, } from './helpers';
+export { updateMediaNodeAttrs as updateMediaSingleNodeAttrs, updateAllMediaNodesAttrs as updateAllMediaSingleNodesAttrs, replaceExternalMedia, } from './helpers';

package/dist/types/nodeviews/mediaNodeUpdater.d.ts

@@ -1,10 +1,9 @@
-import type { MediaADFAttrs } from '@atlaskit/adf-schema';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaTraceContext } from '@atlaskit/media-common';
-import type { MediaOptions, getPosHandler as ProsemirrorGetPosHandler } from '../types';
+import type { MediaOptions, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
 export type RemoteDimensions = {
     id: string;
     height: number;
@@ -30,7 +29,7 @@ export declare class MediaNodeUpdater {
     private getNewFileAttrsForNode;
     updateMediaSingleFileAttrs: () => Promise<void>;
     updateNodeAttrs: (getPos: ProsemirrorGetPosHandler) => Promise<void>;
-    getAttrs: () => MediaADFAttrs | undefined;
+    getAttrs: () => SupportedMediaAttributes | undefined;
     getObjectId: () => Promise<string | null>;
     uploadExternalMedia: (getPos: ProsemirrorGetPosHandler) => Promise<void>;
     getNodeContextId: () => string | null;

package/dist/types/types.d.ts

@@ -1,3 +1,4 @@
+import type { MediaADFAttrs, MediaInlineAttributes } from '@atlaskit/adf-schema';
 import type { ProviderFactory, Providers } from '@atlaskit/editor-common/provider-factory';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
@@ -108,6 +109,7 @@ export type MediaDecorationSpec = {
     type: 'media';
     selected: boolean;
 };
+export type SupportedMediaAttributes = MediaADFAttrs | MediaInlineAttributes;
 export type ProsemirrorGetPosHandler = getPosHandlerNode;
 export type getPosHandler = getPosHandlerNode;
 export type getPosHandlerNode = () => number | undefined;

package/dist/types-ts4.5/commands/helpers.d.ts

@@ -6,10 +6,10 @@ import type { MediaNodeWithPosHandler, MediaPluginState } from '../pm-plugins/ty
  * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
  *
  */
-export declare const findMediaSingleNode: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler | null;
-export declare const findAllMediaSingleNodes: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler[];
+export declare const findMediaNode: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler | null;
+export declare const findAllMediaNodes: (mediaPluginState: MediaPluginState, id: string) => MediaNodeWithPosHandler[];
 export declare const isMediaNode: (pos: number, state: EditorState) => boolean | null;
-export declare const updateAllMediaSingleNodesAttrs: (id: string, attrs: object) => Command;
+export declare const updateAllMediaNodesAttrs: (id: string, attrs: object) => Command;
 export declare const updateCurrentMediaNodeAttrs: (attrs: object, mediaNode: MediaNodeWithPosHandler) => Command;
-export declare const updateMediaSingleNodeAttrs: (id: string, attrs: object) => Command;
+export declare const updateMediaNodeAttrs: (id: string, attrs: object) => Command;
 export declare const replaceExternalMedia: (pos: number, attrs: object) => Command;

package/dist/types-ts4.5/commands/index.d.ts

@@ -1 +1 @@
-export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia, } from './helpers';
+export { updateMediaNodeAttrs as updateMediaSingleNodeAttrs, updateAllMediaNodesAttrs as updateAllMediaSingleNodesAttrs, replaceExternalMedia, } from './helpers';

package/dist/types-ts4.5/nodeviews/mediaNodeUpdater.d.ts

@@ -1,10 +1,9 @@
-import type { MediaADFAttrs } from '@atlaskit/adf-schema';
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaTraceContext } from '@atlaskit/media-common';
-import type { MediaOptions, getPosHandler as ProsemirrorGetPosHandler } from '../types';
+import type { MediaOptions, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
 export type RemoteDimensions = {
     id: string;
     height: number;
@@ -30,7 +29,7 @@ export declare class MediaNodeUpdater {
     private getNewFileAttrsForNode;
     updateMediaSingleFileAttrs: () => Promise<void>;
     updateNodeAttrs: (getPos: ProsemirrorGetPosHandler) => Promise<void>;
-    getAttrs: () => MediaADFAttrs | undefined;
+    getAttrs: () => SupportedMediaAttributes | undefined;
     getObjectId: () => Promise<string | null>;
     uploadExternalMedia: (getPos: ProsemirrorGetPosHandler) => Promise<void>;
     getNodeContextId: () => string | null;

package/dist/types-ts4.5/types.d.ts

@@ -1,3 +1,4 @@
+import type { MediaADFAttrs, MediaInlineAttributes } from '@atlaskit/adf-schema';
 import type { ProviderFactory, Providers } from '@atlaskit/editor-common/provider-factory';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
@@ -108,6 +109,7 @@ export type MediaDecorationSpec = {
     type: 'media';
     selected: boolean;
 };
+export type SupportedMediaAttributes = MediaADFAttrs | MediaInlineAttributes;
 export type ProsemirrorGetPosHandler = getPosHandlerNode;
 export type getPosHandler = getPosHandlerNode;
 export type getPosHandlerNode = () => number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "0.11.11",
+  "version": "0.12.0",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",