@atlaskit/editor-plugin-media 1.2.3 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-media
 
+## 1.4.0
+
+### Minor Changes
+
+- [#76770](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76770) [`7eb1d4032d40`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7eb1d4032d40) - [ux] Select upladed image. In case there are mulitple image files being pasted or drag&dropped, select last image.
+
+## 1.3.0
+
+### Minor Changes
+
+- [#75635](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75635) [`af4972f3a9bb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/af4972f3a9bb) - [ux] Added comment button for media single floating toolbar
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.2.3
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -279,7 +279,8 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref2) {
           allowAltTextOnImages: options && options.allowAltTextOnImages,
           altTextValidator: options && options.altTextValidator,
           fullWidthEnabled: options && options.fullWidthEnabled,
-          allowMediaInlineImages: options && options.allowMediaInlineImages
+          allowMediaInlineImages: options && options.allowMediaInlineImages,
+          getEditorFeatureFlags: options && options.getEditorFeatureFlags
         }, api);
       }
     }

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

@@ -32,6 +32,7 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaCommon = require("@atlaskit/media-common");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _helpers = _interopRequireWildcard(require("../commands/helpers"));
 var helpers = _helpers;
 var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
@@ -86,6 +87,8 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     (0, _defineProperty2.default)(this, "isResizing", false);
     (0, _defineProperty2.default)(this, "resizingWidth", 0);
     (0, _defineProperty2.default)(this, "allowInlineImages", false);
+    // this is only a temporary variable, which gets cleared after the last inserted node has been selected
+    (0, _defineProperty2.default)(this, "lastAddedMediaSingleFileIds", []);
     (0, _defineProperty2.default)(this, "destroyed", false);
     (0, _defineProperty2.default)(this, "removeOnCloseListener", function () {});
     (0, _defineProperty2.default)(this, "onPopupToggleCallback", function () {});
@@ -198,6 +201,13 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
       }
       return type === mediaSingle;
     });
