@atlaskit/editor-common 116.24.3 → 116.24.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-common
 
+## 116.24.5
+
+### Patch Changes
+
+- [`07226ab3fad50`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/07226ab3fad50) -
+  [ux] Reserve native embed first-paint layout
+
+## 116.24.4
+
+### Patch Changes
+
+- [`f813190f05f57`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f813190f05f57) -
+  Update multi bodied extension chrome to match extension presentation.
+- Updated dependencies
+
 ## 116.24.3
 
 ### Patch Changes

package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -4,13 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getShouldShowBodiedMacroLabel = exports.ExtensionLabel = void 0;
+exports.ExtensionLabel = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntl = require("react-intl");
 var _customize = _interopRequireDefault(require("@atlaskit/icon/core/customize"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -117,32 +118,25 @@ var i18n = (0, _reactIntl.defineMessages)({
     description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
-var getShouldShowBodiedMacroLabel = exports.getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) {
-  // Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
-  if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
-    return isNodeHovered;
-  }
-  if (!showLivePagesBodiedMacrosRendererView) {
-    return true;
-  } // Keep showing labels as usual for default experience for bodied macros
-  return !!(isNodeHovered && !showBodiedExtensionRendererView); // For the new live pages bodied macro experience, we only show the label on hover in the "edit" view
-};
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
   var text = _ref.text,
     extensionName = _ref.extensionName,
     customContainerStyles = _ref.customContainerStyles,
     isNodeNested = _ref.isNodeNested,
+    isNodeSelected = _ref.isNodeSelected,
     setIsNodeHovered = _ref.setIsNodeHovered,
     isBodiedMacro = _ref.isBodiedMacro,
     showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
     showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
     showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
-    _pluginInjectionApi = _ref.pluginInjectionApi;
+    _pluginInjectionApi = _ref.pluginInjectionApi,
+    isMultiBodiedMacro = _ref.isMultiBodiedMacro;
   var isInlineExtension = extensionName === 'inlineExtension';
   var showDefaultBodiedStyles = isBodiedMacro;
+  var shouldUseMultiBodiedMacroPresentation = isMultiBodiedMacro && (0, _platformFeatureFlags.fg)('confluence_frontend_native_tabs_extension');
   var containerClassNames = (0, _classnames.default)({
-    bodied: isBodiedMacro
+    bodied: isBodiedMacro && !shouldUseMultiBodiedMacroPresentation
   });
   var labelClassNames = (0, _classnames.default)('extension-label', {
     nested: isNodeNested,
@@ -153,8 +147,8 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     'with-bodied-macro-live-page-styles': isBodiedMacro && showLivePagesBodiedMacrosRendererView,
     'always-hide-label': isBodiedMacro && showBodiedExtensionRendererView,
     // Need this separate class since we don't ever want to show the label during view mode
-    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
-    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
+    'remove-left-margin': (!isBodiedMacro || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && (!isBodiedMacro || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension
   });
   var iconClassNames = (0, _classnames.default)({
     'extension-icon': true
@@ -206,12 +200,12 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
       }, tooltipProps, {
-        css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) && hideLabelStyles]
+        css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI || shouldUseMultiBodiedMacroPresentation && !isNodeSelected) && hideLabelStyles]
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: labelClassNames
       }), text, (0, _react2.jsx)("span", {
-        css: [iconStyles, isBodiedMacro && bodiedMacroIconStyles]
+        css: [iconStyles, isBodiedMacro && !shouldUseMultiBodiedMacroPresentation && bodiedMacroIconStyles]
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: iconClassNames,

package/dist/cjs/extensibility/Extension/Lozenge/LozengeComponent.js

@@ -32,13 +32,15 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
     customContainerStyles = _ref.customContainerStyles,
     isNodeHovered = _ref.isNodeHovered,
     isNodeNested = _ref.isNodeNested,
+    isNodeSelected = _ref.isNodeSelected,
     setIsNodeHovered = _ref.setIsNodeHovered,
     isBodiedMacro = _ref.isBodiedMacro,
     showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
     showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
     setShowBodiedExtensionRendererView = _ref.setShowBodiedExtensionRendererView,
-    pluginInjectionApi = _ref.pluginInjectionApi;
+    pluginInjectionApi = _ref.pluginInjectionApi,
+    isMultiBodiedMacro = _ref.isMultiBodiedMacro;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_ExtensionLabel.ExtensionLabel, {
@@ -46,13 +48,15 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
       extensionName: extensionName,
       isNodeHovered: isNodeHovered,
       isNodeNested: isNodeNested,
+      isNodeSelected: isNodeSelected,
       customContainerStyles: customContainerStyles,
       setIsNodeHovered: setIsNodeHovered,
       isBodiedMacro: isBodiedMacro,
       showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
       showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
       showBodiedExtensionRendererView: showBodiedExtensionRendererView,
-      pluginInjectionApi: pluginInjectionApi
+      pluginInjectionApi: pluginInjectionApi,
+      isMultiBodiedMacro: isMultiBodiedMacro
     }), showLivePagesBodiedMacrosRendererView && isBodiedMacro && (0, _react2.jsx)(_EditToggle.EditToggle, {
       isNodeHovered: isNodeHovered,
       setIsNodeHovered: setIsNodeHovered,

package/dist/cjs/extensibility/Extension/Lozenge/index.js

@@ -59,7 +59,8 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView = _this$props.setShowBodiedExtensionRendererView,
-        pluginInjectionApi = _this$props.pluginInjectionApi;
+        pluginInjectionApi = _this$props.pluginInjectionApi,
+        isMultiBodiedMacro = _this$props.isMultiBodiedMacro;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
         extensionKey = _this$props$node$attr.extensionKey;
@@ -83,7 +84,8 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
-        pluginInjectionApi: pluginInjectionApi
+        pluginInjectionApi: pluginInjectionApi,
+        isMultiBodiedMacro: isMultiBodiedMacro
       });
     });
     return _this;

