@atlaskit/editor-core 185.2.24 → 185.2.26

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

@@ -97,7 +97,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 [];
   }
@@ -111,7 +111,7 @@ var editButton = function editButton(formatMessage, extensionState) {
       var macroState = _pluginKey.pluginKey.getState(state);
       var _getPluginState = (0, _main.getPluginState)(state),
         updateExtension = _getPluginState.updateExtension;
-      (0, _actions.editExtension)(macroState && macroState.macroProvider, updateExtension)(state, dispatch, view);
+      (0, _actions.editExtension)(macroState && macroState.macroProvider, applyChangeToContextPanel, updateExtension)(state, dispatch, view);
       return true;
     },
     title: formatMessage(messages.edit),
@@ -119,15 +119,17 @@ var editButton = function editButton(formatMessage, extensionState) {
     focusEditoronEnter: true
   }];
 };
-var getToolbarConfig = function getToolbarConfig() {
-  var breakoutEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var hoverDecoration = arguments.length > 1 ? arguments[1] : undefined;
+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 = (0, _main.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 = (0, _utils.getSelectedExtension)(state, true);
 

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

@@ -55,7 +55,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.default.useMemo(function () {
     return item.icon ? (0, _reactLoadable.default)({
       loader: function () {
@@ -84,7 +85,8 @@ var ExtensionButton = function ExtensionButton(props) {
     }
     var targetNodeAdf = (0, _utils.nodeToJSON)(node);
     var api = (0, _extensionApi.createExtensionAPI)({
-      editorView: editorView
+      editorView: editorView,
+      applyChange: applyChangeToContextPanel
     });
     item.action(targetNodeAdf, api);
   };
@@ -103,7 +105,8 @@ 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 = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     extensions = _useState2[0],
@@ -141,9 +144,10 @@ var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
   }, [node]);
   var extensionItems = _react.default.useMemo(function () {
     return (0, _extensions.getContextualToolbarItemsFromModule)(extensions, nodeAdf, (0, _extensionApi.createExtensionAPI)({
-      editorView: editorView
+      editorView: editorView,
+      applyChange: applyChangeToContextPanel
     }));
-  }, [extensions, nodeAdf, editorView]);
+  }, [extensions, nodeAdf, editorView, applyChangeToContextPanel]);
   if (!extensionItems.length) {
     return null;
   }
@@ -158,7 +162,8 @@ var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
     children.push( /*#__PURE__*/_react.default.createElement(ExtensionButton, {
       node: node,
       item: item,
-      editorView: editorView
+      editorView: editorView,
+      applyChangeToContextPanel: applyChangeToContextPanel
     }));
     if (index < extensionItems.length - 1) {
       children.push( /*#__PURE__*/_react.default.createElement(_Separator.default, null));

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

@@ -60,7 +60,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.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
@@ -69,6 +70,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
   return (0, _react2.jsx)(_buttonGroup.default, 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;
@@ -239,7 +241,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.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 (0, _react2.jsx)(_Separator.default, {

package/dist/cjs/plugins/index.js

@@ -107,12 +107,6 @@ Object.defineProperty(exports, "collabEditPlugin", {
     return _collabEdit.default;
   }
 });
-Object.defineProperty(exports, "contextPanelPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _contextPanel.default;
-  }
-});
 Object.defineProperty(exports, "copyButtonPlugin", {
   enumerable: true,
   get: function get() {
@@ -454,7 +448,6 @@ var _expand = _interopRequireWildcard(require("./expand"));
 var _scrollIntoView = _interopRequireDefault(require("./scroll-into-view"));
 var _mobileDimensions = _interopRequireDefault(require("./mobile-dimensions"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));
-var _contextPanel = _interopRequireDefault(require("./context-panel"));
 var _selection = _interopRequireDefault(require("./selection"));
 var _mobileSelection = _interopRequireDefault(require("./mobile-selection"));
 var _clipboard = _interopRequireDefault(require("./clipboard"));

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;

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

@@ -40,6 +40,7 @@ var _utils2 = require("../../../utils");
 var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
 var _reactIntlNext = require("react-intl-next");
 var _mediaTaskManager = require("./mediaTaskManager");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -638,7 +639,6 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
             // we shift it to the media single parent as other code is opinionated about
             // the selection landing there. In particular the caption insertion and selection
             // action.
-
             return newState.tr.setSelection(_prosemirrorState.NodeSelection.create(newState.doc, transaction.selection.$from.pos - 1));
           }
         }
@@ -662,12 +662,29 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
     },
     props: {
       decorations: function decorations(state) {
+        // Use this to indicate that the media node is selected
+        var mediaNodes = [];
+        var schema = state.schema,
+          $anchor = state.selection.$anchor,
+          doc = state.doc;
+
+        // Find any media nodes in the current selection
+        if (state.selection instanceof _prosemirrorState.TextSelection || state.selection instanceof _prosemirrorState.AllSelection || state.selection instanceof _prosemirrorState.NodeSelection || state.selection instanceof _cellSelection.CellSelection) {
+          doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
+            if (node.type === schema.nodes.media) {
+              mediaNodes.push(_prosemirrorView.Decoration.node(pos, pos + node.nodeSize, {}, {
+                type: 'media',
+                selected: true
+              }));
+              return false;
+            }
+            return true;
+          });
+        }
         var pluginState = getMediaPluginState(state);
         if (!pluginState.showDropzone) {
-          return;
+          return _prosemirrorView.DecorationSet.create(state.doc, mediaNodes);
         }
-        var schema = state.schema,
-          $anchor = state.selection.$anchor;
 
         // When a media is already selected
         if (state.selection instanceof _prosemirrorState.NodeSelection) {
@@ -676,20 +693,20 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
             var deco = _prosemirrorView.Decoration.node(state.selection.from, state.selection.to, {
               class: 'richMedia-selected'
             });
-            return _prosemirrorView.DecorationSet.create(state.doc, [deco]);
+            return _prosemirrorView.DecorationSet.create(state.doc, [deco].concat(mediaNodes));
           }
-          return;
+          return _prosemirrorView.DecorationSet.create(state.doc, mediaNodes);
         }
         var pos = $anchor.pos;
         if ($anchor.parent.type !== schema.nodes.paragraph && $anchor.parent.type !== schema.nodes.codeBlock) {
           pos = (0, _prosemirrorTransform.insertPoint)(state.doc, pos, schema.nodes.mediaGroup);
         }
         if (pos === null || pos === undefined) {
-          return;
+          return _prosemirrorView.DecorationSet.create(state.doc, mediaNodes);
         }
         var dropPlaceholders = [_prosemirrorView.Decoration.widget(pos, dropPlaceholder, {
           key: 'drop-placeholder'
-        })];
+        })].concat(mediaNodes);
         return _prosemirrorView.DecorationSet.create(state.doc, dropPlaceholders);
       },
       nodeViews: options.nodeViews,

