@elastic/eui 113.2.1 → 114.0.0

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

@@ -3,8 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-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"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
@@ -29,7 +28,7 @@ import { EuiScreenReaderOnly } from '../accessibility';
 import { EuiFlyoutCloseButton } from './_flyout_close_button';
 import { euiFlyoutStyles, composeFlyoutInlineStyles } from './flyout.styles';
 import { usePropsWithComponentDefaults } from '../provider/component_defaults';
-import { DEFAULT_PADDING_SIZE, DEFAULT_PUSH_MIN_BREAKPOINT, DEFAULT_SIDE, DEFAULT_SIZE, DEFAULT_TYPE, isEuiFlyoutSizeNamed } from './const';
+import { DEFAULT_MENU_DISPLAY_MODE, DEFAULT_PADDING_SIZE, DEFAULT_PUSH_MIN_BREAKPOINT, DEFAULT_SIDE, DEFAULT_SIZE, DEFAULT_TYPE, isEuiFlyoutSizeNamed } from './const';
 import { useIsPushed } from './hooks';
 import { EuiFlyoutMenu } from './flyout_menu';
 import { EuiFlyoutOverlay } from './_flyout_overlay';
@@ -37,6 +36,7 @@ import { EuiFlyoutResizeButton } from './_flyout_resize_button';
 import { useEuiFlyoutResizable } from './use_flyout_resizable';
 import { useEuiFlyoutZIndex } from './use_flyout_z_index';
 import { EuiFlyoutParentProvider } from './flyout_parent_context';
