@elastic/eui 113.2.1 → 113.3.0

package/lib/components/flyout/manager/reducer.js

@@ -82,16 +82,20 @@ function flyoutManagerReducer() {
     //   session exists, do nothing (invalid child without a parent).
     case _actions.ACTION_ADD:
       {
+        var _currentSession$child;
         var flyoutId = action.flyoutId,
           title = action.title,
           level = action.level,
           size = action.size,
+          iconType = action.iconType,
           minWidth = action.minWidth;
-
-        // Ignore duplicate registrations
-        if (state.flyouts.some(function (f) {
+        var isDuplicate = state.flyouts.some(function (f) {
           return f.flyoutId === flyoutId;
-        })) {
+        });
+        var isIdempotentChild = level === _const.LEVEL_CHILD && state.sessions.length > 0 && state.sessions[state.sessions.length - 1].childFlyoutId === flyoutId;
+
+        // Ignore duplicate registrations (except idempotent child re-registration after goBack)
+        if (isDuplicate && !isIdempotentChild) {
           return state;
         }
         var newFlyoutState = {
@@ -101,12 +105,14 @@ function flyoutManagerReducer() {
           minWidth: minWidth,
           activityStage: _const.STAGE_OPENING
         };
-        var newFlyouts = [].concat(_toConsumableArray(state.flyouts), [newFlyoutState]);
+        var newFlyouts = isIdempotentChild ? state.flyouts : [].concat(_toConsumableArray(state.flyouts), [newFlyoutState]);
         if (level === _const.LEVEL_MAIN) {
           var newSession = {
             mainFlyoutId: flyoutId,
             title: title,
+            iconType: iconType,
             childFlyoutId: null,
+            childHistory: [],
             zIndex: state.currentZIndex
           };
           return _objectSpread(_objectSpread({}, state), {}, {
@@ -123,8 +129,52 @@ function flyoutManagerReducer() {
         }
         var updatedSessions = _toConsumableArray(state.sessions);
         var currentSessionIndex = updatedSessions.length - 1;
-        updatedSessions[currentSessionIndex] = _objectSpread(_objectSpread({}, updatedSessions[currentSessionIndex]), {}, {
-          childFlyoutId: flyoutId
+        var currentSession = updatedSessions[currentSessionIndex];
+        var childHistory = (_currentSession$child = currentSession.childHistory) !== null && _currentSession$child !== void 0 ? _currentSession$child : [];
+
+        // Idempotent re-registration (e.g. after goBack): flyout already in flyouts and session already points to it
+        if (state.flyouts.some(function (f) {
+          return f.flyoutId === flyoutId;
+        })) {
+          if (currentSession.childFlyoutId === flyoutId) {
+            updatedSessions[currentSessionIndex] = _objectSpread(_objectSpread({}, currentSession), {}, {
+              childTitle: title,
+              childIconType: iconType,
+              childHistory: childHistory
+            });
+            return _objectSpread(_objectSpread({}, state), {}, {
+              sessions: updatedSessions
+            });
+          }
+          return state; // duplicate registration for a different child, ignore
+        }
+
+        // Session already has a child: push current child to history, then set new child (do not remove previous from flyouts)
+        if (currentSession.childFlyoutId) {
+          var _currentSession$child2;
+          var historyEntry = {
+            flyoutId: currentSession.childFlyoutId,
+            title: (_currentSession$child2 = currentSession.childTitle) !== null && _currentSession$child2 !== void 0 ? _currentSession$child2 : '',
+            iconType: currentSession.childIconType
+          };
+          updatedSessions[currentSessionIndex] = _objectSpread(_objectSpread({}, currentSession), {}, {
+            childHistory: [].concat(_toConsumableArray(childHistory), [historyEntry]),
+            childFlyoutId: flyoutId,
+            childTitle: title,
+            childIconType: iconType
+          });
+          return _objectSpread(_objectSpread({}, state), {}, {
+            sessions: updatedSessions,
+            flyouts: newFlyouts
+          });
+        }
+
+        // First child in session
+        updatedSessions[currentSessionIndex] = _objectSpread(_objectSpread({}, currentSession), {}, {
+          childFlyoutId: flyoutId,
+          childTitle: title,
+          childIconType: iconType,
+          childHistory: childHistory
         });
         return _objectSpread(_objectSpread({}, state), {}, {
           sessions: updatedSessions,
@@ -134,10 +184,11 @@ function flyoutManagerReducer() {
 
     // Unregister a flyout and update sessions accordingly.
     // - When closing a `main` flyout, drop its entire session and all associated flyouts.
-    // - When closing a `child` flyout, clear the child pointer on the most
-    //   recent session if it matches.
+    // - When closing a `child` flyout, find the session that owns it (childFlyoutId or
+    //   childHistory) and clear that session's child state so navigation back stays consistent.
     case _actions.ACTION_CLOSE:
       {
+        var _owningSession$childH;
         var removedFlyout = state.flyouts.find(function (f) {
           return f.flyoutId === action.flyoutId;
         });
@@ -150,11 +201,15 @@ function flyoutManagerReducer() {
             return session.mainFlyoutId === action.flyoutId;
           });
           if (sessionToRemove) {
-            // Remove all flyouts associated with this session (main + child)
+            var _sessionToRemove$chil;
+            // Remove all flyouts associated with this session (main + current child + child history)
             var flyoutsToRemove = new Set([action.flyoutId]);
             if (sessionToRemove.childFlyoutId) {
               flyoutsToRemove.add(sessionToRemove.childFlyoutId);
             }
+            ((_sessionToRemove$chil = sessionToRemove.childHistory) !== null && _sessionToRemove$chil !== void 0 ? _sessionToRemove$chil : []).forEach(function (entry) {
+              return flyoutsToRemove.add(entry.flyoutId);
+            });
             var _newFlyouts = state.flyouts.filter(function (f) {
               return !flyoutsToRemove.has(f.flyoutId);
             });
@@ -175,22 +230,43 @@ function flyoutManagerReducer() {
           }
         }
 
-        // Handle child flyout closing (existing logic)
-        var _newFlyouts2 = state.flyouts.filter(function (f) {
-          return f.flyoutId !== action.flyoutId;
-        });
+        // Handle child flyout closing: find the session that owns this child and
+        // clear that session's child state (so we stay consistent when navigating back).
         if (state.sessions.length === 0) {
           return _objectSpread(_objectSpread({}, state), {}, {
-            flyouts: _newFlyouts2
+            flyouts: state.flyouts.filter(function (f) {
+              return f.flyoutId !== action.flyoutId;
+            })
           });
         }
-        var _updatedSessions = _toConsumableArray(state.sessions);
-        var _currentSessionIndex = _updatedSessions.length - 1;
-        if (_updatedSessions[_currentSessionIndex].childFlyoutId === action.flyoutId) {
-          _updatedSessions[_currentSessionIndex] = _objectSpread(_objectSpread({}, _updatedSessions[_currentSessionIndex]), {}, {
-            childFlyoutId: null
+        var owningSessionIndex = state.sessions.findIndex(function (session) {
+          var _session$childHistory;
+          return session.childFlyoutId === action.flyoutId || ((_session$childHistory = session.childHistory) !== null && _session$childHistory !== void 0 ? _session$childHistory : []).some(function (entry) {
+            return entry.flyoutId === action.flyoutId;
+          });
+        });
+        if (owningSessionIndex === -1) {
+          // Closed flyout not in any session's child state; just remove the one flyout
+          return _objectSpread(_objectSpread({}, state), {}, {
+            flyouts: state.flyouts.filter(function (f) {
+              return f.flyoutId !== action.flyoutId;
+            })
           });
         }
+        var owningSession = state.sessions[owningSessionIndex];
+        var childIds = new Set([owningSession.childFlyoutId].concat(_toConsumableArray(((_owningSession$childH = owningSession.childHistory) !== null && _owningSession$childH !== void 0 ? _owningSession$childH : []).map(function (e) {
+          return e.flyoutId;
+        }))).filter(Boolean));
+        var _newFlyouts2 = state.flyouts.filter(function (f) {
+          return !childIds.has(f.flyoutId);
+        });
+        var _updatedSessions = _toConsumableArray(state.sessions);
+        _updatedSessions[owningSessionIndex] = _objectSpread(_objectSpread({}, owningSession), {}, {
+          childFlyoutId: null,
+          childTitle: undefined,
+          childIconType: undefined,
+          childHistory: []
+        });
         return _objectSpread(_objectSpread({}, state), {}, {
           sessions: _updatedSessions,
           flyouts: _newFlyouts2
@@ -223,8 +299,8 @@ function flyoutManagerReducer() {
           return state;
         }
         var _updatedSessions2 = _toConsumableArray(state.sessions);
-        var _currentSessionIndex2 = _updatedSessions2.length - 1;
-        _updatedSessions2[_currentSessionIndex2] = _objectSpread(_objectSpread({}, _updatedSessions2[_currentSessionIndex2]), {}, {
+        var _currentSessionIndex = _updatedSessions2.length - 1;
+        _updatedSessions2[_currentSessionIndex] = _objectSpread(_objectSpread({}, _updatedSessions2[_currentSessionIndex]), {}, {
           childFlyoutId: action.flyoutId
         });
         return _objectSpread(_objectSpread({}, state), {}, {
@@ -270,59 +346,121 @@ function flyoutManagerReducer() {
         });
       }
 
-    // Go back one session (remove current session from stack)
+    // Go back: pop child history when any, else pop current session
     case _actions.ACTION_GO_BACK:
       {
+        var _currentSession$child3, _currentSession$child4;
         if (state.sessions.length === 0) {
           return state;
         }
-        var _currentSessionIndex3 = state.sessions.length - 1;
-        var currentSession = state.sessions[_currentSessionIndex3];
+        var _currentSessionIndex2 = state.sessions.length - 1;
+        var _currentSession = state.sessions[_currentSessionIndex2];
+        var _childHistory = (_currentSession$child3 = _currentSession.childHistory) !== null && _currentSession$child3 !== void 0 ? _currentSession$child3 : [];
+        if (_childHistory.length > 0) {
+          // Pop one child: set current child to the last entry in history, remove the current child flyout
+          var popped = _childHistory[_childHistory.length - 1];
+          var newChildHistory = _childHistory.slice(0, -1);
+          var _updatedSessions3 = _toConsumableArray(state.sessions);
+          _updatedSessions3[_currentSessionIndex2] = _objectSpread(_objectSpread({}, _currentSession), {}, {
+            childHistory: newChildHistory,
+            childFlyoutId: popped.flyoutId,
+            childTitle: popped.title,
+            childIconType: popped.iconType
+          });
+          var _newFlyouts3 = state.flyouts.filter(function (f) {
+            return f.flyoutId !== _currentSession.childFlyoutId;
+          });
+          return _objectSpread(_objectSpread({}, state), {}, {
+            sessions: _updatedSessions3,
+            flyouts: _newFlyouts3
+          });
+        }
 
-        // Close all flyouts in the current session
-        var _flyoutsToRemove = new Set([currentSession.mainFlyoutId]);
-        if (currentSession.childFlyoutId) {
-          _flyoutsToRemove.add(currentSession.childFlyoutId);
+        // No child history: pop current session (main + all its children)
+        var _flyoutsToRemove = new Set([_currentSession.mainFlyoutId]);
+        if (_currentSession.childFlyoutId) {
+          _flyoutsToRemove.add(_currentSession.childFlyoutId);
         }
-        var _newFlyouts3 = state.flyouts.filter(function (f) {
+        ((_currentSession$child4 = _currentSession.childHistory) !== null && _currentSession$child4 !== void 0 ? _currentSession$child4 : []).forEach(function (e) {
+          return _flyoutsToRemove.add(e.flyoutId);
+        });
+        var _newFlyouts4 = state.flyouts.filter(function (f) {
           return !_flyoutsToRemove.has(f.flyoutId);
         });
-        var _newSessions = state.sessions.slice(0, _currentSessionIndex3);
+        var _newSessions = state.sessions.slice(0, _currentSessionIndex2);
         return _objectSpread(_objectSpread({}, state), {}, {
           sessions: _newSessions,
-          flyouts: _newFlyouts3
+          flyouts: _newFlyouts4
         });
       }
 
-    // Navigate to a specific flyout (remove all sessions after it)
+    // Navigate to a specific flyout (by main session or by child in current session's history)
     case _actions.ACTION_GO_TO_FLYOUT:
       {
-        var _flyoutId3 = action.flyoutId;
+        var _flyoutId3 = action.flyoutId,
+          _level = action.level;
+        var _currentSessionIndex3 = state.sessions.length - 1;
+        if (_level === _const.LEVEL_CHILD && state.sessions.length > 0) {
+          var _currentSession2$chil;
+          var _currentSession2 = state.sessions[_currentSessionIndex3];
+          var _childHistory2 = (_currentSession2$chil = _currentSession2.childHistory) !== null && _currentSession2$chil !== void 0 ? _currentSession2$chil : [];
+          var targetIndex = _childHistory2.findIndex(function (entry) {
+            return entry.flyoutId === _flyoutId3;
+          });
+          if (targetIndex === -1) {
+            return state; // Target child not in history
+          }
+          var targetEntry = _childHistory2[targetIndex];
+          var _newChildHistory = _childHistory2.slice(0, targetIndex);
+          var _flyoutsToRemove2 = new Set();
+          if (_currentSession2.childFlyoutId) {
+            _flyoutsToRemove2.add(_currentSession2.childFlyoutId);
+          }
+          _childHistory2.slice(targetIndex + 1).forEach(function (e) {
+            _flyoutsToRemove2.add(e.flyoutId);
+          });
+          var _newFlyouts5 = state.flyouts.filter(function (f) {
+            return !_flyoutsToRemove2.has(f.flyoutId);
+          });
+          var _updatedSessions4 = _toConsumableArray(state.sessions);
+          _updatedSessions4[_currentSessionIndex3] = _objectSpread(_objectSpread({}, _currentSession2), {}, {
+            childHistory: _newChildHistory,
+            childFlyoutId: targetEntry.flyoutId,
+            childTitle: targetEntry.title,
+            childIconType: targetEntry.iconType
+          });
+          return _objectSpread(_objectSpread({}, state), {}, {
+            sessions: _updatedSessions4,
+            flyouts: _newFlyouts5
+          });
+        }
 
-        // Find the session containing the target flyout
+        // Navigate by main flyout: remove all sessions after the target
         var targetSessionIndex = state.sessions.findIndex(function (session) {
           return session.mainFlyoutId === _flyoutId3;
         });
         if (targetSessionIndex === -1) {
           return state; // Target flyout not found
         }
-
-        // Close all sessions after the target session
         var sessionsToClose = state.sessions.slice(targetSessionIndex + 1);
-        var _flyoutsToRemove2 = new Set();
+        var _flyoutsToRemove3 = new Set();
         sessionsToClose.forEach(function (session) {
-          _flyoutsToRemove2.add(session.mainFlyoutId);
+          var _session$childHistory2;
+          _flyoutsToRemove3.add(session.mainFlyoutId);
           if (session.childFlyoutId) {
-            _flyoutsToRemove2.add(session.childFlyoutId);
+            _flyoutsToRemove3.add(session.childFlyoutId);
           }
+          ((_session$childHistory2 = session.childHistory) !== null && _session$childHistory2 !== void 0 ? _session$childHistory2 : []).forEach(function (e) {
+            return _flyoutsToRemove3.add(e.flyoutId);
+          });
         });
-        var _newFlyouts4 = state.flyouts.filter(function (f) {
-          return !_flyoutsToRemove2.has(f.flyoutId);
+        var _newFlyouts6 = state.flyouts.filter(function (f) {
+          return !_flyoutsToRemove3.has(f.flyoutId);
         });
         var _newSessions2 = state.sessions.slice(0, targetSessionIndex + 1);
         return _objectSpread(_objectSpread({}, state), {}, {
           sessions: _newSessions2,
-          flyouts: _newFlyouts4
+          flyouts: _newFlyouts6
         });
       }
 

package/lib/components/flyout/manager/store.js

@@ -7,14 +7,18 @@ exports._resetFlyoutManagerStore = _resetFlyoutManagerStore;
 exports.getFlyoutManagerStore = getFlyoutManagerStore;
 var _actions = require("./actions");
 var _reducer = require("./reducer");
-/*
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
  * 2.0 and the Server Side Public License, v 1; you may not use this file except
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
 /**
  * Events emitted by the flyout manager store for external consumers.
  */
@@ -48,19 +52,68 @@ function createStore() {
   // The onClick handlers won't execute until after store is fully assigned.
   // eslint-disable-next-line prefer-const -- Forward declaration requires 'let' not 'const'
   var store;
-  var computeHistoryItems = function computeHistoryItems() {
+  var computeHistoryItems = function computeHistoryItems(dispatchFn) {
+    var _currentSession$child;
     var currentSessionIndex = currentState.sessions.length - 1;
+    var currentSession = currentSessionIndex >= 0 ? currentState.sessions[currentSessionIndex] : null;
     var previousSessions = currentState.sessions.slice(0, currentSessionIndex);
-    return previousSessions.reverse().map(function (_ref) {
-      var title = _ref.title,
-        mainFlyoutId = _ref.mainFlyoutId;
+    var childHistory = (_currentSession$child = currentSession === null || currentSession === void 0 ? void 0 : currentSession.childHistory) !== null && _currentSession$child !== void 0 ? _currentSession$child : [];
+    var childItems = _toConsumableArray(childHistory).reverse().map(function (entry) {
       return {
-        title: title,
+        title: entry.title,
+        iconType: entry.iconType,
         onClick: function onClick() {
-          store.dispatch((0, _actions.goToFlyout)(mainFlyoutId));
+          dispatchFn((0, _actions.goToFlyout)(entry.flyoutId, 'child'));
         }
       };
     });
+
+    // Previous sessions: list each session's current child then its child history (so all travelled entries appear)
+    var previousSessionItems = [];
+    var _loop = function _loop() {
+      var _session$childHistory;
+      var session = previousSessions[i];
+      var mainTitle = session.title;
+      var mainFlyoutId = session.mainFlyoutId;
+      var history = (_session$childHistory = session.childHistory) !== null && _session$childHistory !== void 0 ? _session$childHistory : [];
+      var hasChildren = session.childFlyoutId != null && session.childTitle != null || history.length > 0;
+      if (session.childFlyoutId && session.childTitle) {
+        previousSessionItems.push({
+          title: session.childTitle,
+          iconType: session.childIconType,
+          onClick: function onClick() {
+            dispatchFn((0, _actions.goToFlyout)(mainFlyoutId, 'main'));
+          }
+        });
+      }
+      var _loop2 = function _loop2() {
+        var entry = history[h];
+        previousSessionItems.push({
+          title: entry.title,
+          iconType: entry.iconType,
+          onClick: function onClick() {
+            dispatchFn((0, _actions.goToFlyout)(mainFlyoutId, 'main'));
+            dispatchFn((0, _actions.goToFlyout)(entry.flyoutId, 'child'));
+          }
+        });
+      };
+      for (var h = history.length - 1; h >= 0; h--) {
+        _loop2();
+      }
+      if (!hasChildren) {
+        previousSessionItems.push({
+          title: mainTitle,
+          iconType: session.iconType,
+          onClick: function onClick() {
+            dispatchFn((0, _actions.goToFlyout)(mainFlyoutId, 'main'));
+          }
+        });
+      }
+    };
+    for (var i = previousSessions.length - 1; i >= 0; i--) {
+      _loop();
+    }
+    return [].concat(_toConsumableArray(childItems), previousSessionItems);
   };
   var dispatch = function dispatch(action) {
     var nextState = (0, _reducer.flyoutManagerReducer)(currentState, action);
@@ -71,7 +124,7 @@ function createStore() {
       // Recompute history items eagerly if sessions changed
       // This ensures stable references and avoids stale closures
       if (nextState.sessions !== previousSessions) {
-        store.historyItems = computeHistoryItems();
+        store.historyItems = computeHistoryItems(dispatch);
 
         // Detect removed sessions and emit CLOSE_SESSION events
         var nextSessionIds = new Set(nextState.sessions.map(function (s) {
@@ -96,8 +149,8 @@ function createStore() {
     subscribe: subscribe,
     subscribeToEvents: subscribeToEvents,
     dispatch: dispatch,
-    addFlyout: function addFlyout(flyoutId, title, level, size, minWidth) {
-      return dispatch((0, _actions.addFlyout)(flyoutId, title, level, size, minWidth));
+    addFlyout: function addFlyout(flyoutId, title, level, size, iconType, minWidth) {
+      return dispatch((0, _actions.addFlyout)(flyoutId, title, level, size, iconType, minWidth));
     },
     closeFlyout: function closeFlyout(flyoutId) {
       return dispatch((0, _actions.closeFlyout)(flyoutId));
@@ -120,8 +173,8 @@ function createStore() {
     goBack: function goBack() {
       return dispatch((0, _actions.goBack)());
     },
-    goToFlyout: function goToFlyout(flyoutId) {
-      return dispatch((0, _actions.goToFlyout)(flyoutId));
+    goToFlyout: function goToFlyout(flyoutId, level) {
+      return dispatch((0, _actions.goToFlyout)(flyoutId, level));
     },
     addUnmanagedFlyout: function addUnmanagedFlyout(flyoutId) {
       return dispatch((0, _actions.addUnmanagedFlyout)(flyoutId));
@@ -129,7 +182,7 @@ function createStore() {
     closeUnmanagedFlyout: function closeUnmanagedFlyout(flyoutId) {
       return dispatch((0, _actions.closeUnmanagedFlyout)(flyoutId));
     },
-    historyItems: computeHistoryItems() // Initialize with current state
+    historyItems: computeHistoryItems(dispatch) // Initialize with current state
   };
   return store;
 }

package/lib/components/flyout/use_flyout_menu.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useEuiFlyoutMenu = void 0;
+var _services = require("../../services");
+var _const = require("./const");
+var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _excluded = ["titleId"];
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+/**
+ * @internal
+ */
+
+/**
+ * Hook to manage flyout menu state and rendering logic.
+ * Determines whether the menu should be rendered based on display mode
+ * and menu content, and computes the appropriate aria-labelledby value.
+ *
+ * @internal
+ */
+var useEuiFlyoutMenu = exports.useEuiFlyoutMenu = function useEuiFlyoutMenu(_ref) {
+  var _flyoutMenuProps$hist, _flyoutMenuProps$hist2, _flyoutMenuProps$cust, _flyoutMenuProps$cust2;
+  var _flyoutMenuProps = _ref.flyoutMenuProps,
+    flyoutMenuDisplayMode = _ref.flyoutMenuDisplayMode,
+    _ariaLabelledBy = _ref.ariaLabelledBy;
+  var generatedMenuId = (0, _services.useGeneratedHtmlId)();
+  var _ref2 = _flyoutMenuProps || {},
+    _titleId = _ref2.titleId,
+    flyoutMenuProps = _objectWithoutProperties(_ref2, _excluded);
+  var hasMenu = !!_flyoutMenuProps;
+  var flyoutMenuId = (0, _react.useMemo)(function () {
+    if (!hasMenu) return undefined;
+    return _titleId || generatedMenuId;
+  }, [hasMenu, _titleId, generatedMenuId]);
+
+  // Determine if the menu has any content
+  // hasBackButton or hasHistory or hasCustomActions or hasVisibleTitle
+  var menuHasContent = hasMenu && (!!flyoutMenuProps.showBackButton || ((_flyoutMenuProps$hist = (_flyoutMenuProps$hist2 = flyoutMenuProps.historyItems) === null || _flyoutMenuProps$hist2 === void 0 ? void 0 : _flyoutMenuProps$hist2.length) !== null && _flyoutMenuProps$hist !== void 0 ? _flyoutMenuProps$hist : 0) > 0 || ((_flyoutMenuProps$cust = (_flyoutMenuProps$cust2 = flyoutMenuProps.customActions) === null || _flyoutMenuProps$cust2 === void 0 ? void 0 : _flyoutMenuProps$cust2.length) !== null && _flyoutMenuProps$cust !== void 0 ? _flyoutMenuProps$cust : 0) > 0 ||
+  // Component defaults to hiding the title, so only explicit false means the title will be visible
+  !!(flyoutMenuProps.title && flyoutMenuProps.hideTitle === false));
+
+  // Determine if the menu should be rendered based on the display mode and menu content
+  var shouldRenderMenu = (0, _react.useMemo)(function () {
+    if (!hasMenu) return false;
+    if (flyoutMenuDisplayMode === _const.MENU_DISPLAY_ALWAYS) return true;
+    if (flyoutMenuDisplayMode === _const.MENU_DISPLAY_AUTO) return menuHasContent;
+    return false;
+  }, [hasMenu, flyoutMenuDisplayMode, menuHasContent]);
+
+  // If the flyout menu is to be rendered, ensure the flyout has aria-labelledby referencing the menu's titleId
+  var ariaLabelledBy = (0, _react.useMemo)(function () {
+    if (flyoutMenuId && shouldRenderMenu) {
+      return (0, _classnames.default)(flyoutMenuId, _ariaLabelledBy);
+    }
+    return _ariaLabelledBy;
+  }, [flyoutMenuId, _ariaLabelledBy, shouldRenderMenu]);
+  return {
+    flyoutMenuId: flyoutMenuId,
+    flyoutMenuProps: flyoutMenuProps,
+    shouldRenderMenu: shouldRenderMenu,
+    ariaLabelledBy: ariaLabelledBy
+  };
+};

package/lib/components/form/file_picker/file_picker.js

@@ -18,7 +18,7 @@ var _validatable_control = require("../validatable_control");
 var _form_control_layout_clear_button = require("../form_control_layout/form_control_layout_clear_button");
 var _file_picker = require("./file_picker.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["stylesMemoizer", "id", "name", "initialPromptText", "className", "disabled", "compressed", "onChange", "isInvalid", "fullWidth", "isLoading", "display"];
+var _excluded = ["stylesMemoizer", "id", "name", "initialPromptText", "className", "disabled", "compressed", "onChange", "isInvalid", "fullWidth", "isLoading", "display", "files"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -59,36 +59,41 @@ var EuiFilePickerClass = exports.EuiFilePickerClass = /*#__PURE__*/function (_Co
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, EuiFilePickerClass, [].concat(args));
+    _defineProperty(_this, "fileInput", null);
+    _defineProperty(_this, "generatedId", (0, _services.htmlIdGenerator)()());
+    _defineProperty(_this, "getPromptTextFromFileList", function (files) {
+      if (!files || files.length === 0) {
+        return null;
+      }
+      if (files.length > 1) {
+        return (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiFilePicker.filesSelected",
+          default: "{fileCount} files selected",
+          values: {
+            fileCount: files.length
+          }
+        });
+      }
+      return files[0].name;
+    });
     _defineProperty(_this, "state", {
-      promptText: null,
+      promptText: _this.props.files ? _this.getPromptTextFromFileList(_this.props.files) : null,
       isHoveringDrop: false
     });
-    _defineProperty(_this, "fileInput", null);
-    _defineProperty(_this, "generatedId", (0, _services.htmlIdGenerator)()());
     _defineProperty(_this, "handleChange", function () {
       if (!_this.fileInput) return;
-      if (_this.fileInput.files && _this.fileInput.files.length > 1) {
+      if (_this.fileInput.files && _this.fileInput.files.length === 1) {
         _this.setState({
-          promptText: (0, _react2.jsx)(_i18n.EuiI18n, {
-            token: "euiFilePicker.filesSelected",
-            default: "{fileCount} files selected",
-            values: {
-              fileCount: _this.fileInput.files.length
-            }
-          })
-        });
-      } else if (_this.fileInput.files && _this.fileInput.files.length === 0) {
-        _this.setState({
-          promptText: null
+          promptText: _this.fileInput.value.split('\\').pop()
         });
       } else {
         _this.setState({
-          promptText: _this.fileInput.value.split('\\').pop()
+          promptText: _this.getPromptTextFromFileList(_this.fileInput.files ? Array.from(_this.fileInput.files) : null)
         });
       }
       var onChange = _this.props.onChange;
       if (onChange) {
-        onChange(_this.fileInput.files);
+        onChange(_this.fileInput.files && _this.fileInput.files.length > 0 ? _this.fileInput.files : null);
       }
     });
     _defineProperty(_this, "removeFiles", function (e) {
@@ -116,6 +121,17 @@ var EuiFilePickerClass = exports.EuiFilePickerClass = /*#__PURE__*/function (_Co
   }
   _inherits(EuiFilePickerClass, _Component);
   return _createClass(EuiFilePickerClass, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      // Update prompt text when files prop changes
+      if (this.props.files !== prevProps.files) {
+        var _this$props$files;
+        this.setState({
+          promptText: this.getPromptTextFromFileList((_this$props$files = this.props.files) !== null && _this$props$files !== void 0 ? _this$props$files : null)
+        });
+      }
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this2 = this;
@@ -139,6 +155,7 @@ var EuiFilePickerClass = exports.EuiFilePickerClass = /*#__PURE__*/function (_Co
           fullWidth = _this2$props$fullWidt === void 0 ? defaultFullWidth : _this2$props$fullWidt,
           isLoading = _this2$props.isLoading,
           display = _this2$props.display,
+          files = _this2$props.files,
           rest = _objectWithoutProperties(_this2$props, _excluded);
         var promptId = "".concat(id || _this2.generatedId, "-filePicker__prompt");
         var isOverridingInitialPrompt = _this2.state.promptText != null;
@@ -253,6 +270,17 @@ EuiFilePickerClass.propTypes = {
      * Use as a callback to access the HTML FileList API
      */
   onChange: _propTypes.default.func,
+  /**
+     * Optionally pass a `File[]` array to maintain the file picker's displayed
+     * state between re-renders. Useful for multi-step forms where the component
+     * may unmount and remount while the file data is still stored in context.
+     *
+     * Note: Due to browser security restrictions, the actual file input
+     * cannot be programmatically set with files. This prop only controls
+     * the displayed state (file names in the prompt). The actual file data
+     * should be stored and managed separately in your application state.
+     */
+  files: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.any.isRequired).isRequired, _propTypes.default.oneOf([null])]),
   /**
      * Reduces the size to a typical (compressed) input
      * @default false