Merge pull request #47453 from ant-design/master

chore: merge master into feature
2025-01-18 14:13:37 +08:00 · 2024-02-16 11:37:35 +08:00 · 2024-02-16 11:37:35 +08:00 · 7587f12fe8
commit 7587f12fe8
parent a149377d17 25fdde5486
9 changed files with 63 additions and 26 deletions
--- a/.dumi/theme/slots/Content/index.tsx
+++ b/.dumi/theme/slots/Content/index.tsx
@ -100,7 +100,7 @@ const Content: React.FC<React.PropsWithChildren> = ({ children }) => {
              juejinLink={meta.frontmatter.juejin_url}
            />
          </InViewSuspense>
-          <InViewSuspense>
+          <InViewSuspense fallback={<div style={{ height: 50, marginTop: 120 }} />}>
            <Contributors filename={meta.frontmatter.filename} />
          </InViewSuspense>
        </article>
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@ -16,6 +16,18 @@ tag: vVERSION

 ---

+## 5.14.1
+
+`2024-02-13`
+
+- 🐞 Fix Steps cannot interact correctly when `type="inline"`. [#47406](https://github.com/ant-design/ant-design/pull/47406)
+- 🐞 Fix DatePicker &amp; TimePicker arrow position not consider panel border radius distance. [#47389](https://github.com/ant-design/ant-design/pull/47389)
+- 🐞 Fix Dropdown should not display when items is empty array. [#47375](https://github.com/ant-design/ant-design/pull/47375)
+- 🐞 Fix Tag that should use `defaultBg` token with `bordered={false}`. [#47372](https://github.com/ant-design/ant-design/pull/47372) [@MadCcc](https://github.com/MadCcc)
+- 🐞 MISC: Fix that `theme.inherit` should not affect `hashded` and `cssVar`. [#47360](https://github.com/ant-design/ant-design/pull/47360) [@MadCcc](https://github.com/MadCcc)
+- 🐞 Fix Calendar panel not switch when change year or month. [#47361](https://github.com/ant-design/ant-design/pull/47361)
+- 💄 Fix Table's sub-table style issue in virtual mode. [#47333](https://github.com/ant-design/ant-design/pull/47333) [@Enigama](https://github.com/Enigama)
+
 ## 5.14.0

 `2024-02-04`
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@ -16,6 +16,18 @@ tag: vVERSION

 ---

+## 5.14.1
+
+`2024-02-13`
+
+- 🐞 修复 Steps `type="inline"` 时鼠标无法 hover 到正确的步骤上的问题。[#47406](https://github.com/ant-design/ant-design/pull/47406)
+- 🐞 修复 DatePicker 与 TimePicker 弹出面板箭头没有考虑面板本身圆角的问题。[#47389](https://github.com/ant-design/ant-design/pull/47389)
+- 🐞 修复 Dropdown `menu.items` 为空时依然显示的问题。[#47375](https://github.com/ant-design/ant-design/pull/47375)
+- 🐞 修复 Tag 无边框模式没有正确使用 `defaultBg` 组件 token 的问题。[#47372](https://github.com/ant-design/ant-design/pull/47372) [@MadCcc](https://github.com/MadCcc)
+- 🐞 杂项：修复主题 `inherit` 配置会隔断 `hashed` 和 `cssVar` 配置的问题。[#47360](https://github.com/ant-design/ant-design/pull/47360) [@MadCcc](https://github.com/MadCcc)
+- 🐞 修复 Calendar 在切换年月时，面板没有跟着切换的问题。[#47361](https://github.com/ant-design/ant-design/pull/47361)
+- 💄 修复 Table 在虚拟模式下子表格的样式问题。[#47333](https://github.com/ant-design/ant-design/pull/47333) [@Enigama](https://github.com/Enigama)
+
 ## 5.14.0

 `2024-02-04`
--- a/components/cascader/demo/basic.tsx
+++ b/components/cascader/demo/basic.tsx
@ -42,7 +42,7 @@ const options: Option[] = [
  },
 ];

-const onChange = (value: string[]) => {
+const onChange = (value: (string | number)[]) => {
  console.log(value);
 };

--- a/components/date-picker/style/index.ts
+++ b/components/date-picker/style/index.ts
@ -364,9 +364,14 @@ const genPickerStyle: GenerateStyle<PickerToken> = (token) => {
            position: 'absolute',
            zIndex: 1,
            display: 'none',
-            marginInlineStart: token.calc(paddingInline).mul(1.5).equal(),
+            paddingInline: token.calc(paddingInline).mul(1.5).equal(),
+            boxSizing: 'content-box',
            transition: `left ${motionDurationSlow} ease-out`,
            ...genRoundedArrow(token, colorBgElevated, boxShadowPopoverArrow),
+
+            '&:before': {
+              insetInlineStart: token.calc(paddingInline).mul(1.5).equal(),
+            },
          },

          [`${componentCls}-panel-container`]: {
--- a/components/dropdown/style/index.ts
+++ b/components/dropdown/style/index.ts
@ -194,6 +194,11 @@ const genBaseStyle: GenerateStyle<DropdownToken> = (token) => {
          boxShadow: token.boxShadowSecondary,
          ...genFocusStyle(token),

+          '&:empty': {
+            padding: 0,
+            boxShadow: 'none',
+          },
+
          [`${menuCls}-item-group-title`]: {
            padding: `${unit(paddingBlock!)} ${unit(controlPaddingHorizontal)}`,
            color: token.colorTextDescription,
--- a/components/steps/style/inline.ts
+++ b/components/steps/style/inline.ts
@ -42,6 +42,9 @@ const genStepsInlineStyle: GenerateStyle<StepsToken, CSSObject> = (token) => {
          },
          [`${componentCls}-icon-dot`]: {
            borderRadius: token.calc(token.fontSizeSM).div(4).equal(),
+            '&::after': {
+              display: 'none',
+            },
          },
        },

--- a/components/table/demo/colspan-rowspan.md
+++ b/components/table/demo/colspan-rowspan.md
@ -2,10 +2,10 @@

 表头只支持列合并，使用 column 里的 colSpan 进行设置。

-表格支持行/列合并，使用 render 里的单元格属性 colSpan 或者 rowSpan 设值为 0 时，设置的表格不会渲染。
+表格支持行/列合并，当 `onCell` 里的单元格属性 `colSpan` 或者 `rowSpan` 设值为 0 时，设置的表格不会渲染。

 ## en-US

 Table column title supports `colSpan` that set in `column`.

-Table cell supports `colSpan` and `rowSpan` that set in render return object. When each of them is set to `0`, the cell will not be rendered.
+Table cell supports `colSpan` and `rowSpan` that set in onCell return object. When each of them is set to `0`, the cell will not be rendered.
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "antd",
-  "version": "5.14.0",
+  "version": "5.14.1",
  "description": "An enterprise-class UI design language and React components implementation",
  "keywords": [
    "ant",
@ -77,7 +77,7 @@
    "lint-fix:demo": "npm run lint:demo -- --fix",
    "lint-fix:script": "npm run lint:script -- --fix",
    "pre-publish": "npm run test-all -- --skip-build && tsx ./scripts/pre-publish-notice.ts",
-    "prepare": "is-ci || husky install && dumi setup",
+    "prepare": "is-ci || husky && dumi setup",
    "prepublishOnly": "antd-tools run guard",
    "prettier": "prettier -c --write **/* --cache",
    "pub": "npm run version && npm run collect-token-statistic && npm run token-meta && antd-tools run pub",
@ -143,7 +143,7 @@
    "rc-motion": "^2.9.0",
    "rc-notification": "~5.3.0",
    "rc-pagination": "~4.0.4",
-    "rc-picker": "~4.0.0-alpha.44",
+    "rc-picker": "~4.1.1",
    "rc-progress": "~3.5.1",
    "rc-rate": "~2.12.0",
    "rc-resize-observer": "^1.4.0",
@ -170,7 +170,7 @@
    "@antv/g6": "^4.8.24",
    "@babel/eslint-plugin": "^7.23.5",
    "@biomejs/biome": "^1.5.3",
-    "@codesandbox/sandpack-react": "^2.12.0",
+    "@codesandbox/sandpack-react": "^2.12.1",
    "@dnd-kit/core": "^6.1.0",
    "@dnd-kit/modifiers": "^7.0.0",
    "@dnd-kit/sortable": "^8.0.0",
@ -188,7 +188,7 @@
    "@testing-library/user-event": "^14.5.2",
    "@types/ali-oss": "^6.16.11",
    "@types/fs-extra": "^11.0.4",
-    "@types/gtag.js": "^0.0.18",
+    "@types/gtag.js": "^0.0.19",
    "@types/http-server": "^0.12.4",
    "@types/inquirer": "^9.0.7",
    "@types/isomorphic-fetch": "^0.0.39",
@ -200,7 +200,7 @@
    "@types/jsdom": "^21.1.6",
    "@types/lodash": "^4.14.202",
    "@types/minimist": "^1.2.5",
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.11.18",
    "@types/nprogress": "^0.2.3",
    "@types/pixelmatch": "^5.2.6",
    "@types/pngjs": "^6.0.4",
@ -209,15 +209,15 @@
    "@types/qs": "^6.9.11",
    "@types/react": "^18.2.55",
    "@types/react-copy-to-clipboard": "^5.0.7",
-    "@types/react-dom": "^18.2.18",
+    "@types/react-dom": "^18.2.19",
    "@types/react-highlight-words": "^0.16.7",
    "@types/react-resizable": "^3.0.7",
-    "@types/semver": "^7.5.6",
+    "@types/semver": "^7.5.7",
    "@types/tar": "^6.1.11",
    "@types/throttle-debounce": "^5.0.2",
    "@types/warning": "^3.0.3",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.1",
+    "@typescript-eslint/parser": "^7.0.1",
    "ali-oss": "^6.20.0",
    "antd-img-crop": "^4.21.0",
    "antd-style": "^3.6.1",
@ -238,13 +238,13 @@
    "eslint-import-resolver-typescript": "^3.6.1",
    "eslint-plugin-compat": "^4.2.0",
    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-jest": "^27.8.0",
    "eslint-plugin-jsx-a11y": "^6.8.0",
    "eslint-plugin-lodash": "^7.4.0",
    "eslint-plugin-markdown": "^3.0.1",
    "eslint-plugin-react": "^7.33.2",
    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-unicorn": "^51.0.0",
+    "eslint-plugin-unicorn": "^51.0.1",
    "fast-glob": "^3.3.2",
    "fetch-jsonp": "^1.3.0",
    "fs-extra": "^11.2.0",
@ -252,7 +252,7 @@
    "glob": "^10.3.10",
    "html2sketch": "^1.0.2",
    "http-server": "^14.1.1",
-    "husky": "^9.0.10",
+    "husky": "^9.0.11",
    "identity-obj-proxy": "^3.0.0",
    "immer": "^10.0.3",
    "inquirer": "^9.2.14",
@ -264,7 +264,7 @@
    "jest-environment-jsdom": "^29.7.0",
    "jest-environment-node": "^29.7.0",
    "jest-image-snapshot": "^6.4.0",
-    "jest-puppeteer": "^9.0.2",
+    "jest-puppeteer": "^10.0.1",
    "jquery": "^3.7.1",
    "jsdom": "^24.0.0",
    "jsonml-to-react-element": "^1.1.11",
@ -296,10 +296,10 @@
    "react-countup": "^6.5.0",
    "react-dom": "^18.2.0",
    "react-draggable": "^4.4.6",
-    "react-fast-marquee": "^1.6.3",
+    "react-fast-marquee": "^1.6.4",
    "react-highlight-words": "^0.20.0",
    "react-infinite-scroll-component": "^6.1.0",
-    "react-intersection-observer": "^9.7.0",
+    "react-intersection-observer": "^9.8.0",
    "react-resizable": "^3.0.5",
    "react-router-dom": "^6.22.0",
    "react-sticky-box": "^2.0.5",
@ -322,12 +322,12 @@
    "stylelint-prettier": "^5.0.0",
    "sylvanas": "^0.6.1",
    "tar": "^6.2.0",
-    "tar-fs": "^3.0.4",
-    "terser": "^5.27.0",
-    "tsx": "^4.7.0",
-    "typedoc": "^0.25.7",
+    "tar-fs": "^3.0.5",
+    "terser": "^5.27.1",
+    "tsx": "^4.7.1",
+    "typedoc": "^0.25.8",
    "typescript": "~5.3.3",
-    "vanilla-jsoneditor": "^0.21.5",
+    "vanilla-jsoneditor": "^0.21.6",
    "vanilla-tilt": "^1.8.1",
    "webpack": "^5.90.1",
    "webpack-bundle-analyzer": "^4.10.1",