@atlaskit/editor-plugin-extension 0.6.3 → 0.7.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-extension
 
+## 0.7.1
+
+### Patch Changes
+
+- [#70741](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70741) [`7c1487568202`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7c1487568202) - ED-21973: Fix for MBE side panel config params update
+
+## 0.7.0
+
+### Minor Changes
+
+- [#68640](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68640) [`e173cb423c75`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e173cb423c75) - Migrate extension plugin to useSharedPluginState from WithPluginState. Adds new dependency on BasePlugin.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.6.3
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.performNodeUpdate = exports.editSelectedExtension = exports.editExtension = exports.createEditSelectedExtensionAction = exports.buildExtensionNode = void 0;
+exports.performNodeUpdate = exports.editExtension = exports.createEditSelectedExtensionAction = exports.buildExtensionNode = void 0;
 Object.defineProperty(exports, "transformSliceToRemoveOpenBodiedExtension", {
   enumerable: true,
   get: function get() {
@@ -57,18 +57,26 @@ var performNodeUpdate = exports.performNodeUpdate = function performNodeUpdate(e
         bodiedExtension = _schema$nodes.bodiedExtension,
         multiBodiedExtension = _schema$nodes.multiBodiedExtension;
       var isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection);
+      var isMultiBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([multiBodiedExtension])(selection);
       var extensionState = (0, _main.getPluginState)(state);
+      var updateSelectionsByNodeType = function updateSelectionsByNodeType(nodeType) {
+        // Bodied/MultiBodied extensions can trigger an update when the cursor is inside which means that there is no node selected.
+        // To work around that we replace the parent and create a text selection instead of new node selection
+        tr = (0, _utils.replaceParentNodeOfType)(nodeType, newNode)(tr);
+        // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+        tr.setSelection(_state2.TextSelection.create(tr.doc, state.selection.anchor));
+      };
       var targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
       var action = _analytics.ACTION.UPDATED;
       var tr = state.tr;
 
       // When it's a bodiedExtension but not selected
       if (newNode.type === bodiedExtension && !isBodiedExtensionSelected) {
-        // Bodied extensions can trigger an update when the cursor is inside which means that there is no node selected.
-        // To work around that we replace the parent and create a text selection instead of new node selection
-        tr = (0, _utils.replaceParentNodeOfType)(state.schema.nodes.bodiedExtension, newNode)(tr);
-        // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-        tr.setSelection(_state2.TextSelection.create(tr.doc, state.selection.anchor));
+        updateSelectionsByNodeType(state.schema.nodes.bodiedExtension);
+      }
+      // When it's a multiBodiedExtension but not selected
+      else if (newNode.type === multiBodiedExtension && !isMultiBodiedExtensionSelected) {
+        updateSelectionsByNodeType(state.schema.nodes.multiBodiedExtension);
       }
       // If any extension is currently selected
       else if ((0, _utils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension, multiBodiedExtension])(selection)) {
@@ -139,26 +147,29 @@ var updateExtensionParams = function updateExtensionParams(editorAnalyticsAPI) {
             case 7:
               newParameters = _context.sent;
               if (!newParameters) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               newAttrs = _objectSpread(_objectSpread({}, attrs), {}, {
                 parameters: _objectSpread(_objectSpread({}, parameters), newParameters)
               });
+              if (type.name === 'multiBodiedExtension') {
+                newAttrs.parameters.macroParams = _objectSpread(_objectSpread({}, parameters.macroParams), newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams);
+              }
               return _context.abrupt("return", performNodeUpdate(editorAnalyticsAPI)(type.name, newAttrs, content, marks, true)(state, dispatch, view));
-            case 11:
-              _context.next = 15;
+            case 12:
+              _context.next = 16;
               break;
-            case 13:
-              _context.prev = 13;
+            case 14:
+              _context.prev = 14;
               _context.t0 = _context["catch"](4);
-            case 15:
-              return _context.abrupt("return", true);
             case 16:
+              return _context.abrupt("return", true);
+            case 17:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 13]]);
+        }, _callee, null, [[4, 14]]);
       }));
       return function (_x, _x2, _x3) {
         return _ref.apply(this, arguments);
@@ -166,28 +177,13 @@ var updateExtensionParams = function updateExtensionParams(editorAnalyticsAPI) {
     }();
   };
 };
