fix(layout): fix ProLayout did not match error

close #7623
ant-design · Nov 5, 2023 · cb330f9 · cb330f9
1 parent 73e759b
commit cb330f9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -155,7 +155,6 @@
     "typescript": "^5.2.2",
     "umi": "^4.0.86",
     "umi-request": "^1.4.0",
-    "use-merge-value": "^1.2.0",
     "vitest": "^0.34.6",
     "write-pkg": "^4.0.0",
     "xhr-mock": "^2.5.1",

diff --git a/packages/layout/src/ProLayout.tsx b/packages/layout/src/ProLayout.tsx
@@ -741,7 +741,9 @@ const BaseProLayout: React.FC<ProLayoutProps> = (props) => {
     }
     return null;
   }, [bgLayoutImgList]);
+
   const { token } = useContext(ProProvider);
+
   return wrapSSR(
     <RouteContext.Provider
       value={{

diff --git a/packages/utils/src/useMediaQuery/index.ts b/packages/utils/src/useMediaQuery/index.ts
@@ -41,10 +41,10 @@ export type MediaQueryKey = keyof typeof MediaQueryEnum;
  * So should use Array.forEach
  */
 export const getScreenClassName = () => {
-  let className: MediaQueryKey = 'md';
+  let queryKey: MediaQueryKey | undefined = undefined;
   // support ssr
   if (typeof window === 'undefined') {
-    return className;
+    return queryKey;
   }
   const mediaQueryKey = (Object.keys(MediaQueryEnum) as MediaQueryKey[]).find(
     (key) => {
@@ -55,8 +55,8 @@ export const getScreenClassName = () => {
       return false;
     },
   );
-  className = mediaQueryKey as unknown as MediaQueryKey;
-  return className;
+  queryKey = mediaQueryKey as unknown as MediaQueryKey;
+  return queryKey;
 };
 
 const useBreakpoint = () => {
@@ -66,9 +66,10 @@ const useBreakpoint = () => {
   const isXl = useMediaQuery(MediaQueryEnum.xl.matchMedia);
   const isSm = useMediaQuery(MediaQueryEnum.sm.matchMedia);
   const isXs = useMediaQuery(MediaQueryEnum.xs.matchMedia);
-  const [colSpan, setColSpan] = useState<keyof typeof MediaQueryEnum>(
-    getScreenClassName(),
-  );
+
+  const [colSpan, setColSpan] = useState<
+    keyof typeof MediaQueryEnum | undefined
+  >(getScreenClassName());
 
   useEffect(() => {
     if (process.env.NODE_ENV === 'TEST') {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/field/__snapshots__/demo.test.ts.snap b/tests/field/__snapshots__/demo.test.ts.snap
@@ -1905,7 +1905,8 @@ exports[`field demos > 📸 renders ./packages/field/src/demos/base_test.tsx cor
                         class="ant-input-number-input-wrap"
                       >
                         <input
-                          aria-valuemin="0"
+                          aria-valuemax="10000"
+                          aria-valuemin="1"
                           autocomplete="off"
                           class="ant-input-number-input"
                           placeholder="请输入"