fix(layout): collapsed use vertical mode

close #7518
ant-design · Aug 13, 2023 · e82170f · e82170f
1 parent e677e32
commit e82170f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/packages/layout/src/components/SiderMenu/SiderMenu.tsx b/packages/layout/src/components/SiderMenu/SiderMenu.tsx
@@ -253,7 +253,7 @@ const SiderMenu: React.FC<SiderMenuProps & PrivateSiderMenuProps> = (props) => {
         <BaseMenu
           {...props}
           key="base-menu"
-          mode="inline"
+          mode={collapsed && !isMobile ? 'vertical' : 'inline'}
           handleOpenChange={onOpenChange}
           style={{
             width: '100%',

diff --git a/tests/demo.tsx b/tests/demo.tsx
@@ -61,7 +61,9 @@ function demoTest(component: string, options: Options = {}) {
 
   const App = (props: { children: any; onInit: () => void }) => {
     useEffect(() => {
-      props.onInit?.();
+      setTimeout(() => {
+        props.onInit?.();
+      }, 1000);
     }, []);
     return (
       <>
@@ -109,23 +111,17 @@ function demoTest(component: string, options: Options = {}) {
           jest.runAllTimers();
         });
 
-        await waitFor(
-          () => {
-            return wrapper.findAllByText('test');
-          },
-          { timeout: 3000 },
-        );
+        await waitFor(() => {
+          return wrapper.findAllByText('test');
+        });
 
         act(() => {
           jest.runAllTimers();
         });
 
-        await waitFor(
-          () => {
-            return wrapper.findAllByText('test');
-          },
-          { timeout: 3000 },
-        );
+        await waitFor(() => {
+          return wrapper.findAllByText('test');
+        });
 
         await waitFor(() => {
           expect(fn).toBeCalled();