@elastic/eui 113.2.1 → 114.0.0

package/optimize/lib/components/flyout/_flyout_overlay.js

@@ -9,6 +9,7 @@ exports.EuiFlyoutOverlay = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _css = require("@emotion/css");
+var _services = require("../../services");
 var _overlay_mask = require("../overlay_mask");
 var _portal = require("../portal");
 var _react2 = require("@emotion/react");
@@ -26,8 +27,7 @@ var getEuiFlyoutOverlayStyles = function getEuiFlyoutOverlayStyles(zIndex) {
   /*
   This needs to have !important to override the default EuiOverlayMask
   z-index based on the headerZindexLocation prop. Using the style attribute
-  doesn't work since EuiOverlayMask requires a string style prop that
-  causes React errors in the test environment.
+  doesn't work since EuiOverlayMask requires the styles to be provided via className
   */
   return /*#__PURE__*/(0, _css.css)("z-index:", zIndex, "!important;;label:getEuiFlyoutOverlayStyles;");
 };
@@ -48,10 +48,39 @@ var EuiFlyoutOverlay = exports.EuiFlyoutOverlay = function EuiFlyoutOverlay(_ref
     hasOverlayMask = _ref.hasOverlayMask,
     maskZIndex = _ref.maskZIndex,
     _ref$headerZindexLoca = _ref.headerZindexLocation,
-    headerZindexLocation = _ref$headerZindexLoca === void 0 ? 'below' : _ref$headerZindexLoca;
+    headerZindexLocation = _ref$headerZindexLoca === void 0 ? 'below' : _ref$headerZindexLoca,
+    containerRect = _ref.containerRect;
   var styles = (0, _react.useMemo)(function () {
     return getEuiFlyoutOverlayStyles(maskZIndex);
   }, [maskZIndex]);
+
+  // Internal ref so we can apply containerRect positioning directly on the DOM
+  // node, avoiding new Emotion CSS class generation on every scroll/resize.
+  var internalMaskRef = (0, _react.useRef)(null);
+  var combinedMaskRef = (0, _services.useCombinedRefs)([internalMaskRef, maskProps === null || maskProps === void 0 ? void 0 : maskProps.maskRef]);
+  (0, _react.useEffect)(function () {
+    var node = internalMaskRef.current;
+    if (!node) return;
+
+    //  containerRect positioning must be applied via node.style.setProperty rather than
+    //  through the style prop - EuiOverlayMask requires styles to be passed via className
+    if (containerRect) {
+      node.style.setProperty('inset-block-start', "".concat(containerRect.top, "px"));
+      node.style.setProperty('inset-inline-start', "".concat(containerRect.left, "px"));
+      node.style.setProperty('inline-size', "".concat(containerRect.width, "px"));
+      node.style.setProperty('block-size', "".concat(containerRect.height, "px"));
+      node.style.setProperty('inset-inline-end', 'auto');
+      node.style.setProperty('inset-block-end', 'auto');
+    } else {
+      node.style.removeProperty('inset-block-start');
+      node.style.removeProperty('inset-inline-start');
+      node.style.removeProperty('inline-size');
+      node.style.removeProperty('block-size');
+      node.style.removeProperty('inset-inline-end');
+      node.style.removeProperty('inset-block-end');
+    }
+  }, [containerRect, hasOverlayMask]); // toggling ownFocus while the flyout is already open should cause re-render
+
   var content = children;
   if (!isPushed || hasOverlayMask) {
     content = (0, _react2.jsx)(_portal.EuiPortal, null, content);
@@ -60,6 +89,7 @@ var EuiFlyoutOverlay = exports.EuiFlyoutOverlay = function EuiFlyoutOverlay(_ref
   return (0, _react2.jsx)(_react.default.Fragment, null, hasOverlayMask && (0, _react2.jsx)(_overlay_mask.EuiOverlayMask, (0, _extends2.default)({
     headerZindexLocation: (_maskProps$headerZind = maskProps === null || maskProps === void 0 ? void 0 : maskProps.headerZindexLocation) !== null && _maskProps$headerZind !== void 0 ? _maskProps$headerZind : headerZindexLocation
   }, maskProps, {
+    maskRef: combinedMaskRef,
     className: classes
   })), content);
 };

package/optimize/lib/components/flyout/const.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FLYOUT_TYPES = exports.FLYOUT_SIZES = exports.FLYOUT_SIDES = exports.FLYOUT_PADDING_SIZES = exports.DEFAULT_TYPE = exports.DEFAULT_SIZE = exports.DEFAULT_SIDE = exports.DEFAULT_PUSH_MIN_BREAKPOINT = exports.DEFAULT_PADDING_SIZE = void 0;
+exports.MENU_DISPLAY_AUTO = exports.MENU_DISPLAY_ALWAYS = exports.FLYOUT_TYPES = exports.FLYOUT_SIZES = exports.FLYOUT_SIDES = exports.FLYOUT_PADDING_SIZES = exports.FLYOUT_MENU_DISPLAY_MODES = exports.DEFAULT_TYPE = exports.DEFAULT_SIZE = exports.DEFAULT_SIDE = exports.DEFAULT_PUSH_MIN_BREAKPOINT = exports.DEFAULT_PADDING_SIZE = exports.DEFAULT_MENU_DISPLAY_MODE = void 0;
 exports.isEuiFlyoutSizeNamed = isEuiFlyoutSizeNamed;
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -25,6 +25,14 @@ var FLYOUT_SIDES = exports.FLYOUT_SIDES = ['left', 'right'];
 var FLYOUT_SIZES = exports.FLYOUT_SIZES = ['s', 'm', 'l', 'fill'];
 /** Type representing a supported named flyout size. */
 
+/** Menu display mode: always render menu when flyoutMenuProps is provided. */
+var MENU_DISPLAY_ALWAYS = exports.MENU_DISPLAY_ALWAYS = 'always';
+/** Menu display mode: only render menu when it has content (back button, history, title, or custom actions). */
+var MENU_DISPLAY_AUTO = exports.MENU_DISPLAY_AUTO = 'auto';
+/** Allowed flyout menu display modes. */
+var FLYOUT_MENU_DISPLAY_MODES = exports.FLYOUT_MENU_DISPLAY_MODES = [MENU_DISPLAY_ALWAYS, MENU_DISPLAY_AUTO];
+/** Type representing a supported flyout menu display mode. */
+
 /** Allowed padding sizes for flyout content. */
 var FLYOUT_PADDING_SIZES = exports.FLYOUT_PADDING_SIZES = ['none', 's', 'm', 'l'];
 /** Type representing a supported flyout padding size. */
@@ -39,6 +47,8 @@ var DEFAULT_SIDE = exports.DEFAULT_SIDE = 'right';
 var DEFAULT_SIZE = exports.DEFAULT_SIZE = 'm';
 /** Default padding size inside flyouts. */
 var DEFAULT_PADDING_SIZE = exports.DEFAULT_PADDING_SIZE = 'l';
+/** Default flyout menu display mode. */
+var DEFAULT_MENU_DISPLAY_MODE = exports.DEFAULT_MENU_DISPLAY_MODE = MENU_DISPLAY_AUTO;
 
 /**
  * Custom type checker for named flyout sizes since the prop

package/optimize/lib/components/flyout/flyout.component.js

@@ -31,9 +31,9 @@ var _flyout_resize_button = require("./_flyout_resize_button");
 var _use_flyout_resizable = require("./use_flyout_resizable");
 var _use_flyout_z_index = require("./use_flyout_z_index");
 var _flyout_parent_context = require("./flyout_parent_context");
+var _use_flyout_menu = require("./use_flyout_menu");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "children", "as", "hideCloseButton", "flyoutMenuProps", "closeButtonProps", "closeButtonPosition", "onClose", "ownFocus", "side", "size", "paddingSize", "maxWidth", "style", "hasChildBackground", "maskProps", "type", "outsideClickCloses", "pushMinBreakpoint", "pushAnimation", "focusTrapProps", "includeFixedHeadersInFocusTrap", "includeSelectorInFocusTrap", "aria-describedby", "aria-labelledby", "id", "resizable", "minWidth", "onResize", "onAnimationEnd", "container"],
-  _excluded2 = ["titleId"];
+var _excluded = ["className", "children", "as", "hideCloseButton", "flyoutMenuProps", "flyoutMenuDisplayMode", "closeButtonProps", "closeButtonPosition", "onClose", "ownFocus", "side", "size", "paddingSize", "maxWidth", "style", "hasChildBackground", "maskProps", "type", "outsideClickCloses", "pushMinBreakpoint", "pushAnimation", "hasAnimation", "focusTrapProps", "includeFixedHeadersInFocusTrap", "includeSelectorInFocusTrap", "aria-describedby", "aria-labelledby", "id", "resizable", "minWidth", "onResize", "onAnimationEnd", "container"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -71,31 +71,33 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
     _usePropsWithComponen2 = _usePropsWithComponen.hideCloseButton,
     hideCloseButton = _usePropsWithComponen2 === void 0 ? false : _usePropsWithComponen2,
     _flyoutMenuProps = _usePropsWithComponen.flyoutMenuProps,
+    _usePropsWithComponen3 = _usePropsWithComponen.flyoutMenuDisplayMode,
+    flyoutMenuDisplayMode = _usePropsWithComponen3 === void 0 ? _const2.DEFAULT_MENU_DISPLAY_MODE : _usePropsWithComponen3,
     closeButtonProps = _usePropsWithComponen.closeButtonProps,
-    _usePropsWithComponen3 = _usePropsWithComponen.closeButtonPosition,
-    closeButtonPosition = _usePropsWithComponen3 === void 0 ? 'inside' : _usePropsWithComponen3,
+    _usePropsWithComponen4 = _usePropsWithComponen.closeButtonPosition,
+    closeButtonPosition = _usePropsWithComponen4 === void 0 ? 'inside' : _usePropsWithComponen4,
     onClose = _usePropsWithComponen.onClose,
-    _usePropsWithComponen4 = _usePropsWithComponen.ownFocus,
-    ownFocus = _usePropsWithComponen4 === void 0 ? true : _usePropsWithComponen4,
-    _usePropsWithComponen5 = _usePropsWithComponen.side,
-    side = _usePropsWithComponen5 === void 0 ? _const2.DEFAULT_SIDE : _usePropsWithComponen5,
-    _usePropsWithComponen6 = _usePropsWithComponen.size,
-    _size = _usePropsWithComponen6 === void 0 ? _const2.DEFAULT_SIZE : _usePropsWithComponen6,
-    _usePropsWithComponen7 = _usePropsWithComponen.paddingSize,
-    paddingSize = _usePropsWithComponen7 === void 0 ? _const2.DEFAULT_PADDING_SIZE : _usePropsWithComponen7,
-    _usePropsWithComponen8 = _usePropsWithComponen.maxWidth,
-    maxWidth = _usePropsWithComponen8 === void 0 ? false : _usePropsWithComponen8,
+    _usePropsWithComponen5 = _usePropsWithComponen.ownFocus,
+    ownFocus = _usePropsWithComponen5 === void 0 ? true : _usePropsWithComponen5,
+    _usePropsWithComponen6 = _usePropsWithComponen.side,
+    side = _usePropsWithComponen6 === void 0 ? _const2.DEFAULT_SIDE : _usePropsWithComponen6,
+    _usePropsWithComponen7 = _usePropsWithComponen.size,
+    _size = _usePropsWithComponen7 === void 0 ? _const2.DEFAULT_SIZE : _usePropsWithComponen7,
+    _usePropsWithComponen8 = _usePropsWithComponen.paddingSize,
+    paddingSize = _usePropsWithComponen8 === void 0 ? _const2.DEFAULT_PADDING_SIZE : _usePropsWithComponen8,
+    _usePropsWithComponen9 = _usePropsWithComponen.maxWidth,
+    maxWidth = _usePropsWithComponen9 === void 0 ? false : _usePropsWithComponen9,
     style = _usePropsWithComponen.style,
-    _usePropsWithComponen9 = _usePropsWithComponen.hasChildBackground,
-    hasChildBackground = _usePropsWithComponen9 === void 0 ? false : _usePropsWithComponen9,
+    _usePropsWithComponen10 = _usePropsWithComponen.hasChildBackground,
+    hasChildBackground = _usePropsWithComponen10 === void 0 ? false : _usePropsWithComponen10,
     maskProps = _usePropsWithComponen.maskProps,
-    _usePropsWithComponen10 = _usePropsWithComponen.type,
-    type = _usePropsWithComponen10 === void 0 ? _const2.DEFAULT_TYPE : _usePropsWithComponen10,
+    _usePropsWithComponen11 = _usePropsWithComponen.type,
+    type = _usePropsWithComponen11 === void 0 ? _const2.DEFAULT_TYPE : _usePropsWithComponen11,
     outsideClickCloses = _usePropsWithComponen.outsideClickCloses,
-    _usePropsWithComponen11 = _usePropsWithComponen.pushMinBreakpoint,
-    pushMinBreakpoint = _usePropsWithComponen11 === void 0 ? _const2.DEFAULT_PUSH_MIN_BREAKPOINT : _usePropsWithComponen11,
-    _usePropsWithComponen12 = _usePropsWithComponen.pushAnimation,
-    pushAnimation = _usePropsWithComponen12 === void 0 ? false : _usePropsWithComponen12,
+    _usePropsWithComponen12 = _usePropsWithComponen.pushMinBreakpoint,
+    pushMinBreakpoint = _usePropsWithComponen12 === void 0 ? _const2.DEFAULT_PUSH_MIN_BREAKPOINT : _usePropsWithComponen12,
+    _pushAnimation = _usePropsWithComponen.pushAnimation,
+    _hasAnimation = _usePropsWithComponen.hasAnimation,
     _focusTrapProps = _usePropsWithComponen.focusTrapProps,
     _usePropsWithComponen13 = _usePropsWithComponen.includeFixedHeadersInFocusTrap,
     includeFixedHeadersInFocusTrap = _usePropsWithComponen13 === void 0 ? true : _usePropsWithComponen13,
@@ -111,6 +113,8 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
     containerProp = _usePropsWithComponen.container,
     rest = (0, _objectWithoutProperties2.default)(_usePropsWithComponen, _excluded);
   var container = resolveContainer(containerProp);
+  var hasAnimationDefault = type === 'overlay';
+  var hasAnimation = _hasAnimation !== null && _hasAnimation !== void 0 ? _hasAnimation : hasAnimationDefault;
   var _useEuiThemeCSSVariab = (0, _services.useEuiThemeCSSVariables)(),
     setGlobalCSSVariables = _useEuiThemeCSSVariab.setGlobalCSSVariables;
   var Element = as || defaultElement;
@@ -162,6 +166,21 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
   var layoutMode = (_managerState$layoutM = managerState === null || managerState === void 0 ? void 0 : managerState.layoutMode) !== null && _managerState$layoutM !== void 0 ? _managerState$layoutM : _const.LAYOUT_MODE_SIDE_BY_SIDE;
   var isActiveManagedFlyout = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.mainFlyoutId) === flyoutId || (currentSession === null || currentSession === void 0 ? void 0 : currentSession.childFlyoutId) === flyoutId;
   var currentZIndexRef = (0, _react.useRef)((_managerState$current = managerState === null || managerState === void 0 ? void 0 : managerState.currentZIndex) !== null && _managerState$current !== void 0 ? _managerState$current : 0);
+  var _useEuiFlyoutMenu = (0, _use_flyout_menu.useEuiFlyoutMenu)({
+      flyoutMenuProps: _flyoutMenuProps,
+      flyoutMenuDisplayMode: flyoutMenuDisplayMode,
+      ariaLabelledBy: _ariaLabelledBy
+    }),
+    flyoutMenuId = _useEuiFlyoutMenu.flyoutMenuId,
+    flyoutMenuProps = _useEuiFlyoutMenu.flyoutMenuProps,
+    shouldRenderMenu = _useEuiFlyoutMenu.shouldRenderMenu,
+    ariaLabelledBy = _useEuiFlyoutMenu.ariaLabelledBy;
+  (0, _react.useEffect)(function () {
+    if (process.env.NODE_ENV === 'development' && _flyoutMenuProps && 'hideTitle' in _flyoutMenuProps) {
+      console.warn('EuiFlyout: `flyoutMenuProps.hideTitle` is deprecated. Use `EuiFlyoutHeader` for visible titles instead.');
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   // Use a ref to access the latest flyoutManager without triggering effect re-runs
   var flyoutManagerRef = (0, _react.useRef)(flyoutManager);
@@ -516,7 +535,7 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
     return _objectSpread(_objectSpread(_objectSpread({}, style), composedStyles), containerPositionStyles);
   }, [style, size, layoutMode, siblingFlyoutId, siblingFlyoutWidth, maxWidth, flyoutZIndex, containerRect, side, isChildFlyout]);
   var styles = (0, _services.useEuiMemoizedStyles)(_flyout.euiFlyoutStyles);
-  var cssStyles = [styles.euiFlyout, styles.paddingSizes[paddingSize], (0, _const2.isEuiFlyoutSizeNamed)(size) && styles[size], maxWidth === false && styles.noMaxWidth, isPushed ? styles.push.push : styles.overlay.overlay, isPushed ? styles.push[side] : styles.overlay[side], isPushed && !pushAnimation && styles.push.noAnimation, styles[side]];
+  var cssStyles = [styles.euiFlyout, styles.paddingSizes[paddingSize], (0, _const2.isEuiFlyoutSizeNamed)(size) && styles[size], maxWidth === false && styles.noMaxWidth, isPushed ? styles.push.push : styles.overlay.overlay, isPushed ? styles.push[side] : styles.overlay[side], !hasAnimation && styles.noAnimation, styles[side]];
   var classes = (0, _classnames.default)('euiFlyout', isChildFlyout && hasChildBackground && 'euiFlyout--hasChildBackground', className);
   var flyoutToggle = (0, _react.useRef)(document.activeElement);
   var _useState5 = (0, _react.useState)([]),
@@ -610,34 +629,6 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
     })));
   }, [hasOverlayMask, descriptionId, focusTrapShards.length]);
 
-  /*
-   * If the flyout menu is to be rendered, ensure the flyout has aria-labelledby referencing the menu's titleId
-   */
-  var generatedMenuId = (0, _services.useGeneratedHtmlId)();
-  var _ref = _flyoutMenuProps || {},
-    _titleId = _ref.titleId,
-    flyoutMenuProps = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
-  var hasMenu = !!_flyoutMenuProps;
-  var flyoutMenuId = (0, _react.useMemo)(function () {
-    if (!hasMenu) return undefined;
-    return _titleId || generatedMenuId;
-  }, [hasMenu, _titleId, generatedMenuId]);
-
-  // If the flyout level is LEVEL_MAIN, the title should be hidden by default
-  var flyoutMenuHideTitle = (0, _react.useMemo)(function () {
-    if (!hasMenu) return undefined;
-    if ((_flyoutMenuProps === null || _flyoutMenuProps === void 0 ? void 0 : _flyoutMenuProps.hideTitle) !== undefined) {
-      return _flyoutMenuProps.hideTitle;
-    }
-    return (currentSession === null || currentSession === void 0 ? void 0 : currentSession.mainFlyoutId) === flyoutId;
-  }, [hasMenu, _flyoutMenuProps, currentSession, flyoutId]);
-  var ariaLabelledBy = (0, _react.useMemo)(function () {
-    if (flyoutMenuId) {
-      return (0, _classnames.default)(flyoutMenuId, _ariaLabelledBy);
-    }
-    return _ariaLabelledBy;
-  }, [flyoutMenuId, _ariaLabelledBy]);
-
   /*
    * Trap focus even when `ownFocus={false}`, otherwise closing
    * the flyout won't return focus to the originating button.
@@ -680,8 +671,10 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
     isPushed: isPushed,
     maskZIndex: maskZIndex,
     headerZindexLocation: effectiveHeaderZindexLocation,
+    containerRect: containerRect,
     maskProps: _objectSpread(_objectSpread({}, maskProps), {}, {
-      maskRef: maskCombinedRefs
+      maskRef: maskCombinedRefs,
+      hasAnimation: hasAnimation
     })
   }, (0, _react2.jsx)(_services.EuiWindowEvent, {
     event: "keydown",
@@ -705,13 +698,12 @@ var EuiFlyoutComponent = exports.EuiFlyoutComponent = /*#__PURE__*/(0, _react.fo
     "aria-labelledby": ariaLabelledBy,
     "data-autofocus": !isPushed || undefined,
     onAnimationEnd: onAnimationEnd
-  }), !isPushed && screenReaderDescription, !_flyoutMenuProps && !hideCloseButton && (0, _react2.jsx)(_flyout_close_button.EuiFlyoutCloseButton, (0, _extends2.default)({}, closeButtonProps, {
+  }), !isPushed && screenReaderDescription, shouldRenderMenu ? (0, _react2.jsx)(_flyout_menu.EuiFlyoutMenu, (0, _extends2.default)({}, flyoutMenuProps, {
+    titleId: flyoutMenuId
+  })) : !hideCloseButton && (0, _react2.jsx)(_flyout_close_button.EuiFlyoutCloseButton, (0, _extends2.default)({}, closeButtonProps, {
     onClose: handleClose,
     closeButtonPosition: closeButtonPosition,
     side: side
-  })), _flyoutMenuProps && (0, _react2.jsx)(_flyout_menu.EuiFlyoutMenu, (0, _extends2.default)({}, flyoutMenuProps, {
-    hideTitle: flyoutMenuHideTitle,
-    titleId: flyoutMenuId
   })), resizable && (0, _react2.jsx)(_flyout_resize_button.EuiFlyoutResizeButton, {
     type: type,
     side: side,

package/optimize/lib/components/flyout/flyout.js

@@ -6,6 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EuiFlyout = void 0;
+Object.defineProperty(exports, "FLYOUT_MENU_DISPLAY_MODES", {
+  enumerable: true,
+  get: function get() {
+    return _const2.FLYOUT_MENU_DISPLAY_MODES;
+  }
+});
 Object.defineProperty(exports, "FLYOUT_PADDING_SIZES", {
   enumerable: true,
   get: function get() {
@@ -41,7 +47,7 @@ var _flyout_parent_context = require("./flyout_parent_context");
 var _const = require("./manager/const");
 var _react2 = require("@emotion/react");
 var _const2 = require("./const");
-var _excluded = ["as", "onClose", "onActive", "session"];
+var _excluded = ["as", "onClose", "onActive", "session", "historyKey"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -57,6 +63,7 @@ var EuiFlyout = exports.EuiFlyout = /*#__PURE__*/(0, _react.forwardRef)(function
     onClose = _usePropsWithComponen.onClose,
     onActive = _usePropsWithComponen.onActive,
     session = _usePropsWithComponen.session,
+    historyKey = _usePropsWithComponen.historyKey,
     rest = (0, _objectWithoutProperties2.default)(_usePropsWithComponen, _excluded);
   var hasActiveSession = (0, _manager.useHasActiveSession)();
   var isInsideParentFlyout = (0, _flyout_parent_context.useIsInsideParentFlyout)();
@@ -83,6 +90,7 @@ var EuiFlyout = exports.EuiFlyout = /*#__PURE__*/(0, _react.forwardRef)(function
         return null;
       }
       return (0, _react2.jsx)(_manager.EuiFlyoutMain, (0, _extends2.default)({}, rest, {
+        historyKey: historyKey,
         onClose: onClose,
         onActive: onActive,
         as: "div",
@@ -93,6 +101,7 @@ var EuiFlyout = exports.EuiFlyout = /*#__PURE__*/(0, _react.forwardRef)(function
     // session=inherit: auto-join existing session as child
     if (hasActiveSession && effectiveSession === _const.SESSION_INHERIT) {
       return (0, _react2.jsx)(_manager.EuiFlyoutChild, (0, _extends2.default)({}, rest, {
+        historyKey: historyKey,
         onClose: onClose,
         onActive: onActive,
         as: "div",

package/optimize/lib/components/flyout/flyout.styles.js

@@ -74,9 +74,9 @@ var euiFlyoutStyles = exports.euiFlyoutStyles = function euiFlyoutStyles(euiThem
     push: {
       push: /*#__PURE__*/(0, _react.css)("clip-path:none;z-index:", Number(euiTheme.levels.flyout) - 1, ";;label:push;"),
       right: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('border-left', euiTheme.border.thick), ";;label:right;"),
-      left: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('border-right', euiTheme.border.thick), ";;label:left;"),
-      noAnimation: _ref
+      left: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('border-right', euiTheme.border.thick), ";;label:left;")
     },
+    noAnimation: _ref,
     // Padding
     paddingSizes: {
       none: /*#__PURE__*/(0, _react.css)(composeFlyoutPadding(euiThemeContext, 'none'), ";;label:none;"),

package/optimize/lib/components/flyout/flyout_menu.js

@@ -22,7 +22,7 @@ var _flyout_menu = require("./flyout_menu.styles");
 var _flyout_menu_context = require("./flyout_menu_context");
 var _i18n = require("../i18n");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "title", "titleId", "hideTitle", "hideCloseButton", "historyItems", "showBackButton", "backButtonProps", "customActions"];
+var _excluded = ["className", "title", "titleId", "hideTitle", "hideCloseButton", "historyItems", "showBackButton", "backButtonProps", "customActions", "iconType"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -81,6 +81,7 @@ var HistoryPopover = function HistoryPopover(_ref) {
     return (0, _react2.jsx)(_list_group.EuiListGroupItem, {
       key: "history-item-".concat(index),
       label: item.title,
+      iconType: item.iconType,
       size: "s",
       onClick: function onClick() {
         item.onClick();
@@ -104,13 +105,15 @@ var EuiFlyoutMenu = exports.EuiFlyoutMenu = function EuiFlyoutMenu(_ref2) {
   var className = _ref2.className,
     title = _ref2.title,
     titleId = _ref2.titleId,
-    hideTitle = _ref2.hideTitle,
+    _ref2$hideTitle = _ref2.hideTitle,
+    hideTitle = _ref2$hideTitle === void 0 ? true : _ref2$hideTitle,
     hideCloseButton = _ref2.hideCloseButton,
     _ref2$historyItems = _ref2.historyItems,
     historyItems = _ref2$historyItems === void 0 ? [] : _ref2$historyItems,
     showBackButton = _ref2.showBackButton,
     backButtonProps = _ref2.backButtonProps,
     customActions = _ref2.customActions,
+    _iconType = _ref2.iconType,
     rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
   var _useContext = (0, _react.useContext)(_flyout_menu_context.EuiFlyoutMenuContext),
     onClose = _useContext.onClose;
@@ -135,7 +138,8 @@ var EuiFlyoutMenu = exports.EuiFlyoutMenu = function EuiFlyoutMenu(_ref2) {
   });
   return (0, _react2.jsx)("div", (0, _extends2.default)({
     className: classes,
-    css: styles.euiFlyoutMenu__container
+    css: styles.euiFlyoutMenu__container,
+    "data-test-subj": "euiFlyoutMenu"
   }, rest), (0, _react2.jsx)(_flex.EuiFlexGroup, {
     alignItems: "center",
     justifyContent: "spaceBetween",

package/optimize/lib/components/flyout/manager/actions.js

@@ -60,7 +60,7 @@ var ACTION_CLOSE_UNMANAGED_FLYOUT = exports.ACTION_CLOSE_UNMANAGED_FLYOUT = "".c
 
 /** Go back one session (remove current session from stack). */
 
-/** Navigate to a specific flyout (remove all sessions after it). */
+/** Navigate to a specific flyout (remove all sessions after it, or pop to child in history). */
 
 /** Set push padding offset for a specific side. */
 
@@ -75,17 +75,23 @@ var ACTION_CLOSE_UNMANAGED_FLYOUT = exports.ACTION_CLOSE_UNMANAGED_FLYOUT = "".c
  * - `title` is used for the flyout menu.
  * - `level` determines whether the flyout is `main` or `child`.
  * - Optional `size` is the named EUI size (e.g. `s`, `m`, `l`).
+ * - Optional `historyKey` (Symbol) scopes history; only flyouts with the same reference share Back/history. Omit for a unique group per session.
+ * - Optional `iconType` is shown next to the session title in the history menu.
  */
 var addFlyout = exports.addFlyout = function addFlyout(flyoutId, title) {
   var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _const.LEVEL_MAIN;
   var size = arguments.length > 3 ? arguments[3] : undefined;
-  var minWidth = arguments.length > 4 ? arguments[4] : undefined;
+  var historyKey = arguments.length > 4 ? arguments[4] : undefined;
+  var iconType = arguments.length > 5 ? arguments[5] : undefined;
+  var minWidth = arguments.length > 6 ? arguments[6] : undefined;
   return {
     type: ACTION_ADD,
     flyoutId: flyoutId,
     title: title,
     level: level,
     size: size,
+    historyKey: historyKey,
+    iconType: iconType,
     minWidth: minWidth
   };
 };
@@ -146,11 +152,12 @@ var goBack = exports.goBack = function goBack() {
   };
 };
 
-/** Navigate to a specific flyout (remove all sessions after it). */
-var goToFlyout = exports.goToFlyout = function goToFlyout(flyoutId) {
+/** Navigate to a specific flyout (remove all sessions after it, or pop to child in history when level === 'child'). */
+var goToFlyout = exports.goToFlyout = function goToFlyout(flyoutId, level) {
   return {
     type: ACTION_GO_TO_FLYOUT,
-    flyoutId: flyoutId
+    flyoutId: flyoutId,
+    level: level
   };
 };
 

package/optimize/lib/components/flyout/manager/flyout_managed.js

@@ -23,9 +23,10 @@ var _context = require("./context");
 var _flyout_managed = require("./flyout_managed.styles");
 var _hooks = require("./hooks");
 var _selectors = require("./selectors");
+var _store = require("./store");
 var _validation = require("./validation");
 var _react2 = require("@emotion/react");
-var _excluded = ["id", "onClose", "onActive", "level", "size", "minWidth", "css", "flyoutMenuProps"];
+var _excluded = ["id", "onClose", "onActive", "level", "size", "minWidth", "historyKey", "css", "flyoutMenuProps"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -65,6 +66,7 @@ var EuiManagedFlyout = exports.EuiManagedFlyout = /*#__PURE__*/(0, _react.forwar
     level = _ref.level,
     sizeProp = _ref.size,
     minWidth = _ref.minWidth,
+    historyKey = _ref.historyKey,
     customCss = _ref.css,
     _flyoutMenuProps = _ref.flyoutMenuProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
@@ -163,18 +165,23 @@ var EuiManagedFlyout = exports.EuiManagedFlyout = /*#__PURE__*/(0, _react.forwar
   // Register with flyout manager context when open, remove when closed
   // Using useLayoutEffect to run synchronously before DOM updates
   (0, _react.useLayoutEffect)(function () {
-    addFlyout(flyoutId, title, level, size, typeof minWidth === 'number' ? minWidth : undefined);
+    addFlyout(flyoutId, title, level, size, level === _const.LEVEL_MAIN ? historyKey : undefined, _flyoutMenuProps === null || _flyoutMenuProps === void 0 ? void 0 : _flyoutMenuProps.iconType, typeof minWidth === 'number' ? minWidth : undefined);
     return function () {
-      // Only call closeFlyout if it wasn't already called via onClose
-      // This prevents duplicate removal when using Escape/X button
-      if (flyoutExistsInManagerRef.current) {
+      var currentStoreState = (0, _store.getFlyoutManagerStore)().getState();
+      var stillInStore = currentStoreState.flyouts.some(function (f) {
+        return f.flyoutId === flyoutId;
+      });
+      if (stillInStore) {
+        // Normal cleanup (deps changed or explicit close via isOpen=false)
         level === _const.LEVEL_MAIN ? closeAllFlyouts() : closeFlyout(flyoutId);
+      } else if (wasRegisteredRef.current) {
+        var _onCloseCallbackRef$c;
+        // Cascade close: was registered but removed externally (e.g. main closed)
+        (_onCloseCallbackRef$c = onCloseCallbackRef.current) === null || _onCloseCallbackRef$c === void 0 || _onCloseCallbackRef$c.call(onCloseCallbackRef, new MouseEvent('navigation'));
       }
-
-      // Reset navigation tracking when explicitly closed via isOpen=false
       wasRegisteredRef.current = false;
     };
-  }, [flyoutId, title, level, size, minWidth, addFlyout, closeFlyout, closeAllFlyouts]);
+  }, [flyoutId, title, level, size, minWidth, historyKey, _flyoutMenuProps === null || _flyoutMenuProps === void 0 ? void 0 : _flyoutMenuProps.iconType, addFlyout, closeFlyout, closeAllFlyouts]);
 
   // Detect when flyout has been removed from manager state (e.g., via Back button)
   // and trigger onClose callback to notify the parent component
@@ -186,8 +193,8 @@ var EuiManagedFlyout = exports.EuiManagedFlyout = /*#__PURE__*/(0, _react.forwar
     // If flyout was previously registered, is marked as open, but no longer exists in manager state,
     // it was removed via navigation (Back button) - trigger close callback
     if (wasRegisteredRef.current && !flyoutExistsInManager) {
-      var _onCloseCallbackRef$c;
-      (_onCloseCallbackRef$c = onCloseCallbackRef.current) === null || _onCloseCallbackRef$c === void 0 || _onCloseCallbackRef$c.call(onCloseCallbackRef, new MouseEvent('navigation'));
+      var _onCloseCallbackRef$c2;
+      (_onCloseCallbackRef$c2 = onCloseCallbackRef.current) === null || _onCloseCallbackRef$c2 === void 0 || _onCloseCallbackRef$c2.call(onCloseCallbackRef, new MouseEvent('navigation'));
       wasRegisteredRef.current = false; // Reset to avoid repeated calls
     }
   }, [flyoutExistsInManager, flyoutId]);
@@ -219,8 +226,7 @@ var EuiManagedFlyout = exports.EuiManagedFlyout = /*#__PURE__*/(0, _react.forwar
     (0, _reactDom.flushSync)(function () {
       level === _const.LEVEL_MAIN ? closeAllFlyouts() : closeFlyout(flyoutId);
     });
-
-    // trigger parent callback, unmounts the component
+    wasRegisteredRef.current = false; // Prevent cleanup from double-firing onClose
     if (onCloseCallbackRef.current) {
       var event = e || new MouseEvent('click');
       onCloseCallbackRef.current(event);