@atlaskit/editor-plugin-extension 0.7.0 → 0.7.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-extension
 
+## 0.7.2
+
+### Patch Changes
+
+- [#70152](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70152) [`53ed3673df28`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/53ed3673df28) - Updating adf-schema version to 35.5.1
+
+## 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

package/dist/cjs/actions.js

@@ -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);

package/dist/cjs/context-panel.js

@@ -158,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);
 }
@@ -178,6 +180,7 @@ function _onChangeAction() {
       _ref6,
       positions,
       node,
+      newAttributes,
       newNode,
       positionUpdated,
       transaction,
@@ -235,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
@@ -256,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/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/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/es2019/actions.js

@@ -42,7 +42,15 @@ export const performNodeUpdate = editorAnalyticsAPI => (type, newAttrs, content,
     multiBodiedExtension
   } = schema.nodes;
   const isBodiedExtensionSelected = !!findSelectedNodeOfType([bodiedExtension])(selection);
+  const isMultiBodiedExtensionSelected = !!findSelectedNodeOfType([multiBodiedExtension])(selection);
   const extensionState = getPluginState(state);
+  const 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 = replaceParentNodeOfType(nodeType, newNode)(tr);
+    // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+    tr.setSelection(TextSelection.create(tr.doc, state.selection.anchor));
+  };
   let targetSelectionSource = TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
   let action = ACTION.UPDATED;
   let {
@@ -51,11 +59,11 @@ export const performNodeUpdate = editorAnalyticsAPI => (type, newAttrs, content,
 
   // 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 = replaceParentNodeOfType(state.schema.nodes.bodiedExtension, newNode)(tr);
-    // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-    tr.setSelection(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 (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension, multiBodiedExtension])(selection)) {
@@ -126,6 +134,12 @@ const updateExtensionParams = editorAnalyticsAPI => (updateExtension, node, acti
           ...newParameters
         }
       };
+      if (type.name === 'multiBodiedExtension') {
+        newAttrs.parameters.macroParams = {
+          ...parameters.macroParams,
+          ...(newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams)
+        };
+      }
       return performNodeUpdate(editorAnalyticsAPI)(type.name, newAttrs, content, marks, true)(state, dispatch, view);
     }
   } catch {}

package/dist/es2019/context-panel.js

@@ -107,6 +107,9 @@ export const getContextPanel = getEditorView => (api, allowAutoSave, featureFlag
     });
   }
 };
