@atlaskit/editor-core 185.2.24 → 185.2.26

package/dist/esm/plugins/extension/commands.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { removeSelectedNode, removeParentNodeOfType } from 'prosemirror-utils';
-import { applyChange } from '../context-panel/transforms';
 import { createCommand } from './plugin-factory';
 import { getSelectedExtension } from './utils';
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
@@ -14,7 +13,7 @@ export function updateState(state) {
     data: state
   });
 }
-export function setEditingContextToContextPanel(processParametersBefore, processParametersAfter) {
+export function setEditingContextToContextPanel(processParametersBefore, processParametersAfter, applyChangeToContextPanel) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
@@ -22,24 +21,28 @@ export function setEditingContextToContextPanel(processParametersBefore, process
       processParametersBefore: processParametersBefore,
       processParametersAfter: processParametersAfter
     }
-  }, applyChange);
+  }, applyChangeToContextPanel);
 }
-export var clearEditingContext = createCommand({
-  type: 'UPDATE_STATE',
-  data: {
-    showContextPanel: false,
-    processParametersBefore: undefined,
-    processParametersAfter: undefined
-  }
-}, applyChange);
-export var forceAutoSave = function forceAutoSave(resolve, reject) {
+export var clearEditingContext = function clearEditingContext(applyChangeToContextPanel) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
-      autoSaveResolve: resolve,
-      autoSaveReject: reject
+      showContextPanel: false,
+      processParametersBefore: undefined,
+      processParametersAfter: undefined
     }