+import { useEuiFlyoutMenu } from './use_flyout_menu';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 /**
  * Resolves the container prop (element, getter, or selector string) to an
@@ -63,31 +63,33 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
     _usePropsWithComponen2 = _usePropsWithComponen.hideCloseButton,
     hideCloseButton = _usePropsWithComponen2 === void 0 ? false : _usePropsWithComponen2,
     _flyoutMenuProps = _usePropsWithComponen.flyoutMenuProps,
+    _usePropsWithComponen3 = _usePropsWithComponen.flyoutMenuDisplayMode,
+    flyoutMenuDisplayMode = _usePropsWithComponen3 === void 0 ? 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 ? DEFAULT_SIDE : _usePropsWithComponen5,
-    _usePropsWithComponen6 = _usePropsWithComponen.size,
-    _size = _usePropsWithComponen6 === void 0 ? DEFAULT_SIZE : _usePropsWithComponen6,
-    _usePropsWithComponen7 = _usePropsWithComponen.paddingSize,
-    paddingSize = _usePropsWithComponen7 === void 0 ? 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 ? DEFAULT_SIDE : _usePropsWithComponen6,
+    _usePropsWithComponen7 = _usePropsWithComponen.size,
+    _size = _usePropsWithComponen7 === void 0 ? DEFAULT_SIZE : _usePropsWithComponen7,
+    _usePropsWithComponen8 = _usePropsWithComponen.paddingSize,
+    paddingSize = _usePropsWithComponen8 === void 0 ? 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 ? DEFAULT_TYPE : _usePropsWithComponen10,
+    _usePropsWithComponen11 = _usePropsWithComponen.type,
+    type = _usePropsWithComponen11 === void 0 ? DEFAULT_TYPE : _usePropsWithComponen11,
     outsideClickCloses = _usePropsWithComponen.outsideClickCloses,
-    _usePropsWithComponen11 = _usePropsWithComponen.pushMinBreakpoint,
-    pushMinBreakpoint = _usePropsWithComponen11 === void 0 ? DEFAULT_PUSH_MIN_BREAKPOINT : _usePropsWithComponen11,
-    _usePropsWithComponen12 = _usePropsWithComponen.pushAnimation,
-    pushAnimation = _usePropsWithComponen12 === void 0 ? false : _usePropsWithComponen12,
+    _usePropsWithComponen12 = _usePropsWithComponen.pushMinBreakpoint,
+    pushMinBreakpoint = _usePropsWithComponen12 === void 0 ? DEFAULT_PUSH_MIN_BREAKPOINT : _usePropsWithComponen12,
+    _pushAnimation = _usePropsWithComponen.pushAnimation,
+    _hasAnimation = _usePropsWithComponen.hasAnimation,
     _focusTrapProps = _usePropsWithComponen.focusTrapProps,
     _usePropsWithComponen13 = _usePropsWithComponen.includeFixedHeadersInFocusTrap,
     includeFixedHeadersInFocusTrap = _usePropsWithComponen13 === void 0 ? true : _usePropsWithComponen13,
@@ -103,6 +105,8 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
     containerProp = _usePropsWithComponen.container,
     rest = _objectWithoutProperties(_usePropsWithComponen, _excluded);
   var container = resolveContainer(containerProp);
+  var hasAnimationDefault = type === 'overlay';
+  var hasAnimation = _hasAnimation !== null && _hasAnimation !== void 0 ? _hasAnimation : hasAnimationDefault;
   var _useEuiThemeCSSVariab = useEuiThemeCSSVariables(),
     setGlobalCSSVariables = _useEuiThemeCSSVariab.setGlobalCSSVariables;
   var Element = as || defaultElement;
@@ -154,6 +158,21 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
   var layoutMode = (_managerState$layoutM = managerState === null || managerState === void 0 ? void 0 : managerState.layoutMode) !== null && _managerState$layoutM !== void 0 ? _managerState$layoutM : 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 = useRef((_managerState$current = managerState === null || managerState === void 0 ? void 0 : managerState.currentZIndex) !== null && _managerState$current !== void 0 ? _managerState$current : 0);
+  var _useEuiFlyoutMenu = useEuiFlyoutMenu({
+      flyoutMenuProps: _flyoutMenuProps,
+      flyoutMenuDisplayMode: flyoutMenuDisplayMode,
+      ariaLabelledBy: _ariaLabelledBy
+    }),
+    flyoutMenuId = _useEuiFlyoutMenu.flyoutMenuId,
+    flyoutMenuProps = _useEuiFlyoutMenu.flyoutMenuProps,
+    shouldRenderMenu = _useEuiFlyoutMenu.shouldRenderMenu,
+    ariaLabelledBy = _useEuiFlyoutMenu.ariaLabelledBy;
+  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 = useRef(flyoutManager);
@@ -508,7 +527,7 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
     return _objectSpread(_objectSpread(_objectSpread({}, style), composedStyles), containerPositionStyles);
   }, [style, size, layoutMode, siblingFlyoutId, siblingFlyoutWidth, maxWidth, flyoutZIndex, containerRect, side, isChildFlyout]);
   var styles = useEuiMemoizedStyles(euiFlyoutStyles);
-  var cssStyles = [styles.euiFlyout, styles.paddingSizes[paddingSize], 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], 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 = classnames('euiFlyout', isChildFlyout && hasChildBackground && 'euiFlyout--hasChildBackground', className);
   var flyoutToggle = useRef(document.activeElement);
   var _useState5 = useState([]),
@@ -602,34 +621,6 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
     })));
   }, [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 = useGeneratedHtmlId();
-  var _ref = _flyoutMenuProps || {},
-    _titleId = _ref.titleId,
-    flyoutMenuProps = _objectWithoutProperties(_ref, _excluded2);
-  var hasMenu = !!_flyoutMenuProps;
-  var flyoutMenuId = 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 = 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 = useMemo(function () {
-    if (flyoutMenuId) {
-      return classnames(flyoutMenuId, _ariaLabelledBy);
-    }
-    return _ariaLabelledBy;
-  }, [flyoutMenuId, _ariaLabelledBy]);
-
   /*
    * Trap focus even when `ownFocus={false}`, otherwise closing
    * the flyout won't return focus to the originating button.
@@ -672,8 +663,10 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
     isPushed: isPushed,
     maskZIndex: maskZIndex,
     headerZindexLocation: effectiveHeaderZindexLocation,
+    containerRect: containerRect,
     maskProps: _objectSpread(_objectSpread({}, maskProps), {}, {
-      maskRef: maskCombinedRefs
+      maskRef: maskCombinedRefs,
+      hasAnimation: hasAnimation
     })
   }, ___EmotionJSX(EuiWindowEvent, {
     event: "keydown",
@@ -697,13 +690,12 @@ export var EuiFlyoutComponent = /*#__PURE__*/forwardRef(function (props, ref) {
     "aria-labelledby": ariaLabelledBy,
     "data-autofocus": !isPushed || undefined,
     onAnimationEnd: onAnimationEnd
-  }), !isPushed && screenReaderDescription, !_flyoutMenuProps && !hideCloseButton && ___EmotionJSX(EuiFlyoutCloseButton, _extends({}, closeButtonProps, {
+  }), !isPushed && screenReaderDescription, shouldRenderMenu ? ___EmotionJSX(EuiFlyoutMenu, _extends({}, flyoutMenuProps, {
+    titleId: flyoutMenuId
+  })) : !hideCloseButton && ___EmotionJSX(EuiFlyoutCloseButton, _extends({}, closeButtonProps, {
     onClose: handleClose,
     closeButtonPosition: closeButtonPosition,
     side: side
-  })), _flyoutMenuProps && ___EmotionJSX(EuiFlyoutMenu, _extends({}, flyoutMenuProps, {
-    hideTitle: flyoutMenuHideTitle,
-    titleId: flyoutMenuId
   })), resizable && ___EmotionJSX(EuiFlyoutResizeButton, {
     type: type,
     side: side,

package/optimize/es/components/flyout/flyout.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-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
@@ -17,13 +17,14 @@ import { EuiFlyoutMenuContext } from './flyout_menu_context';
 import { useIsInsideParentFlyout } from './flyout_parent_context';
 import { SESSION_INHERIT, SESSION_NEVER, SESSION_START } from './manager/const';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-export { FLYOUT_SIDES, FLYOUT_PADDING_SIZES, FLYOUT_SIZES, FLYOUT_TYPES } from './const';
+export { FLYOUT_SIDES, FLYOUT_PADDING_SIZES, FLYOUT_SIZES, FLYOUT_TYPES, FLYOUT_MENU_DISPLAY_MODES } from './const';
 export var EuiFlyout = /*#__PURE__*/forwardRef(function (props, ref) {
   var _usePropsWithComponen = usePropsWithComponentDefaults('EuiFlyout', props),
     as = _usePropsWithComponen.as,
     onClose = _usePropsWithComponen.onClose,
     onActive = _usePropsWithComponen.onActive,
     session = _usePropsWithComponen.session,
+    historyKey = _usePropsWithComponen.historyKey,
     rest = _objectWithoutProperties(_usePropsWithComponen, _excluded);
   var hasActiveSession = useHasActiveSession();
   var isInsideParentFlyout = useIsInsideParentFlyout();
@@ -50,6 +51,7 @@ export var EuiFlyout = /*#__PURE__*/forwardRef(function (props, ref) {
         return null;
       }
       return ___EmotionJSX(EuiFlyoutMain, _extends({}, rest, {
+        historyKey: historyKey,
         onClose: onClose,
         onActive: onActive,
         as: "div",
@@ -60,6 +62,7 @@ export var EuiFlyout = /*#__PURE__*/forwardRef(function (props, ref) {
     // session=inherit: auto-join existing session as child
     if (hasActiveSession && effectiveSession === SESSION_INHERIT) {
       return ___EmotionJSX(EuiFlyoutChild, _extends({}, rest, {
+        historyKey: historyKey,
         onClose: onClose,
         onActive: onActive,
         as: "div",

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

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

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

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _extends from "@babel/runtime/helpers/extends";
-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
@@ -75,6 +75,7 @@ var HistoryPopover = function HistoryPopover(_ref) {
     return ___EmotionJSX(EuiListGroupItem, {
       key: "history-item-".concat(index),
       label: item.title,
+      iconType: item.iconType,
       size: "s",
       onClick: function onClick() {
         item.onClick();
@@ -98,13 +99,15 @@ export var 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 = _objectWithoutProperties(_ref2, _excluded);
   var _useContext = useContext(EuiFlyoutMenuContext),
     onClose = _useContext.onClose;
@@ -129,7 +132,8 @@ export var EuiFlyoutMenu = function EuiFlyoutMenu(_ref2) {
   });
   return ___EmotionJSX("div", _extends({
     className: classes,
-    css: styles.euiFlyoutMenu__container
+    css: styles.euiFlyoutMenu__container,
+    "data-test-subj": "euiFlyoutMenu"
   }, rest), ___EmotionJSX(EuiFlexGroup, {
     alignItems: "center",
     justifyContent: "spaceBetween",

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

@@ -54,7 +54,7 @@ export var ACTION_CLOSE_UNMANAGED_FLYOUT = "".concat(PREFIX, "/closeUnmanagedFly
 
 /** 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. */
 
@@ -69,17 +69,23 @@ export var ACTION_CLOSE_UNMANAGED_FLYOUT = "".concat(PREFIX, "/closeUnmanagedFly
  * - `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.
  */
 export var addFlyout = function addFlyout(flyoutId, title) {
   var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 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
   };
 };
@@ -140,11 +146,12 @@ export var goBack = function goBack() {
   };
 };
 
-/** Navigate to a specific flyout (remove all sessions after it). */
-export var goToFlyout = function goToFlyout(flyoutId) {
+/** Navigate to a specific flyout (remove all sessions after it, or pop to child in history when level === 'child'). */
+export var goToFlyout = function goToFlyout(flyoutId, level) {
   return {
     type: ACTION_GO_TO_FLYOUT,
-    flyoutId: flyoutId
+    flyoutId: flyoutId,
+    level: level
   };
 };
 

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["id", "onClose", "onActive", "level", "size", "minWidth", "css", "flyoutMenuProps"];
+var _excluded = ["id", "onClose", "onActive", "level", "size", "minWidth", "historyKey", "css", "flyoutMenuProps"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
@@ -26,6 +26,7 @@ import { EuiFlyoutIsManagedProvider } from './context';
 import { euiManagedFlyoutStyles } from './flyout_managed.styles';
 import { useFlyoutManager as _useFlyoutManager, useFlyoutId } from './hooks';
 import { useIsFlyoutRegistered } from './selectors';
+import { getFlyoutManagerStore } from './store';
 import { createValidationErrorMessage, isNamedSize, validateManagedFlyoutSize, validateSizeCombination } from './validation';
 
 /**
@@ -57,6 +58,7 @@ export var EuiManagedFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
     level = _ref.level,
     sizeProp = _ref.size,
     minWidth = _ref.minWidth,
+    historyKey = _ref.historyKey,
     customCss = _ref.css,
     _flyoutMenuProps = _ref.flyoutMenuProps,
     props = _objectWithoutProperties(_ref, _excluded);
@@ -155,18 +157,23 @@ export var EuiManagedFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // Register with flyout manager context when open, remove when closed
   // Using useLayoutEffect to run synchronously before DOM updates
   useLayoutEffect(function () {
-    addFlyout(flyoutId, title, level, size, typeof minWidth === 'number' ? minWidth : undefined);
+    addFlyout(flyoutId, title, level, size, level === 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 = 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 === 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
@@ -178,8 +185,8 @@ export var EuiManagedFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
     // 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]);
@@ -211,8 +218,7 @@ export var EuiManagedFlyout = /*#__PURE__*/forwardRef(function (_ref, ref) {
     flushSync(function () {
       level === 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);