@atlaskit/editor-common 116.32.4 → 116.33.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-common
 
+## 116.33.1
+
+### Patch Changes
+
+- [`0635ddbca5ddf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0635ddbca5ddf) -
+  Align multi bodied extension chrome with active interaction states.
+- Updated dependencies
+
+## 116.33.0
+
+### Minor Changes
+
+- [`89de40d80a7ce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/89de40d80a7ce) -
+  [ux] Add toggle to show/hide deleted diffs on the AI suggestion card. An eye icon button is added
+  inline with the Accept and Discard buttons, allowing users to hide all greyed-out deleted content
+  while keeping purple highlighted additions visible. The toggle resets to the default "show
+  deletions" state when navigating between suggestions.
+
+### Patch Changes
+
+- [`3c4994f354f5f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3c4994f354f5f) -
+  [ux] Fix content order being corrupted when indenting or outdenting a list item that has content
+  placed between its sub-lists (e.g. `li(p, ul, p, ul)`).
+- Updated dependencies
+
 ## 116.32.4
 
 ### Patch Changes

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

@@ -181,6 +181,16 @@ var aiSuggestionsMessages = exports.aiSuggestionsMessages = (0, _reactIntl.defin
     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/cjs/extensibility/Extension/Extension/index.js

@@ -51,7 +51,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,
@@ -144,7 +143,6 @@ function ExtensionWithPluginState(props) {
     }
   };
   return (0, _react2.jsx)(_react.Fragment, null, !showLegacyContentHeader && showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
-    isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,
     node: node,
@@ -200,7 +198,6 @@ function ExtensionWithPluginState(props) {
     ,
     className: headerClassNames
   }, !removeBorder && (0, _react2.jsx)(_Lozenge.default, {
-    isNodeSelected: isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     pluginInjectionApi: pluginInjectionApi

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

@@ -62,7 +62,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,
@@ -100,7 +99,6 @@ var InlineExtension = function InlineExtension(props) {
   };
   var inlineExtensionInternal = (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
     node: node,
-    isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     setIsNodeHovered: setIsNodeHovered,
@@ -129,7 +127,6 @@ var InlineExtension = function InlineExtension(props) {
     className: "extension-overlay"
   }), children ? children : (0, _react2.jsx)(_Lozenge.default, {
     node: node,
-    isNodeSelected: isNodeSelected,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     pluginInjectionApi: pluginInjectionApi
   })));

package/dist/cjs/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/cjs/extensibility/Extension/Lozenge/ExtensionFloatingLabel.js

@@ -0,0 +1,31 @@
+/* ExtensionFloatingLabel.tsx generated by @compiled/babel-plugin v0.39.1 */
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ExtensionFloatingLabel = void 0;
+require("./ExtensionFloatingLabel.compiled.css");
+var React = _interopRequireWildcard(require("react"));
+var _runtime = require("@compiled/react/runtime");
+var _compiled = require("@atlaskit/primitives/compiled");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var floatingLabelStyles = {
+  base: "_2rkofajl _zulp1b66 _4cvr1h6o _bfhkvuon _16qsglyw _1e0c1txw _1bah1h6o _p12f11ux _tzy4kb7n _19bvu2gc _u5f3u2gc _kqswstnw _1xi2utpp _154i14id _3um0ewfl _1pbycs5v",
+  selected: "_bfhk15s3 _n3td1b66 _ca0q1b66 _154id439"
+};
+var ExtensionFloatingLabel = exports.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: (0, _runtime.ax)([floatingLabelStyles.base, isSelected && floatingLabelStyles.selected])
+  }, /*#__PURE__*/React.createElement(_compiled.Text, {
+    maxLines: 1,
+    size: "small",
+    color: isSelected ? 'color.text.selected' : 'color.text.subtle'
+  }, title));
+};

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

@@ -123,19 +123,16 @@ var ExtensionLabel = exports.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 && (0, _expValEquals.expValEquals)('confluence_native_tabs_experiment', 'isEnabled', true);
   var containerClassNames = (0, _classnames.default)({
-    bodied: isBodiedMacro && !shouldUseMultiBodiedMacroPresentation
+    bodied: isBodiedMacro
   });
   var labelClassNames = (0, _classnames.default)('extension-label', {
     nested: isNodeNested,
@@ -146,8 +143,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 || 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 = (0, _classnames.default)({
     'extension-icon': true
@@ -199,12 +196,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 || 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, (0, _react2.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/cjs/extensibility/Extension/Lozenge/LozengeComponent.js

@@ -32,15 +32,13 @@ 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,
-    isMultiBodiedMacro = _ref.isMultiBodiedMacro;
+    pluginInjectionApi = _ref.pluginInjectionApi;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_ExtensionLabel.ExtensionLabel, {
@@ -48,15 +46,13 @@ 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,
-      isMultiBodiedMacro: isMultiBodiedMacro
+      pluginInjectionApi: pluginInjectionApi
     }), showLivePagesBodiedMacrosRendererView && isBodiedMacro && (0, _react2.jsx)(_EditToggle.EditToggle, {
       isNodeHovered: isNodeHovered,
       setIsNodeHovered: setIsNodeHovered,

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

@@ -49,7 +49,6 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
     (0, _defineProperty2.default)(_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,
@@ -59,8 +58,7 @@ var ExtensionLozenge = exports.default = /*#__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;
@@ -69,7 +67,6 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
       var title = parameters && parameters.extensionTitle || parameters && parameters.macroMetadata && parameters.macroMetadata.title || extensionKey;
       return (0, _react2.jsx)(_LozengeComponent.LozengeComponent, {
         isNodeHovered: isNodeHovered,
-        isNodeSelected: isNodeSelected,
         isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         extensionName: name,
@@ -84,8 +81,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
-        pluginInjectionApi: pluginInjectionApi,
-        isMultiBodiedMacro: isMultiBodiedMacro
+        pluginInjectionApi: pluginInjectionApi
       });
     });
     return _this;

package/dist/cjs/extensibility/ExtensionComponent.js

@@ -260,7 +260,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/cjs/extensibility/MultiBodiedExtension/index.js

@@ -21,6 +21,7 @@ var _hooks = require("../../hooks");
 var _MultiBodiedExtension = require("../../ui/MultiBodiedExtension");
 var _utils = require("../../utils");
 var _Lozenge = _interopRequireDefault(require("../Extension/Lozenge"));
+var _ExtensionFloatingLabel = require("../Extension/Lozenge/ExtensionFloatingLabel");
 var _shouldExtensionBreakout = require("../utils/should-extension-breakout");
 var _actionApi = require("./action-api");
 var _styles = require("./styles");
@@ -49,6 +50,11 @@ var imageStyles = (0, _react2.css)({
   maxWidth: '24px'
 });
 var hoverStyles = (0, _react2.css)({
+  '&:hover': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
+  }
+});
+var hoverStylesOld = (0, _react2.css)({
   '&:hover': {
     boxShadow: "0 0 0 1px ".concat("var(--ds-border-input, #8C8F97)")
   }
@@ -236,11 +242,14 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       breakoutStyles = (0, _extends2.default)({}, ((0, _objectDestructuringEmpty2.default)(_calculateBreakoutSty), _calculateBreakoutSty));
     mbeWrapperStyles = breakoutStyles;
   }
-  var shouldUseNativeTabsPresentation = (0, _expValEquals.expValEquals)('confluence_native_tabs_experiment', 'isEnabled', true);
-  var isSelectionInsideMultiBodiedExtension = useIsSelectionInsideNode(editorView, node, getPos, shouldUseNativeTabsPresentation);
+  var shouldUseUpdatedChrome = (0, _expValEquals.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 = (0, _classnames.default)('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
@@ -261,8 +270,9 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       setIsNodeHovered(didHover);
     }
   };
-  return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
-    isNodeSelected: shouldUseNativeTabsPresentation ? isMultiBodiedExtensionActive : isNodeSelected,
+  var shouldRenderExtensionLozenge = showMacroInteractionDesignUpdates && !isLivePageViewMode && !shouldUseUpdatedChrome;
+  var shouldRenderFloatingLabel = showMacroInteractionDesignUpdates && !isLivePageViewMode && shouldUseUpdatedChrome && shouldShowChromeOnInteraction;
+  return (0, _react2.jsx)(_react.Fragment, null, shouldRenderExtensionLozenge && (0, _react2.jsx)(_Lozenge.default, {
     node: node,
     showMacroInteractionDesignUpdates: true,
     customContainerStyles: mbeWrapperStyles,
@@ -270,14 +280,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 */
-    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],
+    shouldUseUpdatedChrome ? _styles.mbeExtensionWrapperCSSStyles : _styles.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
@@ -294,9 +303,13 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       return handleMouseEvent(false);
     },
     onBlur: (0, _expValEquals.expValEquals)('editor_a11y__enghealth-46814_fy26', 'isEnabled', true) ? function () {} : undefined
-  }, (0, _react2.jsx)("div", {
+  }, shouldRenderFloatingLabel && (0, _react2.jsx)(_ExtensionFloatingLabel.ExtensionFloatingLabel, {
+    title: title,
+    isSelected: isNodeSelected,
+    testId: "multiBodiedExtension-floating-label"
+  }), (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: shouldUseNativeTabsPresentation ? _styles.overlayStyles : _styles.overlayStylesOld
+    css: shouldUseUpdatedChrome ? _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/MultiBodiedExtension/styles.js

@@ -40,6 +40,10 @@ var mbeExtensionWrapperCSSStyles = exports.mbeExtensionWrapperCSSStyles = (0, _r
     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/cjs/lists/flatten-list.js

@@ -15,6 +15,10 @@ exports.flattenList = flattenList;
  * 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.
  */
 function flattenList(options, predicates) {
   var doc = options.doc,

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.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/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.32.3";
+var packageVersion = "116.33.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

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

@@ -175,6 +175,16 @@ export const 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/es2019/extensibility/Extension/Extension/index.js

@@ -40,7 +40,6 @@ function ExtensionWithPluginState(props) {
     hideFrame,
     editorAppearance,
     macroInteractionDesignFeatureFlags,
-    isNodeSelected,
     isNodeHovered,
     isNodeNested,
     setIsNodeHovered,
@@ -144,7 +143,6 @@ function ExtensionWithPluginState(props) {
     }
   };
   return jsx(Fragment, null, !showLegacyContentHeader && showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
-    isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,
     node: node,
@@ -196,7 +194,6 @@ function ExtensionWithPluginState(props) {
     ,
     className: headerClassNames
   }, !removeBorder && jsx(ExtensionLozenge, {
-    isNodeSelected: isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     pluginInjectionApi: pluginInjectionApi

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

@@ -53,7 +53,6 @@ const InlineExtension = props => {
     node,
     pluginInjectionApi,
     macroInteractionDesignFeatureFlags,
-    isNodeSelected,
     children,
     isNodeHovered,
     setIsNodeHovered,
@@ -94,7 +93,6 @@ const InlineExtension = props => {
   };
   const inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
     node: node,
-    isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     setIsNodeHovered: setIsNodeHovered,
@@ -119,7 +117,6 @@ const InlineExtension = props => {
     className: "extension-overlay"
   }), children ? children : jsx(ExtensionLozenge, {
     node: node,
-    isNodeSelected: isNodeSelected,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     pluginInjectionApi: pluginInjectionApi
   })));

package/dist/es2019/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/es2019/extensibility/Extension/Lozenge/ExtensionFloatingLabel.js

@@ -0,0 +1,22 @@
+/* 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';
+const floatingLabelStyles = {
+  base: "_2rkofajl _zulp1b66 _4cvr1h6o _bfhkvuon _16qsglyw _1e0c1txw _1bah1h6o _p12f11ux _tzy4kb7n _19bvu2gc _u5f3u2gc _kqswstnw _1xi2utpp _154i14id _3um0ewfl _1pbycs5v",
+  selected: "_bfhk15s3 _n3td1b66 _ca0q1b66 _154id439"
+};
+export const ExtensionFloatingLabel = ({
+  isSelected,
+  testId,
+  title
+}) => /*#__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/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -114,20 +114,17 @@ export const ExtensionLabel = ({
   extensionName,
   customContainerStyles,
   isNodeNested,
-  isNodeSelected,
   setIsNodeHovered,
   isBodiedMacro,
   showUpdatedLivePages1PBodiedExtensionUI,
   showLivePagesBodiedMacrosRendererView,
   showBodiedExtensionRendererView,
-  pluginInjectionApi: _pluginInjectionApi,
-  isMultiBodiedMacro
+  pluginInjectionApi: _pluginInjectionApi
 }) => {
   const isInlineExtension = extensionName === 'inlineExtension';
   const showDefaultBodiedStyles = isBodiedMacro;
-  const shouldUseMultiBodiedMacroPresentation = isMultiBodiedMacro && expValEquals('confluence_native_tabs_experiment', 'isEnabled', true);
   const containerClassNames = classnames({
-    bodied: isBodiedMacro && !shouldUseMultiBodiedMacroPresentation
+    bodied: isBodiedMacro
   });
   const labelClassNames = classnames('extension-label', {
     nested: isNodeNested,
@@ -138,8 +135,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 || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension && !isNodeNested,
-    'remove-nested-left-margin': isNodeNested && (!isBodiedMacro || shouldUseMultiBodiedMacroPresentation) && !isInlineExtension
+    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
   });
   const iconClassNames = classnames({
     'extension-icon': true
@@ -188,12 +185,12 @@ export const ExtensionLabel = ({
       // 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/es2019/extensibility/Extension/Lozenge/LozengeComponent.js

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

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

@@ -34,7 +34,6 @@ export default class ExtensionLozenge extends Component {
     _defineProperty(this, "renderFallback", lozengeData => {
       const {
         showMacroInteractionDesignUpdates,
-        isNodeSelected,
         isNodeHovered,
         isNodeNested,
         customContainerStyles,
@@ -44,8 +43,7 @@ export default class ExtensionLozenge extends Component {
         showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView,
-        pluginInjectionApi,
-        isMultiBodiedMacro
+        pluginInjectionApi
       } = this.props;
       const {
         parameters,
@@ -58,7 +56,6 @@ export default class ExtensionLozenge extends Component {
       const title = parameters && parameters.extensionTitle || parameters && parameters.macroMetadata && parameters.macroMetadata.title || extensionKey;
       return jsx(LozengeComponent, {
         isNodeHovered: isNodeHovered,
-        isNodeSelected: isNodeSelected,
         isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         extensionName: name,
@@ -73,8 +70,7 @@ export default class ExtensionLozenge extends Component {
         showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
-        pluginInjectionApi: pluginInjectionApi,
-        isMultiBodiedMacro: isMultiBodiedMacro
+        pluginInjectionApi: pluginInjectionApi
       });
     });
   }