+    // callback to flag that a node has been inserted
+    (0, _defineProperty2.default)(this, "onNodeInserted", function (id, selectionPosition) {
+      _this.lastAddedMediaSingleFileIds.unshift({
+        id: id,
+        selectionPosition: selectionPosition
+      });
+    });
     /**
      * we insert a new file by inserting a initial state for that file.
      *
@@ -228,7 +238,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
         case 'block':
           // read width state right before inserting to get up-to-date and define values
           var widthPluginState = (_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.width) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
-          (0, _mediaSingle2.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI);
+          (0, _mediaSingle2.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, _this.onNodeInserted);
           break;
         case 'group':
           (0, _mediaFiles.insertMediaGroupNode)(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
@@ -263,6 +273,9 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
       if (!view.hasFocus()) {
         view.focus();
       }
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.autoselect-inserted-image_oumto')) {
+        _this.selectLastAddedMediaNode();
+      }
     });
     (0, _defineProperty2.default)(this, "addPendingTask", function (task) {
       _this.taskManager.addPendingTask(task);
@@ -546,6 +559,36 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
       var _this$pluginInjection3;
       return (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.contextIdentifier) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.sharedState.currentState()) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.contextIdentifierProvider;
     }
+  }, {
+    key: "selectLastAddedMediaNode",
+    value: function selectLastAddedMediaNode() {
+      var _this2 = this;
+      // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected
+      if (this.lastAddedMediaSingleFileIds.length !== 0) {
+        this.waitForPendingTasks().then(function () {
+          var lastTrackedAddedNode = _this2.lastAddedMediaSingleFileIds[0];
+          // execute selection only if selection did not change after the node has been inserted
+          if ((lastTrackedAddedNode === null || lastTrackedAddedNode === void 0 ? void 0 : lastTrackedAddedNode.selectionPosition) === _this2.view.state.selection.from) {
+            var lastAddedNode = _this2.mediaNodes.find(function (node) {
+              return node.node.attrs.id === lastTrackedAddedNode.id;
+            });
+            var lastAddedNodePos = lastAddedNode === null || lastAddedNode === void 0 ? void 0 : lastAddedNode.getPos();
+            if (lastAddedNodePos) {
+              var _this2$view = _this2.view,
+                dispatch = _this2$view.dispatch,
+                state = _this2$view.state;
+              var tr = state.tr;
+              tr.setSelection(_state2.NodeSelection.create(tr.doc, lastAddedNodePos));
+              if (dispatch) {
+                dispatch(tr);
+              }
+            }
+          }
+          // reset temp constant after uploads finished
+          _this2.lastAddedMediaSingleFileIds = [];
+        });
+      }
+    }
   }, {
     key: "setView",
     value: function setView(view) {
@@ -567,7 +610,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     key: "initPickers",
     value: function () {
       var _initPickers = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(uploadParams, Picker) {
-        var _this2 = this;
+        var _this3 = this;
         var errorReporter, pickers, pickerPromises, pickerFacadeConfig, customPicker;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -601,7 +644,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
               _context2.t0.push.call(_context2.t0, _context2.t1);
             case 13:
               pickers.forEach(function (picker) {
-                picker.onNewMedia(_this2.insertFile);
+                picker.onNewMedia(_this3.insertFile);
               });
             case 14:
               // set new upload params for the pickers
@@ -627,13 +670,13 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
   }, {
     key: "updateAndDispatch",
     value: function updateAndDispatch(props) {
-      var _this3 = this;
+      var _this4 = this;
       // update plugin state
       Object.keys(props).forEach(function (_key) {
         var key = _key;
         var value = props[key];
         if (value !== undefined) {
-          _this3[key] = value;
+          _this4[key] = value;
         }
       });
       if (this.dispatch) {

package/dist/cjs/toolbar/comments.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commentButton = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _media = require("@atlaskit/editor-common/media");
+var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
+var commentButton = exports.commentButton = function commentButton(intl, state, editorAnalyticsAPI) {
+  var title = intl.formatMessage(_media.commentMessages.addCommentOnMedia);
+  var onClickHandler = function onClickHandler() {
+    return true;
+  };
+  return {
+    type: 'button',
+    testId: 'add-comment-media-button',
+    icon: _comment.default,
+    title: title,
+    onClick: onClickHandler,
+    tooltipContent: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+      description: title
+    })
+  };
+};

package/dist/cjs/toolbar/index.js

@@ -34,6 +34,7 @@ var _currentMediaNode = require("../utils/current-media-node");
 var _mediaSingle2 = require("../utils/media-single");
 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");
@@ -166,7 +167,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
   });
   return items;
 };
-var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) {
+var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi) {
   var _pluginInjectionApi$d, _pluginInjectionApi$d2;
   var mediaSingle = state.schema.nodes.mediaSingle;
   var allowResizing = options.allowResizing,
@@ -175,7 +176,9 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     allowResizingInTables = options.allowResizingInTables,
     allowAltTextOnImages = options.allowAltTextOnImages,
     allowMediaInline = options.allowMediaInline,
-    allowMediaInlineImages = options.allowMediaInlineImages;
+    allowMediaInlineImages = options.allowMediaInlineImages,
+    getEditorFeatureFlags = options.getEditorFeatureFlags;
+  var editorFeatureFlags = getEditorFeatureFlags ? getEditorFeatureFlags() : undefined;
   var toolbarButtons = [];
   var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
     hoverDecoration = _ref.hoverDecoration;
@@ -398,6 +401,12 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         type: 'separator'
       });
     }
+    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia) {
+      var _pluginInjectionApi$a6;
+      toolbarButtons.push((0, _comments.commentButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 ? void 0 : _pluginInjectionApi$a6.actions), {
+        type: 'separator'
+      });
+    }
     if (allowLinking && (0, _linking3.shouldShowMediaLinkToolbar)(state)) {
       toolbarButtons.push({
         type: 'custom',
@@ -413,10 +422,10 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             };
             var openLink = function openLink() {
               if (editorView) {
-                var _pluginInjectionApi$a6;
+                var _pluginInjectionApi$a7;
                 var tr = editorView.state.tr,
                   dispatch = editorView.dispatch;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 || _pluginInjectionApi$a6.actions.attachAnalyticsEvent({
+                pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 || _pluginInjectionApi$a7.actions.attachAnalyticsEvent({
                   eventType: _analytics.EVENT_TYPE.TRACK,
                   action: _analytics.ACTION.VISITED,
                   actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
@@ -442,8 +451,8 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     }
   }
   if (allowAltTextOnImages) {
-    var _pluginInjectionApi$a7;
-    toolbarButtons.push((0, _altText2.altTextButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 ? void 0 : _pluginInjectionApi$a7.actions), {
+    var _pluginInjectionApi$a8;
+    toolbarButtons.push((0, _altText2.altTextButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions), {
       type: 'separator'
     });
   }
@@ -493,8 +502,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     allowAltTextOnImages = options.allowAltTextOnImages,
     providerFactory = options.providerFactory,
     allowMediaInline = options.allowMediaInline,
-    allowResizing = options.allowResizing,
-    getEditorFeatureFlags = options.getEditorFeatureFlags;
+    allowResizing = options.allowResizing;
   var mediaPluginState = _pluginKey.stateKey.getState(state);
   var mediaLinkingState = (0, _linking2.getMediaLinkingState)(state);
   var _ref3 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d4 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
@@ -533,14 +541,14 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$a8, _pluginInjectionApi$f2;
+    var _pluginInjectionApi$a9, _pluginInjectionApi$f2;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele;
       var selector = (0, _mediaFilmstrip.mediaFilmstripItemDOMSelector)(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
@@ -554,7 +562,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
       var element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(".".concat(_styles.MediaSingleNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags);
+    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
   var assistiveMessage = '';
   var selectedMediaSingleNode = (0, _utils2.getSelectedMediaSingle)(state);

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

@@ -113,7 +113,7 @@ var getFileExtension = function getFileExtension(fileName) {
   }
   return undefined;
 };
-var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI) {
+var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted) {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -155,6 +155,9 @@ var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMedia
     }
     dispatch(tr);
   }
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.autoselect-inserted-image_oumto') && onNodeInserted) {
+    onNodeInserted(mediaState.id, view.state.selection.to);
+  }
   return true;
 };
 var changeFromMediaInlineToMediaSingleNode = exports.changeFromMediaInlineToMediaSingleNode = function changeFromMediaInlineToMediaSingleNode(view, fromNode, widthPluginState, editorAnalyticsAPI) {

package/dist/es2019/plugin.js

@@ -272,7 +272,8 @@ export const mediaPlugin = ({
         allowAltTextOnImages: options && options.allowAltTextOnImages,
         altTextValidator: options && options.altTextValidator,
         fullWidthEnabled: options && options.fullWidthEnabled,
-        allowMediaInlineImages: options && options.allowMediaInlineImages
+        allowMediaInlineImages: options && options.allowMediaInlineImages,
+        getEditorFeatureFlags: options && options.getEditorFeatureFlags
       }, api)
     }
   };

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

@@ -14,6 +14,7 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 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 { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -59,6 +60,8 @@ export class MediaPluginStateImplementation {
     _defineProperty(this, "isResizing", false);
     _defineProperty(this, "resizingWidth", 0);
     _defineProperty(this, "allowInlineImages", false);
+    // this is only a temporary variable, which gets cleared after the last inserted node has been selected
+    _defineProperty(this, "lastAddedMediaSingleFileIds", []);
     _defineProperty(this, "destroyed", false);
     _defineProperty(this, "removeOnCloseListener", () => {});
     _defineProperty(this, "onPopupToggleCallback", () => {});
@@ -143,6 +146,13 @@ export class MediaPluginStateImplementation {
       }
       return type === mediaSingle;
     });
+    // callback to flag that a node has been inserted
+    _defineProperty(this, "onNodeInserted", (id, selectionPosition) => {
+      this.lastAddedMediaSingleFileIds.unshift({
+        id,
+        selectionPosition
+      });
+    });
     /**
      * we insert a new file by inserting a initial state for that file.
      *
@@ -176,7 +186,7 @@ export class MediaPluginStateImplementation {
         case 'block':
           // read width state right before inserting to get up-to-date and define values
           const widthPluginState = (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 ? void 0 : (_this$pluginInjection4 = _this$pluginInjection3.width) === null || _this$pluginInjection4 === void 0 ? void 0 : _this$pluginInjection4.sharedState.currentState();
-          insertMediaSingleNode(this.view, mediaStateWithContext, this.getInputMethod(pickerType), collection, this.mediaOptions && this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI);
+          insertMediaSingleNode(this.view, mediaStateWithContext, this.getInputMethod(pickerType), collection, this.mediaOptions && this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, this.onNodeInserted);
           break;
         case 'group':
           insertMediaGroupNode(editorAnalyticsAPI)(this.view, [mediaStateWithContext], collection, this.getInputMethod(pickerType));
@@ -211,6 +221,9 @@ export class MediaPluginStateImplementation {
       if (!view.hasFocus()) {
         view.focus();
       }
+      if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto')) {
+        this.selectLastAddedMediaNode();
+      }
     });
     _defineProperty(this, "addPendingTask", task => {
       this.taskManager.addPendingTask(task);
@@ -483,6 +496,34 @@ export class MediaPluginStateImplementation {
     var _this$pluginInjection5, _this$pluginInjection6, _this$pluginInjection7;
     return (_this$pluginInjection5 = this.pluginInjectionApi) === null || _this$pluginInjection5 === void 0 ? void 0 : (_this$pluginInjection6 = _this$pluginInjection5.contextIdentifier) === null || _this$pluginInjection6 === void 0 ? void 0 : (_this$pluginInjection7 = _this$pluginInjection6.sharedState.currentState()) === null || _this$pluginInjection7 === void 0 ? void 0 : _this$pluginInjection7.contextIdentifierProvider;
   }
+  selectLastAddedMediaNode() {
+    // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected
+    if (this.lastAddedMediaSingleFileIds.length !== 0) {
+      this.waitForPendingTasks().then(() => {
+        const lastTrackedAddedNode = this.lastAddedMediaSingleFileIds[0];
+        // execute selection only if selection did not change after the node has been inserted
+        if ((lastTrackedAddedNode === null || lastTrackedAddedNode === void 0 ? void 0 : lastTrackedAddedNode.selectionPosition) === this.view.state.selection.from) {
+          const lastAddedNode = this.mediaNodes.find(node => {
+            return node.node.attrs.id === lastTrackedAddedNode.id;
+          });
+          const lastAddedNodePos = lastAddedNode === null || lastAddedNode === void 0 ? void 0 : lastAddedNode.getPos();
+          if (lastAddedNodePos) {
+            const {
+              dispatch,
+              state
+            } = this.view;
+            const tr = state.tr;
+            tr.setSelection(NodeSelection.create(tr.doc, lastAddedNodePos));
+            if (dispatch) {
+              dispatch(tr);
+            }
+          }
+        }
+        // reset temp constant after uploads finished
+        this.lastAddedMediaSingleFileIds = [];
+      });
+    }
+  }
   setView(view) {
     this.view = view;
   }

package/dist/es2019/toolbar/comments.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { commentMessages as messages } from '@atlaskit/editor-common/media';
+import CommentIcon from '@atlaskit/icon/glyph/comment';
+export const commentButton = (intl, state, editorAnalyticsAPI) => {
+  const title = intl.formatMessage(messages.addCommentOnMedia);
+  const onClickHandler = () => {
+    return true;
+  };
+  return {
+    type: 'button',
+    testId: 'add-comment-media-button',
+    icon: CommentIcon,
+    title,
+    onClick: onClickHandler,
+    tooltipContent: /*#__PURE__*/React.createElement(ToolTipContent, {
+      description: title
+    })
+  };
+};

