@atlaskit/editor-core 189.3.38 → 189.4.0

package/dist/es2019/plugins/extension/ui/Extension/MultiBodiedExtension/index.js

@@ -0,0 +1,159 @@
+/** @jsx jsx */
+
+import { jsx, css } from '@emotion/react';
+import { N30 } from '@atlaskit/theme/colors';
+import React, { useState } from 'react';
+const useMultiBodiedExtensionActions = ({
+  updateActiveChild,
+  editorView,
+  getPos,
+  node
+}) => {
+  const actions = React.useMemo(() => {
+    return {
+      changeActive(index) {
+        return updateActiveChild(index);
+      },
+      addChild() {
+        const {
+          state,
+          dispatch
+        } = editorView;
+        if (node.content.childCount >= node.attrs.maxFrames) {
+          // TODO: add proper log on this
+          return false;
+        }
+        const p = state.schema.nodes.paragraph.createAndFill({});
+        if (!p) {
+          return false;
+        }
+        const frame = state.schema.nodes.extensionFrame.createAndFill({}, [p]);
+        const pos = getPos();
+        if (typeof pos !== 'number' || !frame) {
+          return false;
+        }
+        const insertAt = Math.min((pos || 1) + node.content.size, state.doc.content.size);
+        dispatch(state.tr.insert(insertAt, frame));
+        return true;
+      },
+      getChildrenCount() {
+        return node.content.childCount;
+      },
+      removeChild(index) {
+        const pos = getPos();
+        // TODO: Add child index validation here, don't trust this data
+        if (typeof pos !== 'number' || typeof index !== 'number') {
+          return false;
+        }
+        const {
+          state,
+          dispatch
+        } = editorView;
+        if (node.content.childCount === 1) {
+          const tr = state.tr;
+          tr.deleteRange(pos, pos + node.content.size);
+          dispatch(tr);
+          return true;
+        }
+        const $pos = state.doc.resolve(pos);
+        const $startNodePos = state.doc.resolve($pos.start($pos.depth + 1));
+        const startFramePosition = $startNodePos.posAtIndex(index);
+        const maybeFrameNode = state.doc.nodeAt(startFramePosition);
+        if (!maybeFrameNode) {
+          return false;
+        }
+        const endFramePosition = maybeFrameNode.content.size + startFramePosition;
+        const tr = state.tr;
+        tr.deleteRange(startFramePosition, endFramePosition);
+        dispatch(tr);
+        return true;
+      },
+      updateParameters(parameters) {
+        const {
+          state,
+          dispatch
+        } = editorView;
+        const pos = getPos();
+        if (typeof pos !== 'number') {
+          return false;
+        }
+        const tr = state.tr.setNodeMarkup(pos, undefined, {
+          ...node.attrs,
+          parameters
+        });
+        dispatch(tr);
+        return true;
+      },
+      getChildren() {
+        var _state$doc$nodeAt;
+        const {
+          state
+        } = editorView;
+        const pos = getPos();
+        if (typeof pos !== 'number') {
+          return [];
+        }
+        const children = (_state$doc$nodeAt = state.doc.nodeAt(pos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.content;
+        return children ? children.toJSON() : [];
+      }
+    };
+  }, [node, editorView, getPos, updateActiveChild]);
+  return actions;
+};
+const MultiBodiedExtension = ({
+  node,
+  handleContentDOMRef,
+  getPos,
+  tryExtensionHandler,
+  editorView
+}) => {
+  const [activeChildIndex, setActiveChildIndex] = useState(0);
+  // Adding to avoid aliasing `this` for the callbacks
+  const updateActiveChild = React.useCallback(index => {
+    if (typeof index !== 'number') {
+      // TODO: Make sure we log this somewhere if this happens
+      setActiveChildIndex(0);
+      return false;
+    }
+    setActiveChildIndex(index);
+    return true;
+  }, [setActiveChildIndex]);
+  const actions = useMultiBodiedExtensionActions({
+    updateActiveChild,
+    editorView,
+    getPos,
+    node
+  });
+  const extensionHandlerResult = React.useMemo(() => {
+    return tryExtensionHandler(actions);
+  }, [tryExtensionHandler, actions]);
+  const articleRef = React.useCallback(node => {
+    return handleContentDOMRef(node);
+  }, [handleContentDOMRef]);
+  const containerCss = css`
+    border: 1px solid ${`var(--ds-border, ${N30})`};
+    padding: ${"var(--ds-space-050, 4px)"};
+    .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {
+      display: none;
+    }
+
+    .multiBodiedExtension-content-dom-wrapper
+      > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1}) {
+      display: block;
+    }
+  `;
+  return jsx("section", {
+    className: "multiBodiedExtension--container",
+    css: containerCss,
+    "data-testid": "multiBodiedExtension--container",
+    "data-active-child-index": activeChildIndex
+  }, jsx("nav", {
+    className: "multiBodiedExtension-navigation",
+    "data-testid": "multiBodiedExtension-navigation"
+  }, extensionHandlerResult), jsx("article", {
+    className: "multiBodiedExtension--frames",
+    "data-testid": "multiBodiedExtension--frames",
+    ref: articleRef
+  }));
+};
+export default MultiBodiedExtension;

package/dist/es2019/plugins/extension/utils.js

@@ -4,9 +4,10 @@ export const getSelectedExtension = (state, searchParent = false) => {
   const {
     inlineExtension,
     extension,
-    bodiedExtension
+    bodiedExtension,
+    multiBodiedExtension
   } = state.schema.nodes;
-  const nodeTypes = [extension, bodiedExtension, inlineExtension];
+  const nodeTypes = [extension, bodiedExtension, inlineExtension, multiBodiedExtension];
   return findSelectedNodeOfType(nodeTypes)(state.selection) || searchParent && findParentNodeOfType(nodeTypes)(state.selection) || undefined;
 };
 export const findExtensionWithLocalId = (state, localId) => {
@@ -20,9 +21,10 @@ export const findExtensionWithLocalId = (state, localId) => {
   const {
     inlineExtension,
     extension,
-    bodiedExtension
+    bodiedExtension,
+    multiBodiedExtension
   } = state.schema.nodes;
-  const nodeTypes = [extension, bodiedExtension, inlineExtension];
+  const nodeTypes = [extension, bodiedExtension, inlineExtension, multiBodiedExtension];
   let matched;
   state.doc.descendants((node, pos) => {
     if (nodeTypes.includes(node.type) && node.attrs.localId === localId) {

package/dist/es2019/ui/ContentStyles/extension.js

@@ -1,7 +1,13 @@
 import { css } from '@emotion/react';
 import { blockNodesVerticalMargin, akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackground, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
 export const extensionStyles = css`
+  .multiBodiedExtensionView-content-wrap.${akEditorSelectedNodeClassName}:not(.danger) {
+    ${getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket])}
+  }
+
   .extensionView-content-wrap,
+  .multiBodiedExtensionView-content-wrap,
   .bodiedExtensionView-content-wrap {
     margin: ${blockNodesVerticalMargin} 0;
 

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.3.38";
+export const version = "189.4.0";

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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 { removeSelectedNode, removeParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { removeSelectedNode, removeParentNodeOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createCommand } from './plugin-factory';
 import { getSelectedExtension } from './utils';
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
@@ -72,7 +72,7 @@ export var removeExtension = function removeExtension() {
     if (getSelectedExtension(state)) {
       return removeSelectedNode(tr);
     } else {
-      return removeParentNodeOfType(state.schema.nodes.bodiedExtension)(tr);
+      return checkAndRemoveExtensionNode(state, tr);
     }
   });
 };
@@ -85,4 +85,11 @@ export var removeDescendantNodes = function removeDescendantNodes(sourceNode) {
   }, function (tr, state) {
     return sourceNode ? removeConnectedNodes(state, sourceNode) : tr;
   });
+};
+export var checkAndRemoveExtensionNode = function checkAndRemoveExtensionNode(state, tr) {
+  var nodeType = state.schema.nodes.bodiedExtension;
+  if (findParentNodeOfType(state.schema.nodes.multiBodiedExtension)(state.selection)) {
+    nodeType = state.schema.nodes.multiBodiedExtension;
+  }
+  return removeParentNodeOfType(nodeType)(tr);
 };

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

@@ -1,4 +1,4 @@
-import { extension, bodiedExtension, inlineExtension } from '@atlaskit/adf-schema';
+import { extension, bodiedExtension, inlineExtension, multiBodiedExtension, extensionFrame } from '@atlaskit/adf-schema';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createPlugin } from './pm-plugins/main';
 import { createPlugin as createMacroPlugin } from './pm-plugins/macro';
@@ -9,6 +9,7 @@ import { getToolbarConfig } from './toolbar';
 import { getContextPanel } from './context-panel';
 import { createExtensionAPI } from './extension-api';
 import { createEditSelectedExtensionAction } from './actions';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var extensionPlugin = function extensionPlugin(_ref) {
   var _api$featureFlags, _api$analytics2, _api$analytics3, _api$contextPanel3, _api$analytics4, _api$contextPanel4;
   var _ref$config = _ref.config,
@@ -23,7 +24,7 @@ var extensionPlugin = function extensionPlugin(_ref) {
   return {
     name: 'extension',
     nodes: function nodes() {
-      return [{
+      var extensionNodes = [{
         name: 'extension',
         node: extension
       }, {
@@ -33,6 +34,19 @@ var extensionPlugin = function extensionPlugin(_ref) {
         name: 'inlineExtension',
         node: inlineExtension
       }];
+
+      // Revert to returning all nodes without local variable, once FF is removed
+      if (getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
+        extensionNodes.push({
+          name: 'extensionFrame',
+          node: extensionFrame
+        });
+        extensionNodes.push({
+          name: 'multiBodiedExtension',
+          node: multiBodiedExtension
+        });
+      }
+      return extensionNodes;
     },
     pmPlugins: function pmPlugins() {
       return [{

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

@@ -284,7 +284,8 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         // WARNING: referentiality-plugin also creates these nodeviews
         bodiedExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
         // WARNING: referentiality-plugin also creates these nodeviews
-        inlineExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
+        inlineExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
+        multiBodiedExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
       handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension'], function (target) {
         return !target.closest('.extension-content');

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

@@ -121,7 +121,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
     var formatMessage = intl.formatMessage;
     var extensionState = getPluginState(state);
     if (extensionState && !extensionState.showContextPanel && extensionState.element) {
-      var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension];
+      var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension, state.schema.nodes.multiBodiedExtension];
       var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel, editorAnalyticsAPI);
       var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
       var extensionObj = getSelectedExtension(state, true);

package/dist/esm/plugins/extension/ui/Extension/Extension/index.js

@@ -15,7 +15,6 @@ import { overlay } from '../styles';
 import ExtensionLozenge from '../Lozenge';
 import classnames from 'classnames';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 function ExtensionWithPluginState(props) {
   var node = props.node,
     handleContentDOMRef = props.handleContentDOMRef,
@@ -28,13 +27,7 @@ function ExtensionWithPluginState(props) {
     shadowClassNames = props.shadowClassNames,
     hideFrame = props.hideFrame,
     editorAppearance = props.editorAppearance;
-  var isMultiBodiedExtension = false;
-  if (getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
-    isMultiBodiedExtension = true;
-  }
-
-  //TODO: clean-up after removing multi-bodied-extension FF
-  var hasBody = node.type.name === 'bodiedExtension' || isMultiBodiedExtension && node.type.name === 'multiBodiedExtension';
+  var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
   var isMobile = editorAppearance === 'mobile';
   var hasChildren = !!children;
   var removeBorder = hideFrame && !isMobile && !hasBody || false;

package/dist/esm/plugins/extension/ui/Extension/ExtensionComponent.js

@@ -16,6 +16,7 @@ import { getNodeRenderer, getExtensionModuleNodePrivateProps } from '@atlaskit/e
 import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
 import Extension from './Extension';
 import InlineExtension from './InlineExtension';
+import MultiBodiedExtension from './MultiBodiedExtension';
 var ExtensionComponent = /*#__PURE__*/function (_Component) {
   _inherits(ExtensionComponent, _Component);
   var _super = _createSuper(ExtensionComponent);
@@ -87,7 +88,7 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
         }
       }, _callee, null, [[4, 11]]);
     })));
-    _defineProperty(_assertThisInitialized(_this), "handleExtension", function (pmNode) {
+    _defineProperty(_assertThisInitialized(_this), "handleExtension", function (pmNode, actions) {
       var _pmNode$marks;
       var _this$props = _this.props,
         extensionHandlers = _this$props.extensionHandlers,
@@ -116,16 +117,24 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
       var result;
       if (extensionHandlers && extensionHandlers[extensionType]) {
         var render = getExtensionRenderer(extensionHandlers[extensionType]);
-        result = render(node, editorView.state.doc);
+        result = render(node, editorView.state.doc, actions);
       }
       if (!result) {
         var extensionHandlerFromProvider = _this.state.extensionProvider && _this.getNodeRenderer(_this.state.extensionProvider, extensionType, extensionKey);
         if (extensionHandlerFromProvider) {
           var NodeRenderer = extensionHandlerFromProvider;
-          return /*#__PURE__*/React.createElement(NodeRenderer, {
-            node: node,
-            references: _this.props.references
-          });
+          if (node.type === 'multiBodiedExtension') {
+            return /*#__PURE__*/React.createElement(NodeRenderer, {
+              node: node,
+              references: _this.props.references,
+              actions: actions
+            });
+          } else {
+            return /*#__PURE__*/React.createElement(NodeRenderer, {
+              node: node,
+              references: _this.props.references
+            });
+          }
         }
       }
       return result;
@@ -173,8 +182,18 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
         editorView = _this$props2.editorView,
         references = _this$props2.references,
         editorAppearance = _this$props2.editorAppearance,
-        pluginInjectionApi = _this$props2.pluginInjectionApi;
-      var extensionHandlerResult = this.tryExtensionHandler();
+        pluginInjectionApi = _this$props2.pluginInjectionApi,
+        getPos = _this$props2.getPos;
+      if (node.type.name === 'multiBodiedExtension') {
+        return /*#__PURE__*/React.createElement(MultiBodiedExtension, {
+          node: node,
+          editorView: editorView,
+          getPos: getPos,
+          handleContentDOMRef: handleContentDOMRef,
+          tryExtensionHandler: this.tryExtensionHandler.bind(this)
+        });
+      }
+      var extensionHandlerResult = this.tryExtensionHandler(undefined);
       switch (node.type.name) {
         case 'extension':
         case 'bodiedExtension':
@@ -199,10 +218,10 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "tryExtensionHandler",
-    value: function tryExtensionHandler() {
+    value: function tryExtensionHandler(actions) {
       var node = this.props.node;
       try {
-        var extensionContent = this.handleExtension(node);
+        var extensionContent = this.handleExtension(node, actions);
         if (extensionContent && /*#__PURE__*/React.isValidElement(extensionContent)) {
           return extensionContent;
         }

package/dist/esm/plugins/extension/ui/Extension/ExtensionNodeWrapper.js

@@ -1,5 +1,12 @@
 import React from 'react';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+/**
+ * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * else wrap with a div (for multi bodied extensions)
+ *
+ * @param param0
+ * @returns
+ */
 var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
     nodeType = _ref.nodeType;

package/dist/esm/plugins/extension/ui/Extension/MultiBodiedExtension/index.js

@@ -0,0 +1,146 @@
+import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _templateObject;
+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; }
+/** @jsx jsx */
+
+import { jsx, css } from '@emotion/react';
+import { N30 } from '@atlaskit/theme/colors';
+import React, { useState } from 'react';
+var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_ref) {
+  var updateActiveChild = _ref.updateActiveChild,
+    editorView = _ref.editorView,
+    getPos = _ref.getPos,
+    node = _ref.node;
+  var actions = React.useMemo(function () {
+    return {
+      changeActive: function changeActive(index) {
+        return updateActiveChild(index);
+      },
+      addChild: function addChild() {
+        var state = editorView.state,
+          dispatch = editorView.dispatch;
+        if (node.content.childCount >= node.attrs.maxFrames) {
+          // TODO: add proper log on this
+          return false;
+        }
+        var p = state.schema.nodes.paragraph.createAndFill({});
+        if (!p) {
+          return false;
+        }
+        var frame = state.schema.nodes.extensionFrame.createAndFill({}, [p]);
+        var pos = getPos();
+        if (typeof pos !== 'number' || !frame) {
+          return false;
+        }
+        var insertAt = Math.min((pos || 1) + node.content.size, state.doc.content.size);
+        dispatch(state.tr.insert(insertAt, frame));
+        return true;
+      },
+      getChildrenCount: function getChildrenCount() {
+        return node.content.childCount;
+      },
+      removeChild: function removeChild(index) {
+        var pos = getPos();
+        // TODO: Add child index validation here, don't trust this data
+        if (typeof pos !== 'number' || typeof index !== 'number') {
+          return false;
+        }
+        var state = editorView.state,
+          dispatch = editorView.dispatch;
+        if (node.content.childCount === 1) {
+          var _tr = state.tr;
+          _tr.deleteRange(pos, pos + node.content.size);
+          dispatch(_tr);
+          return true;
+        }
+        var $pos = state.doc.resolve(pos);
+        var $startNodePos = state.doc.resolve($pos.start($pos.depth + 1));
+        var startFramePosition = $startNodePos.posAtIndex(index);
+        var maybeFrameNode = state.doc.nodeAt(startFramePosition);
+        if (!maybeFrameNode) {
+          return false;
+        }
+        var endFramePosition = maybeFrameNode.content.size + startFramePosition;
+        var tr = state.tr;
+        tr.deleteRange(startFramePosition, endFramePosition);
+        dispatch(tr);
+        return true;
+      },
+      updateParameters: function updateParameters(parameters) {
+        var state = editorView.state,
+          dispatch = editorView.dispatch;
+        var pos = getPos();
+        if (typeof pos !== 'number') {
+          return false;
+        }
+        var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node.attrs), {}, {
+          parameters: parameters
+        }));
+        dispatch(tr);
+        return true;
+      },
+      getChildren: function getChildren() {
+        var _state$doc$nodeAt;
+        var state = editorView.state;
+        var pos = getPos();
+        if (typeof pos !== 'number') {
+          return [];
+        }
+        var children = (_state$doc$nodeAt = state.doc.nodeAt(pos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.content;
+        return children ? children.toJSON() : [];
+      }
+    };
+  }, [node, editorView, getPos, updateActiveChild]);
+  return actions;
+};
+var MultiBodiedExtension = function MultiBodiedExtension(_ref2) {
+  var node = _ref2.node,
+    handleContentDOMRef = _ref2.handleContentDOMRef,
+    getPos = _ref2.getPos,
+    tryExtensionHandler = _ref2.tryExtensionHandler,
+    editorView = _ref2.editorView;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeChildIndex = _useState2[0],
+    setActiveChildIndex = _useState2[1];
+  // Adding to avoid aliasing `this` for the callbacks
+  var updateActiveChild = React.useCallback(function (index) {
+    if (typeof index !== 'number') {
+      // TODO: Make sure we log this somewhere if this happens
+      setActiveChildIndex(0);
+      return false;
+    }
+    setActiveChildIndex(index);
+    return true;
+  }, [setActiveChildIndex]);
+  var actions = useMultiBodiedExtensionActions({
+    updateActiveChild: updateActiveChild,
+    editorView: editorView,
+    getPos: getPos,
+    node: node
+  });
+  var extensionHandlerResult = React.useMemo(function () {
+    return tryExtensionHandler(actions);
+  }, [tryExtensionHandler, actions]);
+  var articleRef = React.useCallback(function (node) {
+    return handleContentDOMRef(node);
+  }, [handleContentDOMRef]);
+  var containerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    border: 1px solid ", ";\n    padding: ", ";\n    .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'] {\n      display: none;\n    }\n\n    .multiBodiedExtension-content-dom-wrapper\n      > [data-extension-frame='true']:nth-of-type(", ") {\n      display: block;\n    }\n  "])), "var(--ds-border, ".concat(N30, ")"), "var(--ds-space-050, 4px)", activeChildIndex + 1);
+  return jsx("section", {
+    className: "multiBodiedExtension--container",
+    css: containerCss,
+    "data-testid": "multiBodiedExtension--container",
+    "data-active-child-index": activeChildIndex
+  }, jsx("nav", {
+    className: "multiBodiedExtension-navigation",
+    "data-testid": "multiBodiedExtension-navigation"
+  }, extensionHandlerResult), jsx("article", {
+    className: "multiBodiedExtension--frames",
+    "data-testid": "multiBodiedExtension--frames",
+    ref: articleRef
+  }));
+};
+export default MultiBodiedExtension;

package/dist/esm/plugins/extension/utils.js

@@ -5,8 +5,9 @@ export var getSelectedExtension = function getSelectedExtension(state) {
   var _state$schema$nodes = state.schema.nodes,
     inlineExtension = _state$schema$nodes.inlineExtension,
     extension = _state$schema$nodes.extension,
-    bodiedExtension = _state$schema$nodes.bodiedExtension;
-  var nodeTypes = [extension, bodiedExtension, inlineExtension];
+    bodiedExtension = _state$schema$nodes.bodiedExtension,
+    multiBodiedExtension = _state$schema$nodes.multiBodiedExtension;
+  var nodeTypes = [extension, bodiedExtension, inlineExtension, multiBodiedExtension];
   return findSelectedNodeOfType(nodeTypes)(state.selection) || searchParent && findParentNodeOfType(nodeTypes)(state.selection) || undefined;
 };
 export var findExtensionWithLocalId = function findExtensionWithLocalId(state, localId) {
@@ -20,8 +21,9 @@ export var findExtensionWithLocalId = function findExtensionWithLocalId(state, l
   var _state$schema$nodes2 = state.schema.nodes,
     inlineExtension = _state$schema$nodes2.inlineExtension,
     extension = _state$schema$nodes2.extension,
-    bodiedExtension = _state$schema$nodes2.bodiedExtension;
-  var nodeTypes = [extension, bodiedExtension, inlineExtension];
+    bodiedExtension = _state$schema$nodes2.bodiedExtension,
+    multiBodiedExtension = _state$schema$nodes2.multiBodiedExtension;
+  var nodeTypes = [extension, bodiedExtension, inlineExtension, multiBodiedExtension];
   var matched;
   state.doc.descendants(function (node, pos) {
     if (nodeTypes.includes(node.type) && node.attrs.localId === localId) {

package/dist/esm/ui/ContentStyles/extension.js

@@ -2,4 +2,5 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 import { css } from '@emotion/react';
 import { blockNodesVerticalMargin, akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackground, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-export var extensionStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .extensionView-content-wrap,\n  .bodiedExtensionView-content-wrap {\n    margin: ", " 0;\n\n    &:first-of-type {\n      margin-top: 0;\n    }\n\n    &:last-of-type {\n      margin-bottom: 0;\n    }\n\n    &:not(.danger).", " {\n      & > span > .extension-container {\n        ", "\n      }\n    }\n\n    &.danger > span > .extension-container {\n      box-shadow: 0 0 0 ", "px\n        ", ";\n      background-color: ", ";\n    }\n\n    &.inline {\n      word-wrap: break-all;\n    }\n  }\n\n  .extensionView-content-wrap .extension-container {\n    overflow: hidden;\n  }\n\n  .bodiedExtensionView-content-wrap\n    .extensionView-content-wrap\n    .extension-container {\n    width: 100%;\n    max-width: 100%; // ensure width can't go over 100%;\n  }\n\n  [data-mark-type='fragment'] {\n    & > .extensionView-content-wrap,\n    & > .bodiedExtensionView-content-wrap {\n      margin: ", " 0;\n    }\n\n    & > [data-mark-type='dataConsumer'] {\n      & > .extensionView-content-wrap,\n      & > .bodiedExtensionView-content-wrap {\n        margin: ", " 0;\n      }\n    }\n\n    &:first-child {\n      & > .extensionView-content-wrap,\n      & > .bodiedExtensionView-content-wrap {\n        margin-top: 0;\n      }\n\n      & > [data-mark-type='dataConsumer'] {\n        & > .extensionView-content-wrap,\n        & > .bodiedExtensionView-content-wrap {\n          margin-top: 0;\n        }\n      }\n    }\n\n    &:nth-last-of-type(-n + 2):not(:first-of-type) {\n      & > .extensionView-content-wrap,\n      & > .bodiedExtensionView-content-wrap {\n        margin-bottom: 0;\n      }\n\n      & > [data-mark-type='dataConsumer'] {\n        & > .extensionView-content-wrap,\n        & > .bodiedExtensionView-content-wrap {\n          margin-bottom: 0;\n        }\n      }\n    }\n  }\n"])), blockNodesVerticalMargin, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedBorderSize, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(akEditorDeleteBackground, ")"), blockNodesVerticalMargin, blockNodesVerticalMargin);
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
+export var extensionStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .multiBodiedExtensionView-content-wrap.", ":not(.danger) {\n    ", "\n  }\n\n  .extensionView-content-wrap,\n  .multiBodiedExtensionView-content-wrap,\n  .bodiedExtensionView-content-wrap {\n    margin: ", " 0;\n\n    &:first-of-type {\n      margin-top: 0;\n    }\n\n    &:last-of-type {\n      margin-bottom: 0;\n    }\n\n    &:not(.danger).", " {\n      & > span > .extension-container {\n        ", "\n      }\n    }\n\n    &.danger > span > .extension-container {\n      box-shadow: 0 0 0 ", "px\n        ", ";\n      background-color: ", ";\n    }\n\n    &.inline {\n      word-wrap: break-all;\n    }\n  }\n\n  .extensionView-content-wrap .extension-container {\n    overflow: hidden;\n  }\n\n  .bodiedExtensionView-content-wrap\n    .extensionView-content-wrap\n    .extension-container {\n    width: 100%;\n    max-width: 100%; // ensure width can't go over 100%;\n  }\n\n  [data-mark-type='fragment'] {\n    & > .extensionView-content-wrap,\n    & > .bodiedExtensionView-content-wrap {\n      margin: ", " 0;\n    }\n\n    & > [data-mark-type='dataConsumer'] {\n      & > .extensionView-content-wrap,\n      & > .bodiedExtensionView-content-wrap {\n        margin: ", " 0;\n      }\n    }\n\n    &:first-child {\n      & > .extensionView-content-wrap,\n      & > .bodiedExtensionView-content-wrap {\n        margin-top: 0;\n      }\n\n      & > [data-mark-type='dataConsumer'] {\n        & > .extensionView-content-wrap,\n        & > .bodiedExtensionView-content-wrap {\n          margin-top: 0;\n        }\n      }\n    }\n\n    &:nth-last-of-type(-n + 2):not(:first-of-type) {\n      & > .extensionView-content-wrap,\n      & > .bodiedExtensionView-content-wrap {\n        margin-bottom: 0;\n      }\n\n      & > [data-mark-type='dataConsumer'] {\n        & > .extensionView-content-wrap,\n        & > .bodiedExtensionView-content-wrap {\n          margin-bottom: 0;\n        }\n      }\n    }\n  }\n"])), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket]), blockNodesVerticalMargin, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedBorderSize, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(akEditorDeleteBackground, ")"), blockNodesVerticalMargin, blockNodesVerticalMargin);

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.3.38";
+export var version = "189.4.0";

package/dist/types/plugins/extension/commands.d.ts

@@ -3,6 +3,7 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { ExtensionState } from './types';
 import type { Parameters, TransformBefore, TransformAfter } from '@atlaskit/editor-common/src/extensions';
 import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function updateState(state: Partial<ExtensionState>): import("@atlaskit/editor-common/types").Command;
 export declare function setEditingContextToContextPanel<T extends Parameters = Parameters>(processParametersBefore: TransformBefore<T>, processParametersAfter: TransformAfter<T>, applyChangeToContextPanel: ApplyChangeHandler | undefined): import("@atlaskit/editor-common/types").Command;
 export declare const clearEditingContext: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => import("@atlaskit/editor-common/types").Command;
@@ -10,3 +11,4 @@ export declare const forceAutoSave: (applyChangeToContextPanel: ApplyChangeHandl
 export declare const updateExtensionLayout: (layout: ExtensionLayout) => import("@atlaskit/editor-common/types").Command;
 export declare const removeExtension: () => import("@atlaskit/editor-common/types").Command;
 export declare const removeDescendantNodes: (sourceNode?: PMNode) => import("@atlaskit/editor-common/types").Command;
+export declare const checkAndRemoveExtensionNode: (state: EditorState, tr: Transaction) => Transaction;

package/dist/types/plugins/extension/ui/Extension/ExtensionComponent.d.ts

@@ -23,6 +23,7 @@ export interface State {
     _privateProps?: {
         __hideFrame?: boolean;
     };
+    activeChildIndex?: number;
 }
 export default class ExtensionComponent extends Component<Props, State> {
     private privatePropsParsed;

package/dist/types/plugins/extension/ui/Extension/ExtensionNodeWrapper.d.ts

@@ -3,5 +3,12 @@ type Props = {
     children: React.ReactNode;
     nodeType: string;
 };
+/**
+ * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * else wrap with a div (for multi bodied extensions)
+ *
+ * @param param0
+ * @returns
+ */
 declare const ExtensionNodeWrapper: ({ children, nodeType }: Props) => JSX.Element;
 export default ExtensionNodeWrapper;