package/dist/cjs/extensibility/Extension.js

@@ -34,6 +34,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
         editorView = _this$props.editorView,
         handleContentDOMRef = _this$props.handleContentDOMRef,
         extensionHandlers = _this$props.extensionHandlers,
+        extensionLoadingHandlers = _this$props.extensionLoadingHandlers,
         references = _this$props.references,
         editorAppearance = _this$props.editorAppearance,
         pluginInjectionApi = _this$props.pluginInjectionApi,
@@ -59,6 +60,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
         extensionProvider: extensionProvider,
         handleContentDOMRef: handleContentDOMRef,
         extensionHandlers: extensionHandlers,
+        extensionLoadingHandlers: extensionLoadingHandlers,
         editorAppearance: editorAppearance,
         pluginInjectionApi: pluginInjectionApi,
         eventDispatcher: eventDispatcher,

package/dist/cjs/extensibility/ExtensionComponent.js

@@ -149,6 +149,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
       var _pmNode$marks;
       var _this$props = _this.props,
         extensionHandlers = _this$props.extensionHandlers,
+        extensionLoadingHandlers = _this$props.extensionLoadingHandlers,
         editorView = _this$props.editorView,
         showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
         rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
@@ -184,6 +185,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
         }
       }
       var result;
+      var loadingFallback = extensionLoadingHandlers !== null && extensionLoadingHandlers !== void 0 && extensionLoadingHandlers[extensionType] ? (0, _utils.getExtensionRenderer)(extensionLoadingHandlers[extensionType])(node, editorView.state.doc, actions) : undefined;
       if (extensionHandlers && extensionHandlers[extensionType]) {
         var render = (0, _utils.getExtensionRenderer)(extensionHandlers[extensionType]);
         result = render(node, editorView.state.doc, actions);
@@ -196,18 +198,20 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
             return /*#__PURE__*/_react.default.createElement(NodeRenderer, {
               node: node,
               references: _this.props.references,
-              actions: actions
+              actions: actions,
+              loadingFallback: loadingFallback
             });
           }
           return /*#__PURE__*/_react.default.createElement(NodeRenderer, {
             node: node,
             references: _this.props.references,
             isSelected: isSelected,
+            loadingFallback: loadingFallback,
             showUnknownMacroPlaceholder: (0, _platformFeatureFlags.fg)('tinymce_display_unknown_macro_body_content')
           });
         }
       }