-
-// This is to decouple extensions from editor core
-// Ideally in the future we completely deprecate `EditorActions`
-var editSelectedExtension = exports.editSelectedExtension = function editSelectedExtension(editorActions) {
-  var editorView = editorActions._privateGetEditorView();
-  var _getPluginState = (0, _main.getPluginState)(editorView.state),
-    updateExtension = _getPluginState.updateExtension,
-    applyChangeToContextPanel = _getPluginState.applyChangeToContextPanel;
-  // The analytics API cannot be accessed in this case because
-  // we do not have access to the plugin injection API. Rather
-  // than change the way this works - we just won't use analytics
-  // here for now.
-  var editorAnalyticsAPI = undefined;
-  return editExtension(null, applyChangeToContextPanel, editorAnalyticsAPI, updateExtension)(editorView.state, editorView.dispatch, editorView);
-};
 var editExtension = exports.editExtension = function editExtension(macroProvider, applyChangeToContextPanel, editorAnalyticsAPI, updateExtension) {
   return function (state, dispatch, view) {
     if (!view) {
       return false;
     }
-    var _getPluginState2 = (0, _main.getPluginState)(state),
-      localId = _getPluginState2.localId;
+    var _getPluginState = (0, _main.getPluginState)(state),
+      localId = _getPluginState.localId;
     var nodeWithPos = (0, _utils2.findExtensionWithLocalId)(state, localId);
     if (!nodeWithPos) {
       return false;
@@ -225,15 +221,15 @@ var editExtension = exports.editExtension = function editExtension(macroProvider
 };
 var createEditSelectedExtensionAction = exports.createEditSelectedExtensionAction = function createEditSelectedExtensionAction(_ref2) {
   var editorViewRef = _ref2.editorViewRef,
-    editorAnalyticsAPI = _ref2.editorAnalyticsAPI;
+    editorAnalyticsAPI = _ref2.editorAnalyticsAPI,
+    applyChangeToContextPanel = _ref2.applyChangeToContextPanel;
   return function () {
     var view = editorViewRef.current;
     if (!view) {
       return false;
     }
-    var _getPluginState3 = (0, _main.getPluginState)(view.state),
-      updateExtension = _getPluginState3.updateExtension,
-      applyChangeToContextPanel = _getPluginState3.applyChangeToContextPanel;
+    var _getPluginState2 = (0, _main.getPluginState)(view.state),
+      updateExtension = _getPluginState2.updateExtension;
     return editExtension(null, applyChangeToContextPanel, editorAnalyticsAPI, updateExtension)(view.state, view.dispatch, view);
   };
 };

package/dist/cjs/context-panel.js

@@ -46,9 +46,11 @@ var duplicateSelection = exports.duplicateSelection = function duplicateSelectio
   }
 };
 var getContextPanel = exports.getContextPanel = function getContextPanel(getEditorView) {
-  return function (allowAutoSave, featureFlags, applyChange) {
+  return function (api, allowAutoSave, featureFlags) {
     return function (state) {
+      var _api$contextPanel;
       var nodeWithPos = (0, _utils.getSelectedExtension)(state, true);
+      var applyChange = api === null || api === void 0 || (_api$contextPanel = api.contextPanel) === null || _api$contextPanel === void 0 ? void 0 : _api$contextPanel.actions.applyChange;
 
       // Adding checks to bail out early
       if (!nodeWithPos) {
@@ -82,6 +84,7 @@ var getContextPanel = exports.getContextPanel = function getContextPanel(getEdit
             return null;
           }
           return /*#__PURE__*/_react.default.createElement(_ConfigPanelLoader.default, {
+            api: api,
             showHeader: true,
             closeOnEsc: true,
             extensionType: extensionType,
@@ -155,6 +158,8 @@ var getContextPanel = exports.getContextPanel = function getContextPanel(getEdit
     };
   };
 };
+
+// Added this interface to handle the macroParams on Parameters
 function onChangeAction(_x2) {
   return _onChangeAction.apply(this, arguments);
 }
@@ -175,6 +180,7 @@ function _onChangeAction() {
       _ref6,
       positions,
       node,
+      newAttributes,
       newNode,
       positionUpdated,
       transaction,
@@ -232,15 +238,18 @@ function _onChangeAction() {
           return _context3.abrupt("return");
         case 23:
           node = nodeWithPos.node;
-          newNode = (0, _actions.buildExtensionNode)(nodeWithPos.node.toJSON().type, editorView.state.schema, _objectSpread(_objectSpread({}, node.attrs), {}, {
-            parameters: _objectSpread(_objectSpread({}, oldParameters), newParameters)
-          }), node.content, node.marks);
+          newAttributes = _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread(_objectSpread({}, oldParameters), newParameters), {}, {
+              macroParams: _objectSpread(_objectSpread({}, oldParameters === null || oldParameters === void 0 ? void 0 : oldParameters.macroParams), newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams)
+            })
+          });
+          newNode = (0, _actions.buildExtensionNode)(nodeWithPos.node.toJSON().type, editorView.state.schema, newAttributes, node.content, node.marks);
           if (newNode) {
-            _context3.next = 27;
+            _context3.next = 28;
             break;
           }
           return _context3.abrupt("return");
-        case 27:
+        case 28:
           positionUpdated = positions[key];
           transaction = editorView.state.tr.replaceWith(positionUpdated, positionUpdated + newNode.nodeSize, newNode); // Ensure we preserve the selection, tr.replaceWith causes it to be lost in some cases
           // when replacing the node
@@ -253,13 +262,13 @@ function _onChangeAction() {
           }
           positionsLess = _objectSpread({}, (0, _main.getPluginState)(editorView.state).positions);
           delete positionsLess[key];
-          _context3.next = 35;
+          _context3.next = 36;
           return (0, _commands.updateState)({
             positions: positionsLess
           })(editorView.state, editorView.dispatch);
-        case 35:
-          editorView.dispatch(transaction);
         case 36:
+          editorView.dispatch(transaction);
+        case 37:
         case "end":
           return _context3.stop();
       }

package/dist/cjs/extension-api.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getEditInLegacyMacroBrowser = exports.createExtensionAPI = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _validator = require("@atlaskit/adf-utils/validator");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -17,6 +18,8 @@ var _commands = require("./commands");
 var _actions = require("./pm-plugins/macro/actions");
 var _pluginKey = require("./pm-plugins/macro/plugin-key");
 var _utils3 = require("./utils");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getEditInLegacyMacroBrowser = exports.getEditInLegacyMacroBrowser = function getEditInLegacyMacroBrowser(_ref) {
   var view = _ref.view,
     macroProvider = _ref.macroProvider,
@@ -221,6 +224,15 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       }) : node.marks;
       var newContent = changedValues.hasOwnProperty('content') ? _model.Fragment.fromJSON(schema, changedValues.content) : node.content;
       var newAttrs = changedValues.hasOwnProperty('attrs') ? changedValues.attrs : node.attrs;
+      if (node.type.name === 'multiBodiedExtension') {
+        var _changedValues$attrs, _node$attrs$parameter, _changedValues$attrs2;
+        newAttrs = _objectSpread(_objectSpread(_objectSpread({}, node.attrs), changedValues.attrs), {}, {
+          parameters: _objectSpread(_objectSpread(_objectSpread({}, node.attrs.parameters), (_changedValues$attrs = changedValues.attrs) === null || _changedValues$attrs === void 0 ? void 0 : _changedValues$attrs.parameters), {}, {
+            macroParams: _objectSpread(_objectSpread({}, (_node$attrs$parameter = node.attrs.parameters) === null || _node$attrs$parameter === void 0 ? void 0 : _node$attrs$parameter.macroParams), (_changedValues$attrs2 = changedValues.attrs) === null || _changedValues$attrs2 === void 0 || (_changedValues$attrs2 = _changedValues$attrs2.parameters) === null || _changedValues$attrs2 === void 0 ? void 0 : _changedValues$attrs2.macroParams)
+          })
+        });
+        // console.log('newAttrs', newAttrs);
+      }
 
       // Validate if the new attributes, content and marks result in a valid node and adf.
       try {

package/dist/cjs/plugin.js

@@ -19,7 +19,7 @@ var _main = require("./pm-plugins/main");
 var _uniqueId = require("./pm-plugins/unique-id");
 var _toolbar = require("./toolbar");
 var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
-  var _api$featureFlags, _api$analytics2, _api$analytics3, _api$decorations, _api$contextPanel3, _api$analytics4, _api$contextPanel4;
+  var _api$featureFlags, _api$analytics2, _api$analytics3, _api$contextPanel3, _api$decorations, _api$contextPanel4, _api$analytics4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     _api = _ref.api;
@@ -126,7 +126,8 @@ var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
       insertMacroFromMacroBrowser: (0, _actions2.insertMacroFromMacroBrowser)(_api === null || _api === void 0 || (_api$analytics2 = _api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions),
       editSelectedExtension: (0, _actions.createEditSelectedExtensionAction)({
         editorViewRef: editorViewRef,
-        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics3 = _api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions
+        editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics3 = _api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions,
+        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel3 = _api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange
       }),
       runMacroAutoConvert: _actions2.runMacroAutoConvert,
       forceAutoSave: _commands.forceAutoSave
@@ -135,13 +136,13 @@ var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
       floatingToolbar: (0, _toolbar.getToolbarConfig)({
         breakoutEnabled: options.breakoutEnabled,
         hoverDecoration: _api === null || _api === void 0 || (_api$decorations = _api.decorations) === null || _api$decorations === void 0 ? void 0 : _api$decorations.actions.hoverDecoration,
-        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel3 = _api.contextPanel) === null || _api$contextPanel3 === void 0 ? void 0 : _api$contextPanel3.actions.applyChange,
+        applyChangeToContextPanel: _api === null || _api === void 0 || (_api$contextPanel4 = _api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange,
         editorAnalyticsAPI: _api === null || _api === void 0 || (_api$analytics4 = _api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions
       }),
       contextPanel: (0, _contextPanel.getContextPanel)(function () {
         var _editorViewRef$curren;
         return (_editorViewRef$curren = editorViewRef.current) !== null && _editorViewRef$curren !== void 0 ? _editorViewRef$curren : undefined;
-      })(options.allowAutoSave, featureFlags, _api === null || _api === void 0 || (_api$contextPanel4 = _api.contextPanel) === null || _api$contextPanel4 === void 0 ? void 0 : _api$contextPanel4.actions.applyChange)
+      })(_api, options.allowAutoSave, featureFlags)
     }
   };
 };

package/dist/cjs/pm-plugins/macro/actions.js

@@ -22,7 +22,7 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
   return function (macroProvider, macroNode, isEditing) {
     return /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(view) {
-        var newMacro, state, dispatch, currentLayout, node, selection, schema, _schema$nodes, extension, inlineExtension, bodiedExtension, extensionState, targetSelectionSource, tr, isBodiedExtensionSelected, pos, _macroNode$attrs, extensionType, extensionKey, layout, localId;
+        var newMacro, state, dispatch, currentLayout, node, selection, schema, _schema$nodes, extension, inlineExtension, bodiedExtension, multiBodiedExtension, updateSelectionsByNodeType, extensionState, targetSelectionSource, tr, isBodiedExtensionSelected, isMultiBodiedExtensionSelected, pos, _macroNode$attrs, extensionType, extensionKey, layout, localId;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -37,7 +37,7 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
             case 4:
               newMacro = _context.sent;
               if (!(newMacro && macroNode)) {
-                _context.next = 20;
+                _context.next = 22;
                 break;
               }
               state = view.state, dispatch = view.dispatch;
@@ -52,19 +52,27 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
               return _context.abrupt("return", false);
             case 11:
               selection = state.selection, schema = state.schema;
-              _schema$nodes = schema.nodes, extension = _schema$nodes.extension, inlineExtension = _schema$nodes.inlineExtension, bodiedExtension = _schema$nodes.bodiedExtension;
+              _schema$nodes = schema.nodes, extension = _schema$nodes.extension, inlineExtension = _schema$nodes.inlineExtension, bodiedExtension = _schema$nodes.bodiedExtension, multiBodiedExtension = _schema$nodes.multiBodiedExtension;
+              updateSelectionsByNodeType = function updateSelectionsByNodeType(nodeType) {
+                // `isEditing` is `false` when we are inserting from insert-block toolbar
+                tr = isEditing ? (0, _utils.replaceParentNodeOfType)(nodeType, node)(tr) : (0, _utils.safeInsert)(node)(tr);
+                // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+                tr.setSelection(_state.TextSelection.create(tr.doc, state.selection.anchor));
+              };
               extensionState = (0, _pluginFactory.getPluginState)(state);
               targetSelectionSource = _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
               tr = state.tr;
-              isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection); // When it's a bodiedExtension but not selected
+              isBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([bodiedExtension])(selection);
+              isMultiBodiedExtensionSelected = !!(0, _utils.findSelectedNodeOfType)([multiBodiedExtension])(selection); // When it's a bodiedExtension but not selected
               if (macroNode.type === bodiedExtension && !isBodiedExtensionSelected) {
-                // `isEditing` is `false` when we are inserting from insert-block toolbar
-                tr = isEditing ? (0, _utils.replaceParentNodeOfType)(bodiedExtension, node)(tr) : (0, _utils.safeInsert)(node)(tr);
-                // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-                tr.setSelection(_state.TextSelection.create(tr.doc, state.selection.anchor));
+                updateSelectionsByNodeType(state.schema.nodes.bodiedExtension);
+              }
+              // When it's a multiBodiedExtension but not selected
+              else if (macroNode.type === multiBodiedExtension && !isMultiBodiedExtensionSelected) {
+                updateSelectionsByNodeType(state.schema.nodes.multiBodiedExtension);
               }
               // If any extension is currently selected
-              else if ((0, _utils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension])(selection)) {
+              else if ((0, _utils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension, multiBodiedExtension])(selection)) {
                 tr = (0, _utils.replaceSelectedNode)(node)(tr);
                 // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
                 tr.setSelection(_state.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
@@ -101,9 +109,9 @@ var insertMacroFromMacroBrowser = exports.insertMacroFromMacroBrowser = function
                 dispatch(tr.scrollIntoView());
               }
               return _context.abrupt("return", true);
-            case 20:
+            case 22:
               return _context.abrupt("return", false);
-            case 21:
+            case 23:
             case "end":
               return _context.stop();
           }
@@ -130,6 +138,8 @@ var resolveMacro = exports.resolveMacro = function resolveMacro(macro, state, op
     node = schema.nodes.bodiedExtension.create(_objectSpread(_objectSpread({}, attrs), optionalAttrs), schema.nodeFromJSON(macro).content);
   } else if (type === 'inlineExtension') {
     node = schema.nodes.inlineExtension.create(attrs);
+  } else if (type === 'multiBodiedExtension') {
+    node = schema.nodes.multiBodiedExtension.create(_objectSpread(_objectSpread({}, attrs), optionalAttrs), schema.nodeFromJSON(macro).content);
   }
   return node && (0, _insert.normaliseNestedLayout)(state, node);
 };

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

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "createCommand", {
     return _pluginFactory.createCommand;
   }
 });
