Update cleanup logic

angeles-mb · angeles-mb · commit 00a3974a9efc · 2026-02-12T16:21:26.000+01:00
diff --git a/packages/eui/src/components/flyout/manager/flyout_managed.test.tsx b/packages/eui/src/components/flyout/manager/flyout_managed.test.tsx
@@ -154,7 +154,7 @@ describe('EuiManagedFlyout', () => {
     expect(el).toHaveAttribute(PROPERTY_LEVEL, LEVEL_MAIN);
   });
 
-  it('calls the unregister callback prop when onClose', () => {
+  it('calls closeAllFlyouts during cleanup when main flyout unmounts', () => {
     const onClose = jest.fn();
 
     const { getByTestSubject, unmount } = renderInProvider(
@@ -174,6 +174,30 @@ describe('EuiManagedFlyout', () => {
     });
 
     expect(mockCloseAllFlyouts).toHaveBeenCalled();
+    expect(mockCloseFlyout).not.toHaveBeenCalled();
+  });
+
+  it('calls closeFlyout during cleanup when child flyout unmounts', () => {
+    const onClose = jest.fn();
+
+    const { getByTestSubject, unmount } = renderInProvider(
+      <EuiManagedFlyout id="close-me" level={LEVEL_CHILD} onClose={onClose} />
+    );
+
+    act(() => {
+      userEvent.click(getByTestSubject('managed-flyout'));
+    });
+
+    // The onClose should be called when the flyout is clicked
+    expect(onClose).toHaveBeenCalled();
+
+    // The closeFlyout should be called when the component unmounts (cleanup)
+    act(() => {
+      unmount();
+    });
+
+    expect(mockCloseFlyout).toHaveBeenCalledWith('close-me');
+    expect(mockCloseAllFlyouts).not.toHaveBeenCalled();
   });
 
   it('registers child flyout and sets data-level child', () => {
diff --git a/packages/eui/src/components/flyout/manager/flyout_managed.tsx b/packages/eui/src/components/flyout/manager/flyout_managed.tsx
@@ -195,13 +195,13 @@ export const EuiManagedFlyout = forwardRef<HTMLElement, EuiManagedFlyoutProps>(
         // Only call closeFlyout if it wasn't already called via onClose
         // This prevents duplicate removal when using Escape/X button
         if (flyoutExistsInManagerRef.current) {
-          closeFlyout(flyoutId);
+          level === LEVEL_MAIN ? closeAllFlyouts() : closeFlyout(flyoutId);
         }
 
         // Reset navigation tracking when explicitly closed via isOpen=false
         wasRegisteredRef.current = false;
       };
-    }, [flyoutId, title, level, size, addFlyout, closeFlyout]);
+    }, [flyoutId, title, level, size, 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
