From ead0c8ee4a34cff60c915891429b8eafd43b31da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DB=E7=BB=B4=E4=B8=80=28s=2Ey=29?= Date: Fri, 8 Nov 2024 20:42:10 +0800 Subject: [PATCH 1/5] feat: export DraggerProps (#51546) --- components/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/index.ts b/components/index.ts index 4a47c13aae..1640e3e383 100644 --- a/components/index.ts +++ b/components/index.ts @@ -166,7 +166,7 @@ export type { TreeSelectProps } from './tree-select'; export { default as Typography } from './typography'; export type { TypographyProps } from './typography'; export { default as Upload } from './upload'; -export type { UploadFile, UploadProps } from './upload'; +export type { UploadFile, UploadProps, DraggerProps } from './upload'; export { default as version } from './version'; export { default as Watermark } from './watermark'; export type { WatermarkProps } from './watermark'; From a1cbc5a3a0c47f7823c987dea7a980436bdb9581 Mon Sep 17 00:00:00 2001 From: alan-rudzinski <144225133+alan-rudzinski@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:43:58 +0100 Subject: [PATCH 2/5] fix: Propagate inputMode to individual Cells in Input.OTP #51239 (#51271) --- components/input/OTP/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/input/OTP/index.tsx b/components/input/OTP/index.tsx index 3baead3550..2cbba8e97e 100644 --- a/components/input/OTP/index.tsx +++ b/components/input/OTP/index.tsx @@ -69,6 +69,7 @@ const OTP = React.forwardRef((props, ref) => { autoFocus, mask, type, + inputMode, ...restProps } = props; @@ -217,6 +218,7 @@ const OTP = React.forwardRef((props, ref) => { status: mergedStatus as InputStatus, mask, type, + inputMode, }; return wrapCSSVar( From f6afb89f17669f1d64665cdc574927f75d3234c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 9 Nov 2024 10:40:24 +0800 Subject: [PATCH 3/5] chore: upgrade deps (#51549) Co-authored-by: afc163 <507615+afc163@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c37bf147a8..c4e7831285 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "@rc-component/mutate-observer": "^1.1.0", "@rc-component/qrcode": "~1.0.0", "@rc-component/tour": "~1.15.1", - "@rc-component/trigger": "^2.2.3", + "@rc-component/trigger": "^2.2.5", "classnames": "^2.5.1", "copy-to-clipboard": "^3.3.3", "dayjs": "^1.11.11", From f7609a04a7002f1a1f6dc9d5daee3a01e0bb01a2 Mon Sep 17 00:00:00 2001 From: DisLido Date: Sat, 9 Nov 2024 17:13:22 +0800 Subject: [PATCH 4/5] fix(Image): preview.rootClassName (#51538) Co-authored-by: afc163 --- components/image/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/image/index.tsx b/components/image/index.tsx index 45d02ba067..cd694b26dd 100644 --- a/components/image/index.tsx +++ b/components/image/index.tsx @@ -54,7 +54,7 @@ const Image: CompositionImage = (props) => { return preview; } const _preview = typeof preview === 'object' ? preview : {}; - const { getContainer, closeIcon, ...restPreviewProps } = _preview; + const { getContainer, closeIcon, rootClassName, ...restPreviewProps } = _preview; return { mask: (
@@ -64,6 +64,7 @@ const Image: CompositionImage = (props) => { ), icons, ...restPreviewProps, + rootClassName: classNames(mergedRootClassName, rootClassName), getContainer: getContainer ?? getContextPopupContainer, transitionName: getTransitionName(rootPrefixCls, 'zoom', _preview.transitionName), maskTransitionName: getTransitionName(rootPrefixCls, 'fade', _preview.maskTransitionName), From 80030b98457ec41a77810b730e425dc4ab28a3f2 Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Sat, 9 Nov 2024 17:13:33 +0800 Subject: [PATCH 5/5] docs: update note about Table key (#51551) --- components/table/index.en-US.md | 2 +- components/table/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/table/index.en-US.md b/components/table/index.en-US.md index ea1168a346..e3411a174b 100644 --- a/components/table/index.en-US.md +++ b/components/table/index.en-US.md @@ -349,7 +349,7 @@ Here is the [CodeSandbox for TypeScript](https://codesandbox.io/s/serene-platfor ## Note -According to the [React documentation](https://facebook.github.io/react/docs/lists-and-keys.html#keys), every child in an array should be assigned a unique key. The values inside the Table's `dataSource` and `columns` should follow this rule. By default, `dataSource[i].key` will be treated as the key value for `dataSource`. +According to the [React documentation](https://react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key), every child in an array should be assigned a unique key. The values inside the Table's `dataSource` and `columns` should follow this rule. By default, `dataSource[i].key` will be treated as the key value for `dataSource`. ![console warning](https://os.alipayobjects.com/rmsportal/luLdLvhPOiRpyss.png) diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md index f0220ef05b..5818a374ca 100644 --- a/components/table/index.zh-CN.md +++ b/components/table/index.zh-CN.md @@ -352,7 +352,7 @@ TypeScript 里使用 Table 的 [CodeSandbox 实例](https://codesandbox.io/s/ser ## 注意 -按照 [React 的规范](https://zh-hans.reactjs.org/docs/lists-and-keys.html#keys)，所有的数组组件必须绑定 `key`。在 Table 中，`dataSource` 和 `columns` 里的数据值都需要指定 `key` 值。对于 `dataSource` 默认将每列数据的 `key` 属性作为唯一的标识。 +按照 [React 的规范](https://zh-hans.react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key)，所有的列表必须绑定 `key`。在 Table 中，`dataSource` 和 `columns` 里的数据值都需要指定 `key` 值。对于 `dataSource` 默认将每列数据的 `key` 属性作为唯一的标识。 ![控制台警告](https://os.alipayobjects.com/rmsportal/luLdLvhPOiRpyss.png)