-exports.createPlugin = exports.createExtensionProviderHandler = exports.createContextIdentifierProviderHandler = void 0;
+exports.createPlugin = exports.createExtensionProviderHandler = void 0;
 Object.defineProperty(exports, "getPluginState", {
   enumerable: true,
   get: function get() {
@@ -123,50 +123,12 @@ var createExtensionProviderHandler = exports.createExtensionProviderHandler = fu
     };
   }();
 };
-var createContextIdentifierProviderHandler = exports.createContextIdentifierProviderHandler = function createContextIdentifierProviderHandler(view) {
-  return /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(name, provider) {
-      var contextIdentifierProvider;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!(name === 'contextIdentifierProvider' && provider)) {
-              _context3.next = 11;
-              break;
-            }
-            _context3.prev = 1;
-            _context3.next = 4;
-            return provider;
-          case 4:
-            contextIdentifierProvider = _context3.sent;
-            (0, _commands.updateState)({
-              contextIdentifierProvider: contextIdentifierProvider
-            })(view.state, view.dispatch);
-            _context3.next = 11;
-            break;
-          case 8:
-            _context3.prev = 8;
-            _context3.t0 = _context3["catch"](1);
-            (0, _commands.updateState)({
-              contextIdentifierProvider: undefined
-            })(view.state, view.dispatch);
-          case 11:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[1, 8]]);
-    }));
-    return function (_x6, _x7) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-};
-var handleUpdate = exports.handleUpdate = function handleUpdate(_ref4) {
-  var view = _ref4.view,
-    prevState = _ref4.prevState,
-    domAtPos = _ref4.domAtPos,
-    extensionHandlers = _ref4.extensionHandlers,
-    applyChange = _ref4.applyChange;
+var handleUpdate = exports.handleUpdate = function handleUpdate(_ref3) {
+  var view = _ref3.view,
+    prevState = _ref3.prevState,
+    domAtPos = _ref3.domAtPos,
+    extensionHandlers = _ref3.extensionHandlers,
+    applyChange = _ref3.applyChange;
   var state = view.state,
     dispatch = view.dispatch;
   var _getPluginState = (0, _pluginFactory.getPluginState)(state),
@@ -224,13 +186,11 @@ var handleUpdate = exports.handleUpdate = function handleUpdate(_ref4) {
   return true;
 };
 var createPlugin = exports.createPlugin = function createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, pluginInjectionApi) {
-  var _pluginInjectionApi$c;
   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,
-    applyChangeToContextPanel: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.contextPanel) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.actions) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.applyChange
+    showContextPanel: false
   });
   var extensionNodeViewOptions = {
     appearance: options.appearance
@@ -240,23 +200,20 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
     view: function view(editorView) {
       var domAtPos = editorView.domAtPos.bind(editorView);
       var extensionProviderHandler = createExtensionProviderHandler(editorView);
-      var contextIdentificationProviderHandler = createContextIdentifierProviderHandler(editorView);
       providerFactory.subscribe('extensionProvider', extensionProviderHandler);
-      providerFactory.subscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
       return {
         update: function update(view, prevState) {
-          var _pluginInjectionApi$c2;
+          var _pluginInjectionApi$c;
           handleUpdate({
             view: view,
             prevState: prevState,
             domAtPos: domAtPos,
             extensionHandlers: extensionHandlers,
-            applyChange: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.contextPanel) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions.applyChange
+            applyChange: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.contextPanel) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.applyChange
           });
         },
         destroy: function destroy() {
           providerFactory.unsubscribe('extensionProvider', extensionProviderHandler);
-          providerFactory.unsubscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
         }
       };
     },