-      return result;
+      return result !== null && result !== void 0 ? result : loadingFallback;
     });
     return _this;
   }

package/dist/cjs/extensibility/MultiBodiedExtension/index.js

@@ -7,12 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
+var _bindEventListener = require("bind-event-listener");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _file = _interopRequireDefault(require("@atlaskit/icon/core/file"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -63,6 +64,67 @@ var MultiBodiedExtensionFrames = function MultiBodiedExtensionFrames(_ref) {
     ref: articleRef
   });
 };
+var isSelectionInsideNode = function isSelectionInsideNode(selection, node, getPos) {
+  var nodeStartPosition = getPos();
+  if (typeof nodeStartPosition !== 'number' || !selection) {
+    return false;
+  }
+  var nodeEndPosition = nodeStartPosition + node.nodeSize;
+
+  /*
+  	selection starts within MBE ||
+  	selection ends within MBE ||
+  	selection includes MBE
+  */
+  return nodeStartPosition < selection.from && selection.from < nodeEndPosition || nodeStartPosition < selection.to && selection.to < nodeEndPosition || nodeStartPosition >= selection.from && selection.to >= nodeEndPosition;
+};
+var useIsSelectionInsideNode = function useIsSelectionInsideNode(editorView, node, getPos, enabled) {
+  var nodeRef = (0, _react.useRef)(node);
+  var _useState = (0, _react.useState)(function () {
+      return enabled && isSelectionInsideNode(editorView.state.selection, node, getPos);
+    }),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    isSelectionInside = _useState2[0],
+    setIsSelectionInside = _useState2[1];
+  nodeRef.current = node;
+  (0, _react.useEffect)(function () {
+    if (!enabled) {
+      return;
+    }
+    var animationFrameId;
+    var updateSelectionInsideNode = function updateSelectionInsideNode() {
+      setIsSelectionInside(isSelectionInsideNode(editorView.state.selection, nodeRef.current, getPos));
+    };
+    var scheduleUpdateSelectionInsideNode = function scheduleUpdateSelectionInsideNode() {
+      if (animationFrameId !== undefined) {
+        cancelAnimationFrame(animationFrameId);
+      }
+      animationFrameId = requestAnimationFrame(updateSelectionInsideNode);
+    };
+    var ownerDocument = editorView.dom.ownerDocument;
+    var unbindSelectionChange = (0, _bindEventListener.bind)(ownerDocument, {
+      listener: scheduleUpdateSelectionInsideNode,
+      type: 'selectionchange'
+    });
+    var unbindKeyUp = (0, _bindEventListener.bind)(editorView.dom, {
+      listener: scheduleUpdateSelectionInsideNode,
+      type: 'keyup'
+    });
+    var unbindMouseUp = (0, _bindEventListener.bind)(editorView.dom, {
+      listener: scheduleUpdateSelectionInsideNode,
+      type: 'mouseup'
+    });
+    return function () {
+      if (animationFrameId !== undefined) {
+        cancelAnimationFrame(animationFrameId);
+      }
+      unbindSelectionChange();
+      unbindKeyUp();
+      unbindMouseUp();
+    };
+  }, [editorView, getPos, enabled]);
+  return enabled && isSelectionInside;
+};
 
 // Similar to the one in platform/packages/editor/editor-common/src/extensibility/Extension/Lozenge.tsx
 var getWrapperTitleContent = function getWrapperTitleContent(imageData, title, showMacroInteractionDesignUpdates) {
@@ -122,10 +184,10 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
     node: node,
     type: 'image'
   });
