@atlaskit/editor-common 116.32.4 → 116.33.1

package/dist/es2019/extensibility/ExtensionComponent.js

@@ -215,7 +215,9 @@ class ExtensionComponentInner extends Component {
         editorAppearance: editorAppearance,
         macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
         isNodeSelected: selectedNode === node,
+        isNodeHovered: this.state.isNodeHovered,
         isNodeNested: isNodeNested,
+        setIsNodeHovered: this.setIsNodeHovered,
         isLivePageViewMode: isLivePageViewMode,
         allowBodiedOverride: allowBodiedOverride
       });

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

@@ -17,6 +17,7 @@ import { useSharedPluginStateWithSelector } from '../../hooks';
 import { removeMarginsAndBorder, sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
 import { calculateBreakoutStyles, getExtensionLozengeData } from '../../utils';
 import ExtensionLozenge from '../Extension/Lozenge';
+import { ExtensionFloatingLabel } from '../Extension/Lozenge/ExtensionFloatingLabel';
 import { shouldExtensionBreakout } from '../utils/should-extension-breakout';
 import { useMultiBodiedExtensionActions } from './action-api';
 import { mbeExtensionWrapperCSSStyles, mbeExtensionWrapperCSSStylesOld, overlayStyles, overlayStylesOld } from './styles';
@@ -37,6 +38,11 @@ const imageStyles = css({
   maxWidth: '24px'
 });
 const hoverStyles = css({
+  '&:hover': {
+    boxShadow: `0 0 0 1px ${"var(--ds-border, #0B120E24)"}`
+  }
+});
+const hoverStylesOld = css({
   '&:hover': {
     boxShadow: `0 0 0 1px ${"var(--ds-border-input, #8C8F97)"}`
   }
@@ -222,11 +228,14 @@ const MultiBodiedExtensionWithWidth = ({
     });
     mbeWrapperStyles = breakoutStyles;
   }
-  const shouldUseNativeTabsPresentation = expValEquals('confluence_native_tabs_experiment', 'isEnabled', true);
-  const isSelectionInsideMultiBodiedExtension = useIsSelectionInsideNode(editorView, node, getPos, shouldUseNativeTabsPresentation);
+  const shouldUseUpdatedChrome = expValEquals('confluence_native_tabs_experiment', 'isEnabled', true);
+  const isSelectionInsideMultiBodiedExtension = useIsSelectionInsideNode(editorView, node, getPos, shouldUseUpdatedChrome && !isLivePageViewMode);
   const isMultiBodiedExtensionActive = isNodeSelected || isSelectionInsideMultiBodiedExtension;
+  const shouldShowChromeOnInteraction = isNodeHovered || isMultiBodiedExtensionActive;
+  const shouldShowMultiBodiedExtensionChrome = shouldUseUpdatedChrome ? !isLivePageViewMode && shouldShowChromeOnInteraction : true;
   const wrapperClassNames = classnames('multiBodiedExtension--wrapper', 'extension-container', 'block', {
-    'with-border': showMacroInteractionDesignUpdates && (shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : true),
+    'with-border': showMacroInteractionDesignUpdates && shouldShowMultiBodiedExtensionChrome,
+    'with-selected-border': showMacroInteractionDesignUpdates && shouldUseUpdatedChrome && !isLivePageViewMode && isNodeSelected,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
     'with-padding-background-styles': showMacroInteractionDesignUpdates,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
@@ -247,8 +256,9 @@ const MultiBodiedExtensionWithWidth = ({
       setIsNodeHovered(didHover);
     }
   };
-  return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
-    isNodeSelected: shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : isNodeSelected,
+  const shouldRenderExtensionLozenge = showMacroInteractionDesignUpdates && !isLivePageViewMode && !shouldUseUpdatedChrome;
+  const shouldRenderFloatingLabel = showMacroInteractionDesignUpdates && !isLivePageViewMode && shouldUseUpdatedChrome && shouldShowChromeOnInteraction;
+  return jsx(Fragment, null, shouldRenderExtensionLozenge && jsx(ExtensionLozenge, {
     node: node,
     showMacroInteractionDesignUpdates: true,
     customContainerStyles: mbeWrapperStyles,
@@ -256,14 +266,13 @@ const MultiBodiedExtensionWithWidth = ({
     isNodeNested: isNodeNested,
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: true,
-    isMultiBodiedMacro: shouldUseNativeTabsPresentation,
     pluginInjectionApi: pluginInjectionApi
   }), 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 */
-    shouldUseNativeTabsPresentation ? mbeExtensionWrapperCSSStyles : mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
-    showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles],
+    shouldUseUpdatedChrome ? mbeExtensionWrapperCSSStyles : mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
+    showMacroInteractionDesignUpdates && !isLivePageViewMode && (shouldUseUpdatedChrome ? hoverStyles : hoverStylesOld)],
     "data-testid": "multiBodiedExtension--wrapper-editor",
     "data-layout": node.attrs.layout
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
@@ -276,9 +285,13 @@ const MultiBodiedExtensionWithWidth = ({
     onFocus: expValEquals('editor_a11y__enghealth-46814_fy26', 'isEnabled', true) ? () => {} : undefined,
     onMouseLeave: () => handleMouseEvent(false),
     onBlur: expValEquals('editor_a11y__enghealth-46814_fy26', 'isEnabled', true) ? () => {} : undefined
-  }, jsx("div", {
+  }, shouldRenderFloatingLabel && jsx(ExtensionFloatingLabel, {
+    title: title,
+    isSelected: isNodeSelected,
+    testId: "multiBodiedExtension-floating-label"
+  }), 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: shouldUseNativeTabsPresentation ? overlayStyles : overlayStylesOld
+    css: shouldUseUpdatedChrome ? overlayStyles : overlayStylesOld
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: overlayClassNames,

package/dist/es2019/extensibility/MultiBodiedExtension/styles.js

@@ -34,6 +34,10 @@ export const mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
     boxShadow: `0 0 0 1px ${"var(--ds-border, #0B120E24)"}`
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.with-selected-border': {
+    boxShadow: `0 0 0 1px ${"var(--ds-border-focused, #4688EC)"}`
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.with-hover-border': {
     boxShadow: `0 0 0 1px ${"var(--ds-border-input, #8C8F97)"}`
   },

package/dist/es2019/lists/flatten-list.js

@@ -9,6 +9,10 @@
  * Uses `doc.nodesBetween` to walk the tree and delegates type-specific
  * decisions to the provided predicates. The core algorithm — selection
  * intersection, depth adjustment, index tracking — is shared.
+ *
+ * @private
+ * @deprecated Cannot represent content placed between an item's sub-lists
+ * (e.g. `li(p, ul, p, ul)`). Callers provide their own flatten that handles this.
  */
 export function flattenList(options, predicates) {
   const {

package/dist/es2019/monitoring/error.js

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

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

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "116.32.3";
+const packageVersion = "116.33.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/ai-messages/ai-suggestions.js

@@ -175,6 +175,16 @@ export var aiSuggestionsMessages = defineMessages({
     defaultMessage: 'Compare with original',
     description: 'Label for the dropdown action to compare suggestion with original content'
   },
+  cardHideDeletedDiffsLabel: {
+    id: 'fabric.editor.ai.suggestions.card.hideDeletedDiffsLabel.non-final',
+    defaultMessage: 'Hide comparison',
+    description: 'Tooltip label for the eye icon button on the AI suggestions card when deleted diffs are visible'
+  },
+  cardShowDeletedDiffsLabel: {
+    id: 'fabric.editor.ai.suggestions.card.showDeletedDiffsLabel.non-final',
+    defaultMessage: 'Show comparison',
+    description: 'Tooltip label for the eye icon button on the AI suggestions card when deleted diffs are hidden'
+  },
   cardScrollBackToSuggestionLabel: {
     id: 'fabric.editor.ai.suggestions.card.scrollBackToSuggestionLabel.non-final',
     defaultMessage: 'Back to suggestion',

package/dist/esm/extensibility/Extension/Extension/index.js

@@ -44,7 +44,6 @@ function ExtensionWithPluginState(props) {
     hideFrame = props.hideFrame,
     editorAppearance = props.editorAppearance,
     macroInteractionDesignFeatureFlags = props.macroInteractionDesignFeatureFlags,
-    isNodeSelected = props.isNodeSelected,
     isNodeHovered = props.isNodeHovered,
     isNodeNested = props.isNodeNested,
     setIsNodeHovered = props.setIsNodeHovered,
@@ -137,7 +136,6 @@ function ExtensionWithPluginState(props) {
     }
   };
   return jsx(Fragment, null, !showLegacyContentHeader && showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
-    isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,
     node: node,
@@ -193,7 +191,6 @@ function ExtensionWithPluginState(props) {
     ,
     className: headerClassNames
   }, !removeBorder && jsx(ExtensionLozenge, {
-    isNodeSelected: isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     pluginInjectionApi: pluginInjectionApi

package/dist/esm/extensibility/Extension/InlineExtension/index.js

@@ -52,7 +52,6 @@ var InlineExtension = function InlineExtension(props) {
   var node = props.node,
     pluginInjectionApi = props.pluginInjectionApi,
     macroInteractionDesignFeatureFlags = props.macroInteractionDesignFeatureFlags,
-    isNodeSelected = props.isNodeSelected,
     children = props.children,
     isNodeHovered = props.isNodeHovered,
     setIsNodeHovered = props.setIsNodeHovered,
@@ -90,7 +89,6 @@ var InlineExtension = function InlineExtension(props) {
   };
   var inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
     node: node,
-    isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     setIsNodeHovered: setIsNodeHovered,
@@ -119,7 +117,6 @@ var InlineExtension = function InlineExtension(props) {
     className: "extension-overlay"
   }), children ? children : jsx(ExtensionLozenge, {
     node: node,
-    isNodeSelected: isNodeSelected,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     pluginInjectionApi: pluginInjectionApi
   })));

package/dist/esm/extensibility/Extension/Lozenge/ExtensionFloatingLabel.compiled.css

@@ -0,0 +1,20 @@
+
+._2rkofajl{border-radius:var(--ds-radius-small,3px)}
+._zulp1b66{gap:var(--ds-space-050,4px)}._154i14id{top:-10px}
+._154id439{top:-14px}
+._16qsglyw{box-shadow:none}
+._19bvu2gc{padding-left:var(--ds-space-100,8px)}
+._1bah1h6o{justify-content:center}
+._1e0c1txw{display:flex}
+._1pbycs5v{z-index:2}
+._1xi2utpp{right:var(--ds-space-150,9pt)}
+._3um0ewfl{visibility:visible}
+._4cvr1h6o{align-items:center}
+._bfhk15s3{background-color:var(--ds-background-selected,#e9f2fe)}
+._bfhkvuon{background-color:var(--ds-surface,#fff)}
+._ca0q1b66{padding-top:var(--ds-space-050,4px)}
+._kqswstnw{position:absolute}
+._n3td1b66{padding-bottom:var(--ds-space-050,4px)}
+._p12f11ux{max-width:140px}
+._tzy4kb7n{opacity:1}
+._u5f3u2gc{padding-right:var(--ds-space-100,8px)}

package/dist/esm/extensibility/Extension/Lozenge/ExtensionFloatingLabel.js

@@ -0,0 +1,23 @@
+/* ExtensionFloatingLabel.tsx generated by @compiled/babel-plugin v0.39.1 */
+import "./ExtensionFloatingLabel.compiled.css";
+import * as React from 'react';
+import { ax, ix } from "@compiled/react/runtime";
+import { Text } from '@atlaskit/primitives/compiled';
+var floatingLabelStyles = {
+  base: "_2rkofajl _zulp1b66 _4cvr1h6o _bfhkvuon _16qsglyw _1e0c1txw _1bah1h6o _p12f11ux _tzy4kb7n _19bvu2gc _u5f3u2gc _kqswstnw _1xi2utpp _154i14id _3um0ewfl _1pbycs5v",
+  selected: "_bfhk15s3 _n3td1b66 _ca0q1b66 _154id439"
+};
+export var ExtensionFloatingLabel = function ExtensionFloatingLabel(_ref) {
+  var isSelected = _ref.isSelected,
+    testId = _ref.testId,
+    title = _ref.title;
+  return /*#__PURE__*/React.createElement("div", {
+    contentEditable: false,
+    "data-testid": testId,
+    className: ax([floatingLabelStyles.base, isSelected && floatingLabelStyles.selected])
+  }, /*#__PURE__*/React.createElement(Text, {
+    maxLines: 1,
+    size: "small",
+    color: isSelected ? 'color.text.selected' : 'color.text.subtle'
+  }, title));
+};

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

@@ -114,19 +114,16 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
     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,
-    isMultiBodiedMacro = _ref.isMultiBodiedMacro;
+    _pluginInjectionApi = _ref.pluginInjectionApi;
   var isInlineExtension = extensionName === 'inlineExtension';
   var showDefaultBodiedStyles = isBodiedMacro;
-  var shouldUseMultiBodiedMacroPresentation = isMultiBodiedMacro && expValEquals('confluence_native_tabs_experiment', 'isEnabled', true);
   var containerClassNames = classnames({
-    bodied: isBodiedMacro && !shouldUseMultiBodiedMacroPresentation
+    bodied: isBodiedMacro
   });
   var labelClassNames = classnames('extension-label', {
     nested: isNodeNested,
@@ -137,8 +134,8 @@ export var 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 || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension && !isNodeNested,
-    'remove-nested-left-margin': isNodeNested && (!isBodiedMacro || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension
+    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
   });
   var iconClassNames = classnames({
     'extension-icon': true
@@ -190,12 +187,12 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
       }, tooltipProps, {
-        css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI || shouldUseMultiBodiedMacroPresentation && !isNodeSelected) && hideLabelStyles]
+        css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) && 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 && !shouldUseMultiBodiedMacroPresentation && bodiedMacroIconStyles]
+        css: [iconStyles, isBodiedMacro && bodiedMacroIconStyles]
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: iconClassNames,

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

@@ -29,15 +29,13 @@ export var 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,
-    isMultiBodiedMacro = _ref.isMultiBodiedMacro;
+    pluginInjectionApi = _ref.pluginInjectionApi;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return jsx(Fragment, null, jsx(ExtensionLabel, {
@@ -45,15 +43,13 @@ export var 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,
-      isMultiBodiedMacro: isMultiBodiedMacro
+      pluginInjectionApi: pluginInjectionApi
     }), showLivePagesBodiedMacrosRendererView && isBodiedMacro && jsx(EditToggle, {
       isNodeHovered: isNodeHovered,
       setIsNodeHovered: setIsNodeHovered,

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

@@ -44,7 +44,6 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
     _defineProperty(_this, "renderFallback", function (lozengeData) {
       var _this$props = _this.props,
         showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
-        isNodeSelected = _this$props.isNodeSelected,
         isNodeHovered = _this$props.isNodeHovered,
         isNodeNested = _this$props.isNodeNested,
         customContainerStyles = _this$props.customContainerStyles,
@@ -54,8 +53,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView = _this$props.setShowBodiedExtensionRendererView,
-        pluginInjectionApi = _this$props.pluginInjectionApi,
-        isMultiBodiedMacro = _this$props.isMultiBodiedMacro;
+        pluginInjectionApi = _this$props.pluginInjectionApi;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
         extensionKey = _this$props$node$attr.extensionKey;
@@ -64,7 +62,6 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
       var title = parameters && parameters.extensionTitle || parameters && parameters.macroMetadata && parameters.macroMetadata.title || extensionKey;
       return jsx(LozengeComponent, {
         isNodeHovered: isNodeHovered,
-        isNodeSelected: isNodeSelected,
         isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         extensionName: name,
@@ -79,8 +76,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
-        pluginInjectionApi: pluginInjectionApi,
-        isMultiBodiedMacro: isMultiBodiedMacro
+        pluginInjectionApi: pluginInjectionApi
       });
     });
     return _this;

package/dist/esm/extensibility/ExtensionComponent.js

@@ -251,7 +251,9 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
           editorAppearance: editorAppearance,
           macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
           isNodeSelected: selectedNode === node,
+          isNodeHovered: this.state.isNodeHovered,
           isNodeNested: isNodeNested,
+          setIsNodeHovered: this.setIsNodeHovered,
           isLivePageViewMode: isLivePageViewMode,
           allowBodiedOverride: allowBodiedOverride
         });

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

@@ -22,6 +22,7 @@ import { useSharedPluginStateWithSelector } from '../../hooks';
 import { removeMarginsAndBorder, sharedMultiBodiedExtensionStyles } from '../../ui/MultiBodiedExtension';
 import { calculateBreakoutStyles, getExtensionLozengeData } from '../../utils';
 import ExtensionLozenge from '../Extension/Lozenge';
+import { ExtensionFloatingLabel } from '../Extension/Lozenge/ExtensionFloatingLabel';
 import { shouldExtensionBreakout } from '../utils/should-extension-breakout';
 import { useMultiBodiedExtensionActions } from './action-api';
 import { mbeExtensionWrapperCSSStyles, mbeExtensionWrapperCSSStylesOld, overlayStyles, overlayStylesOld } from './styles';
@@ -42,6 +43,11 @@ var imageStyles = css({
   maxWidth: '24px'
 });
 var hoverStyles = css({
+  '&:hover': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
+  }
+});
+var hoverStylesOld = css({
   '&:hover': {
     boxShadow: "0 0 0 1px ".concat("var(--ds-border-input, #8C8F97)")
   }
@@ -229,11 +235,14 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       breakoutStyles = _extends({}, (_objectDestructuringEmpty(_calculateBreakoutSty), _calculateBreakoutSty));
     mbeWrapperStyles = breakoutStyles;
   }
-  var shouldUseNativeTabsPresentation = expValEquals('confluence_native_tabs_experiment', 'isEnabled', true);
-  var isSelectionInsideMultiBodiedExtension = useIsSelectionInsideNode(editorView, node, getPos, shouldUseNativeTabsPresentation);
+  var shouldUseUpdatedChrome = expValEquals('confluence_native_tabs_experiment', 'isEnabled', true);
+  var isSelectionInsideMultiBodiedExtension = useIsSelectionInsideNode(editorView, node, getPos, shouldUseUpdatedChrome && !isLivePageViewMode);
   var isMultiBodiedExtensionActive = isNodeSelected || isSelectionInsideMultiBodiedExtension;
+  var shouldShowChromeOnInteraction = isNodeHovered || isMultiBodiedExtensionActive;
+  var shouldShowMultiBodiedExtensionChrome = shouldUseUpdatedChrome ? !isLivePageViewMode && shouldShowChromeOnInteraction : true;
   var wrapperClassNames = classnames('multiBodiedExtension--wrapper', 'extension-container', 'block', {
-    'with-border': showMacroInteractionDesignUpdates && (shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : true),
+    'with-border': showMacroInteractionDesignUpdates && shouldShowMultiBodiedExtensionChrome,
+    'with-selected-border': showMacroInteractionDesignUpdates && shouldUseUpdatedChrome && !isLivePageViewMode && isNodeSelected,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
     'with-padding-background-styles': showMacroInteractionDesignUpdates,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
@@ -254,8 +263,9 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       setIsNodeHovered(didHover);
     }
   };
-  return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
-    isNodeSelected: shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : isNodeSelected,
+  var shouldRenderExtensionLozenge = showMacroInteractionDesignUpdates && !isLivePageViewMode && !shouldUseUpdatedChrome;
+  var shouldRenderFloatingLabel = showMacroInteractionDesignUpdates && !isLivePageViewMode && shouldUseUpdatedChrome && shouldShowChromeOnInteraction;
+  return jsx(Fragment, null, shouldRenderExtensionLozenge && jsx(ExtensionLozenge, {
     node: node,
     showMacroInteractionDesignUpdates: true,
     customContainerStyles: mbeWrapperStyles,
@@ -263,14 +273,13 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
     isNodeNested: isNodeNested,
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: true,
-    isMultiBodiedMacro: shouldUseNativeTabsPresentation,
     pluginInjectionApi: pluginInjectionApi
   }), 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 */
-    shouldUseNativeTabsPresentation ? mbeExtensionWrapperCSSStyles : mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
-    showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles],
+    shouldUseUpdatedChrome ? mbeExtensionWrapperCSSStyles : mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
+    showMacroInteractionDesignUpdates && !isLivePageViewMode && (shouldUseUpdatedChrome ? hoverStyles : hoverStylesOld)],
     "data-testid": "multiBodiedExtension--wrapper-editor",
     "data-layout": node.attrs.layout
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
@@ -287,9 +296,13 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       return handleMouseEvent(false);
     },
     onBlur: expValEquals('editor_a11y__enghealth-46814_fy26', 'isEnabled', true) ? function () {} : undefined
-  }, jsx("div", {
+  }, shouldRenderFloatingLabel && jsx(ExtensionFloatingLabel, {
+    title: title,
+    isSelected: isNodeSelected,
+    testId: "multiBodiedExtension-floating-label"
+  }), 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: shouldUseNativeTabsPresentation ? overlayStyles : overlayStylesOld
+    css: shouldUseUpdatedChrome ? overlayStyles : overlayStylesOld
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: overlayClassNames,

package/dist/esm/extensibility/MultiBodiedExtension/styles.js

@@ -34,6 +34,10 @@ export var mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
     boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.with-selected-border': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border-focused, #4688EC)")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.with-hover-border': {
     boxShadow: "0 0 0 1px ".concat("var(--ds-border-input, #8C8F97)")
   },

package/dist/esm/lists/flatten-list.js

@@ -9,6 +9,10 @@
  * Uses `doc.nodesBetween` to walk the tree and delegates type-specific
  * decisions to the provided predicates. The core algorithm — selection
  * intersection, depth adjustment, index tracking — is shared.
+ *
+ * @private
+ * @deprecated Cannot represent content placed between an item's sub-lists
+ * (e.g. `li(p, ul, p, ul)`). Callers provide their own flatten that handles this.
  */
 export function flattenList(options, predicates) {
   var doc = options.doc,

package/dist/esm/monitoring/error.js

@@ -20,7 +20,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.32.3";
+var packageVersion = "116.33.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "116.32.3";
+var packageVersion = "116.33.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/types/ai-messages/ai-suggestions.d.ts

@@ -44,6 +44,11 @@ export declare const aiSuggestionsMessages: {
         description: string;
         id: string;
     };
+    cardHideDeletedDiffsLabel: {
+        defaultMessage: string;
+        description: string;
+        id: string;
+    };
     cardMoreOptionsButtonLabel: {
         defaultMessage: string;
         description: string;
@@ -74,6 +79,11 @@ export declare const aiSuggestionsMessages: {
         description: string;
         id: string;
     };
+    cardShowDeletedDiffsLabel: {
+        defaultMessage: string;
+        description: string;
+        id: string;
+    };
     cardShowSidebarButtonLabel: {
         defaultMessage: string;
         description: string;

package/dist/types/extensibility/Extension/Lozenge/ExtensionFloatingLabel.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import type { ReactElement } from 'react';
+type Props = {
+    isSelected?: boolean;
+    testId?: string;
+    title: string;
+};
+export declare const ExtensionFloatingLabel: ({ isSelected, testId, title }: Props) => ReactElement;
+export {};

package/dist/types/extensibility/Extension/Lozenge/ExtensionLabel.d.ts

@@ -9,10 +9,8 @@ type ExtensionLabelProps = {
     customContainerStyles?: CSSProperties;
     extensionName: string;
     isBodiedMacro?: boolean;
-    isMultiBodiedMacro?: boolean;
     isNodeHovered?: boolean;
     isNodeNested?: boolean;
-    isNodeSelected?: boolean;
     pluginInjectionApi?: ExtensionsPluginInjectionAPI;
     setIsNodeHovered?: (isHovered: boolean) => void;
     showBodiedExtensionRendererView?: boolean;
@@ -20,5 +18,5 @@ type ExtensionLabelProps = {
     showUpdatedLivePages1PBodiedExtensionUI?: boolean;
     text: string;
 };
-export declare const ExtensionLabel: ({ text, extensionName, customContainerStyles, isNodeNested, isNodeSelected, setIsNodeHovered, isBodiedMacro, showUpdatedLivePages1PBodiedExtensionUI, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, pluginInjectionApi: _pluginInjectionApi, isMultiBodiedMacro, }: ExtensionLabelProps) => jsx.JSX.Element;
+export declare const ExtensionLabel: ({ text, extensionName, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showUpdatedLivePages1PBodiedExtensionUI, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, pluginInjectionApi: _pluginInjectionApi, }: ExtensionLabelProps) => jsx.JSX.Element;
 export {};

package/dist/types/extensibility/Extension/Lozenge/LozengeComponent.d.ts

@@ -11,10 +11,8 @@ type LozengeComponentProps = {
     customContainerStyles?: CSSProperties;
     extensionName: string;
     isBodiedMacro?: boolean;
-    isMultiBodiedMacro?: boolean;
     isNodeHovered?: boolean;
     isNodeNested?: boolean;
-    isNodeSelected?: boolean;
     lozengeData?: LozengeData;
     params: any;
     pluginInjectionApi?: ExtensionsPluginInjectionAPI;
@@ -27,5 +25,5 @@ type LozengeComponentProps = {
     showUpdatedLivePages1PBodiedExtensionUI?: boolean;
     title: string;
 };
-export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, isNodeSelected, setIsNodeHovered, isBodiedMacro, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, pluginInjectionApi, isMultiBodiedMacro, }: LozengeComponentProps) => jsx.JSX.Element;
+export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, pluginInjectionApi, }: LozengeComponentProps) => jsx.JSX.Element;
 export {};

package/dist/types/extensibility/Extension/Lozenge/index.d.ts

@@ -10,10 +10,8 @@ import type { ExtensionsPluginInjectionAPI } from '../../types';
 export interface Props {
     customContainerStyles?: CSSProperties;
     isBodiedMacro?: boolean;
-    isMultiBodiedMacro?: boolean;
     isNodeHovered?: boolean;
     isNodeNested?: boolean;
-    isNodeSelected?: boolean;
     node: PmNode;
     pluginInjectionApi?: ExtensionsPluginInjectionAPI;
     setIsNodeHovered?: (isHovered: boolean) => void;