package/dist/cjs/toolbar.js

@@ -64,7 +64,7 @@ var isLayoutSupported = function isLayoutSupported(state, selectedExtNode) {
   if (!selectedExtNode) {
     return false;
   }
-  return !!((selectedExtNode.node.type === bodiedExtension || selectedExtNode.node.type === multiBodiedExtension || selectedExtNode.node.type === extension && !(0, _utils2.hasParentNodeOfType)([bodiedExtension, table, expand].filter(Boolean))(selection)) && !(0, _utils2.hasParentNodeOfType)([layoutSection])(selection));
+  return !!(([bodiedExtension, multiBodiedExtension].includes(selectedExtNode.node.type) || selectedExtNode.node.type === extension && !(0, _utils2.hasParentNodeOfType)([bodiedExtension, table, expand].filter(Boolean))(selection)) && !(0, _utils2.hasParentNodeOfType)([layoutSection])(selection));
 };
 var breakoutOptions = function breakoutOptions(state, formatMessage, extensionState, breakoutEnabled) {
   var nodeWithPos = (0, _utils3.getSelectedExtension)(state, true);

package/dist/cjs/ui/ConfigPanel/ConfigPanel.js

@@ -26,9 +26,8 @@ var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _extensions = require("@atlaskit/editor-common/extensions");
-var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _form = _interopRequireWildcard(require("@atlaskit/form"));
-var _pluginKey = require("../../plugin-key");
 var _constants = require("./constants");
 var _ErrorMessage = _interopRequireDefault(require("./ErrorMessage"));
 var _FormContent = _interopRequireDefault(require("./FormContent"));
@@ -414,7 +413,8 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
         errorMessage = _this$props7.errorMessage,
         fields = _this$props7.fields,
         isLoading = _this$props7.isLoading,
-        onCancel = _this$props7.onCancel;
+        onCancel = _this$props7.onCancel,
+        api = _this$props7.api;
       var _this$state = this.state,
         currentParameters = _this$state.currentParameters,
         hasParsedParameters = _this$state.hasParsedParameters,
@@ -437,32 +437,20 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
             noValidate: true,
             onKeyDown: handleKeyDown,
             "data-testid": "extension-config-panel"
-          }), _this2.renderHeader(extensionManifest), /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
-            plugins: {
-              extension: _pluginKey.pluginKey
-            },
-            render: function render(_ref6) {
-              var extension = _ref6.extension;
-              return /*#__PURE__*/_react.default.createElement(_FormErrorBoundary.FormErrorBoundary, {
-                contextIdentifierProvider: extension === null || extension === void 0 ? void 0 : extension.contextIdentifierProvider,
-                extensionKey: extensionManifest.key,
-                fields: fields || []
-              }, /*#__PURE__*/_react.default.createElement(ConfigFormIntl, {
-                canSave: !autoSave,
-                errorMessage: errorMessage,
-                extensionManifest: extensionManifest,
-                fields: fields,
-                firstVisibleFieldName: firstVisibleFieldName,
-                hasParsedParameters: hasParsedParameters,
-                isLoading: isLoading || false,
-                onCancel: onCancel,
-                onFieldChange: onFieldChange,
-                parameters: currentParameters,
-                submitting: submitting,
-                contextIdentifierProvider: extension === null || extension === void 0 ? void 0 : extension.contextIdentifierProvider,
-                featureFlags: featureFlags
-              }));
-            }
+          }), _this2.renderHeader(extensionManifest), /*#__PURE__*/_react.default.createElement(ConfigFormIntlWithBoundary, {
+            api: api,
+            canSave: !autoSave,
+            errorMessage: errorMessage,
+            extensionManifest: extensionManifest,
+            fields: fields !== null && fields !== void 0 ? fields : [],
+            firstVisibleFieldName: firstVisibleFieldName,
+            hasParsedParameters: hasParsedParameters,
+            isLoading: isLoading || false,
+            onCancel: onCancel,
+            onFieldChange: onFieldChange,
+            parameters: currentParameters,
+            submitting: submitting,
+            featureFlags: featureFlags
           }));
         });
       });
