@atlaskit/editor-core 185.2.24 → 185.2.26

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @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
+
+- [`87366c84531`](https://bitbucket.org/atlassian/atlassian-frontend/commits/87366c84531) - Extract context panel plugin to new package @atlaskit/editor-plugin-context-panel
+- Updated dependencies
+
 ## 185.2.24
 
 ### 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/labs/next/presets/universal.js

@@ -8,6 +8,7 @@ exports.default = createUniversalPreset;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _plugins = require("../../../plugins");
+var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
 var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
 var _card = _interopRequireDefault(require("../../../plugins/card"));
 var _editorPluginTable = require("@atlaskit/editor-plugin-table");
@@ -232,6 +233,11 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       }]);
     }
     return builder;
+  }).maybeAdd(_editorPluginContextPanel.contextPanelPlugin, function (plugin, builder) {
+    if (isFullPage) {
+      return builder.add(_editorPluginContextPanel.contextPanelPlugin);
+    }
+    return builder;
   }).maybeAdd(_plugins.extensionPlugin, function (plugin, builder) {
     if (props.allowExtension) {
       var extensionConfig = (0, _typeof2.default)(props.allowExtension) === 'object' ? props.allowExtension : {};
@@ -307,11 +313,6 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(_plugins.contextPanelPlugin, function (plugin, builder) {
-    if (isFullPage) {
-      return builder.add(_plugins.contextPanelPlugin);
-    }
-    return builder;
   }).maybeAdd(_plugins.scrollIntoViewPlugin, function (plugin, builder) {
     if (props.autoScrollIntoView !== false) {
       return builder.add(_plugins.scrollIntoViewPlugin);

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/actions.js

@@ -167,11 +167,12 @@ exports.updateExtensionParams = updateExtensionParams;
 var editSelectedExtension = function editSelectedExtension(editorActions) {
   var editorView = editorActions._privateGetEditorView();
   var _getPluginState = (0, _main.getPluginState)(editorView.state),
-    updateExtension = _getPluginState.updateExtension;
-  return editExtension(null, updateExtension)(editorView.state, editorView.dispatch, editorView);
+    updateExtension = _getPluginState.updateExtension,
+    applyChangeToContextPanel = _getPluginState.applyChangeToContextPanel;
+  return editExtension(null, applyChangeToContextPanel, updateExtension)(editorView.state, editorView.dispatch, editorView);
 };
 exports.editSelectedExtension = editSelectedExtension;
-var editExtension = function editExtension(macroProvider, updateExtension) {
+var editExtension = function editExtension(macroProvider, applyChangeToContextPanel, updateExtension) {
   return function (state, dispatch, view) {
     if (!view) {
       return false;
@@ -191,7 +192,8 @@ var editExtension = function editExtension(macroProvider, updateExtension) {
         if (updateMethod && view) {
           var actions = (0, _extensionApi.createExtensionAPI)({
             editorView: view,
-            editInLegacyMacroBrowser: editInLegacyMacroBrowser
+            editInLegacyMacroBrowser: editInLegacyMacroBrowser,
+            applyChange: applyChangeToContextPanel
           });
           updateExtensionParams(updateMethod, nodeWithPos, actions)(state, dispatch, view);
           return;

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

@@ -10,7 +10,6 @@ exports.updateExtensionLayout = void 0;
 exports.updateState = updateState;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _prosemirrorUtils = require("prosemirror-utils");
-var _transforms = require("../context-panel/transforms");
 var _pluginFactory = require("./plugin-factory");
 var _utils = require("./utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
@@ -25,7 +24,7 @@ function updateState(state) {
     data: state
   });
 }
-function setEditingContextToContextPanel(processParametersBefore, processParametersAfter) {
+function setEditingContextToContextPanel(processParametersBefore, processParametersAfter, applyChangeToContextPanel) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
@@ -33,25 +32,29 @@ function setEditingContextToContextPanel(processParametersBefore, processParamet
       processParametersBefore: processParametersBefore,
       processParametersAfter: processParametersAfter
     }
-  }, _transforms.applyChange);
+  }, applyChangeToContextPanel);
 }
-var clearEditingContext = (0, _pluginFactory.createCommand)({
-  type: 'UPDATE_STATE',
-  data: {
-    showContextPanel: false,
-    processParametersBefore: undefined,
-    processParametersAfter: undefined
-  }
-}, _transforms.applyChange);
-exports.clearEditingContext = clearEditingContext;
-var forceAutoSave = function forceAutoSave(resolve, reject) {
+var clearEditingContext = function clearEditingContext(applyChangeToContextPanel) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
-      autoSaveResolve: resolve,
-      autoSaveReject: reject
+      showContextPanel: false,
+      processParametersBefore: undefined,
+      processParametersAfter: undefined
     }
-  }, _transforms.applyChange);
+  }, applyChangeToContextPanel);
+};
+exports.clearEditingContext = clearEditingContext;
+var forceAutoSave = function forceAutoSave(applyChangeToContextPanel) {
+  return function (resolve, reject) {
+    return (0, _pluginFactory.createCommand)({
+      type: 'UPDATE_STATE',
+      data: {
+        autoSaveResolve: resolve,
+        autoSaveReject: reject
+      }
+    }, applyChangeToContextPanel);
+  };
 };
 exports.forceAutoSave = forceAutoSave;
 var updateExtensionLayout = function updateExtensionLayout(layout) {

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

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

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

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

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

@@ -12,7 +12,7 @@ var _uniqueId = require("./pm-plugins/unique-id");
 var _toolbar = require("./toolbar");
 var _contextPanel = require("./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()) || {};
@@ -45,7 +45,10 @@ var extensionPlugin = function extensionPlugin() {
         }
       }, {
         name: 'extensionKeymap',
-        plugin: _keymap.default
+        plugin: function plugin() {
+          var _api$dependencies$con;
+          return (0, _keymap.default)(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() {
@@ -54,8 +57,12 @@ var extensionPlugin = function extensionPlugin() {
       }];
     },
     pluginsOptions: {
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(options.breakoutEnabled, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration),
-      contextPanel: (0, _contextPanel.getContextPanel)(options.allowAutoSave, featureFlags)
+      floatingToolbar: (0, _toolbar.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: (0, _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/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/extension/pm-plugins/keymap.js

@@ -11,14 +11,14 @@ var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _commands = require("../commands");
 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 keymapPlugin() {
+function keymapPlugin(applyChange) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.escape.common, function (state, dispatch) {
     var extensionState = (0, _main.getPluginState)(state);
     if (!extensionState.showContextPanel) {
       return false;
     }
-    return (0, _commands.clearEditingContext)(state, dispatch);
+    return (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
   }, list);
   return (0, _prosemirrorKeymap.keymap)(list);
 }

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

@@ -165,7 +165,8 @@ 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 = (0, _pluginFactory.getPluginState)(state),
@@ -179,7 +180,7 @@ var handleUpdate = function handleUpdate(_ref4) {
   var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
-      (0, _commands.clearEditingContext)(state, dispatch);
+      (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
     }
     return;
   }
@@ -195,7 +196,7 @@ var handleUpdate = function handleUpdate(_ref4) {
   element !== newElement;
   if (isNewNodeSelected || shouldUpdateEditButton) {
     if (showContextPanel) {
-      (0, _commands.clearEditingContext)(state, dispatch);
+      (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
       return;
     }
     var extensionType = node.attrs.extensionType;
@@ -224,11 +225,13 @@ var handleUpdate = function handleUpdate(_ref4) {
 };
 exports.handleUpdate = handleUpdate;
 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 = (0, _pluginFactory.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
@@ -243,11 +246,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() {