package/dist/es2019/toolbar/index.js

@@ -24,6 +24,7 @@ import { currentMediaOrInlineNodeBorderMark } from '../utils/current-media-node'
 import { isVideo } from '../utils/media-single';
 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';
@@ -152,7 +153,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDe
   });
   return items;
 };
-const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) => {
+const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi) => {
   var _pluginInjectionApi$d, _pluginInjectionApi$d2;
   const {
     mediaSingle
@@ -164,8 +165,10 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     allowResizingInTables,
     allowAltTextOnImages,
     allowMediaInline,
-    allowMediaInlineImages
+    allowMediaInlineImages,
+    getEditorFeatureFlags
   } = options;
+  const editorFeatureFlags = getEditorFeatureFlags ? getEditorFeatureFlags() : undefined;
   let toolbarButtons = [];
   const {
     hoverDecoration
@@ -395,6 +398,12 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         type: 'separator'
       });
     }
+    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia) {
+      var _pluginInjectionApi$a6;
+      toolbarButtons.push(commentButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 ? void 0 : _pluginInjectionApi$a6.actions), {
+        type: 'separator'
+      });
+    }
     if (allowLinking && shouldShowMediaLinkToolbar(state)) {
       toolbarButtons.push({
         type: 'custom',
@@ -412,14 +421,14 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             };
             const openLink = () => {
               if (editorView) {
-                var _pluginInjectionApi$a6;
+                var _pluginInjectionApi$a7;
                 const {
                   state: {
                     tr
                   },
                   dispatch
                 } = editorView;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 ? void 0 : _pluginInjectionApi$a6.actions.attachAnalyticsEvent({
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 ? void 0 : _pluginInjectionApi$a7.actions.attachAnalyticsEvent({
                   eventType: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
@@ -445,8 +454,8 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     }
   }
   if (allowAltTextOnImages) {
-    var _pluginInjectionApi$a7;
-    toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 ? void 0 : _pluginInjectionApi$a7.actions), {
+    var _pluginInjectionApi$a8;
+    toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions), {
       type: 'separator'
     });
   }
@@ -494,8 +503,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     allowAltTextOnImages,
     providerFactory,
     allowMediaInline,
-    allowResizing,
-    getEditorFeatureFlags
+    allowResizing
   } = options;
   const mediaPluginState = stateKey.getState(state);
   const mediaLinkingState = getMediaLinkingState(state);
@@ -534,14 +542,14 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$a8, _pluginInjectionApi$f3, _pluginInjectionApi$f4;
+    var _pluginInjectionApi$a9, _pluginInjectionApi$f3, _pluginInjectionApi$f4;
     const mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele;
       const selector = mediaFilmstripItemDOMSelector(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.actions) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.forceFocusSelector);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f3 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f3 === void 0 ? void 0 : (_pluginInjectionApi$f4 = _pluginInjectionApi$f3.actions) === null || _pluginInjectionApi$f4 === void 0 ? void 0 : _pluginInjectionApi$f4.forceFocusSelector);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele2;
@@ -555,7 +563,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
       const element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(`.${MediaSingleNodeSelector}`);
       return element || mediaPluginState.element;
     };