@@ -470,6 +458,44 @@ var ConfigPanel = /*#__PURE__*/function (_React$Component) {
   }]);
   return ConfigPanel;
 }(_react.default.Component);
+function ConfigFormIntlWithBoundary(_ref6) {
+  var api = _ref6.api,
+    fields = _ref6.fields,
+    submitting = _ref6.submitting,
+    parameters = _ref6.parameters,
+    featureFlags = _ref6.featureFlags,
+    canSave = _ref6.canSave,
+    extensionManifest = _ref6.extensionManifest,
+    onFieldChange = _ref6.onFieldChange,
+    onCancel = _ref6.onCancel,
+    isLoading = _ref6.isLoading,
+    hasParsedParameters = _ref6.hasParsedParameters,
+    firstVisibleFieldName = _ref6.firstVisibleFieldName,
+    errorMessage = _ref6.errorMessage;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['contextIdentifier']),
+    contextIdentifierState = _useSharedPluginState.contextIdentifierState;
+  var _ref7 = contextIdentifierState !== null && contextIdentifierState !== void 0 ? contextIdentifierState : {},
+    contextIdentifierProvider = _ref7.contextIdentifierProvider;
+  return /*#__PURE__*/_react.default.createElement(_FormErrorBoundary.FormErrorBoundary, {
+    contextIdentifierProvider: contextIdentifierProvider,
+    extensionKey: extensionManifest.key,
+    fields: fields
+  }, /*#__PURE__*/_react.default.createElement(ConfigFormIntl, {
+    canSave: canSave,
+    errorMessage: errorMessage,
+    extensionManifest: extensionManifest,
+    fields: fields,
+    firstVisibleFieldName: firstVisibleFieldName,
+    hasParsedParameters: hasParsedParameters,
+    isLoading: isLoading || false,
+    onCancel: onCancel,
+    onFieldChange: onFieldChange,
+    parameters: parameters,
+    submitting: submitting,
+    contextIdentifierProvider: contextIdentifierProvider,
+    featureFlags: featureFlags
+  }));
+}
 var _default = exports.default = (0, _analyticsNext.withAnalyticsContext)({
   source: 'ConfigPanel'
 })((0, _analyticsNext.withAnalyticsEvents)()(ConfigPanel));

package/dist/cjs/ui/ConfigPanel/ConfigPanelFieldsLoader.js

@@ -87,7 +87,8 @@ function FieldsLoader(_ref) {
     showHeader = _ref.showHeader,
     featureFlags = _ref.featureFlags,
     onChange = _ref.onChange,
-    onCancel = _ref.onCancel;
+    onCancel = _ref.onCancel,
+    api = _ref.api;
   var _useStateFromPromise = (0, _useStateFromPromise3.useStateFromPromise)(function () {
       return extensionProvider.getExtension(extensionType, extensionKey);
     }, [extensionProvider, extensionType, extensionKey]),
@@ -104,6 +105,7 @@ function FieldsLoader(_ref) {
     extensionParameters: extensionParameters
   }, function (fields) {
     return /*#__PURE__*/_react.default.createElement(_ConfigPanel.default, {
+      api: api,
       extensionManifest: extensionManifest,
       isLoading: !extensionManifest || errorMessage === null && !fields,
       fields: fields,