@atlaskit/editor-core 185.2.25 → 185.2.26

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 185.2.26
+
+### Patch Changes
+
+- [`5e01082b600`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5e01082b600) - Extracting SelectionBasedNodeView to editor-common.
+- Updated dependencies
+
 ## 185.2.25
 
 ### Patch Changes

package/dist/cjs/editor-next/editor-internal.js

@@ -17,7 +17,7 @@ var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props"
 var _contextAdapter = require("../nodeviews/context-adapter");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _EditorContext = _interopRequireDefault(require("../ui/EditorContext"));
-var _PortalProvider = require("../ui/PortalProvider");
+var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _RenderTracking = require("../utils/performance/components/RenderTracking");
 var _getBaseFontSize = require("./utils/getBaseFontSize");
 var _useMeasureEditorMountTime = _interopRequireDefault(require("./hooks/useMeasureEditorMountTime"));
@@ -88,7 +88,7 @@ function EditorInternalWithoutHooks(_ref) {
     })
   }, (0, _react.jsx)(_EditorContext.default, {
     editorActions: editorActions
-  }, (0, _react.jsx)(_contextAdapter.ContextAdapter, null, (0, _react.jsx)(_PortalProvider.PortalProviderWithThemeProviders, {
+  }, (0, _react.jsx)(_contextAdapter.ContextAdapter, null, (0, _react.jsx)(_portalProvider.PortalProviderWithThemeProviders, {
     onAnalyticsEvent: handleAnalyticsEvent,
     useAnalyticsContext: props.UNSAFE_useAnalyticsContext,
     render: function render(portalProviderAPI) {
@@ -146,7 +146,7 @@ function EditorInternalWithoutHooks(_ref) {
             pluginHooks: config.pluginHooks
           }));
         }
-      }), (0, _react.jsx)(_PortalProvider.PortalRenderer, {
+      }), (0, _react.jsx)(_portalProvider.PortalRenderer, {
         portalProviderAPI: portalProviderAPI
       }));
     }

package/dist/cjs/index.js