-  }, applyChange);
+  }, applyChangeToContextPanel);
+};
+export var forceAutoSave = function forceAutoSave(applyChangeToContextPanel) {
+  return function (resolve, reject) {
+    return createCommand({
+      type: 'UPDATE_STATE',
+      data: {
+        autoSaveResolve: resolve,
+        autoSaveReject: reject
+      }
+    }, applyChangeToContextPanel);
+  };
 };
 export var updateExtensionLayout = function updateExtensionLayout(layout) {
   return createCommand({

package/dist/esm/plugins/extension/context-panel.js

@@ -25,7 +25,7 @@ var areParametersEqual = function areParametersEqual(firstParameters, secondPara
   }
   return firstParameters === secondParameters;
 };
-export var getContextPanel = function getContextPanel(allowAutoSave, featureFlags) {
+export var getContextPanel = function getContextPanel(allowAutoSave, featureFlags, applyChange) {
   return function (state) {
     var nodeWithPos = getSelectedExtension(state, true);
 
@@ -87,7 +87,7 @@ export var getContextPanel = function getContextPanel(allowAutoSave, featureFlag
                           autoSaveResolve();
                         }
                         if (!allowAutoSave) {
-                          clearEditingContext(editorView.state, editorView.dispatch);
+                          clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
                         }
                       case 5:
                       case "end":
@@ -110,7 +110,7 @@ export var getContextPanel = function getContextPanel(allowAutoSave, featureFlag
                       _context2.prev = 1;
                       _context2.next = 4;
                       return new Promise(function (resolve, reject) {
-                        forceAutoSave(resolve, reject)(editorView.state, editorView.dispatch);
+                        forceAutoSave(applyChange)(resolve, reject)(editorView.state, editorView.dispatch);
                       });
                     case 4:
                       _context2.next = 9;
@@ -122,7 +122,7 @@ export var getContextPanel = function getContextPanel(allowAutoSave, featureFlag
                       // eslint-disable-next-line no-console
                       console.error("Autosave failed with error", _context2.t0);
                     case 9:
-                      clearEditingContext(editorView.state, editorView.dispatch);
+                      clearEditingContext(applyChange)(editorView.state, editorView.dispatch);
                     case 10:
                     case "end":
                       return _context2.stop();

package/dist/esm/plugins/extension/extension-api.js

@@ -237,7 +237,7 @@ export var createExtensionAPI = function createExtensionAPI(options) {
   return {
     editInContextPanel: function editInContextPanel(transformBefore, transformAfter) {
       var editorView = options.editorView;
-      setEditingContextToContextPanel(transformBefore, transformAfter)(editorView.state, editorView.dispatch, editorView);
+      setEditingContextToContextPanel(transformBefore, transformAfter, options.applyChange)(editorView.state, editorView.dispatch, editorView);
     },
     _editInLegacyMacroBrowser: function _editInLegacyMacroBrowser() {
       var editorView = options.editorView;

package/dist/esm/plugins/extension/index.js

@@ -5,7 +5,7 @@ import { createPlugin as createUniqueIdPlugin } from './pm-plugins/unique-id';
 import { getToolbarConfig } from './toolbar';
 import { getContextPanel } from './context-panel';
 var extensionPlugin = function extensionPlugin() {
-  var _api$dependencies, _api$dependencies$fea;
+  var _api$dependencies, _api$dependencies$fea, _api$dependencies$con2, _api$dependencies$con3;
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var api = arguments.length > 1 ? arguments[1] : undefined;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
@@ -38,7 +38,10 @@ var extensionPlugin = function extensionPlugin() {
         }
       }, {
         name: 'extensionKeymap',
-        plugin: keymapPlugin
+        plugin: function plugin() {
+          var _api$dependencies$con;
+          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$con = api.dependencies.contextPanel) === null || _api$dependencies$con === void 0 ? void 0 : _api$dependencies$con.actions.applyChange);
+        }
       }, {
         name: 'extensionUniqueId',
         plugin: function plugin() {
@@ -47,8 +50,12 @@ var extensionPlugin = function extensionPlugin() {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: getToolbarConfig(options.breakoutEnabled, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
-      contextPanel: getContextPanel(options.allowAutoSave, featureFlags)
+      floatingToolbar: getToolbarConfig({
+        breakoutEnabled: options.breakoutEnabled,
+        hoverDecoration: api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration,
+        applyChangeToContextPanel: api === null || api === void 0 ? void 0 : (_api$dependencies$con2 = api.dependencies.contextPanel) === null || _api$dependencies$con2 === void 0 ? void 0 : _api$dependencies$con2.actions.applyChange
+      }),
+      contextPanel: getContextPanel(options.allowAutoSave, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$con3 = api.dependencies.contextPanel) === null || _api$dependencies$con3 === void 0 ? void 0 : _api$dependencies$con3.actions.applyChange)
     }
   };
 };

package/dist/esm/plugins/extension/nodeviews/extension.js

@@ -6,7 +6,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
-import { ReactNodeView } from '../../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import Extension from '../ui/Extension';
 import ExtensionNodeWrapper from '../ui/Extension/ExtensionNodeWrapper';
 // getInlineNodeViewProducer is a new api to use instead of ReactNodeView

package/dist/esm/plugins/extension/pm-plugins/keymap.js

@@ -2,14 +2,14 @@ import { keymap } from 'prosemirror-keymap';
 import { getPluginState } from './main';
 import * as keymaps from '../../../keymaps';
 import { clearEditingContext } from '../commands';
-export default function keymapPlugin() {
+export default function keymapPlugin(applyChange) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.escape.common, function (state, dispatch) {
     var extensionState = getPluginState(state);
     if (!extensionState.showContextPanel) {
       return false;
     }
-    return clearEditingContext(state, dispatch);
+    return clearEditingContext(applyChange)(state, dispatch);
   }, list);
   return keymap(list);
 }

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

@@ -137,7 +137,8 @@ export var handleUpdate = function handleUpdate(_ref4) {
   var view = _ref4.view,
     prevState = _ref4.prevState,
     domAtPos = _ref4.domAtPos,
-    extensionHandlers = _ref4.extensionHandlers;
+    extensionHandlers = _ref4.extensionHandlers,
+    applyChange = _ref4.applyChange;
   var state = view.state,
     dispatch = view.dispatch;
   var _getPluginState = getPluginState(state),
@@ -151,7 +152,7 @@ export var handleUpdate = function handleUpdate(_ref4) {
   var selectedExtension = getSelectedExtension(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
-      clearEditingContext(state, dispatch);
+      clearEditingContext(applyChange)(state, dispatch);
     }
     return;
   }
@@ -167,7 +168,7 @@ export var handleUpdate = function handleUpdate(_ref4) {
   element !== newElement;
   if (isNewNodeSelected || shouldUpdateEditButton) {
     if (showContextPanel) {
-      clearEditingContext(state, dispatch);
+      clearEditingContext(applyChange)(state, dispatch);
       return;
     }
     var extensionType = node.attrs.extensionType;
@@ -195,11 +196,13 @@ export var handleUpdate = function handleUpdate(_ref4) {
   return true;
 };
 var createPlugin = function createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, pluginInjectionApi) {
+  var _pluginInjectionApi$d;
   var useLongPressSelection = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var options = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : {};
   var state = createPluginState(dispatch, {
     showEditButton: false,
-    showContextPanel: false
+    showContextPanel: false,
+    applyChangeToContextPanel: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.contextPanel) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.applyChange
   });
   var extensionNodeViewOptions = {
     appearance: options.appearance
@@ -214,11 +217,13 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
       providerFactory.subscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
       return {
         update: function update(view, prevState) {
+          var _pluginInjectionApi$d2;
           handleUpdate({
             view: view,
             prevState: prevState,
             domAtPos: domAtPos,
-            extensionHandlers: extensionHandlers
+            extensionHandlers: extensionHandlers,
+            applyChange: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.contextPanel) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.applyChange
           });
         },
         destroy: function destroy() {

package/dist/esm/plugins/extension/toolbar.js

@@ -89,7 +89,7 @@ var breakoutOptions = function breakoutOptions(state, formatMessage, extensionSt
   }
   return [];
 };
-var editButton = function editButton(formatMessage, extensionState) {
+var editButton = function editButton(formatMessage, extensionState, applyChangeToContextPanel) {
   if (!extensionState.showEditButton) {
     return [];
   }
@@ -103,7 +103,7 @@ var editButton = function editButton(formatMessage, extensionState) {
       var macroState = macroPluginKey.getState(state);
       var _getPluginState = getPluginState(state),
         updateExtension = _getPluginState.updateExtension;
-      editExtension(macroState && macroState.macroProvider, updateExtension)(state, dispatch, view);
+      editExtension(macroState && macroState.macroProvider, applyChangeToContextPanel, updateExtension)(state, dispatch, view);
       return true;
     },
     title: formatMessage(messages.edit),
@@ -111,15 +111,17 @@ var editButton = function editButton(formatMessage, extensionState) {
     focusEditoronEnter: true
   }];
 };
-export var getToolbarConfig = function getToolbarConfig() {
-  var breakoutEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
+export var getToolbarConfig = function getToolbarConfig(_ref) {
+  var _ref$breakoutEnabled = _ref.breakoutEnabled,
+    breakoutEnabled = _ref$breakoutEnabled === void 0 ? true : _ref$breakoutEnabled,
+    hoverDecoration = _ref.hoverDecoration,
+    applyChangeToContextPanel = _ref.applyChangeToContextPanel;
   return function (state, intl) {
     var formatMessage = intl.formatMessage;
     var extensionState = getPluginState(state);
     if (extensionState && !extensionState.showContextPanel && extensionState.element) {
       var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension];
-      var editButtonArray = editButton(formatMessage, extensionState);
+      var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel);
       var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
       var extensionObj = getSelectedExtension(state, true);
 

package/dist/esm/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js

@@ -45,7 +45,8 @@ var resolveExtensionIcon = /*#__PURE__*/function () {
 var ExtensionButton = function ExtensionButton(props) {
   var item = props.item,
     node = props.node,
-    editorView = props.editorView;
+    editorView = props.editorView,
+    applyChangeToContextPanel = props.applyChangeToContextPanel;
   var ButtonIcon = React.useMemo(function () {
     return item.icon ? Loadable({
       loader: function () {
@@ -74,7 +75,8 @@ var ExtensionButton = function ExtensionButton(props) {
     }
     var targetNodeAdf = nodeToJSON(node);
     var api = createExtensionAPI({
-      editorView: editorView
+      editorView: editorView,
+      applyChange: applyChangeToContextPanel
     });
     item.action(targetNodeAdf, api);
   };
@@ -93,7 +95,8 @@ export var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
   var node = props.node,
     editorView = props.editorView,
     extensionProvider = props.extensionProvider,
-    separator = props.separator;
+    separator = props.separator,
+    applyChangeToContextPanel = props.applyChangeToContextPanel;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     extensions = _useState2[0],
@@ -131,9 +134,10 @@ export var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
   }, [node]);
   var extensionItems = React.useMemo(function () {
     return getContextualToolbarItemsFromModule(extensions, nodeAdf, createExtensionAPI({
-      editorView: editorView
+      editorView: editorView,
+      applyChange: applyChangeToContextPanel
     }));
-  }, [extensions, nodeAdf, editorView]);
+  }, [extensions, nodeAdf, editorView, applyChangeToContextPanel]);
   if (!extensionItems.length) {
     return null;
   }
@@ -148,7 +152,8 @@ export var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
     children.push( /*#__PURE__*/React.createElement(ExtensionButton, {
       node: node,
       item: item,
-      editorView: editorView
+      editorView: editorView,
+      applyChangeToContextPanel: applyChangeToContextPanel
     }));
     if (index < extensionItems.length - 1) {
       children.push( /*#__PURE__*/React.createElement(Separator, null));

package/dist/esm/plugins/floating-toolbar/ui/Toolbar.js

@@ -51,7 +51,8 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
     node = _ref.node,
     setDisableScroll = _ref.setDisableScroll,
     mountRef = _ref.mountRef,
-    featureFlags = _ref.featureFlags;
+    featureFlags = _ref.featureFlags,
+    api = _ref.api;
   var emojiAndColourPickerMountPoint = scrollable ? popupsMountPoint || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.fabric-editor-popup-scroll-parent')) || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.ak-editor-content-area')) || undefined : popupsMountPoint;
   var _ref2 = featureFlags || {
       useSomewhatSemanticTextColorNames: false
@@ -60,6 +61,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
   return jsx(ButtonGroup, null, items.filter(function (item) {
     return !item.hidden;
   }).map(function (item, idx) {
+    var _api$dependencies$con;
     switch (item.type) {
       case 'button':
         var ButtonIcon = item.icon;
@@ -230,7 +232,8 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           node: node,
           editorView: editorView,
           extensionProvider: extensionsProvider,
-          separator: item.separator
+          separator: item.separator,
+          applyChangeToContextPanel: api === null || api === void 0 ? void 0 : (_api$dependencies$con = api.dependencies.contextPanel) === null || _api$dependencies$con === void 0 ? void 0 : _api$dependencies$con.actions.applyChange
         });
       case 'separator':
         return jsx(Separator, {

package/dist/esm/plugins/index.js

@@ -52,7 +52,6 @@ export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as scrollIntoViewPlugin } from './scroll-into-view';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';
-export { default as contextPanelPlugin } from './context-panel';
 export { default as selectionPlugin } from './selection';
 export { default as mobileSelectionPlugin } from './mobile-selection';
 export { default as clipboardPlugin } from './clipboard';

package/dist/esm/plugins/jira-issue/index.js

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
 import { confluenceJiraIssue } from '@atlaskit/adf-schema';
-import { ReactNodeView } from '../../nodeviews';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import ReactJIRAIssueNode from './nodeviews/jira-issue';
 export var pluginKey = new PluginKey('jiraIssuePlugin');
 var createPlugin = function createPlugin(_ref) {

package/dist/esm/plugins/media/index.js

@@ -87,10 +87,10 @@ var mediaPlugin = function mediaPlugin() {
           return createPlugin(schema, {
             providerFactory: providerFactory,
             nodeViews: {
-              mediaGroup: ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options),
+              mediaGroup: ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api),
               mediaSingle: ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent, options, api),
               media: ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api),
-              mediaInline: ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory)
+              mediaInline: ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, api)
             },
             errorReporter: errorReporter,
             uploadErrorHandler: options && options.uploadErrorHandler,

package/dist/esm/plugins/media/nodeviews/mediaGroup.js

@@ -15,17 +15,15 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import EditorCloseIcon from '@atlaskit/icon/glyph/editor/close';
 import { Filmstrip } from '@atlaskit/media-filmstrip';
 import React from 'react';
-import ReactNodeView from '../../../nodeviews/ReactNodeView';
-import { stateKey as reactNodeViewStateKey } from '../../../plugins/base/pm-plugins/react-nodeview';
-import WithPluginState from '../../../ui/WithPluginState';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { setNodeSelection } from '../../../utils';
 import { isNodeSelectedOrInRange, SelectedState } from '../../../utils/nodes';
-import { pluginKey as editorDisabledPluginKey } from '../../editor-disabled';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { injectIntl } from 'react-intl-next';
 import { messages } from './messages';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 var isMediaGroupSelectedFromProps = function isMediaGroupSelectedFromProps(props) {
   return isNodeSelectedOrInRange(props.anchorPos, props.headPos, props.getPos(), props.node.nodeSize);
 };
@@ -251,6 +249,15 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
 _defineProperty(MediaGroup, "displayName", 'MediaGroup');
 var IntlMediaGroup = injectIntl(MediaGroup);
 export default IntlMediaGroup;
+function MediaGroupNodeViewInternal(_ref2) {
+  var renderFn = _ref2.renderFn,
+    pluginInjectionApi = _ref2.pluginInjectionApi;
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['editorDisabled']),
+    editorDisabledPlugin = _useSharedPluginState.editorDisabledState;
+  return renderFn({
+    editorDisabledPlugin: editorDisabledPlugin
+  });
+}
 var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(MediaGroupNodeView, _ReactNodeView);
   var _super2 = _createSuper(MediaGroupNodeView);
@@ -263,16 +270,17 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
     value: function render(props, forwardRef) {
       var _this3 = this;
       var providerFactory = props.providerFactory,
-        mediaOptions = props.mediaOptions;
+        mediaOptions = props.mediaOptions,
+        pluginInjectionApi = props.pluginInjectionApi;
       var getPos = this.getPos;
       return /*#__PURE__*/React.createElement(WithProviders, {
         providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
-        renderNode: function renderNode(_ref2) {
-          var mediaProvider = _ref2.mediaProvider,
-            contextIdentifierProvider = _ref2.contextIdentifierProvider;
-          var renderFn = function renderFn(_ref3) {
-            var editorDisabledPlugin = _ref3.editorDisabledPlugin;
+        renderNode: function renderNode(_ref3) {
+          var mediaProvider = _ref3.mediaProvider,
+            contextIdentifierProvider = _ref3.contextIdentifierProvider;
+          var renderFn = function renderFn(_ref4) {
+            var editorDisabledPlugin = _ref4.editorDisabledPlugin;
             if (!mediaProvider) {
               return null;
             }
@@ -291,13 +299,9 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
               mediaOptions: mediaOptions
             });
           };
-          return /*#__PURE__*/React.createElement(WithPluginState, {
-            editorView: _this3.view,
-            plugins: {
-              reactNodeViewState: reactNodeViewStateKey,
-              editorDisabledPlugin: editorDisabledPluginKey
-            },
-            render: renderFn
+          return /*#__PURE__*/React.createElement(MediaGroupNodeViewInternal, {
+            renderFn: renderFn,
+            pluginInjectionApi: pluginInjectionApi
           });
         }
       });
@@ -307,11 +311,13 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
 }(ReactNodeView);
 export var ReactMediaGroupNode = function ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory) {
   var mediaOptions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var pluginInjectionApi = arguments.length > 4 ? arguments[4] : undefined;
   return function (node, view, getPos) {
     var hasIntlContext = true;
     return new MediaGroupNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory,
-      mediaOptions: mediaOptions
+      mediaOptions: mediaOptions,
+      pluginInjectionApi: pluginInjectionApi
     }, undefined, undefined, undefined, hasIntlContext).init();
   };
 };

package/dist/esm/plugins/media/nodeviews/mediaInline.js

@@ -13,7 +13,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React, { useEffect, useState } from 'react';
-import { SelectionBasedNodeView } from '../../../nodeviews/';
+import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import WithPluginState from '../../../ui/WithPluginState';
 import { MediaInlineCard } from '@atlaskit/media-card';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
@@ -253,7 +253,7 @@ export var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   }]);
   return MediaInlineNodeView;
 }(SelectionBasedNodeView);
-export var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent) {
+export var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, pluginInjectionApi, dispatchAnalyticsEvent) {
   return function (node, view, getPos) {
     return new MediaInlineNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory,

package/dist/esm/plugins/media/nodeviews/mediaNodeView/index.js

@@ -10,9 +10,8 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
-import { NodeSelection } from 'prosemirror-state';
 import React from 'react';
-import { SelectionBasedNodeView } from '../../../../nodeviews';
+import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import MediaNode from './media';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { isMediaBlobUrlFromAttrs } from '../../utils/media-common';
@@ -26,6 +25,9 @@ var MediaNodeWithProviders = function MediaNodeWithProviders(_ref) {
     width: widthState
   });
 };
+function isMediaDecorationSpec(decoration) {
+  return decoration.spec.type !== undefined && decoration.spec.selected !== undefined;
+}
 var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   _inherits(MediaNodeView, _SelectionBasedNodeVi);
   var _super = _createSuper(MediaNodeView);
@@ -36,15 +38,12 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
+    _defineProperty(_assertThisInitialized(_this), "isSelected", false);
     _defineProperty(_assertThisInitialized(_this), "renderMediaNodeWithState", function (mediaProvider, contextIdentifierProvider) {
       return function (_ref2) {
         var editorWidth = _ref2.width;
         var getPos = _this.getPos;
         var mediaOptions = _this.reactComponentProps.mediaOptions;
-        var selection = _this.view.state.selection;
-        var isSelected = function isSelected() {
-          return _this.isNodeInsideSelection(selection.from, selection.to) || selection instanceof NodeSelection && selection.from === getPos();
-        };
         var attrs = _this.getAttrs();
         var url = attrs.type === 'external' ? attrs.url : '';
         var width = attrs.width,
@@ -72,7 +71,7 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
           view: _this.view,
           node: _this.node,
           getPos: getPos,
-          selected: isSelected(),
+          selected: _this.nodeInsideSelection(),
           originalDimensions: originalDimensions,
           maxDimensions: maxDimensions,
           url: url,
@@ -106,11 +105,18 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     }
   }, {
     key: "viewShouldUpdate",
-    value: function viewShouldUpdate(nextNode) {
+    value: function viewShouldUpdate(nextNode, decorations) {
+      var hasMediaNodeSelectedDecoration = decorations.some(function (decoration) {
+        return isMediaDecorationSpec(decoration) && decoration.spec.type === 'media' && decoration.spec.selected;
+      });
+      if (this.isSelected !== hasMediaNodeSelectedDecoration) {
+        this.isSelected = hasMediaNodeSelectedDecoration;
+        return true;
+      }
       if (this.node.attrs !== nextNode.attrs) {
         return true;
       }
-      return _get(_getPrototypeOf(MediaNodeView.prototype), "viewShouldUpdate", this).call(this, nextNode);
+      return _get(_getPrototypeOf(MediaNodeView.prototype), "viewShouldUpdate", this).call(this, nextNode, decorations);
     }
   }, {
     key: "stopEvent",

package/dist/esm/plugins/media/nodeviews/mediaSingle.js

@@ -31,7 +31,7 @@ import { floatingLayouts, isRichMediaInsideOfBlockNode } from '@atlaskit/editor-
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { isMediaBlobUrlFromAttrs } from '../utils/media-common';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import ReactNodeView from '../../../nodeviews/ReactNodeView';
+import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import CaptionPlaceholder from '../ui/CaptionPlaceholder';
 import { NodeSelection } from 'prosemirror-state';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';