package/dist/cjs/plugins/tasks-and-decisions/nodeviews/decisionItem.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 _Decision = _interopRequireDefault(require("../ui/Decision"));
 var _utils = require("../../type-ahead/utils");
 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); }; }
@@ -77,7 +77,7 @@ var Decision = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return Decision;
-}(_nodeviews.ReactNodeView);
+}(_reactNodeView.default);
 var decisionItemNodeView = function decisionItemNodeView(portalProviderAPI, eventDispatcher) {
   return function (node, view, getPos) {
     var hasIntlContext = true;

package/dist/cjs/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -16,7 +16,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _steps = require("@atlaskit/adf-schema/steps");
-var _nodeviews = require("../../../nodeviews");
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _WithPluginState = _interopRequireDefault(require("../../../ui/WithPluginState"));
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _Task = _interopRequireDefault(require("../ui/Task"));
@@ -159,7 +159,7 @@ var Task = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return Task;
-}(_nodeviews.ReactNodeView);
+}(_reactNodeView.default);
 function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory) {
   return function (node, view, getPos) {
     var hasIntlContext = true;

package/dist/cjs/plugins/unsupported-content/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,8 +10,9 @@ var _prosemirrorState = require("prosemirror-state");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _ui = require("@atlaskit/editor-common/ui");
 var _unsupportedInlineNodeView = require("./unsupported-inline-node-view");
-var _nodeviews = require("../../nodeviews");
-var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
+var _reactNodeView = _interopRequireWildcard(require("@atlaskit/editor-common/react-node-view"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var pluginKey = new _prosemirrorState.PluginKey('unsupportedContentPlugin');
 exports.pluginKey = pluginKey;
 var createPlugin = function createPlugin(pmPluginFactoryParams) {
@@ -22,7 +24,7 @@ var createPlugin = function createPlugin(pmPluginFactoryParams) {
     key: pluginKey,
     props: {
       nodeViews: {
-        confluenceUnsupportedBlock: _nodeviews.ReactNodeView.fromComponent(_ui.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
+        confluenceUnsupportedBlock: _reactNodeView.default.fromComponent(_ui.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent: dispatchAnalyticsEvent
         }, undefined, hasIntlContext),
         confluenceUnsupportedInline: (0, _reactNodeView.getInlineNodeViewProducer)({
@@ -32,7 +34,7 @@ var createPlugin = function createPlugin(pmPluginFactoryParams) {
             dispatchAnalyticsEvent: dispatchAnalyticsEvent
           }
         }),
-        unsupportedBlock: _nodeviews.ReactNodeView.fromComponent(_ui.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
+        unsupportedBlock: _reactNodeView.default.fromComponent(_ui.UnsupportedBlock, portalProviderAPI, eventDispatcher, {
           dispatchAnalyticsEvent: dispatchAnalyticsEvent
         }, undefined, hasIntlContext),
         unsupportedInline: (0, _reactNodeView.getInlineNodeViewProducer)({

package/dist/cjs/test-utils.js

@@ -22,12 +22,6 @@ Object.defineProperty(exports, "GapCursorSide", {
     return _selection.Side;
   }
 });
-Object.defineProperty(exports, "PortalProviderAPI", {
-  enumerable: true,
-  get: function get() {
-    return _PortalProvider.PortalProviderAPI;
-  }
-});
 exports.createPMSchemaAndPlugins = void 0;
 Object.defineProperty(exports, "createTypeAheadTools", {
   enumerable: true,
@@ -47,7 +41,6 @@ var _base = _interopRequireDefault(require("./plugins/base"));
 var _pluginKey = require("./plugins/analytics/plugin-key");
 var _api = require("./plugins/type-ahead/api");
 var _preset = require("@atlaskit/editor-common/preset");
-var _PortalProvider = require("./ui/PortalProvider");
 var _eventDispatcher = require("./event-dispatcher");
 var _selection = require("./plugins/selection/gap-cursor/selection");
 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; }

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

@@ -25,7 +25,6 @@ var _colors = require("@atlaskit/theme/colors");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _WithPluginState = _interopRequireDefault(require("../WithPluginState"));
-var _contextPanel = require("../../plugins/context-panel");
 var _WithEditorActions = _interopRequireDefault(require("../WithEditorActions"));
 var _document = require("../../utils/document");
 var _excluded = ["actions"];
@@ -183,6 +182,14 @@ var widthPluginKey = {
     return state['widthPlugin$'];
   }
 };
+
+// @ts-ignore
+var contextPanelPluginKey = {
+  key: 'contextPanelPluginKey$',
+  getState: function getState(state) {
+    return state['contextPanelPluginKey$'];
+  }
+};
 function ContextPanelWithActions(_ref2) {
   var actions = _ref2.actions,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
@@ -198,7 +205,7 @@ function ContextPanelWithActions(_ref2) {
   return (0, _react2.jsx)(_WithPluginState.default, {
     eventDispatcher: eventDispatcher,
     plugins: {
-      contextPanel: _contextPanel.pluginKey,
+      contextPanel: contextPanelPluginKey,
       widthState: widthPluginKey
     },
     render: function render(_ref3) {

package/dist/cjs/utils/action.js

@@ -29,7 +29,7 @@ function _temporaryFixForConfigPanel() {
           }
           _context.next = 4;
           return new Promise(function (resolve) {
-            (0, _commands.forceAutoSave)(resolve)(editorView.state, editorView.dispatch);
+            (0, _commands.forceAutoSave)(extensionPluginState.applyChangeToContextPanel)(resolve)(editorView.state, editorView.dispatch);
           });
         case 4:
         case "end":

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "185.2.24";
+var version = "185.2.26";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.2.24",
+	"version": "185.2.26",
 	"sideEffects": false
 }

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

@@ -10,7 +10,7 @@ import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from
 import { ContextAdapter } from '../nodeviews/context-adapter';
 import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
 import EditorContext from '../ui/EditorContext';
-import { PortalProviderWithThemeProviders, PortalRenderer } from '../ui/PortalProvider';
+import { PortalProviderWithThemeProviders, PortalRenderer } from '@atlaskit/editor-common/portal-provider';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
 import { getBaseFontSize } from './utils/getBaseFontSize';
 import useMeasureEditorMountTime from './hooks/useMeasureEditorMountTime';