@@ -128,19 +128,19 @@ Object.defineProperty(exports, "MentionResource", {
 Object.defineProperty(exports, "PortalProvider", {
   enumerable: true,
   get: function get() {
-    return _PortalProvider.PortalProvider;
+    return _portalProvider.PortalProvider;
   }
 });
 Object.defineProperty(exports, "PortalProviderAPI", {
   enumerable: true,
   get: function get() {
-    return _PortalProvider.PortalProviderAPI;
+    return _portalProvider.PortalProviderAPI;
   }
 });
 Object.defineProperty(exports, "PortalRenderer", {
   enumerable: true,
   get: function get() {
-    return _PortalProvider.PortalRenderer;
+    return _portalProvider.PortalRenderer;
   }
 });
 Object.defineProperty(exports, "PresenceResource", {
@@ -699,7 +699,7 @@ var _utils = require("./utils");
 var _listCommands = require("./utils/list-commands");
 var _createEditor = require("./create-editor");
 var _actions3 = _interopRequireDefault(require("./actions"));
-var _PortalProvider = require("./ui/PortalProvider");
+var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _gapCursorSelection = require("./plugins/selection/gap-cursor-selection");
 var _mobileSelection = require("./plugins/mobile-selection");
 var _commands8 = require("./plugins/expand/commands");

package/dist/cjs/labs/next/Editor.js

@@ -32,7 +32,7 @@ Object.defineProperty(exports, "useEditorSharedConfig", {
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
-var _PortalProvider = require("../../ui/PortalProvider");
+var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _EditorInternal = require("./internal/components/EditorInternal");
 var _presetContext = require("./internal/context/preset-context");
 var _sharedConfig = require("./internal/context/shared-config");
@@ -55,14 +55,14 @@ function Editor(props) {
   var plugins = (0, _presetContext.usePresetContext)();
   return /*#__PURE__*/_react.default.createElement(_reactIntlNext.IntlProvider, {
     locale: "en"
-  }, /*#__PURE__*/_react.default.createElement(_PortalProvider.PortalProvider, {
+  }, /*#__PURE__*/_react.default.createElement(_portalProvider.PortalProvider, {
     onAnalyticsEvent: props.onAnalyticsEvent,
     render: function render(portalProviderAPI) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_EditorInternal.EditorInternal, (0, _extends2.default)({}, props, {
         plugins: plugins.length ? plugins : props.plugins,
         portalProviderAPI: portalProviderAPI,
         onAnalyticsEvent: props.onAnalyticsEvent
-      })), /*#__PURE__*/_react.default.createElement(_PortalProvider.PortalRenderer, {
+      })), /*#__PURE__*/_react.default.createElement(_portalProvider.PortalRenderer, {
         portalProviderAPI: portalProviderAPI
       }));
     }

package/dist/cjs/nodeviews/index.js

@@ -1,20 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-Object.defineProperty(exports, "ReactNodeView", {
-  enumerable: true,
-  get: function get() {
-    return _ReactNodeView.default;
-  }
-});
-Object.defineProperty(exports, "SelectionBasedNodeView", {
-  enumerable: true,
-  get: function get() {
-    return _SelectionBasedNodeView.SelectionBasedNodeView;
-  }
-});
-var _ReactNodeView = _interopRequireDefault(require("./ReactNodeView"));
-var _SelectionBasedNodeView = require("./SelectionBasedNodeView");
+});

package/dist/cjs/plugins/annotation/index.js

@@ -13,15 +13,14 @@ Object.defineProperty(exports, "AnnotationUpdateEmitter", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
-var _reactNodeview = require("../../plugins/base/pm-plugins/react-nodeview");
 var _keymap = require("./pm-plugins/keymap");
 var _inlineComment = require("./pm-plugins/inline-comment");
 var _updateProvider = require("./update-provider");
 var _utils = require("./utils");
 var _toolbar = require("./toolbar");
 var _InlineCommentView = require("./ui/InlineCommentView");
-var annotationPlugin = function annotationPlugin(annotationProviders) {
+var _hooks = require("@atlaskit/editor-common/hooks");
+var annotationPlugin = function annotationPlugin(annotationProviders, api) {
   return {
     name: 'annotation',
     marks: function marks() {
@@ -30,6 +29,12 @@ var annotationPlugin = function annotationPlugin(annotationProviders) {
         mark: _adfSchema.annotation
       }];
     },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      return (0, _utils.getPluginState)(editorState);
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'annotation',
@@ -75,27 +80,32 @@ var annotationPlugin = function annotationPlugin(annotationProviders) {
       if (!annotationProviders) {
         return null;
       }
-      return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-        plugins: {
-          selectionState: _reactNodeview.stateKey,
-          inlineCommentState: _utils.inlineCommentPluginKey
-        },
-        render: function render(_ref3) {
-          var inlineCommentState = _ref3.inlineCommentState;
-          if (inlineCommentState && !inlineCommentState.isVisible) {
-            return null;
-          }
-          return /*#__PURE__*/_react.default.createElement("div", {
-            "data-editor-popup": "true"
-          }, /*#__PURE__*/_react.default.createElement(_InlineCommentView.InlineCommentView, {
-            providers: annotationProviders,
-            editorView: editorView,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          }));
-        }
+      return /*#__PURE__*/_react.default.createElement(AnnotationContentComponent, {
+        api: api,
+        editorView: editorView,
+        annotationProviders: annotationProviders,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent
       });
     }
   };
 };
+function AnnotationContentComponent(_ref3) {
+  var api = _ref3.api,
+    editorView = _ref3.editorView,
+    annotationProviders = _ref3.annotationProviders,
+    dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['annotation']),
+    inlineCommentState = _useSharedPluginState.annotationState;
+  if (inlineCommentState && !inlineCommentState.isVisible) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement("div", {
+    "data-editor-popup": "true"
+  }, /*#__PURE__*/_react.default.createElement(_InlineCommentView.InlineCommentView, {
+    providers: annotationProviders,
+    editorView: editorView,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  }));
+}
 var _default = annotationPlugin;
 exports.default = _default;

package/dist/cjs/plugins/annotation/nodeviews/index.js

@@ -12,7 +12,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _react = _interopRequireDefault(require("react"));
 var _styles = require("@atlaskit/editor-common/styles");
-var _nodeviews = require("../../../nodeviews");
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 var AnnotationNodeView = /*#__PURE__*/function (_ReactNodeView) {
@@ -50,7 +50,7 @@ var AnnotationNodeView = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return AnnotationNodeView;
-}(_nodeviews.ReactNodeView);
+}(_reactNodeView.default);
 exports.AnnotationNodeView = AnnotationNodeView;
 var getAnnotationViewClassname = function getAnnotationViewClassname(isUnresolved, hasFocus) {
   if (!isUnresolved) {

package/dist/cjs/plugins/base/index.js

@@ -18,7 +18,6 @@ var _contextIdentifier = _interopRequireDefault(require("./pm-plugins/context-id
 var _newlinePreserveMarks = _interopRequireDefault(require("./pm-plugins/newline-preserve-marks"));
 var _inlineCursorTarget = _interopRequireDefault(require("./pm-plugins/inline-cursor-target"));
 var _betterTypeHistory = _interopRequireDefault(require("./pm-plugins/better-type-history"));
-var _reactNodeview = require("./pm-plugins/react-nodeview");
 var _scrollGutter = _interopRequireDefault(require("./pm-plugins/scroll-gutter"));
 var _keymap = require("../../utils/keymap");
 var _frozenEditor = _interopRequireDefault(require("./pm-plugins/frozen-editor"));
@@ -65,11 +64,6 @@ var basePlugin = function basePlugin(options, api) {
       }, {
         name: 'newlinePreserveMarksPlugin',
         plugin: _newlinePreserveMarks.default
-      }, {
-        name: 'reactNodeView',
-        plugin: function plugin() {
-          return _reactNodeview.plugin;
-        }
       }, {
         name: 'frozenEditor',
         plugin: function plugin(_ref3) {

package/dist/cjs/plugins/caption/index.js

@@ -21,12 +21,11 @@ var captionPlugin = function captionPlugin(_, api) {
       return [{
         name: 'caption',
         plugin: function plugin(_ref) {
-          var _api$dependencies$ana;
           var portalProviderAPI = _ref.portalProviderAPI,
             providerFactory = _ref.providerFactory,
             eventDispatcher = _ref.eventDispatcher,
             dispatch = _ref.dispatch;
-          return (0, _main.default)(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
+          return (0, _main.default)(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api);
         }
       }, {
         name: 'captionKeymap',

package/dist/cjs/plugins/caption/nodeviews/index.js

@@ -15,7 +15,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _nodeviews = require("../../../nodeviews/");
+var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-node-view");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
@@ -72,9 +72,9 @@ var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     }
   }]);
   return CaptionNodeView;
-}(_nodeviews.SelectionBasedNodeView);
+}(_selectionBasedNodeView.SelectionBasedNodeView);
 exports.CaptionNodeView = CaptionNodeView;
-function captionNodeView(portalProviderAPI, eventDispatcher) {
+function captionNodeView(portalProviderAPI, eventDispatcher, pluginInjectionApi) {
   return function (node, view, getPos) {
     var hasIntlContext = true;
     return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();

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

@@ -18,7 +18,9 @@ var fireAnalytics = function fireAnalytics(tr, action, analyticsApi) {
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.CAPTION
   })(tr);
 };
-var _default = function _default(portalProviderAPI, eventDispatcher, providerFactory, dispatch, analyticsApi) {
+var _default = function _default(portalProviderAPI, eventDispatcher, providerFactory, dispatch, pluginInjectionApi) {
+  var _pluginInjectionApi$d;
+  var analyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions;
   return new _safePlugin.SafePlugin({
     appendTransaction: function appendTransaction(transactions, oldState, newState) {
       // only run for transactions that change selection
@@ -48,7 +50,7 @@ var _default = function _default(portalProviderAPI, eventDispatcher, providerFac
     key: _pluginKey.pluginKey,
     props: {
       nodeViews: {
-        caption: (0, _nodeviews.default)(portalProviderAPI, eventDispatcher)
+        caption: (0, _nodeviews.default)(portalProviderAPI, eventDispatcher, pluginInjectionApi)
       }
     }
   });

package/dist/cjs/plugins/card/nodeviews/embedCard.js

@@ -21,7 +21,7 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _genericCard = require("./genericCard");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _nodeviews = require("../../../nodeviews/");
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _actions = require("../pm-plugins/actions");
 var _ResizableEmbedCard = _interopRequireDefault(require("../ui/ResizableEmbedCard"));
 var _utils = require("@atlaskit/editor-common/utils");
@@ -341,8 +341,8 @@ exports.EmbedCardComponent = EmbedCardComponent;
   contextAdapter: _propTypes.default.object
 });
 var WrappedBlockCard = (0, _genericCard.Card)(EmbedCardComponent, _ui.UnsupportedBlock);
-var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
-  (0, _inherits2.default)(EmbedCard, _SelectionBasedNodeVi);
+var EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
+  (0, _inherits2.default)(EmbedCard, _ReactNodeView);
   var _super2 = _createSuper(EmbedCard);
   function EmbedCard() {
     (0, _classCallCheck2.default)(this, EmbedCard);
@@ -392,5 +392,5 @@ var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     }
   }]);
   return EmbedCard;
-}(_nodeviews.SelectionBasedNodeView);
+}(_reactNodeView.default);
 exports.EmbedCard = EmbedCard;

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

@@ -12,7 +12,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _react = _interopRequireDefault(require("react"));
-var _nodeviews = require("../../../nodeviews");
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _Extension = _interopRequireDefault(require("../ui/Extension"));
 var _ExtensionNodeWrapper = _interopRequireDefault(require("../ui/Extension/ExtensionNodeWrapper"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -76,7 +76,7 @@ var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return ExtensionNode;
-}(_nodeviews.ReactNodeView);
+}(_reactNodeView.default);
 exports.ExtensionNode = ExtensionNode;
 function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi) {
   return function (node, view, getPos) {

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

@@ -8,7 +8,7 @@ exports.pluginKey = exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _prosemirrorState = require("prosemirror-state");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _nodeviews = require("../../nodeviews");
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _jiraIssue = _interopRequireDefault(require("./nodeviews/jira-issue"));
 var pluginKey = new _prosemirrorState.PluginKey('jiraIssuePlugin');
 exports.pluginKey = pluginKey;
@@ -19,7 +19,7 @@ var createPlugin = function createPlugin(_ref) {
     key: pluginKey,
     props: {
       nodeViews: {
-        confluenceJiraIssue: _nodeviews.ReactNodeView.fromComponent(_jiraIssue.default, portalProviderAPI, eventDispatcher)
+        confluenceJiraIssue: _reactNodeView.default.fromComponent(_jiraIssue.default, portalProviderAPI, eventDispatcher)
       }
     }
   });

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

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

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

@@ -18,17 +18,15 @@ var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _close = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/close"));
 var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
 var _react = _interopRequireDefault(require("react"));
-var _ReactNodeView2 = _interopRequireDefault(require("../../../nodeviews/ReactNodeView"));
-var _reactNodeview = require("../../../plugins/base/pm-plugins/react-nodeview");
-var _WithPluginState = _interopRequireDefault(require("../../../ui/WithPluginState"));
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _utils = require("../../../utils");
 var _nodes = require("../../../utils/nodes");
-var _editorDisabled = require("../../editor-disabled");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _mediaNodeUpdater = require("./mediaNodeUpdater");
 var _mediaCommon = require("@atlaskit/media-common");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("./messages");
+var _hooks = require("@atlaskit/editor-common/hooks");
 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) { (0, _defineProperty2.default)(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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -259,6 +257,15 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
 var IntlMediaGroup = (0, _reactIntlNext.injectIntl)(MediaGroup);
 var _default = IntlMediaGroup;
 exports.default = _default;
+function MediaGroupNodeViewInternal(_ref2) {
+  var renderFn = _ref2.renderFn,
+    pluginInjectionApi = _ref2.pluginInjectionApi;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['editorDisabled']),
+    editorDisabledPlugin = _useSharedPluginState.editorDisabledState;
+  return renderFn({
+    editorDisabledPlugin: editorDisabledPlugin
+  });
+}
 var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
   (0, _inherits2.default)(MediaGroupNodeView, _ReactNodeView);
   var _super2 = _createSuper(MediaGroupNodeView);
@@ -271,16 +278,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.default.createElement(_providerFactory.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;
             }
@@ -299,27 +307,25 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
               mediaOptions: mediaOptions
             });
           };
-          return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-            editorView: _this3.view,
-            plugins: {
-              reactNodeViewState: _reactNodeview.stateKey,
-              editorDisabledPlugin: _editorDisabled.pluginKey
-            },
-            render: renderFn
+          return /*#__PURE__*/_react.default.createElement(MediaGroupNodeViewInternal, {
+            renderFn: renderFn,
+            pluginInjectionApi: pluginInjectionApi
           });
         }
       });
     }
   }]);
   return MediaGroupNodeView;