+
+// Added this interface to handle the macroParams on Parameters
+
 export async function onChangeAction(editorView, updatedParameters = {}, oldParameters = {}, nodeWithPos, onSaving) {
   // WARNING: editorView.state stales quickly, do not unpack
   const {
@@ -149,13 +152,18 @@ export async function onChangeAction(editorView, updatedParameters = {}, oldPara
   const {
     node
   } = nodeWithPos;
-  const newNode = buildExtensionNode(nodeWithPos.node.toJSON().type, editorView.state.schema, {
+  const newAttributes = {
     ...node.attrs,
     parameters: {
       ...oldParameters,
-      ...newParameters
+      ...newParameters,
+      macroParams: {
+        ...(oldParameters === null || oldParameters === void 0 ? void 0 : oldParameters.macroParams),
+        ...(newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams)
+      }
     }
-  }, node.content, node.marks);
+  };
+  const newNode = buildExtensionNode(nodeWithPos.node.toJSON().type, editorView.state.schema, newAttributes, node.content, node.marks);
   if (!newNode) {
     return;
   }

package/dist/es2019/extension-api.js

@@ -234,7 +234,23 @@ export const createExtensionAPI = options => {
         attrs
       }) => mark.create(attrs)) : node.marks;
       const newContent = changedValues.hasOwnProperty('content') ? Fragment.fromJSON(schema, changedValues.content) : node.content;
-      const newAttrs = changedValues.hasOwnProperty('attrs') ? changedValues.attrs : node.attrs;
+      let newAttrs = changedValues.hasOwnProperty('attrs') ? changedValues.attrs : node.attrs;
+      if (node.type.name === 'multiBodiedExtension') {
+        var _changedValues$attrs, _node$attrs$parameter, _changedValues$attrs2, _changedValues$attrs3;
+        newAttrs = {
+          ...node.attrs,
+          ...changedValues.attrs,
+          parameters: {
+            ...node.attrs.parameters,
+            ...((_changedValues$attrs = changedValues.attrs) === null || _changedValues$attrs === void 0 ? void 0 : _changedValues$attrs.parameters),
+            macroParams: {
+              ...((_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 ? void 0 : (_changedValues$attrs3 = _changedValues$attrs2.parameters) === null || _changedValues$attrs3 === void 0 ? void 0 : _changedValues$attrs3.macroParams)
+            }
+          }
+        };
+        // console.log('newAttrs', newAttrs);
+      }
 
       // Validate if the new attributes, content and marks result in a valid node and adf.
       try {

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

@@ -32,24 +32,33 @@ export const insertMacroFromMacroBrowser = editorAnalyticsAPI => (macroProvider,
     const {
       extension,
       inlineExtension,
-      bodiedExtension
+      bodiedExtension,
+      multiBodiedExtension
     } = schema.nodes;
+    const updateSelectionsByNodeType = nodeType => {
+      // `isEditing` is `false` when we are inserting from insert-block toolbar
+      tr = isEditing ? replaceParentNodeOfType(nodeType, node)(tr) : safeInsert(node)(tr);
+      // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+      tr.setSelection(TextSelection.create(tr.doc, state.selection.anchor));
+    };
     const extensionState = getExtensionPluginState(state);
     let targetSelectionSource = TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
     let {
       tr
     } = state;
     const isBodiedExtensionSelected = !!findSelectedNodeOfType([bodiedExtension])(selection);
+    const isMultiBodiedExtensionSelected = !!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 ? replaceParentNodeOfType(bodiedExtension, node)(tr) : safeInsert(node)(tr);
-      // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-      tr.setSelection(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 (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension])(selection)) {
+    else if (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension, multiBodiedExtension])(selection)) {
       tr = replaceSelectedNode(node)(tr);
       // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
       tr.setSelection(NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
@@ -118,6 +127,11 @@ export const resolveMacro = (macro, state, optionalAttrs) => {
     }, schema.nodeFromJSON(macro).content);
   } else if (type === 'inlineExtension') {
     node = schema.nodes.inlineExtension.create(attrs);
+  } else if (type === 'multiBodiedExtension') {
+    node = schema.nodes.multiBodiedExtension.create({
+      ...attrs,
+      ...optionalAttrs
+    }, schema.nodeFromJSON(macro).content);
   }
   return node && normaliseNestedLayout(state, node);
 };

package/dist/es2019/toolbar.js

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

package/dist/esm/actions.js

@@ -44,18 +44,26 @@ export var performNodeUpdate = function performNodeUpdate(editorAnalyticsAPI) {
         bodiedExtension = _schema$nodes.bodiedExtension,
         multiBodiedExtension = _schema$nodes.multiBodiedExtension;
       var isBodiedExtensionSelected = !!findSelectedNodeOfType([bodiedExtension])(selection);
+      var isMultiBodiedExtensionSelected = !!findSelectedNodeOfType([multiBodiedExtension])(selection);
       var extensionState = 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 = replaceParentNodeOfType(nodeType, newNode)(tr);
+        // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+        tr.setSelection(TextSelection.create(tr.doc, state.selection.anchor));
+      };
       var targetSelectionSource = TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
       var action = 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 = replaceParentNodeOfType(state.schema.nodes.bodiedExtension, newNode)(tr);
-        // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-        tr.setSelection(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 (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension, multiBodiedExtension])(selection)) {
@@ -126,26 +134,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);

package/dist/esm/context-panel.js

@@ -150,6 +150,9 @@ export var getContextPanel = function getContextPanel(getEditorView) {
     };
   };
 };