-  var _useState = (0, _react.useState)(0),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    activeChildIndex = _useState2[0],
-    setActiveChildIndex = _useState2[1];
+  var _useState3 = (0, _react.useState)(0),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    activeChildIndex = _useState4[0],
+    setActiveChildIndex = _useState4[1];
   // Adding to avoid aliasing `this` for the callbacks
   var updateActiveChild = _react.default.useCallback(function (index) {
     if (typeof index !== 'number') {
@@ -175,8 +237,11 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       breakoutStyles = (0, _extends2.default)({}, ((0, _objectDestructuringEmpty2.default)(_calculateBreakoutSty), _calculateBreakoutSty));
     mbeWrapperStyles = breakoutStyles;
   }
+  var shouldUseNativeTabsPresentation = (0, _platformFeatureFlags.fg)('confluence_frontend_native_tabs_extension');
+  var isSelectionInsideMultiBodiedExtension = useIsSelectionInsideNode(editorView, node, getPos, shouldUseNativeTabsPresentation);
+  var isMultiBodiedExtensionActive = isNodeSelected || isSelectionInsideMultiBodiedExtension;
   var wrapperClassNames = (0, _classnames.default)('multiBodiedExtension--wrapper', 'extension-container', 'block', {
-    'with-border': showMacroInteractionDesignUpdates,
+    'with-border': showMacroInteractionDesignUpdates && (shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : true),
     'with-danger-overlay': showMacroInteractionDesignUpdates,
     'with-padding-background-styles': showMacroInteractionDesignUpdates,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
@@ -198,7 +263,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
     }
   };
   return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
-    isNodeSelected: isNodeSelected,
+    isNodeSelected: shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: true,
     customContainerStyles: mbeWrapperStyles,
@@ -206,12 +271,13 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
     isNodeNested: isNodeNested,
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: true,
+    isMultiBodiedMacro: shouldUseNativeTabsPresentation,
     pluginInjectionApi: pluginInjectionApi
   }), (0, _react2.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: wrapperClassNames,
     css: [/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
-    (0, _platformFeatureFlags.fg)('confluence_frontend_native_tabs_extension') ? _styles.mbeExtensionWrapperCSSStyles : _styles.mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
+    shouldUseNativeTabsPresentation ? _styles.mbeExtensionWrapperCSSStyles : _styles.mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
     showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles],
     "data-testid": "multiBodiedExtension--wrapper-editor",
     "data-layout": node.attrs.layout
@@ -231,7 +297,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
     onBlur: (0, _expValEquals.expValEquals)('editor_a11y__enghealth-46814_fy26', 'isEnabled', true) ? function () {} : undefined
   }, (0, _react2.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    css: (0, _platformFeatureFlags.fg)('confluence_frontend_native_tabs_extension') ? _styles.overlayStyles : _styles.overlayStylesOld
+    css: shouldUseNativeTabsPresentation ? _styles.overlayStyles : _styles.overlayStylesOld
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: overlayClassNames,

package/dist/cjs/extensibility/extensionNodeView.js

@@ -321,6 +321,7 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
         providerFactory: props.providerFactory,
         handleContentDOMRef: forwardRef,
         extensionHandlers: props.extensionHandlers,
+        extensionLoadingHandlers: props.extensionLoadingHandlers,
         editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
         pluginInjectionApi: props.pluginInjectionApi,
         macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
@@ -331,11 +332,12 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
     }
   }]);
 }(_reactNodeView.default); // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers, intl) {
