Merge branch 'ant-design:master' into master

ant-design · Jan 15, 2025 · 50a6f30 · 50a6f30
2 parents 6f4b0e7 + 4c1ac5d
commit 50a6f30
Show file tree

Hide file tree

Showing 7 changed files with 319 additions and 225 deletions.
diff --git a/package.json b/package.json
@@ -94,7 +94,7 @@
     "@umijs/utils": "^4.4.4",
     "@vitest/coverage-istanbul": "^2.1.8",
     "animated-scroll-to": "^2.3.0",
-    "antd": "^5.23.0",
+    "antd": "^5.23.1",
     "antd-style": "^3.7.1",
     "babel-loader": "^9.2.1",
     "babel-types": "^6.26.0",
@@ -121,7 +121,7 @@
     "inquirer": "^8.2.6",
     "jest-canvas-mock": "^2.5.2",
     "jest-fetch-mock": "^3.0.3",
-    "jsdom": "^25.0.1",
+    "jsdom": "^26.0.0",
     "lerna": "^3.22.1",
     "lint-staged": "^10.5.4",
     "lodash": "^4.17.21",
@@ -176,8 +176,5 @@
     "commit-msg": "fabric verify-commit"
   },
   "packageManager": "[email protected]",
-  "version": "",
-  "dependencies": {
-    "nwsapi": "2.2.13"
-  }
+  "version": ""
 }
diff --git a/packages/layout/src/components/FooterToolbar/index.tsx b/packages/layout/src/components/FooterToolbar/index.tsx
@@ -60,7 +60,7 @@ const FooterToolbar: React.FC<FooterToolbarProps> = (props) => {
   }, [value.collapsed, value.hasSiderMenu, value.isMobile, value.siderWidth]);
 
   const containerDom = useMemo(() => {
-    if (typeof window === undefined || typeof document === undefined)
+    if (typeof window === 'undefined' || typeof document === 'undefined')
       return null;
     // 只读取一次就行了，不然总是的渲染
     return getTargetContainer?.() || document.body;

diff --git a/packages/layout/src/components/SettingDrawer/index.tsx b/packages/layout/src/components/SettingDrawer/index.tsx
@@ -218,7 +218,7 @@ export const SettingDrawer: React.FC<SettingDrawerProps> = (props) => {
     onSettingChange,
     enableDarkTheme,
     prefixCls = 'ant-pro',
-    pathname = window.location.pathname,
+    pathname = isBrowser() ? window.location.pathname : '',
     disableUrlParams = true,
     themeOnly,
     drawerProps,

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
@@ -1946,6 +1946,7 @@ exports[`field demos > 📸 renders ./packages/field/src/demos/base_test.tsx cor
                     >
                       <div
                         class="ant-input-number ant-input-number-outlined ant-input-number-compact-item ant-input-number-compact-first-item"
+                        style="width: calc((100% - 30px) / 2);"
                       >
                         <div
                           class="ant-input-number-handler-wrap"
@@ -2029,7 +2030,7 @@ exports[`field demos > 📸 renders ./packages/field/src/demos/base_test.tsx cor
                       />
                       <div
                         class="ant-input-number ant-input-number-outlined ant-input-number-compact-item ant-input-number-compact-last-item"
-                        style="border-inline-start: 0;"
+                        style="width: calc((100% - 30px) / 2); border-inline-start: 0;"
                       >
                         <div
                           class="ant-input-number-handler-wrap"

diff --git a/tests/form/__snapshots__/demo.test.ts.snap b/tests/form/__snapshots__/demo.test.ts.snap
@@ -3277,6 +3277,7 @@ exports[`form demos > 📸 renders ./packages/form/src/components/FieldSet/demos
                           >
                             <div
                               class="ant-input-number ant-input-number-in-form-item ant-input-number-outlined ant-input-number-compact-item ant-input-number-compact-first-item"
+                              style="width: calc((100% - 60px) / 2);"
                             >
                               <div
                                 class="ant-input-number-handler-wrap"
@@ -3361,7 +3362,7 @@ exports[`form demos > 📸 renders ./packages/form/src/components/FieldSet/demos
                             />
                             <div
                               class="ant-input-number ant-input-number-in-form-item ant-input-number-outlined ant-input-number-compact-item ant-input-number-compact-last-item"
-                              style="border-inline-start: 0;"
+                              style="width: calc((100% - 60px) / 2); border-inline-start: 0;"
                             >
                               <div
                                 class="ant-input-number-handler-wrap"

diff --git a/tests/setupTests.ts b/tests/setupTests.ts
@@ -5,7 +5,6 @@ import MockDate from 'mockdate';
 import React from 'react';
 import { vi } from 'vitest';
 import tableData from './table/mock.data.json';
-
 import { defaultConfig } from 'antd/lib/theme/internal';
 
 defaultConfig.hashed = false;