From 5471db8383bfe7dae355e50778a3969e1e43f5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E6=9E=AB?= <7971419+crazyair@users.noreply.github.com> Date: Wed, 31 Dec 2025 17:03:15 +0800 Subject: [PATCH 1/8] type: fix modal type (#56441) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fix modal type * fix: add type * feat: add warn deprecated --------- Co-authored-by: 遇见同学 <1875694521@qq.com> --- components/modal/confirm.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/components/modal/confirm.tsx b/components/modal/confirm.tsx index 08cd2e5050..c1b4e81566 100644 --- a/components/modal/confirm.tsx +++ b/components/modal/confirm.tsx @@ -22,7 +22,15 @@ export type ModalFunc = (props: ModalFuncProps) => { update: (configUpdate: ConfigUpdate) => void; }; -export type ModalStaticFunctions = Record, ModalFunc>; +export type ModalStaticFunctions = { + info: ModalFunc; + success: ModalFunc; + error: ModalFunc; + warning: ModalFunc; + confirm: ModalFunc; + /** @deprecated Please use `warning` instead */ + warn: ModalFunc; +}; const ConfirmDialogWrapper: React.FC = (props) => { const { prefixCls: customizePrefixCls, getContainer, direction } = props; From e2f3cf6133a8ffa80ba9f7667df1f0c50deda63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E7=88=B1=E5=90=83=E7=99=BD=E8=90=9D?= =?UTF-8?q?=E5=8D=9C?= Date: Wed, 31 Dec 2025 17:50:18 +0800 Subject: [PATCH 2/8] test: update test case (#56451) --- .../__snapshots__/components.test.tsx.snap | 14 ---- .../__snapshots__/demo-extend.test.ts.snap | 1 - .../__snapshots__/demo.test.tsx.snap | 1 - .../__snapshots__/demo-extend.test.tsx.snap | 3 - .../__snapshots__/demo-extend.test.ts.snap | 11 --- .../__snapshots__/demo.test.tsx.snap | 11 --- .../__snapshots__/pagination.test.tsx.snap | 1 - .../__snapshots__/index.test.tsx.snap | 71 ------------------- .../__snapshots__/demo-extend.test.ts.snap | 19 ----- .../__tests__/__snapshots__/demo.test.ts.snap | 19 ----- .../__snapshots__/index.test.tsx.snap | 1 - .../__snapshots__/demo-extend.test.ts.snap | 1 - .../__tests__/__snapshots__/demo.test.ts.snap | 1 - .../__snapshots__/demo-extend.test.ts.snap | 4 -- .../__tests__/__snapshots__/demo.test.ts.snap | 6 -- .../__snapshots__/demo-extend.test.ts.snap | 1 - package.json | 6 +- 17 files changed, 3 insertions(+), 168 deletions(-) diff --git a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap index e953bcfebd..2cbf434ab2 100644 --- a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap +++ b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap @@ -18614,7 +18614,6 @@ exports[`ConfigProvider components Pagination configProvider 1`] = ` class="config-pagination-options" >
diff --git a/components/segmented/__tests__/__snapshots__/demo.test.ts.snap b/components/segmented/__tests__/__snapshots__/demo.test.ts.snap index d2f0cce695..d2f91bf77e 100644 --- a/components/segmented/__tests__/__snapshots__/demo.test.ts.snap +++ b/components/segmented/__tests__/__snapshots__/demo.test.ts.snap @@ -1688,7 +1688,6 @@ exports[`renders components/segmented/demo/size-consistent.tsx correctly 1`] = `
diff --git a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap index 5b3013c615..2f6419e52a 100644 --- a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -8987,7 +8987,6 @@ exports[`renders components/table/demo/edit-row.tsx extend context correctly 1`] class="ant-pagination-options" >
Date: Thu, 1 Jan 2026 10:02:19 +0800 Subject: [PATCH 3/8] docs: remove demo of Table hidden resizable column (#56447) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc: hidden table component resizable-column demo * chore: 调整代码格式 * doc: remove resizable column demo from Table component * chore: rm deps * update: update snapshot file * fix: package.json version number error --------- Co-authored-by: thinkasany <480968828@qq.com> Co-authored-by: 遇见同学 <1875694521@qq.com> --- .../__snapshots__/demo-extend.test.ts.snap | 353 ------------------ .../__tests__/__snapshots__/demo.test.ts.snap | 330 ---------------- components/table/demo/resizable-column.md | 24 -- components/table/demo/resizable-column.tsx | 123 ------ components/table/index.en-US.md | 1 - components/table/index.zh-CN.md | 1 - package.json | 2 - 7 files changed, 834 deletions(-) delete mode 100644 components/table/demo/resizable-column.md delete mode 100644 components/table/demo/resizable-column.tsx diff --git a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap index 2f6419e52a..94f470d3fd 100644 --- a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -23632,359 +23632,6 @@ Array [ exports[`renders components/table/demo/reset-filter.tsx extend context correctly 2`] = `[]`; -exports[`renders components/table/demo/resizable-column.tsx extend context correctly 1`] = ` -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Date - - -
- - Amount - - - - -
-
-
- -
- -
- - 		- Type - - - Note - - - Action -
- 2018-02-11 - - 120 - - income - - transfer - - - Delete - -
- 2018-03-11 - - 243 - - income - - transfer - - - Delete - -
- 2018-04-11 - - 98 - - income - - transfer - - - Delete - -
-
-
-
-
    -
  • - -
    • -
  • - - 1 - -
    • -
  • - -
    • -
-
-
-
-`; - -exports[`renders components/table/demo/resizable-column.tsx extend context correctly 2`] = `[]`; - exports[`renders components/table/demo/responsive.tsx extend context correctly 1`] = `
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Date - - -
- - Amount - - - - -
- - 		- Type - - - Note - - - Action -
- 2018-02-11 - - 120 - - income - - transfer - - - Delete - -
- 2018-03-11 - - 243 - - income - - transfer - - - Delete - -
- 2018-04-11 - - 98 - - income - - transfer - - - Delete - -
-
-
-
-
    -
  • - -
    • -
  • - - 1 - -
    • -
  • - -
    • -
-
-
-
-`; - exports[`renders components/table/demo/responsive.tsx correctly 1`] = `
, data: ResizeCallbackData) => void; -} - -const ResizableTitle: React.FC & TitlePropsType>> = (props) => { - const { onResize, width, ...restProps } = props; - - if (!width) { - return ; - } - - return ( - e.stopPropagation()} />} - onResize={onResize} - draggableOpts={{ enableUserSelectHack: false }} - > - - - ); -}; - -const data: DataType[] = [ - { - key: 0, - date: '2018-02-11', - amount: 120, - type: 'income', - note: 'transfer', - }, - { - key: 1, - date: '2018-03-11', - amount: 243, - type: 'income', - note: 'transfer', - }, - { - key: 2, - date: '2018-04-11', - amount: 98, - type: 'income', - note: 'transfer', - }, -]; - -const App: React.FC = () => { - const [columns, setColumns] = useState>([ - { - title: 'Date', - dataIndex: 'date', - width: 200, - }, - { - title: 'Amount', - dataIndex: 'amount', - width: 100, - sorter: (a, b) => a.amount - b.amount, - }, - { - title: 'Type', - dataIndex: 'type', - width: 100, - }, - { - title: 'Note', - dataIndex: 'note', - width: 100, - }, - { - title: 'Action', - key: 'action', - render: () => Delete, - }, - ]); - - const handleResize = - (index: number) => - (_: React.SyntheticEvent, { size }: ResizeCallbackData) => { - const newColumns = [...columns]; - newColumns[index] = { - ...newColumns[index], - width: size.width, - }; - setColumns(newColumns); - }; - - const mergedColumns = columns.map[number]>((col, index) => ({ - ...col, - onHeaderCell: (column: TableColumnsType[number]) => ({ - width: column.width, - onResize: handleResize(index) as React.ReactEventHandler, - }), - })); - - return ( - - bordered - components={{ header: { cell: ResizableTitle } }} - columns={mergedColumns} - dataSource={data} - /> - ); -}; - -export default App; diff --git a/components/table/index.en-US.md b/components/table/index.en-US.md index 3a93181f57..457f57e578 100644 --- a/components/table/index.en-US.md +++ b/components/table/index.en-US.md @@ -96,7 +96,6 @@ const columns = [ Drag sorting Drag Column sorting Drag sorting with handler -Resizable column ellipsis column ellipsis column custom tooltip Custom empty diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md index a330d2d998..7de56e854c 100644 --- a/components/table/index.zh-CN.md +++ b/components/table/index.zh-CN.md @@ -98,7 +98,6 @@ const columns = [ 拖拽排序 列拖拽排序 拖拽手柄列 -可伸缩列 单元格自动省略 自定义单元格省略提示 自定义空状态 diff --git a/package.json b/package.json index df50859c47..eff00261a9 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,6 @@ "@types/react": "^19.2.7", "@types/react-dom": "^19.2.3", "@types/react-highlight-words": "^0.20.0", - "@types/react-resizable": "^3.0.8", "@types/semver": "^7.7.1", "@types/spinnies": "^0.5.3", "@types/tar": "^6.1.13", @@ -300,7 +299,6 @@ "react-highlight-words": "^0.21.0", "react-icons": "^5.5.0", "react-infinite-scroll-component": "^6.1.1", - "react-resizable": "3.0.5", "react-router-dom": "^7.10.1", "react-sticky-box": "^2.0.5", "rehype-stringify": "^10.0.1", From 89fa65614932990d03a9cc56faa9edfdc83b7a81 Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Thu, 1 Jan 2026 15:46:42 +0800 Subject: [PATCH 4/8] docs: update DatePicker defaultValue (#56455) --- .dumi/pages/index/components/ComponentsList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.dumi/pages/index/components/ComponentsList.tsx b/.dumi/pages/index/components/ComponentsList.tsx index 0fb76d539e..28901b2f5c 100644 --- a/.dumi/pages/index/components/ComponentsList.tsx +++ b/.dumi/pages/index/components/ComponentsList.tsx @@ -165,7 +165,8 @@ const ComponentsList: React.FC = () => { type: 'update', node: ( { /> ), }, - // { // title: 'Progress', // type: 'update', From da8e1ccde2d3666456a3cb2652ce222b4a02c45f Mon Sep 17 00:00:00 2001 From: elrrrrrrr Date: Fri, 2 Jan 2026 09:28:59 +0800 Subject: [PATCH 5/8] fix: setup utoo (#56452) * fix: setup utoo * chore: size-limit to 617 KiB --------- Co-authored-by: binghui.dbh --- .github/workflows/size-limit.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml index 6edfa31e81..6bf0f207d5 100644 --- a/.github/workflows/size-limit.yml +++ b/.github/workflows/size-limit.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: oven-sh/setup-utoo@v1 + - uses: utooland/setup-utoo@v1 - name: size-limit uses: ant-design/size-limit-action@master with: diff --git a/package.json b/package.json index eff00261a9..8796b1cf9d 100644 --- a/package.json +++ b/package.json @@ -338,7 +338,7 @@ }, { "path": "./dist/antd-with-locales.min.js", - "limit": "616 KiB", + "limit": "617 KiB", "gzip": true } ], From d9eb4ccb4bb93255fdb2c45f13d25c62d9b196fa Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Fri, 2 Jan 2026 21:57:34 +0800 Subject: [PATCH 6/8] chore: bump eslint (#56457) --- eslint.config.mjs | 1 + package.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 461b7f7773..068ed23d51 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -26,6 +26,7 @@ export default antfu( typescript: true, react: true, rules: { + 'react/jsx-key-before-spread': 'off', 'node/prefer-global/process': 'off', // TODO: remove this 'node/prefer-global/buffer': 'off', // TODO: remove this 'jsdoc/empty-tags': 'off', diff --git a/package.json b/package.json index 8796b1cf9d..60f84d3e5f 100644 --- a/package.json +++ b/package.json @@ -174,7 +174,7 @@ "@emotion/css": "^11.13.5", "@emotion/react": "^11.14.0", "@emotion/server": "^11.11.0", - "@eslint-react/eslint-plugin": "^2.3.13", + "@eslint-react/eslint-plugin": "^2.5.0", "@ianvs/prettier-plugin-sort-imports": "^4.7.0", "@inquirer/prompts": "^8.0.2", "@madccc/duplicate-package-checker-webpack-plugin": "^1.0.0", @@ -239,12 +239,12 @@ "dumi": "~2.4.21", "dumi-plugin-color-chunk": "^2.1.0", "env-paths": "^3.0.0", - "eslint": "^9.39.1", + "eslint": "^9.39.2", "eslint-plugin-compat": "^6.0.2", - "eslint-plugin-jest": "^29.2.1", + "eslint-plugin-jest": "^29.12.0", "eslint-plugin-jsx-a11y": "^6.10.2", "eslint-plugin-react-hooks": "^7.0.1", - "eslint-plugin-react-refresh": "^0.4.24", + "eslint-plugin-react-refresh": "^0.4.26", "fast-glob": "^3.3.3", "father": "4.6.13", "fs-extra": "^11.3.2", From 24bd6fd31158702ce099ad519b4ce10c4259290b Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Sun, 4 Jan 2026 10:01:16 +0800 Subject: [PATCH 7/8] type: rm redundant any type (#56460) --- scripts/generate-token-meta.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/generate-token-meta.ts b/scripts/generate-token-meta.ts index cd99391932..d3f1947e1d 100644 --- a/scripts/generate-token-meta.ts +++ b/scripts/generate-token-meta.ts @@ -53,7 +53,7 @@ function getPresetColorsTokenList(presetColors: string[]) { } const main = async () => { - const app = await (Application as any).bootstrap( + const app = await Application.bootstrap( { // typedoc options here entryPoints: ['components/theme/interface/index.ts', 'components/*/style/index.{ts,tsx}'], @@ -87,7 +87,7 @@ const main = async () => { } else if (type.name === 'AliasToken') { tokenMeta.alias = getTokenList(type.children, 'alias'); } else if (type.name === 'PresetColors') { - presetColors = (type?.type as any)?.target?.elements?.map((item: any) => item.value); + presetColors = type?.type?.target?.elements?.map((item: any) => item.value); } }); From 8ec34d6204cfac9492cf2cbaa6dc44d39f1cc387 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Sun, 4 Jan 2026 12:28:29 +0800 Subject: [PATCH 8/8] chore: rm useless yml (#56461) --- .github/workflows/test-v6.yml | 231 ---------------------------------- .github/workflows/test.yml | 6 - 2 files changed, 237 deletions(-) delete mode 100644 .github/workflows/test-v6.yml diff --git a/.github/workflows/test-v6.yml b/.github/workflows/test-v6.yml deleted file mode 100644 index 2b635a209c..0000000000 --- a/.github/workflows/test-v6.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Origin Source -# https://github.com/ant-design/ant-design/blob/79f566b7f8abb1012ef55b0d2793bfdf5595b85d/.github/workflows/test.yml -name: ✅ test v6 - -on: - push: - branches: [next] - pull_request: - branches: [next] - -# Cancel prev CI if new commit come -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -permissions: - contents: read - -jobs: - lint: - runs-on: blacksmith-4vcpu-ubuntu-2404 - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut install - - run: ut lint - - ################################ Test ################################ - test-react-legacy: - name: test-react-legacy - strategy: - matrix: - react: ['18'] - shard: [1/2, 2/2] - env: - REACT: ${{ matrix.react }} - runs-on: blacksmith-4vcpu-ubuntu-2404 - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut - - name: install react 18 - if: ${{ matrix.react == '18' }} - run: ut ut-install-react-18 - # dom test - - name: dom test - run: ut test -- --maxWorkers=2 --shard=${{matrix.shard}} - - test-node: - name: test-node - runs-on: blacksmith-4vcpu-ubuntu-2404 - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut install - - run: ut run test:node - - test-react-latest: - name: test-react-latest - strategy: - matrix: - module: [dom] - shard: [1/2, 2/2] - runs-on: blacksmith-4vcpu-ubuntu-2404 - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut install --ignore-scripts - - # dom test - - name: dom test - run: ut test -- --maxWorkers=2 --shard=${{matrix.shard}} --coverage - - - name: persist coverages - run: | - mkdir persist-coverage - mv coverage/coverage-final.json persist-coverage/react-test-${{matrix.module}}-${{strategy.job-index}}.json - - - uses: actions/upload-artifact@v4 - name: upload coverages - with: - name: coverage-artifacts-${{ matrix.module }}-${{ strategy.job-index }} - path: persist-coverage/ - - test-react-latest-dist: - name: test-react-latest-dist - strategy: - matrix: - module: [dist, dist-min] - shard: [1/2, 2/2] - runs-on: blacksmith-4vcpu-ubuntu-2404 - needs: build - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut - - - name: restore cache from dist - uses: actions/cache@v5 - with: - path: dist - key: dist-${{ github.sha }} - - - name: dist-min test - if: ${{ matrix.module == 'dist-min' }} - run: ut test - env: - LIB_DIR: dist-min - - - name: dist test - if: ${{ matrix.module == 'dist' }} - run: ut test - env: - LIB_DIR: dist - - ############################ Test Coverage ########################### - upload-test-coverage: - name: test-coverage - runs-on: blacksmith-4vcpu-ubuntu-2404 - needs: test-react-latest - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - uses: actions/download-artifact@v7 - with: - pattern: coverage-artifacts-* - merge-multiple: true - path: persist-coverage - - name: Merge Code Coverage - run: | - utx nyc merge persist-coverage/ coverage/coverage-final.json - utx nyc report --reporter text -t coverage --report-dir coverage - rm -rf persist-coverage - - name: Upload coverage to codecov - uses: codecov/codecov-action@v5 - with: - # use own token to upload coverage reports - token: ${{ secrets.CODECOV_TOKEN }} - - ########################### Compile & Test ########################### - build: - runs-on: blacksmith-4vcpu-ubuntu-2404 - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut - - - name: cache lib - uses: actions/cache@v5 - with: - path: lib - key: lib-${{ github.sha }} - - - name: cache es - uses: actions/cache@v5 - with: - path: es - key: es-${{ github.sha }} - - - name: compile - run: ut compile - - - name: cache dist - uses: actions/cache@v5 - with: - path: dist - key: dist-${{ github.sha }} - - - name: dist - run: ut dist - env: - NODE_OPTIONS: --max_old_space_size=4096 - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - CI: 1 - - - name: check build files - run: ut test:dekko - - # Artifact build files - - uses: actions/upload-artifact@v4 - if: github.event_name == 'push' && github.ref == 'refs/heads/next' - with: - name: build artifacts - path: | - dist - locale - es - lib - - - name: zip builds - if: github.repository == 'ant-design/ant-design' && github.event_name == 'push' && github.ref == 'refs/heads/next' - env: - ALI_OSS_AK_ID: ${{ secrets.ALI_OSS_AK_ID }} - ALI_OSS_AK_SECRET: ${{ secrets.ALI_OSS_AK_SECRET }} - HEAD_SHA: ${{ github.sha }} - run: | - zip -r oss-artifacts.zip dist locale es lib - echo "🤖 Uploading" - node scripts/visual-regression/upload.js ./oss-artifacts.zip --ref=$HEAD_SHA - - test-lib-es: - name: test lib/es module - runs-on: blacksmith-4vcpu-ubuntu-2404 - strategy: - matrix: - module: [lib, es] - shard: [1/2, 2/2] - steps: - - uses: actions/checkout@v6 - - uses: utooland/setup-utoo@v1 - - run: ut - - - name: restore cache from ${{ matrix.module }} - # lib only run in master branch not in pull request - if: ${{ github.event_name != 'pull_request' || matrix.module != 'lib' }} - uses: actions/cache@v5 - with: - path: ${{ matrix.module }} - key: ${{ matrix.module }}-${{ github.sha }} - - - name: compile - # lib only run in master branch not in pull request - if: ${{ github.event_name != 'pull_request' || matrix.module != 'lib' }} - run: ut compile - - - name: test - # lib only run in master branch not in pull request - if: ${{ github.event_name != 'pull_request' || matrix.module != 'lib' }} - run: ut test -- --maxWorkers=2 --shard=${{matrix.shard}} - env: - LIB_DIR: ${{ matrix.module }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 78ad439af7..f524d4685d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,12 +39,6 @@ jobs: - uses: actions/checkout@v6 - uses: utooland/setup-utoo@v1 - run: ut - - name: install react 16 - if: ${{ matrix.react == '16' }} - run: ut bun-install-react-16 - - name: install react 17 - if: ${{ matrix.react == '17' }} - run: ut bun-install-react-17 # dom test - name: dom test run: ut test -- --maxWorkers=2 --shard=${{matrix.shard}} --coverage