@elastic/eui 113.2.0 → 113.3.0

package/optimize/lib/components/context_menu/context_menu_item.js

@@ -16,7 +16,7 @@ var _icon = require("../icon");
 var _tool_tip = require("../tool_tip");
 var _context_menu_item = require("./context_menu_item.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["children", "className", "hasPanel", "icon", "buttonRef", "disabled", "layoutAlign", "toolTipContent", "toolTipProps", "href", "target", "rel", "size"];
+var _excluded = ["children", "className", "hasPanel", "icon", "buttonRef", "disabled", "layoutAlign", "toolTipContent", "toolTipProps", "href", "target", "rel", "size", "color"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -47,12 +47,13 @@ var EuiContextMenuItem = exports.EuiContextMenuItem = function EuiContextMenuIte
     rel = _ref.rel,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'm' : _ref$size,
+    color = _ref.color,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var isHrefValid = !href || (0, _href_validator.validateHref)(href);
   var disabled = _disabled || !isHrefValid;
   var classes = (0, _classnames.default)('euiContextMenuItem', className);
   var styles = (0, _services.useEuiMemoizedStyles)(_context_menu_item.euiContextMenuItemStyles);
-  var cssStyles = [styles.euiContextMenuItem, styles.sizes[size], styles.layoutAlign[layoutAlign], disabled && styles.disabled];
+  var cssStyles = [styles.euiContextMenuItem, styles.sizes[size], styles.layoutAlign[layoutAlign], disabled && styles.disabled, !disabled && color && styles.colors[color]];
   var iconInstance = icon && (typeof icon === 'string' ? (0, _react2.jsx)(_icon.EuiIcon, {
     type: icon,
     size: "m",

package/optimize/lib/components/context_menu/context_menu_item.styles.js

@@ -81,6 +81,10 @@ var euiContextMenuItemStyles = exports.euiContextMenuItemStyles = function euiCo
       euiContextMenuItem__text: _ref2,
       s: /*#__PURE__*/(0, _react.css)((0, _global_styling.euiFontSize)(euiThemeContext, 's'), ";;label:s;")
     },
-    euiContextMenuItem__arrow: _ref
+    euiContextMenuItem__arrow: _ref,
+    // Colors - maps button color names to text color overrides
+    colors: Object.fromEntries(_global_styling.EXTENDED_BUTTON_COLORS.map(function (color) {
+      return [color, /*#__PURE__*/(0, _react.css)("color:", (0, _global_styling.euiButtonEmptyColor)(euiThemeContext, color).color, ";;label:colors;")];
+    }))
   };
 };

package/optimize/lib/components/date_picker/super_date_picker/time_window_buttons.js

@@ -160,11 +160,20 @@ var EuiTimeWindowButtons = exports.EuiTimeWindowButtons = function EuiTimeWindow
 function useEuiTimeWindow(start, end, apply, options) {
   var _options$zoomFactor;
   var min = _datemath.default.parse(start);
+
+  /* `roundUp: true` will result in an "inclusive" time (e.g. 23:59:59.999 for 'now/d').
+  It only changes the value for relative expressions (e.g. 'now/d') but not absolute ISO strings. */
   var max = _datemath.default.parse(end, {
     roundUp: true
   });
   var isInvalid = !min || !min.isValid() || !max || !max.isValid();
-  var windowDuration = isInvalid ? -1 : max.diff(min);
+  /* An end at .999ms is always considered an inclusive boundary (either as result of `roundUp: true`
+  or entered manually). 
+  To avoid a 1ms drift on every time window or zoom step, windowDuration has to be increased by 1ms.
+  This ensures the window is always at a clean boundary (e.g. 00:00:00.000 - 23:59:59.999). */
+  var isInclusiveBoundary = !isInvalid && max.milliseconds() === 999;
+  var endBoundary = !isInvalid ? isInclusiveBoundary ? (0, _moment.default)(max).add(1, 'ms') : (0, _moment.default)(max) : null;
+  var windowDuration = isInvalid || !endBoundary ? -1 : endBoundary.diff(min);
   var isWindowDurationZero = windowDuration === 0;
   var zoomFactor = getPercentageMultiplier((_options$zoomFactor = options === null || options === void 0 ? void 0 : options.zoomFactor) !== null && _options$zoomFactor !== void 0 ? _options$zoomFactor : ZOOM_FACTOR_DEFAULT);
   var zoomDelta = windowDuration * (zoomFactor / 2); // Gets added to each end, that's why it's split in half
@@ -185,7 +194,10 @@ function useEuiTimeWindow(start, end, apply, options) {
   function stepForward() {
     if (isInvalid || isWindowDurationZero) return;
     apply({
-      start: (0, _moment.default)(max).toISOString(),
+      /* Prevent 1ms drifts for inclusive boundaries by using the exclusive max (+ 1ms)
+      as the start of the next window (e.g. 00:00:00.000 instead of 23:59:59.999) */
+      start: (isInclusiveBoundary ? endBoundary // `!` is safe here because we early return on `isInvalid`
+      : (0, _moment.default)(max)).toISOString(),
       end: (0, _moment.default)(max).add(windowDuration, 'ms').toISOString()
     });
   }
@@ -193,7 +205,9 @@ function useEuiTimeWindow(start, end, apply, options) {
     if (isInvalid || isWindowDurationZero) return;
     apply({
       start: (0, _moment.default)(min).subtract(windowDuration, 'ms').toISOString(),
-      end: (0, _moment.default)(min).toISOString()
+      /* Prevent 1ms drifts for inclusive boundaries by using the exclusive min (- 1ms)
+      as the end of the previous window (e.g. 23:59:59.999 instead of 00:00:00.000) */
+      end: (isInclusiveBoundary ? (0, _moment.default)(min).subtract(1, 'ms') : (0, _moment.default)(min)).toISOString()
     });
   }
   function expandWindow() {

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", "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,40 +71,42 @@ 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,
+    _usePropsWithComponen13 = _usePropsWithComponen.pushAnimation,
+    pushAnimation = _usePropsWithComponen13 === void 0 ? false : _usePropsWithComponen13,
     _focusTrapProps = _usePropsWithComponen.focusTrapProps,
-    _usePropsWithComponen13 = _usePropsWithComponen.includeFixedHeadersInFocusTrap,
-    includeFixedHeadersInFocusTrap = _usePropsWithComponen13 === void 0 ? true : _usePropsWithComponen13,
+    _usePropsWithComponen14 = _usePropsWithComponen.includeFixedHeadersInFocusTrap,
+    includeFixedHeadersInFocusTrap = _usePropsWithComponen14 === void 0 ? true : _usePropsWithComponen14,
     includeSelectorInFocusTrap = _usePropsWithComponen.includeSelectorInFocusTrap,
     _ariaDescribedBy = _usePropsWithComponen['aria-describedby'],
     _ariaLabelledBy = _usePropsWithComponen['aria-labelledby'],
     id = _usePropsWithComponen.id,
-    _usePropsWithComponen14 = _usePropsWithComponen.resizable,
-    resizable = _usePropsWithComponen14 === void 0 ? false : _usePropsWithComponen14,
+    _usePropsWithComponen15 = _usePropsWithComponen.resizable,
+    resizable = _usePropsWithComponen15 === void 0 ? false : _usePropsWithComponen15,
     minWidth = _usePropsWithComponen.minWidth,
     onResize = _usePropsWithComponen.onResize,
     onAnimationEnd = _usePropsWithComponen.onAnimationEnd,
@@ -162,6 +164,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);
@@ -610,34 +627,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.
@@ -705,13 +694,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() {

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

@@ -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,7 +105,8 @@ 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,
@@ -135,7 +137,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,20 @@ 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 `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 iconType = arguments.length > 4 ? arguments[4] : undefined;
+  var minWidth = arguments.length > 5 ? arguments[5] : undefined;
   return {
     type: ACTION_ADD,
     flyoutId: flyoutId,
     title: title,
     level: level,
     size: size,
+    iconType: iconType,
     minWidth: minWidth
   };
 };
@@ -146,11 +149,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,6 +23,7 @@ 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"];
@@ -163,18 +164,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, _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, _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 +192,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 +225,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);