-    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags);
+    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
   var assistiveMessage = '';
   const selectedMediaSingleNode = getSelectedMediaSingle(state);

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

@@ -102,7 +102,7 @@ const getFileExtension = fileName => {
   }
   return undefined;
 };
-export const insertMediaSingleNode = (view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI) => {
+export const insertMediaSingleNode = (view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted) => {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -146,6 +146,9 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
     }
     dispatch(tr);
   }
+  if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto') && onNodeInserted) {
+    onNodeInserted(mediaState.id, view.state.selection.to);
+  }
   return true;
 };
 export const changeFromMediaInlineToMediaSingleNode = (view, fromNode, widthPluginState, editorAnalyticsAPI) => {

package/dist/esm/plugin.js

@@ -268,7 +268,8 @@ export var mediaPlugin = function mediaPlugin(_ref2) {
           allowAltTextOnImages: options && options.allowAltTextOnImages,
           altTextValidator: options && options.altTextValidator,
           fullWidthEnabled: options && options.fullWidthEnabled,
-          allowMediaInlineImages: options && options.allowMediaInlineImages
+          allowMediaInlineImages: options && options.allowMediaInlineImages,
+          getEditorFeatureFlags: options && options.getEditorFeatureFlags
         }, api);
       }
     }

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

@@ -23,6 +23,7 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 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 { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -71,6 +72,8 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     _defineProperty(this, "isResizing", false);
     _defineProperty(this, "resizingWidth", 0);
     _defineProperty(this, "allowInlineImages", false);
+    // this is only a temporary variable, which gets cleared after the last inserted node has been selected
+    _defineProperty(this, "lastAddedMediaSingleFileIds", []);
     _defineProperty(this, "destroyed", false);
     _defineProperty(this, "removeOnCloseListener", function () {});
     _defineProperty(this, "onPopupToggleCallback", function () {});
@@ -183,6 +186,13 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       }
       return type === mediaSingle;
     });
