refactor(cli): simplify keypress and mouse providers and update tests (#22853)

packages/cli/src/ui/hooks/useFocus.test.tsx

@@ -4,12 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
+import { renderWithProviders } from '../../test-utils/render.js';
 import { EventEmitter } from 'node:events';
 import { useFocus } from './useFocus.js';
 import { vi, type Mock } from 'vitest';
 import { useStdin, useStdout } from 'ink';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
 import { act } from 'react';
 
 // Mock the ink hooks
@@ -54,11 +53,7 @@ describe('useFocus', () => {
       hookResult = useFocus();
       return null;
     }
-    const { unmount } = render(
-      <KeypressProvider>
-        <TestComponent />
-      </KeypressProvider>,
-    );
+    const { unmount } = renderWithProviders(<TestComponent />);
     return {
       result: {
         get current() {

packages/cli/src/ui/hooks/useKeypress.test.tsx

@@ -5,9 +5,8 @@
  */
 
 import { act } from 'react';
-import { render } from '../../test-utils/render.js';
+import { renderHookWithProviders } from '../../test-utils/render.js';
 import { useKeypress } from './useKeypress.js';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
 import { useStdin } from 'ink';
 import { EventEmitter } from 'node:events';
 import type { Mock } from 'vitest';
@@ -44,17 +43,8 @@ describe(`useKeypress`, () => {
   const onKeypress = vi.fn();
   let originalNodeVersion: string;
 
-  const renderKeypressHook = (isActive = true) => {
-    function TestComponent() {
-      useKeypress(onKeypress, { isActive });
-      return null;
-    }
-    return render(
-      <KeypressProvider>
-        <TestComponent />
-      </KeypressProvider>,
-    );
-  };
+  const renderKeypressHook = (isActive = true) =>
+    renderHookWithProviders(() => useKeypress(onKeypress, { isActive }));
 
   beforeEach(() => {
     vi.clearAllMocks();

packages/cli/src/ui/hooks/useMouse.test.ts

@@ -7,7 +7,7 @@
 import { vi } from 'vitest';
 import { renderHook } from '../../test-utils/render.js';
 import { useMouse } from './useMouse.js';
-import { MouseProvider, useMouseContext } from '../contexts/MouseContext.js';
+import { useMouseContext } from '../contexts/MouseContext.js';
 
 vi.mock('../contexts/MouseContext.js', async (importOriginal) => {
   const actual =
@@ -16,10 +16,10 @@ vi.mock('../contexts/MouseContext.js', async (importOriginal) => {
   const unsubscribe = vi.fn();
   return {
     ...actual,
-    useMouseContext: () => ({
+    useMouseContext: vi.fn(() => ({
       subscribe,
       unsubscribe,
-    }),
+    })),
   };
 });
 
@@ -31,27 +31,22 @@ describe('useMouse', () => {
   });
 
   it('should not subscribe when isActive is false', () => {
-    renderHook(() => useMouse(mockOnMouseEvent, { isActive: false }), {
-      wrapper: MouseProvider,
-    });
+    renderHook(() => useMouse(mockOnMouseEvent, { isActive: false }));
 
     const { subscribe } = useMouseContext();
     expect(subscribe).not.toHaveBeenCalled();
   });
 
   it('should subscribe when isActive is true', () => {
-    renderHook(() => useMouse(mockOnMouseEvent, { isActive: true }), {
-      wrapper: MouseProvider,
-    });
+    renderHook(() => useMouse(mockOnMouseEvent, { isActive: true }));
 
     const { subscribe } = useMouseContext();
     expect(subscribe).toHaveBeenCalledWith(mockOnMouseEvent);
   });
 
   it('should unsubscribe on unmount', () => {
-    const { unmount } = renderHook(
-      () => useMouse(mockOnMouseEvent, { isActive: true }),
-      { wrapper: MouseProvider },
+    const { unmount } = renderHook(() =>
+      useMouse(mockOnMouseEvent, { isActive: true }),
     );
 
     const { unsubscribe } = useMouseContext();
@@ -65,7 +60,6 @@ describe('useMouse', () => {
         useMouse(mockOnMouseEvent, { isActive }),
       {
         initialProps: { isActive: true },
-        wrapper: MouseProvider,
       },
     );