+
+// Added this interface to handle the macroParams on Parameters
+
 export function onChangeAction(_x2) {
   return _onChangeAction.apply(this, arguments);
 }
@@ -170,6 +173,7 @@ function _onChangeAction() {
       _ref6,
       positions,
       node,
+      newAttributes,
       newNode,
       positionUpdated,
       transaction,
@@ -227,15 +231,18 @@ function _onChangeAction() {
           return _context3.abrupt("return");
         case 23:
           node = nodeWithPos.node;
-          newNode = 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 = 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
@@ -248,13 +255,13 @@ function _onChangeAction() {
           }
           positionsLess = _objectSpread({}, getPluginState(editorView.state).positions);
           delete positionsLess[key];
-          _context3.next = 35;
+          _context3.next = 36;
           return 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/esm/extension-api.js

@@ -1,4 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _typeof from "@babel/runtime/helpers/typeof";
+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) { _defineProperty(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; }
 import { validator } from '@atlaskit/adf-utils/validator';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { nodeToJSON } from '@atlaskit/editor-common/utils';
@@ -214,6 +217,15 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       }) : node.marks;
       var newContent = changedValues.hasOwnProperty('content') ? 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/esm/pm-plugins/macro/actions.js

@@ -15,7 +15,7 @@ export var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(ed
   return function (macroProvider, macroNode, isEditing) {
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -30,7 +30,7 @@ export var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(ed
             case 4:
               newMacro = _context.sent;
               if (!(newMacro && macroNode)) {
-                _context.next = 20;
+                _context.next = 22;
                 break;
               }
               state = view.state, dispatch = view.dispatch;
@@ -45,19 +45,27 @@ export var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(ed
               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 ? replaceParentNodeOfType(nodeType, node)(tr) : safeInsert(node)(tr);
+                // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+                tr.setSelection(TextSelection.create(tr.doc, state.selection.anchor));
+              };
               extensionState = getExtensionPluginState(state);
               targetSelectionSource = TARGET_SELECTION_SOURCE.CURRENT_SELECTION;
               tr = state.tr;
-              isBodiedExtensionSelected = !!findSelectedNodeOfType([bodiedExtension])(selection); // When it's a bodiedExtension but not selected
+              isBodiedExtensionSelected = !!findSelectedNodeOfType([bodiedExtension])(selection);
+              isMultiBodiedExtensionSelected = !!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 ? replaceParentNodeOfType(bodiedExtension, node)(tr) : safeInsert(node)(tr);
-                // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-                tr.setSelection(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 (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension])(selection)) {
+              else if (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension, multiBodiedExtension])(selection)) {
                 tr = replaceSelectedNode(node)(tr);
                 // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
                 tr.setSelection(NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
@@ -94,9 +102,9 @@ export var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(ed
                 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();
           }
@@ -123,6 +131,8 @@ export var resolveMacro = function resolveMacro(macro, state, optionalAttrs) {
     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 && normaliseNestedLayout(state, node);
 };

package/dist/esm/toolbar.js

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

package/dist/types/context-panel.d.ts

@@ -7,4 +7,9 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ExtensionPlugin } from './types';
 export declare const duplicateSelection: (selectionToDuplicate: Selection, doc: Node) => Selection | undefined;
 export declare const getContextPanel: (getEditorView?: () => EditorView | undefined) => (api: ExtractInjectionAPI<ExtensionPlugin> | undefined, allowAutoSave?: boolean, featureFlags?: FeatureFlags) => (state: EditorState) => JSX.Element | undefined;
-export declare function onChangeAction(editorView: EditorView, updatedParameters: object | undefined, oldParameters: object | undefined, nodeWithPos: ContentNodeWithPos, onSaving?: () => void): Promise<void>;
+interface Parameters {
+    [key: string]: unknown;
+    macroParams?: Record<string, unknown>;
+}
+export declare function onChangeAction(editorView: EditorView, updatedParameters: Parameters | undefined, oldParameters: Parameters | undefined, nodeWithPos: ContentNodeWithPos, onSaving?: () => void): Promise<void>;
+export {};

package/dist/types/ui/ConfigPanel/ConfigPanel.d.ts

@@ -19,5 +19,5 @@ type Props = {
     featureFlags?: FeatureFlags;
     api: ExtractInjectionAPI<ExtensionPlugin> | undefined;
 } & WithAnalyticsEventsProps;
-declare const _default: React.ForwardRefExoticComponent<Pick<Omit<Props, keyof WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "featureFlags" | "api" | "autoSaveReject" | "key" | "parameters" | "autoSave" | "onChange" | "errorMessage" | "analyticsContext" | "fields" | "extensionManifest" | "isLoading" | "onCancel" | "autoSaveTrigger" | "showHeader" | "closeOnEsc"> & React.RefAttributes<any>>;
+declare const _default: React.ForwardRefExoticComponent<Pick<Omit<Props, keyof WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "featureFlags" | "api" | "autoSaveReject" | "parameters" | "key" | "autoSave" | "onChange" | "errorMessage" | "analyticsContext" | "fields" | "extensionManifest" | "isLoading" | "onCancel" | "autoSaveTrigger" | "showHeader" | "closeOnEsc"> & React.RefAttributes<any>>;
 export default _default;

package/dist/types-ts4.5/context-panel.d.ts

@@ -7,4 +7,9 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ExtensionPlugin } from './types';
 export declare const duplicateSelection: (selectionToDuplicate: Selection, doc: Node) => Selection | undefined;
 export declare const getContextPanel: (getEditorView?: () => EditorView | undefined) => (api: ExtractInjectionAPI<ExtensionPlugin> | undefined, allowAutoSave?: boolean, featureFlags?: FeatureFlags) => (state: EditorState) => JSX.Element | undefined;
-export declare function onChangeAction(editorView: EditorView, updatedParameters: object | undefined, oldParameters: object | undefined, nodeWithPos: ContentNodeWithPos, onSaving?: () => void): Promise<void>;
+interface Parameters {
+    [key: string]: unknown;
+    macroParams?: Record<string, unknown>;
+}
+export declare function onChangeAction(editorView: EditorView, updatedParameters: Parameters | undefined, oldParameters: Parameters | undefined, nodeWithPos: ContentNodeWithPos, onSaving?: () => void): Promise<void>;
+export {};

package/dist/types-ts4.5/ui/ConfigPanel/ConfigPanel.d.ts

@@ -19,5 +19,5 @@ type Props = {
     featureFlags?: FeatureFlags;
     api: ExtractInjectionAPI<ExtensionPlugin> | undefined;
 } & WithAnalyticsEventsProps;
-declare const _default: React.ForwardRefExoticComponent<Pick<Omit<Props, keyof WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "featureFlags" | "api" | "autoSaveReject" | "key" | "parameters" | "autoSave" | "onChange" | "errorMessage" | "analyticsContext" | "fields" | "extensionManifest" | "isLoading" | "onCancel" | "autoSaveTrigger" | "showHeader" | "closeOnEsc"> & React.RefAttributes<any>>;
+declare const _default: React.ForwardRefExoticComponent<Pick<Omit<Props, keyof WithAnalyticsEventsProps> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "featureFlags" | "api" | "autoSaveReject" | "parameters" | "key" | "autoSave" | "onChange" | "errorMessage" | "analyticsContext" | "fields" | "extensionManifest" | "isLoading" | "onCancel" | "autoSaveTrigger" | "showHeader" | "closeOnEsc"> & React.RefAttributes<any>>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-extension",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "editor-plugin-extension plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -24,14 +24,14 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.3.0",
+    "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/adf-utils": "^19.0.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/avatar": "^21.4.0",
-    "@atlaskit/button": "^17.2.0",
+    "@atlaskit/button": "^17.3.0",
     "@atlaskit/checkbox": "^13.0.0",
     "@atlaskit/datetime-picker": "^13.0.3",
-    "@atlaskit/editor-common": "^77.1.0",
+    "@atlaskit/editor-common": "^77.2.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-context-identifier": "^0.1.0",