+    // callback to flag that a node has been inserted
+    _defineProperty(this, "onNodeInserted", function (id, selectionPosition) {
+      _this.lastAddedMediaSingleFileIds.unshift({
+        id: id,
+        selectionPosition: selectionPosition
+      });
+    });
     /**
      * we insert a new file by inserting a initial state for that file.
      *
@@ -213,7 +223,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
         case 'block':
           // read width state right before inserting to get up-to-date and define values
           var widthPluginState = (_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.width) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
-          insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI);
+          insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, _this.onNodeInserted);
           break;
         case 'group':
           insertMediaGroupNode(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
@@ -248,6 +258,9 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       if (!view.hasFocus()) {
         view.focus();
       }
+      if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto')) {
+        _this.selectLastAddedMediaNode();
+      }
     });
     _defineProperty(this, "addPendingTask", function (task) {
       _this.taskManager.addPendingTask(task);
@@ -531,6 +544,36 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       var _this$pluginInjection3;
       return (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.contextIdentifier) === null || _this$pluginInjection3 === void 0 || (_this$pluginInjection3 = _this$pluginInjection3.sharedState.currentState()) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.contextIdentifierProvider;
     }
+  }, {
+    key: "selectLastAddedMediaNode",
+    value: function selectLastAddedMediaNode() {
+      var _this2 = this;
+      // if lastAddedMediaSingleFileIds is empty exit because there are no added media single nodes to be selected
+      if (this.lastAddedMediaSingleFileIds.length !== 0) {
+        this.waitForPendingTasks().then(function () {
+          var lastTrackedAddedNode = _this2.lastAddedMediaSingleFileIds[0];
+          // execute selection only if selection did not change after the node has been inserted
+          if ((lastTrackedAddedNode === null || lastTrackedAddedNode === void 0 ? void 0 : lastTrackedAddedNode.selectionPosition) === _this2.view.state.selection.from) {
+            var lastAddedNode = _this2.mediaNodes.find(function (node) {
+              return node.node.attrs.id === lastTrackedAddedNode.id;
+            });
+            var lastAddedNodePos = lastAddedNode === null || lastAddedNode === void 0 ? void 0 : lastAddedNode.getPos();
+            if (lastAddedNodePos) {
+              var _this2$view = _this2.view,
+                dispatch = _this2$view.dispatch,
+                state = _this2$view.state;
+              var tr = state.tr;
+              tr.setSelection(NodeSelection.create(tr.doc, lastAddedNodePos));
+              if (dispatch) {
+                dispatch(tr);
+              }
+            }
+          }
+          // reset temp constant after uploads finished
+          _this2.lastAddedMediaSingleFileIds = [];
+        });
+      }
+    }
   }, {
     key: "setView",
     value: function setView(view) {
@@ -552,7 +595,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     key: "initPickers",
     value: function () {
       var _initPickers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(uploadParams, Picker) {
-        var _this2 = this;
+        var _this3 = this;
         var errorReporter, pickers, pickerPromises, pickerFacadeConfig, customPicker;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -586,7 +629,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
               _context2.t0.push.call(_context2.t0, _context2.t1);
             case 13:
               pickers.forEach(function (picker) {
-                picker.onNewMedia(_this2.insertFile);
+                picker.onNewMedia(_this3.insertFile);
               });
             case 14:
               // set new upload params for the pickers
@@ -612,13 +655,13 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   }, {
     key: "updateAndDispatch",
     value: function updateAndDispatch(props) {
-      var _this3 = this;
+      var _this4 = this;
       // update plugin state
       Object.keys(props).forEach(function (_key) {
         var key = _key;
         var value = props[key];
         if (value !== undefined) {
-          _this3[key] = value;
+          _this4[key] = value;
         }
       });
       if (this.dispatch) {

package/dist/esm/toolbar/comments.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { commentMessages as messages } from '@atlaskit/editor-common/media';
+import CommentIcon from '@atlaskit/icon/glyph/comment';
+export var commentButton = function commentButton(intl, state, editorAnalyticsAPI) {
+  var title = intl.formatMessage(messages.addCommentOnMedia);
+  var onClickHandler = function onClickHandler() {
+    return true;
+  };
+  return {
+    type: 'button',
+    testId: 'add-comment-media-button',
+    icon: CommentIcon,
+    title: title,
+    onClick: onClickHandler,
+    tooltipContent: /*#__PURE__*/React.createElement(ToolTipContent, {
+      description: title
+    })
+  };
+};