-}(_ReactNodeView2.default);
+}(_reactNodeView.default);
 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/cjs/plugins/media/nodeviews/mediaInline.js

@@ -17,7 +17,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _nodeviews = require("../../../nodeviews/");
+var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-node-view");
 var _WithPluginState = _interopRequireDefault(require("../../../ui/WithPluginState"));
 var _mediaCard = require("@atlaskit/media-card");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
@@ -266,9 +266,9 @@ var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     }
   }]);
   return MediaInlineNodeView;
-}(_nodeviews.SelectionBasedNodeView);
+}(_selectionBasedNodeView.SelectionBasedNodeView);
 exports.MediaInlineNodeView = MediaInlineNodeView;
-var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent) {
+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/cjs/plugins/media/nodeviews/mediaNodeView/index.js

@@ -15,9 +15,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _ui = require("@atlaskit/editor-common/ui");
-var _prosemirrorState = require("prosemirror-state");
 var _react = _interopRequireDefault(require("react"));
-var _nodeviews = require("../../../../nodeviews");
+var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-node-view");
 var _media = _interopRequireDefault(require("./media"));
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaCommon = require("../../utils/media-common");
@@ -33,6 +32,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) {
   (0, _inherits2.default)(MediaNodeView, _SelectionBasedNodeVi);
   var _super = _createSuper(MediaNodeView);
@@ -43,15 +45,12 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isSelected", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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 _prosemirrorState.NodeSelection && selection.from === getPos();
-        };
         var attrs = _this.getAttrs();
         var url = attrs.type === 'external' ? attrs.url : '';
         var width = attrs.width,
