From bc908ebf93034c78fb4c87da956e73cdb0217c96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:12:37 +0800 Subject: [PATCH 1/3] chore: upgrade deps (#51564) Co-authored-by: afc163 <507615+afc163@users.noreply.github.com> --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 328d1f5aca..4719ff75cf 100644 --- a/package.json +++ b/package.json @@ -135,12 +135,12 @@ "rc-motion": "^2.9.3", "rc-notification": "~5.6.2", "rc-pagination": "~4.3.0", - "rc-picker": "~4.7.0", + "rc-picker": "~4.7.2", "rc-progress": "~4.0.0", "rc-rate": "~2.13.0", "rc-resize-observer": "^1.4.0", "rc-segmented": "~2.5.0", - "rc-select": "~14.16.2", + "rc-select": "~14.16.3", "rc-slider": "~11.1.7", "rc-steps": "~6.0.1", "rc-switch": "~4.1.0", @@ -149,7 +149,7 @@ "rc-textarea": "~1.8.2", "rc-tooltip": "~6.2.1", "rc-tree": "~5.10.1", - "rc-tree-select": "~5.24.2", + "rc-tree-select": "~5.24.3", "rc-upload": "~4.8.1", "rc-util": "^5.43.0", "scroll-into-view-if-needed": "^3.1.0", From 58dd60ee50a21719e17d2c8d2aea0c7c0e6a8d25 Mon Sep 17 00:00:00 2001 From: DDDDD12138 <43703884+DDDDD12138@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:15:54 +0800 Subject: [PATCH 2/3] docs: ensure doc and ts types match for cellRender props (#51566) --- components/calendar/index.en-US.md | 4 ++-- components/calendar/index.zh-CN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/calendar/index.en-US.md b/components/calendar/index.en-US.md index 03b35c6eb0..ddf4655bac 100644 --- a/components/calendar/index.en-US.md +++ b/components/calendar/index.en-US.md @@ -39,9 +39,9 @@ Common props ref：[Common props](/docs/react/common-props) | Property | Description | Type | Default | Version | | --- | --- | --- | --- | --- | -| cellRender | Customize cell content | function(current: dayjs, today: dayjs, info: { originNode: React.ReactElement,today: DateType, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | +| cellRender | Customize cell content | function(current: dayjs, info: { prefixCls: string, originNode: React.ReactElement, today: dayjs, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | | dateFullCellRender | Customize the display of the date cell, the returned content will override the cell | function(date: Dayjs): ReactNode | - | | -| fullCellRender | Customize cell content | function(current: dayjs, today: dayjs, info: { originNode: React.ReactElement,today: DateType, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | +| fullCellRender | Customize cell content | function(current: dayjs, info: { prefixCls: string, originNode: React.ReactElement, today: dayjs, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | | defaultValue | The date selected by default | [dayjs](https://day.js.org/) | - | | | disabledDate | Function that specifies the dates that cannot be selected, `currentDate` is same dayjs object as `value` prop which you shouldn't mutate it](https://github.com/ant-design/ant-design/issues/30987) | (currentDate: Dayjs) => boolean | - | | | fullscreen | Whether to display in full-screen | boolean | true | | diff --git a/components/calendar/index.zh-CN.md b/components/calendar/index.zh-CN.md index c243a54103..3e76ce755a 100644 --- a/components/calendar/index.zh-CN.md +++ b/components/calendar/index.zh-CN.md @@ -40,9 +40,9 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*-p-wQLik200AAA | 参数 | 说明 | 类型 | 默认值 | 版本 | | --- | --- | --- | --- | --- | -| cellRender | 自定义单元格的内容 | function(current: dayjs, today: dayjs, info: { originNode: React.ReactElement,today: DateType, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | +| cellRender | 自定义单元格的内容 | function(current: dayjs, info: { prefixCls: string, originNode: React.ReactElement, today: dayjs, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | | dateFullCellRender | 自定义渲染日期单元格，返回内容覆盖单元格，>= 5.4.0 请用 `fullCellRender` | function(date: Dayjs): ReactNode | - | < 5.4.0 | -| fullCellRender | 自定义单元格的内容 | function(current: dayjs, today: dayjs, info: { originNode: React.ReactElement,today: DateType, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | +| fullCellRender | 自定义单元格的内容 | function(current: dayjs, info: { prefixCls: string, originNode: React.ReactElement, today: dayjs, range?: 'start' \| 'end', type: PanelMode, locale?: Locale, subType?: 'hour' \| 'minute' \| 'second' \| 'meridiem' }) => React.ReactNode | - | 5.4.0 | | defaultValue | 默认展示的日期 | [dayjs](https://day.js.org/) | - | | | disabledDate | 不可选择的日期，参数为当前 `value`，注意使用时[不要直接修改](https://github.com/ant-design/ant-design/issues/30987) | (currentDate: Dayjs) => boolean | - | | | fullscreen | 是否全屏显示 | boolean | true | | From 491a20ff5892bcd0ba6bcde92078169cd1964d28 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Nov 2024 15:07:15 +0800 Subject: [PATCH 3/3] fix: TreeSelect content being cut due to wrong height calculation (#51567) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 二货机器人 --- .../__snapshots__/components.test.tsx.snap | 60 +++++-- .../__snapshots__/index.test.tsx.snap | 146 ------------------ .../tree-select/__tests__/index.test.tsx | 4 +- components/tree-select/index.tsx | 6 +- package.json | 2 +- 5 files changed, 56 insertions(+), 162 deletions(-) diff --git a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap index 98cea82afd..afce1338a8 100644 --- a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap +++ b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap @@ -42577,8 +42577,14 @@ exports[`ConfigProvider components TreeSelect configProvider 1`] = ` >
+ + light +
@@ -42617,7 +42623,7 @@ exports[`ConfigProvider components TreeSelect configProvider 1`] = ` >
+ + light +
@@ -42821,7 +42833,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize large >
+ + light +
@@ -42960,7 +42978,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize middl >
+ + light +
@@ -43099,7 +43123,7 @@ exports[`ConfigProvider components TreeSelect configProvider componentSize small >
+ + light +
@@ -43238,7 +43268,7 @@ exports[`ConfigProvider components TreeSelect normal 1`] = ` >
+ + light +
@@ -43377,7 +43413,7 @@ exports[`ConfigProvider components TreeSelect prefixCls 1`] = ` >
-
- - - - - - -
-
-
-
-
-
- -
- -
-
-
- -
-`; - exports[`TreeSelect TreeSelect Custom Icons should support customized icons 1`] = `
{ it('should `treeIcon` work', () => { const { container } = render( - Bamboo} /> + } /> , ); - expect(container.firstChild).toMatchSnapshot(); + expect(container.querySelector('.ant-select-tree-treenode .bamboo')).toBeTruthy(); }); }); diff --git a/components/tree-select/index.tsx b/components/tree-select/index.tsx index 0cc70df8f2..833f33d1fd 100644 --- a/components/tree-select/index.tsx +++ b/components/tree-select/index.tsx @@ -31,6 +31,7 @@ import { useCompactItemContext } from '../space/Compact'; import type { AntTreeNodeProps, TreeProps } from '../tree'; import type { SwitcherIcon } from '../tree/Tree'; import SwitcherIconCom from '../tree/utils/iconUtil'; +import { useToken } from '../theme/internal'; import useStyle from './style'; type RawValue = string | number; @@ -97,7 +98,7 @@ const InternalTreeSelect =