package/dist/esm/toolbar/index.js

@@ -28,6 +28,7 @@ import { currentMediaOrInlineNodeBorderMark } from '../utils/current-media-node'
 import { isVideo } from '../utils/media-single';
 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';
@@ -156,7 +157,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
   });
   return items;
 };
-var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) {
+var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToolbar(state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi) {
   var _pluginInjectionApi$d, _pluginInjectionApi$d2;
   var mediaSingle = state.schema.nodes.mediaSingle;
   var allowResizing = options.allowResizing,
@@ -165,7 +166,9 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     allowResizingInTables = options.allowResizingInTables,
     allowAltTextOnImages = options.allowAltTextOnImages,
     allowMediaInline = options.allowMediaInline,
-    allowMediaInlineImages = options.allowMediaInlineImages;
+    allowMediaInlineImages = options.allowMediaInlineImages,
+    getEditorFeatureFlags = options.getEditorFeatureFlags;
+  var editorFeatureFlags = getEditorFeatureFlags ? getEditorFeatureFlags() : undefined;
   var toolbarButtons = [];
   var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
     hoverDecoration = _ref.hoverDecoration;
@@ -388,6 +391,12 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         type: 'separator'
       });
     }
+    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia) {
+      var _pluginInjectionApi$a6;
+      toolbarButtons.push(commentButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 ? void 0 : _pluginInjectionApi$a6.actions), {
+        type: 'separator'
+      });
+    }
     if (allowLinking && shouldShowMediaLinkToolbar(state)) {
       toolbarButtons.push({
         type: 'custom',
@@ -403,10 +412,10 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             };
             var openLink = function openLink() {
               if (editorView) {
-                var _pluginInjectionApi$a6;
+                var _pluginInjectionApi$a7;
                 var tr = editorView.state.tr,
                   dispatch = editorView.dispatch;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a6 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a6 === void 0 || _pluginInjectionApi$a6.actions.attachAnalyticsEvent({
+                pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 || _pluginInjectionApi$a7.actions.attachAnalyticsEvent({
                   eventType: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
@@ -432,8 +441,8 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     }
   }
   if (allowAltTextOnImages) {
-    var _pluginInjectionApi$a7;
-    toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a7 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a7 === void 0 ? void 0 : _pluginInjectionApi$a7.actions), {
+    var _pluginInjectionApi$a8;
+    toolbarButtons.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions), {
       type: 'separator'
     });
   }
@@ -483,8 +492,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     allowAltTextOnImages = options.allowAltTextOnImages,
     providerFactory = options.providerFactory,
     allowMediaInline = options.allowMediaInline,
-    allowResizing = options.allowResizing,
-    getEditorFeatureFlags = options.getEditorFeatureFlags;
+    allowResizing = options.allowResizing;
   var mediaPluginState = stateKey.getState(state);
   var mediaLinkingState = getMediaLinkingState(state);
   var _ref3 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d4 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
@@ -523,14 +531,14 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
-    var _pluginInjectionApi$a8, _pluginInjectionApi$f2;
+    var _pluginInjectionApi$a9, _pluginInjectionApi$f2;
     var mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele;
       var selector = mediaFilmstripItemDOMSelector(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a8 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a8 === void 0 ? void 0 : _pluginInjectionApi$a8.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a9 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a9 === void 0 ? void 0 : _pluginInjectionApi$a9.actions, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f2 = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f2 === void 0 || (_pluginInjectionApi$f2 = _pluginInjectionApi$f2.actions) === null || _pluginInjectionApi$f2 === void 0 ? void 0 : _pluginInjectionApi$f2.forceFocusSelector);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     baseToolbar.getDomRef = function () {
       var _mediaPluginState$ele2;
@@ -544,7 +552,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
       var element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(".".concat(MediaSingleNodeSelector));
       return element || mediaPluginState.element;
     };
-    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags);
+    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi);
   }
   var assistiveMessage = '';
   var selectedMediaSingleNode = getSelectedMediaSingle(state);

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

@@ -104,7 +104,7 @@ var getFileExtension = function getFileExtension(fileName) {
   }
   return undefined;
 };