@@ -79,7 +78,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,
@@ -113,11 +112,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 (0, _get2.default)((0, _getPrototypeOf2.default)(MediaNodeView.prototype), "viewShouldUpdate", this).call(this, nextNode);
+      return (0, _get2.default)((0, _getPrototypeOf2.default)(MediaNodeView.prototype), "viewShouldUpdate", this).call(this, nextNode, decorations);
     }
   }, {
     key: "stopEvent",
@@ -155,7 +161,7 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     }
   }]);
   return MediaNodeView;
-}(_nodeviews.SelectionBasedNodeView);
+}(_selectionBasedNodeView.SelectionBasedNodeView);
 var ReactMediaNode = function ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory) {
   var mediaOptions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var pluginInjectionApi = arguments.length > 4 ? arguments[4] : undefined;

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

@@ -33,7 +33,7 @@ var _styles = require("./styles");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaCommon = require("../utils/media-common");
 var _mediaCommon2 = require("@atlaskit/media-common");
-var _ReactNodeView2 = _interopRequireDefault(require("../../../nodeviews/ReactNodeView"));
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _CaptionPlaceholder = _interopRequireDefault(require("../ui/CaptionPlaceholder"));
 var _prosemirrorState = require("prosemirror-state");
 var _captions = require("../commands/captions");
@@ -584,7 +584,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return MediaSingleNodeView;
-}(_ReactNodeView2.default);
+}(_reactNodeView.default);
 var ReactMediaSingleNode = function ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent) {
   var mediaOptions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var pluginInjectionApi = arguments.length > 5 ? arguments[5] : undefined;