+function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers, intl) {
   return function (node, view, getPos) {
     return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory,
       extensionHandlers: extensionHandlers,
+      extensionLoadingHandlers: extensionLoadingHandlers,
       extensionNodeViewOptions: extensionNodeViewOptions,
       pluginInjectionApi: pluginInjectionApi,
       macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,

package/dist/cjs/extensions/extension-handlers.js

@@ -124,6 +124,9 @@ function isUnknownConfluenceMacroWithBody(extensionNode) {
 function ExtensionLoading(props) {
   var intl = (0, _reactIntl.useIntl)();
   var extensionNode = props.node;
+  if (!props.error && !props.timedOut && props.loadingFallback) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.loadingFallback);
+  }
   if (props.error || props.timedOut) {
     // eslint-disable-next-line no-console
     console.error('Error rendering extension', props.error);

package/dist/cjs/monitoring/error.js

@@ -28,7 +28,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "116.24.2";
+var packageVersion = "116.24.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "116.24.2";
+var packageVersion = "116.24.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -10,6 +10,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { FormattedMessage, defineMessages } from 'react-intl';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
+import { fg } from '@atlaskit/platform-feature-flags';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -108,33 +109,26 @@ const i18n = defineMessages({
     description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
-export const getShouldShowBodiedMacroLabel = (isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) => {
-  // Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
-  if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
-    return isNodeHovered;
-  }
-  if (!showLivePagesBodiedMacrosRendererView) {
-    return true;
-  } // Keep showing labels as usual for default experience for bodied macros
-  return !!(isNodeHovered && !showBodiedExtensionRendererView); // For the new live pages bodied macro experience, we only show the label on hover in the "edit" view
-};
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 export const ExtensionLabel = ({
   text,
   extensionName,
   customContainerStyles,
   isNodeNested,
+  isNodeSelected,
   setIsNodeHovered,
   isBodiedMacro,
   showUpdatedLivePages1PBodiedExtensionUI,
   showLivePagesBodiedMacrosRendererView,
   showBodiedExtensionRendererView,
-  pluginInjectionApi: _pluginInjectionApi
+  pluginInjectionApi: _pluginInjectionApi,
+  isMultiBodiedMacro
 }) => {
   const isInlineExtension = extensionName === 'inlineExtension';
   const showDefaultBodiedStyles = isBodiedMacro;
+  const shouldUseMultiBodiedMacroPresentation = isMultiBodiedMacro && fg('confluence_frontend_native_tabs_extension');
   const containerClassNames = classnames({
-    bodied: isBodiedMacro
+    bodied: isBodiedMacro && !shouldUseMultiBodiedMacroPresentation
   });
   const labelClassNames = classnames('extension-label', {
     nested: isNodeNested,
@@ -145,8 +139,8 @@ export const ExtensionLabel = ({
     'with-bodied-macro-live-page-styles': isBodiedMacro && showLivePagesBodiedMacrosRendererView,
     'always-hide-label': isBodiedMacro && showBodiedExtensionRendererView,
     // Need this separate class since we don't ever want to show the label during view mode
-    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
-    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
+    'remove-left-margin': (!isBodiedMacro || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && (!isBodiedMacro || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension
   });
   const iconClassNames = classnames({
     'extension-icon': true
@@ -195,12 +189,12 @@ export const ExtensionLabel = ({
       // Ignored via go/ees005
       // eslint-disable-next-line react/jsx-props-no-spreading
     }, tooltipProps, {
-      css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) && hideLabelStyles]
+      css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI || shouldUseMultiBodiedMacroPresentation && !isNodeSelected) && hideLabelStyles]
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: labelClassNames
     }), text, jsx("span", {
-      css: [iconStyles, isBodiedMacro && bodiedMacroIconStyles]
+      css: [iconStyles, isBodiedMacro && !shouldUseMultiBodiedMacroPresentation && bodiedMacroIconStyles]
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: iconClassNames,

package/dist/es2019/extensibility/Extension/Lozenge/LozengeComponent.js

@@ -26,13 +26,15 @@ export const LozengeComponent = ({
   customContainerStyles,
   isNodeHovered,
   isNodeNested,
+  isNodeSelected,
   setIsNodeHovered,
   isBodiedMacro,
   showLivePagesBodiedMacrosRendererView,
   showUpdatedLivePages1PBodiedExtensionUI,
   showBodiedExtensionRendererView,
   setShowBodiedExtensionRendererView,
-  pluginInjectionApi
+  pluginInjectionApi,
+  isMultiBodiedMacro
 }) => {
   const capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
@@ -41,13 +43,15 @@ export const LozengeComponent = ({
       extensionName: extensionName,
       isNodeHovered: isNodeHovered,
       isNodeNested: isNodeNested,
+      isNodeSelected: isNodeSelected,
       customContainerStyles: customContainerStyles,
       setIsNodeHovered: setIsNodeHovered,
       isBodiedMacro: isBodiedMacro,
       showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
       showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
       showBodiedExtensionRendererView: showBodiedExtensionRendererView,
-      pluginInjectionApi: pluginInjectionApi
+      pluginInjectionApi: pluginInjectionApi,
+      isMultiBodiedMacro: isMultiBodiedMacro
     }), showLivePagesBodiedMacrosRendererView && isBodiedMacro && jsx(EditToggle, {
       isNodeHovered: isNodeHovered,
       setIsNodeHovered: setIsNodeHovered,

package/dist/es2019/extensibility/Extension/Lozenge/index.js

@@ -44,7 +44,8 @@ export default class ExtensionLozenge extends Component {
         showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView,
-        pluginInjectionApi
+        pluginInjectionApi,
+        isMultiBodiedMacro
       } = this.props;
       const {
         parameters,
@@ -72,7 +73,8 @@ export default class ExtensionLozenge extends Component {
         showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
-        pluginInjectionApi: pluginInjectionApi
+        pluginInjectionApi: pluginInjectionApi,
+        isMultiBodiedMacro: isMultiBodiedMacro
       });
     });
   }

package/dist/es2019/extensibility/Extension.js

@@ -17,6 +17,7 @@ export class Extension extends Component {
         editorView,
         handleContentDOMRef,
         extensionHandlers,
+        extensionLoadingHandlers,
         references,
         editorAppearance,
         pluginInjectionApi,
@@ -44,6 +45,7 @@ export class Extension extends Component {
         extensionProvider: extensionProvider,
         handleContentDOMRef: handleContentDOMRef,
         extensionHandlers: extensionHandlers,
+        extensionLoadingHandlers: extensionLoadingHandlers,
         editorAppearance: editorAppearance,
         pluginInjectionApi: pluginInjectionApi,
         eventDispatcher: eventDispatcher,

package/dist/es2019/extensibility/ExtensionComponent.js

@@ -102,9 +102,10 @@ class ExtensionComponentInner extends Component {
       }
     });
     _defineProperty(this, "handleExtension", (pmNode, actions) => {
-      var _pmNode$marks, _pmNode$marks$find, _pmNode$marks$find$at;
+      var _pmNode$marks, _pmNode$marks$find, _pmNode$marks$find$at, _result;
       const {
         extensionHandlers,
+        extensionLoadingHandlers,
         editorView,
         showBodiedExtensionRendererView,
         rendererExtensionHandlers
@@ -142,6 +143,7 @@ class ExtensionComponentInner extends Component {
         }
       }
       let result;
+      const loadingFallback = extensionLoadingHandlers !== null && extensionLoadingHandlers !== void 0 && extensionLoadingHandlers[extensionType] ? getExtensionRenderer(extensionLoadingHandlers[extensionType])(node, editorView.state.doc, actions) : undefined;
       if (extensionHandlers && extensionHandlers[extensionType]) {
         const render = getExtensionRenderer(extensionHandlers[extensionType]);
         result = render(node, editorView.state.doc, actions);
@@ -154,18 +156,20 @@ class ExtensionComponentInner extends Component {
             return /*#__PURE__*/React.createElement(NodeRenderer, {
               node: node,
               references: this.props.references,
-              actions: actions
+              actions: actions,
+              loadingFallback: loadingFallback
             });
           }
           return /*#__PURE__*/React.createElement(NodeRenderer, {
             node: node,
             references: this.props.references,
             isSelected: isSelected,
+            loadingFallback: loadingFallback,
             showUnknownMacroPlaceholder: fg('tinymce_display_unknown_macro_body_content')
           });
         }
       }
-      return result;
+      return (_result = result) !== null && _result !== void 0 ? _result : loadingFallback;
     });
   }
   componentDidUpdate() {