-export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI) {
+export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI, onNodeInserted) {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -146,6 +146,9 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
     }
     dispatch(tr);
   }
+  if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto') && onNodeInserted) {
+    onNodeInserted(mediaState.id, view.state.selection.to);
+  }
   return true;
 };
 export var changeFromMediaInlineToMediaSingleNode = function changeFromMediaInlineToMediaSingleNode(view, fromNode, widthPluginState, editorAnalyticsAPI) {

package/dist/types/pm-plugins/main.d.ts

@@ -37,6 +37,10 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     resizingWidth: number;
     currentMaxWidth?: number;
     allowInlineImages: boolean;
+    lastAddedMediaSingleFileIds: {
+        id: string;
+        selectionPosition: number;
+    }[];
     private view;
     private destroyed;
     private errorReporter;
@@ -64,12 +68,14 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     private isMediaSchemaNode;
     private getDomElement;
     get contextIdentifierProvider(): import("@atlaskit/editor-common/provider-factory").ContextIdentifierProvider | undefined;
+    onNodeInserted: (id: string, selectionPosition: number) => void;
     /**
      * we insert a new file by inserting a initial state for that file.
      *
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
     insertFile: (mediaState: MediaState, onMediaStateChanged: MediaStateEventSubscriber, pickerType?: string) => void;
+    private selectLastAddedMediaNode;
     addPendingTask: (task: Promise<any>) => void;
     splitMediaGroup: () => boolean;
     onPopupPickerClose: () => void;

package/dist/types/pm-plugins/types.d.ts

@@ -35,6 +35,10 @@ export interface MediaPluginState {
     resizingWidth: number;
     currentMaxWidth?: number;
     allowInlineImages?: boolean;
+    lastAddedMediaSingleFileIds: {
+        id: string;
+        selectionPosition: number;
+    }[];
     dispatch?: Dispatch;
     setMediaProvider: (mediaProvider?: Promise<MediaProvider>) => Promise<void>;
     getMediaOptions: () => MediaPluginOptions;

package/dist/types/toolbar/comments.d.ts

@@ -0,0 +1,5 @@
+import type { IntlShape } from 'react-intl-next';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { Command, FloatingToolbarButton } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const commentButton: (intl: IntlShape, state: EditorState, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarButton<Command>;

package/dist/types/utils/media-single.d.ts

@@ -14,7 +14,7 @@ export interface MediaSingleState extends MediaState {
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
 export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia) => boolean;
 export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => boolean;
-export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
+export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: ((id: string, selectionPosition: number) => void) | undefined) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const createMediaSingleNode: (schema: Schema, collection: string, maxWidth?: number, minWidth?: number, alignLeftOnInsert?: boolean) => (mediaState: MediaSingleState) => PMNode;
 export declare function isCaptionNode(editorView: EditorView): boolean;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -37,6 +37,10 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     resizingWidth: number;
     currentMaxWidth?: number;
     allowInlineImages: boolean;
+    lastAddedMediaSingleFileIds: {
+        id: string;
+        selectionPosition: number;
+    }[];
     private view;
     private destroyed;
     private errorReporter;
@@ -64,12 +68,14 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     private isMediaSchemaNode;
     private getDomElement;
     get contextIdentifierProvider(): import("@atlaskit/editor-common/provider-factory").ContextIdentifierProvider | undefined;
+    onNodeInserted: (id: string, selectionPosition: number) => void;
     /**
      * we insert a new file by inserting a initial state for that file.
      *
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
     insertFile: (mediaState: MediaState, onMediaStateChanged: MediaStateEventSubscriber, pickerType?: string) => void;
+    private selectLastAddedMediaNode;
     addPendingTask: (task: Promise<any>) => void;
     splitMediaGroup: () => boolean;
     onPopupPickerClose: () => void;

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

@@ -35,6 +35,10 @@ export interface MediaPluginState {
     resizingWidth: number;
     currentMaxWidth?: number;
     allowInlineImages?: boolean;
+    lastAddedMediaSingleFileIds: {
+        id: string;
+        selectionPosition: number;
+    }[];
     dispatch?: Dispatch;
     setMediaProvider: (mediaProvider?: Promise<MediaProvider>) => Promise<void>;
     getMediaOptions: () => MediaPluginOptions;

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

@@ -0,0 +1,5 @@
+import type { IntlShape } from 'react-intl-next';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { Command, FloatingToolbarButton } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const commentButton: (intl: IntlShape, state: EditorState, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => FloatingToolbarButton<Command>;

package/dist/types-ts4.5/utils/media-single.d.ts

@@ -14,7 +14,7 @@ export interface MediaSingleState extends MediaState {
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
 export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia) => boolean;
 export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => boolean;
-export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
+export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: ((id: string, selectionPosition: number) => void) | undefined) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const createMediaSingleNode: (schema: Schema, collection: string, maxWidth?: number, minWidth?: number, alignLeftOnInsert?: boolean) => (mediaState: MediaSingleState) => PMNode;
 export declare function isCaptionNode(editorView: EditorView): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "1.2.3",
+  "version": "1.4.0",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/button": "^17.6.0",
-    "@atlaskit/editor-common": "^78.7.0",
+    "@atlaskit/editor-common": "^78.8.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
@@ -62,7 +62,7 @@
     "@atlaskit/media-ui": "^25.2.0",
     "@atlaskit/media-viewer": "^48.2.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^3.0.0",
+    "@atlaskit/primitives": "^3.1.0",
     "@atlaskit/textfield": "^6.0.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/tokens": "^1.38.0",
@@ -143,6 +143,9 @@
     },
     "platform.editor.media.fix-copy-paste-excel_62g4s": {
       "type": "boolean"
+    },
+    "platform.editor.media.autoselect-inserted-image_oumto": {
+      "type": "boolean"
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",