From 440b34596259754c273f01eadd4ffe33ceece2e4 Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Fri, 7 Apr 2023 12:00:34 +0800 Subject: [PATCH 01/17] chore: fix cssinjs check (#41695) --- scripts/generate-cssinjs.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/generate-cssinjs.js b/scripts/generate-cssinjs.js index 32577a209d..98a694db85 100644 --- a/scripts/generate-cssinjs.js +++ b/scripts/generate-cssinjs.js @@ -14,26 +14,26 @@ module.exports = { const EmptyElement = React.createElement('div'); styleFiles.forEach((file) => { + const pathArr = file.split('/'); + const styleIndex = pathArr.lastIndexOf('style'); + const componentName = pathArr[styleIndex - 1]; let useStyle = () => {}; if (file.includes('grid')) { // eslint-disable-next-line global-require,import/no-dynamic-require const { useColStyle, useRowStyle } = require(file); - useStyle = () => { - useRowStyle(); - useColStyle(); + useStyle = (prefixCls) => { + useRowStyle(prefixCls); + useColStyle(prefixCls); }; } else { // eslint-disable-next-line global-require,import/no-dynamic-require useStyle = require(file).default; } const Component = () => { - useStyle(key); + useStyle(`${key}-${componentName}`); return EmptyElement; }; - const pathArr = file.split('/'); - const styleIndex = pathArr.lastIndexOf('style'); - const componentName = pathArr[styleIndex - 1]; beforeRender?.(componentName); render(Component); }); From 4dc86da9e5ea660526490afd7d8c523008d96216 Mon Sep 17 00:00:00 2001 From: Rinku Chaudhari <76877078+therealrinku@users.noreply.github.com> Date: Fri, 7 Apr 2023 21:12:50 +0545 Subject: [PATCH 02/17] chore: code comment english (#41706) * translations: cn to en * docs: grammar fix and ts definitions translated to english * scripts change revert --- components/affix/index.tsx | 8 ++++---- components/alert/index.tsx | 4 ++-- components/avatar/avatar.tsx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/affix/index.tsx b/components/affix/index.tsx index f7e5939e0c..41e670a76e 100644 --- a/components/affix/index.tsx +++ b/components/affix/index.tsx @@ -21,14 +21,14 @@ function getDefaultTarget() { // Affix export interface AffixProps { - /** 距离窗口顶部达到指定偏移量后触发 */ + /** Triggered when the specified offset is reached from the top of the window */ offsetTop?: number; - /** 距离窗口底部达到指定偏移量后触发 */ + /** Triggered when the specified offset is reached from the bottom of the window */ offsetBottom?: number; style?: React.CSSProperties; - /** 固定状态改变时触发的回调函数 */ + /** Callback function triggered when fixed state changes */ onChange?: (affixed?: boolean) => void; - /** 设置 Affix 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 */ + /** Set the element that Affix needs to listen to its scroll event, the value is a function that returns the corresponding DOM element */ target?: () => Window | HTMLElement | null; prefixCls?: string; className?: string; diff --git a/components/alert/index.tsx b/components/alert/index.tsx index 47f01f8f3b..e5cbedd01b 100644 --- a/components/alert/index.tsx +++ b/components/alert/index.tsx @@ -132,7 +132,7 @@ const Alert: CompoundedComponent = ({ if (type !== undefined) { return type; } - // banner 模式默认为警告 + // banner mode defaults to 'warning' return banner ? 'warning' : 'info'; }; @@ -140,7 +140,7 @@ const Alert: CompoundedComponent = ({ const isClosable = closeText ? true : closable; const type = getType(); - // banner 模式默认有 Icon + // banner mode defaults to Icon const isShowIcon = banner && showIcon === undefined ? true : showIcon; const alertCls = classNames( diff --git a/components/avatar/avatar.tsx b/components/avatar/avatar.tsx index d1750eb7c3..bcecaf9acb 100644 --- a/components/avatar/avatar.tsx +++ b/components/avatar/avatar.tsx @@ -36,7 +36,7 @@ export interface AvatarProps { crossOrigin?: '' | 'anonymous' | 'use-credentials'; onClick?: (e?: React.MouseEvent) => void; /* callback when img load error */ - /* return false to prevent Avatar show default fallback behavior, then you can do fallback by your self */ + /* return false to prevent Avatar show default fallback behavior, then you can do fallback by yourself */ onError?: () => boolean; } From b483ef8c3f64f8036b0157b0c3a5ea576dafae9c Mon Sep 17 00:00:00 2001 From: JiaQi <112228030+Yuiai01@users.noreply.github.com> Date: Fri, 7 Apr 2023 23:39:23 +0800 Subject: [PATCH 03/17] style(List.Item.Meta): Avatar and title are not aligned (#41688) * fix(List.Item.Meta):Avatar and title are not aligned * chore: add test case --- components/list/__tests__/Item.test.tsx | 16 ++++++++++++++++ components/list/style/index.ts | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/components/list/__tests__/Item.test.tsx b/components/list/__tests__/Item.test.tsx index 64af9280a7..6330c0166d 100644 --- a/components/list/__tests__/Item.test.tsx +++ b/components/list/__tests__/Item.test.tsx @@ -230,4 +230,20 @@ describe('List Item Layout', () => { rerender(getDom(5)); expect(loadId).toEqual([1, 3, 5]); }); + + it('List.Item.Meta title should have no default margin', () => { + const { container } = render( + ( + + + + )} + />, + ); + + const title = container.querySelector('.ant-list-item-meta-title'); + expect(title && getComputedStyle(title).margin).toEqual('0px 0px 4px 0px'); + }); }); diff --git a/components/list/style/index.ts b/components/list/style/index.ts index 9692ac48f9..9a4b9e8160 100644 --- a/components/list/style/index.ts +++ b/components/list/style/index.ts @@ -187,7 +187,7 @@ const genBaseStyle: GenerateStyle = (token) => { }, [`${componentCls}-item-meta-title`]: { - marginBottom: token.marginXXS, + margin: `0 0 ${token.marginXXS}px 0`, color: colorText, fontSize: token.fontSize, lineHeight: token.lineHeight, From 3b60671fb9ff851c9fc41abb4c34cc4bf00b0970 Mon Sep 17 00:00:00 2001 From: acyza <101238421+acyza@users.noreply.github.com> Date: Sat, 8 Apr 2023 09:54:20 +0800 Subject: [PATCH 04/17] fix: switcherIcon cannot be hidden (#41708) * fix: switcherIcon cannot be hidden * fix: switcherIcon cannot be hidden * chore: update * chore: add test case * chore: fix test --- components/tree/__tests__/index.test.tsx | 29 ++++++++++++++++++++++++ components/tree/utils/iconUtil.tsx | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/components/tree/__tests__/index.test.tsx b/components/tree/__tests__/index.test.tsx index 97435ef004..3fad4485c7 100644 --- a/components/tree/__tests__/index.test.tsx +++ b/components/tree/__tests__/index.test.tsx @@ -185,4 +185,33 @@ describe('Tree', () => { expect(nodeDraggable).toHaveBeenCalledWith(dragTreeData[0]); }); }); + + describe('hidden switcherIcon', () => { + it('use `switcherIcon={() => null}`', () => { + const { container } = render( + null}> + + + + + , + ); + container.querySelectorAll('.ant-tree-switcher').forEach((el) => { + expect(el.children.length).toBe(0); + }); + }); + it('use `switcherIcon={null}`', () => { + const { container } = render( + + + + + + , + ); + container.querySelectorAll('.ant-tree-switcher').forEach((el) => { + expect(el.children.length).toBe(0); + }); + }); + }); }); diff --git a/components/tree/utils/iconUtil.tsx b/components/tree/utils/iconUtil.tsx index 35fe64fca5..83d78d5322 100644 --- a/components/tree/utils/iconUtil.tsx +++ b/components/tree/utils/iconUtil.tsx @@ -64,7 +64,7 @@ const SwitcherIconCom: React.FC = (props) => { }); } - if (switcher) { + if (switcher !== undefined) { return switcher as unknown as React.ReactElement; } From 56c27b1c2da6e75d26899dd8be3e167bc8c5a776 Mon Sep 17 00:00:00 2001 From: my-csl <54094975+my-csl@users.noreply.github.com> Date: Sat, 8 Apr 2023 16:07:09 +0800 Subject: [PATCH 05/17] docs: remove duplicate words (#41712) --- docs/react/practical-projects.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/react/practical-projects.zh-CN.md b/docs/react/practical-projects.zh-CN.md index 070e0ead40..3b2914be43 100644 --- a/docs/react/practical-projects.zh-CN.md +++ b/docs/react/practical-projects.zh-CN.md @@ -319,7 +319,7 @@ export default function Layout() { } ``` -这里先用 umi 的 `useAppData` 拿到全局客户端路由 `clientRoutes`，这是一份嵌套结构的路由表，我们把 `clientRoutes[0]` 传给 ProLayout；再通过 `useLocation()` 拿到 location 信息，也传给 ProLayout 来决定哪个菜单应该高亮；同时我们希望点击菜单时做路由跳转，需要需要定制 ProLayout 的 menuItemRender 方法。 +这里先用 umi 的 `useAppData` 拿到全局客户端路由 `clientRoutes`，这是一份嵌套结构的路由表，我们把 `clientRoutes[0]` 传给 ProLayout；再通过 `useLocation()` 拿到 location 信息，也传给 ProLayout 来决定哪个菜单应该高亮；同时我们希望点击菜单时做路由跳转，需要定制 ProLayout 的 menuItemRender 方法。 聪明的你可能已经发现 `src/layouts/index.less` 已经没地方引用他了，为了保持项目文件的整洁，可以选择删掉他。 From 09430623b5e5f8c8e0acd4439eecb417d045bb36 Mon Sep 17 00:00:00 2001 From: Chinnawat Chimdee Date: Sat, 8 Apr 2023 15:24:24 +0700 Subject: [PATCH 06/17] fix: add missing Thai locale config (#41697) --- components/locale/th_TH.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/components/locale/th_TH.ts b/components/locale/th_TH.ts index 0d3f82a269..b85d3dc0b9 100644 --- a/components/locale/th_TH.ts +++ b/components/locale/th_TH.ts @@ -21,9 +21,12 @@ const localeValues: Locale = { filterConfirm: 'ยืนยัน', filterReset: 'รีเซ็ต', filterEmptyText: 'ไม่มีตัวกรอง', + filterCheckall: 'เลือกรายการทั้งหมด', + filterSearchPlaceholder: 'ค้นหาตัวกรอง', emptyText: 'ไม่มีข้อมูล', selectAll: 'เลือกทั้งหมดในหน้านี้', selectInvert: 'กลับสถานะการเลือกในหน้านี้', + selectNone: 'ไม่เลือกข้อมูลทั้งหมด', selectionAll: 'เลือกข้อมูลทั้งหมด', sortTitle: 'เรียง', expand: 'แสดงแถวข้อมูล', @@ -32,6 +35,11 @@ const localeValues: Locale = { triggerAsc: 'คลิกเรียงจากน้อยไปมาก', cancelSort: 'คลิกเพื่อยกเลิกการเรียง', }, + Tour: { + Next: 'ถัดไป', + Previous: 'ย้อนกลับ', + Finish: 'เสร็จสิ้น', + }, Modal: { okText: 'ตกลง', cancelText: 'ยกเลิก', @@ -125,6 +133,13 @@ const localeValues: Locale = { }, }, }, + Image: { + preview: 'ดูตัวอย่าง', + }, + QRCode: { + expired: 'คิวอาร์โค้ดหมดอายุ', + refresh: 'รีเฟรช', + }, }; export default localeValues; From 2bafb252eb9fc4c4646436ffdf8c6bd1d29dc556 Mon Sep 17 00:00:00 2001 From: my-csl <54094975+my-csl@users.noreply.github.com> Date: Sat, 8 Apr 2023 21:00:55 +0800 Subject: [PATCH 07/17] docs: Update practical-projects.zh-CN.md (#41711) Delete duplicate words From 1688d5995f11c8c8b2357b7c3f719f725103b02b Mon Sep 17 00:00:00 2001 From: JiaQi <112228030+Yuiai01@users.noreply.github.com> Date: Sat, 8 Apr 2023 21:01:51 +0800 Subject: [PATCH 08/17] chore: Update random image sources (#41704) * chore: update demo * chore: update test case * chore: update snap --- components/avatar/__tests__/Avatar.test.tsx | 8 +++---- .../__snapshots__/Avatar.test.tsx.snap | 4 ++-- .../__snapshots__/demo-extend.test.ts.snap | 6 ++--- .../__snapshots__/demo.test.tsx.snap | 6 ++--- components/avatar/demo/group.tsx | 6 ++--- .../__snapshots__/demo-extend.test.ts.snap | 2 +- .../__tests__/__snapshots__/demo.test.ts.snap | 2 +- components/card/demo/loading.tsx | 4 ++-- components/card/demo/meta.tsx | 6 ++--- .../__snapshots__/components.test.tsx.snap | 14 ++++++------ .../__tests__/components.test.tsx | 2 +- components/list/__tests__/Item.test.tsx | 2 +- .../__snapshots__/demo-extend.test.ts.snap | 22 +++++++++---------- .../__tests__/__snapshots__/demo.test.ts.snap | 22 +++++++++---------- components/list/demo/basic.tsx | 2 +- components/list/demo/pagination.tsx | 4 +++- components/list/demo/vertical.tsx | 2 +- .../__snapshots__/demo-extend.test.ts.snap | 2 +- .../__tests__/__snapshots__/demo.test.ts.snap | 2 +- components/segmented/demo/custom.tsx | 2 +- components/skeleton/demo/list.tsx | 2 +- .../__snapshots__/demo-extend.test.ts.snap | 8 +++---- .../__tests__/__snapshots__/demo.test.ts.snap | 8 +++---- components/steps/demo/inline.tsx | 4 +++- 24 files changed, 73 insertions(+), 69 deletions(-) diff --git a/components/avatar/__tests__/Avatar.test.tsx b/components/avatar/__tests__/Avatar.test.tsx index e07ac6bbb2..0ff9be3b89 100644 --- a/components/avatar/__tests__/Avatar.test.tsx +++ b/components/avatar/__tests__/Avatar.test.tsx @@ -53,7 +53,7 @@ describe('Avatar Render', () => { it('should handle onError correctly', () => { const LOAD_FAILURE_SRC = 'http://error.url/'; - const LOAD_SUCCESS_SRC = 'https://joesch.moe/api/v1/random'; + const LOAD_SUCCESS_SRC = 'https://xsgames.co/randomusers/avatar.php?g=pixel'; const Foo: React.FC = () => { const [avatarSrc, setAvatarSrc] = useState( LOAD_FAILURE_SRC, @@ -75,7 +75,7 @@ describe('Avatar Render', () => { it('should show image on success after a failure state', () => { const LOAD_FAILURE_SRC = 'http://error.url'; - const LOAD_SUCCESS_SRC = 'https://joesch.moe/api/v1/random'; + const LOAD_SUCCESS_SRC = 'https://xsgames.co/randomusers/avatar.php?g=pixel'; const div = global.document.createElement('div'); global.document.body.appendChild(div); @@ -172,7 +172,7 @@ describe('Avatar Render', () => { }); it('should exist crossorigin attribute', () => { - const LOAD_SUCCESS_SRC = 'https://joesch.moe/api/v1/random'; + const LOAD_SUCCESS_SRC = 'https://xsgames.co/randomusers/avatar.php?g=pixel'; const crossOrigin = 'anonymous'; const { container } = render( @@ -184,7 +184,7 @@ describe('Avatar Render', () => { }); it('should not exist crossorigin attribute', () => { - const LOAD_SUCCESS_SRC = 'https://joesch.moe/api/v1/random'; + const LOAD_SUCCESS_SRC = 'https://xsgames.co/randomusers/avatar.php?g=pixel'; const { container } = render(crossorigin); expect(container.querySelector('img')?.crossOrigin).toBeFalsy(); expect(container.querySelector('img')?.crossOrigin).toEqual(''); diff --git a/components/avatar/__tests__/__snapshots__/Avatar.test.tsx.snap b/components/avatar/__tests__/__snapshots__/Avatar.test.tsx.snap index bc692839d4..a07848455e 100644 --- a/components/avatar/__tests__/__snapshots__/Avatar.test.tsx.snap +++ b/components/avatar/__tests__/__snapshots__/Avatar.test.tsx.snap @@ -140,7 +140,7 @@ exports[`Avatar Render should handle onError correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > `; @@ -163,7 +163,7 @@ exports[`Avatar Render should show image on success after a failure state 2`] = class="ant-avatar ant-avatar-circle ant-avatar-image" > `; diff --git a/components/avatar/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/avatar/__tests__/__snapshots__/demo-extend.test.ts.snap index 670ac3ac34..47fdac09f6 100644 --- a/components/avatar/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/avatar/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -415,7 +415,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > ( <> - + K @@ -16,7 +16,7 @@ const App: React.FC = () => ( - + K } /> @@ -29,7 +29,7 @@ const App: React.FC = () => ( size="large" maxStyle={{ color: '#f56a00', backgroundColor: '#fde3cf' }} > - + K } /> diff --git a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap index aed17f7f1c..60bdaa15b2 100644 --- a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -601,7 +601,7 @@ exports[`renders components/card/demo/meta.tsx extend context correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/card/__tests__/__snapshots__/demo.test.ts.snap b/components/card/__tests__/__snapshots__/demo.test.ts.snap index 7aca6084c9..189098480a 100644 --- a/components/card/__tests__/__snapshots__/demo.test.ts.snap +++ b/components/card/__tests__/__snapshots__/demo.test.ts.snap @@ -601,7 +601,7 @@ exports[`renders components/card/demo/meta.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/card/demo/loading.tsx b/components/card/demo/loading.tsx index 7bd6ae8b40..c73b67197d 100644 --- a/components/card/demo/loading.tsx +++ b/components/card/demo/loading.tsx @@ -16,7 +16,7 @@ const App: React.FC = () => { } + avatar={} title="Card title" description="This is the description" /> @@ -31,7 +31,7 @@ const App: React.FC = () => { > } + avatar={} title="Card title" description="This is the description" /> diff --git a/components/card/demo/meta.tsx b/components/card/demo/meta.tsx index e2628041e5..0f61cf368f 100644 --- a/components/card/demo/meta.tsx +++ b/components/card/demo/meta.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { EditOutlined,EllipsisOutlined,SettingOutlined } from '@ant-design/icons'; -import { Avatar,Card } from 'antd'; +import { EditOutlined, EllipsisOutlined, SettingOutlined } from '@ant-design/icons'; +import { Avatar, Card } from 'antd'; const { Meta } = Card; @@ -20,7 +20,7 @@ const App: React.FC = () => ( ]} > } + avatar={} title="Card title" description="This is the description" /> diff --git a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap index 59cf812dc9..cd9196fe5e 100644 --- a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap +++ b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap @@ -17322,7 +17322,7 @@ exports[`ConfigProvider components List configProvider 1`] = ` class="config-avatar config-avatar-circle config-avatar-image" > @@ -17374,7 +17374,7 @@ exports[`ConfigProvider components List configProvider componentDisabled 1`] = ` class="config-avatar config-avatar-circle config-avatar-image" > @@ -17426,7 +17426,7 @@ exports[`ConfigProvider components List configProvider componentSize large 1`] = class="config-avatar config-avatar-circle config-avatar-image" > @@ -17478,7 +17478,7 @@ exports[`ConfigProvider components List configProvider componentSize middle 1`] class="config-avatar config-avatar-circle config-avatar-image" > @@ -17530,7 +17530,7 @@ exports[`ConfigProvider components List configProvider virtual and dropdownMatch class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -17582,7 +17582,7 @@ exports[`ConfigProvider components List normal 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -17634,7 +17634,7 @@ exports[`ConfigProvider components List prefixCls 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/config-provider/__tests__/components.test.tsx b/components/config-provider/__tests__/components.test.tsx index 173a7e7b40..63017b6fcb 100644 --- a/components/config-provider/__tests__/components.test.tsx +++ b/components/config-provider/__tests__/components.test.tsx @@ -351,7 +351,7 @@ describe('ConfigProvider', () => { } + avatar={} title="Ant Design" description="Ant Design, a design language for background applications, is refined by Ant UED Team" /> diff --git a/components/list/__tests__/Item.test.tsx b/components/list/__tests__/Item.test.tsx index 6330c0166d..0c87bc8fab 100644 --- a/components/list/__tests__/Item.test.tsx +++ b/components/list/__tests__/Item.test.tsx @@ -9,7 +9,7 @@ describe('List Item Layout', () => { key: 1, href: 'https://ant.design', title: 'ant design', - avatar: 'https://joesch.moe/api/v1/random', + avatar: 'https://xsgames.co/randomusers/avatar.php?g=pixel', description: 'Ant Design, a design language for background applications, is refined by Ant UED Team.', content: diff --git a/components/list/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/list/__tests__/__snapshots__/demo-extend.test.ts.snap index 0d52adf94c..7b0695c856 100644 --- a/components/list/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/list/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -26,7 +26,7 @@ exports[`renders components/list/demo/basic.tsx extend context correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -63,7 +63,7 @@ exports[`renders components/list/demo/basic.tsx extend context correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -100,7 +100,7 @@ exports[`renders components/list/demo/basic.tsx extend context correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -137,7 +137,7 @@ exports[`renders components/list/demo/basic.tsx extend context correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1360,7 +1360,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1397,7 +1397,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1434,7 +1434,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1471,7 +1471,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -2079,7 +2079,7 @@ exports[`renders components/list/demo/vertical.tsx extend context correctly 1`] class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -2245,7 +2245,7 @@ exports[`renders components/list/demo/vertical.tsx extend context correctly 1`] class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -2411,7 +2411,7 @@ exports[`renders components/list/demo/vertical.tsx extend context correctly 1`] class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/list/__tests__/__snapshots__/demo.test.ts.snap b/components/list/__tests__/__snapshots__/demo.test.ts.snap index 117a01e608..d4e9382cc3 100644 --- a/components/list/__tests__/__snapshots__/demo.test.ts.snap +++ b/components/list/__tests__/__snapshots__/demo.test.ts.snap @@ -26,7 +26,7 @@ exports[`renders components/list/demo/basic.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -63,7 +63,7 @@ exports[`renders components/list/demo/basic.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -100,7 +100,7 @@ exports[`renders components/list/demo/basic.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -137,7 +137,7 @@ exports[`renders components/list/demo/basic.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1360,7 +1360,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1397,7 +1397,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1434,7 +1434,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1471,7 +1471,7 @@ Array [ class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -2072,7 +2072,7 @@ exports[`renders components/list/demo/vertical.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -2238,7 +2238,7 @@ exports[`renders components/list/demo/vertical.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -2404,7 +2404,7 @@ exports[`renders components/list/demo/vertical.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/list/demo/basic.tsx b/components/list/demo/basic.tsx index c4a57e0fc7..ac7ea9519b 100644 --- a/components/list/demo/basic.tsx +++ b/components/list/demo/basic.tsx @@ -23,7 +23,7 @@ const App: React.FC = () => ( renderItem={(item, index) => ( } + avatar={} title={{item.title}} description="Ant Design, a design language for background applications, is refined by Ant UED Team" /> diff --git a/components/list/demo/pagination.tsx b/components/list/demo/pagination.tsx index 6b9740cedc..2040de7ea4 100644 --- a/components/list/demo/pagination.tsx +++ b/components/list/demo/pagination.tsx @@ -70,7 +70,9 @@ const App: React.FC = () => { renderItem={(item, index) => ( } + avatar={ + + } title={{item.title}} description="Ant Design, a design language for background applications, is refined by Ant UED Team" /> diff --git a/components/list/demo/vertical.tsx b/components/list/demo/vertical.tsx index e0e91bcfd3..6236c7cf36 100644 --- a/components/list/demo/vertical.tsx +++ b/components/list/demo/vertical.tsx @@ -5,7 +5,7 @@ import React from 'react'; const data = Array.from({ length: 23 }).map((_, i) => ({ href: 'https://ant.design', title: `ant design part ${i}`, - avatar: `https://joesch.moe/api/v1/random?key=${i}`, + avatar: `https://xsgames.co/randomusers/avatar.php?g=pixel&key=${i}`, description: 'Ant Design, a design language for background applications, is refined by Ant UED Team.', content: diff --git a/components/segmented/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/segmented/__tests__/__snapshots__/demo-extend.test.ts.snap index 486276e316..992d80d6da 100644 --- a/components/segmented/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/segmented/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -330,7 +330,7 @@ exports[`renders components/segmented/demo/custom.tsx extend context correctly 1 class="ant-avatar ant-avatar-circle ant-avatar-image" >
diff --git a/components/segmented/__tests__/__snapshots__/demo.test.ts.snap b/components/segmented/__tests__/__snapshots__/demo.test.ts.snap index 30d9b7deb4..245d41fcc8 100644 --- a/components/segmented/__tests__/__snapshots__/demo.test.ts.snap +++ b/components/segmented/__tests__/__snapshots__/demo.test.ts.snap @@ -330,7 +330,7 @@ exports[`renders components/segmented/demo/custom.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" >
diff --git a/components/segmented/demo/custom.tsx b/components/segmented/demo/custom.tsx index 4ccba19174..a55e9518b1 100644 --- a/components/segmented/demo/custom.tsx +++ b/components/segmented/demo/custom.tsx @@ -9,7 +9,7 @@ const App: React.FC = () => ( { label: (
- +
User 1
), diff --git a/components/skeleton/demo/list.tsx b/components/skeleton/demo/list.tsx index 8bf4bde336..9660db215c 100644 --- a/components/skeleton/demo/list.tsx +++ b/components/skeleton/demo/list.tsx @@ -11,7 +11,7 @@ interface IconTextProps { const listData = Array.from({ length: 3 }).map((_, i) => ({ href: 'https://ant.design', title: `ant design part ${i + 1}`, - avatar: `https://joesch.moe/api/v1/random?key=${i}`, + avatar: `https://xsgames.co/randomusers/avatar.php?g=pixel&key=${i}`, description: 'Ant Design, a design language for background applications, is refined by Ant UED Team.', content: diff --git a/components/steps/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/steps/__tests__/__snapshots__/demo-extend.test.ts.snap index dcbe167cf7..18d1c1442d 100644 --- a/components/steps/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/steps/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -851,7 +851,7 @@ exports[`renders components/steps/demo/inline.tsx extend context correctly 1`] = class="ant-avatar ant-avatar-circle ant-avatar-image" >
@@ -1058,7 +1058,7 @@ exports[`renders components/steps/demo/inline.tsx extend context correctly 1`] = class="ant-avatar ant-avatar-circle ant-avatar-image" >
@@ -1265,7 +1265,7 @@ exports[`renders components/steps/demo/inline.tsx extend context correctly 1`] = class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1472,7 +1472,7 @@ exports[`renders components/steps/demo/inline.tsx extend context correctly 1`] = class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/steps/__tests__/__snapshots__/demo.test.ts.snap b/components/steps/__tests__/__snapshots__/demo.test.ts.snap index 5ee1df9f40..bdf5074caf 100644 --- a/components/steps/__tests__/__snapshots__/demo.test.ts.snap +++ b/components/steps/__tests__/__snapshots__/demo.test.ts.snap @@ -751,7 +751,7 @@ exports[`renders components/steps/demo/inline.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -901,7 +901,7 @@ exports[`renders components/steps/demo/inline.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1051,7 +1051,7 @@ exports[`renders components/steps/demo/inline.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > @@ -1201,7 +1201,7 @@ exports[`renders components/steps/demo/inline.tsx correctly 1`] = ` class="ant-avatar ant-avatar-circle ant-avatar-image" > diff --git a/components/steps/demo/inline.tsx b/components/steps/demo/inline.tsx index 76be63ff30..027897f549 100644 --- a/components/steps/demo/inline.tsx +++ b/components/steps/demo/inline.tsx @@ -45,7 +45,9 @@ const App: React.FC = () => ( renderItem={(item, index) => ( } + avatar={ + + } title={{item.title}} description="Ant Design, a design language for background applications, is refined by Ant UED Team" /> From 117203b05be526202244af575424911f02021b0d Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Sat, 8 Apr 2023 21:26:15 +0800 Subject: [PATCH 09/17] test: update snap fix CI (#41701) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: update snap fix ci * test: update snapshot --------- Co-authored-by: 二货机器人 --- .../__snapshots__/index.test.tsx.snap | 81 ++++++++++++++++++- .../popconfirm/__tests__/index.test.tsx | 4 +- 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/components/popconfirm/__tests__/__snapshots__/index.test.tsx.snap b/components/popconfirm/__tests__/__snapshots__/index.test.tsx.snap index 63d5ab2cb5..28ae9b5ea1 100644 --- a/components/popconfirm/__tests__/__snapshots__/index.test.tsx.snap +++ b/components/popconfirm/__tests__/__snapshots__/index.test.tsx.snap @@ -6,4 +6,83 @@ exports[`Popconfirm should show overlay when trigger is clicked 1`] = `"
"`; -exports[`Popconfirm shows content for render functions 1`] = `"
"`; +exports[`Popconfirm shows content for render functions 1`] = ` +
+
+
+ +
+
+`; diff --git a/components/popconfirm/__tests__/index.test.tsx b/components/popconfirm/__tests__/index.test.tsx index 3fd59090f3..f8bc40d6d2 100644 --- a/components/popconfirm/__tests__/index.test.tsx +++ b/components/popconfirm/__tests__/index.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import Popconfirm from '..'; import mountTest from '../../../tests/shared/mountTest'; import rtlTest from '../../../tests/shared/rtlTest'; -import { render, fireEvent, act, waitFakeTimer } from '../../../tests/utils'; +import { act, fireEvent, render, waitFakeTimer } from '../../../tests/utils'; import Button from '../../button'; describe('Popconfirm', () => { @@ -94,7 +94,7 @@ describe('Popconfirm', () => { expect(popconfirm.container.querySelector('.ant-popover')).not.toBe(null); expect(popconfirm.container.querySelector('.ant-popover')?.innerHTML).toContain('some-title'); - expect(popconfirm.container.querySelector('.ant-popover')?.innerHTML).toMatchSnapshot(); + expect(popconfirm.container.querySelector('.ant-popover')).toMatchSnapshot(); }); it('should be controlled by open', () => { From 862ce2eba54db0b4701f569e8d37888d0d2b1db2 Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Mon, 10 Apr 2023 09:43:03 +0800 Subject: [PATCH 10/17] fix: fix hover style (#41685) * fix: fix hover style * fix * fix --- components/pagination/style/index.tsx | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/components/pagination/style/index.tsx b/components/pagination/style/index.tsx index c1e6078f9b..274c6ed598 100644 --- a/components/pagination/style/index.tsx +++ b/components/pagination/style/index.tsx @@ -98,13 +98,14 @@ const genPaginationDisabledStyle: GenerateStyle = (t [`${componentCls}-item-link`]: { color: token.colorTextDisabled, cursor: 'not-allowed', - '&:hover, &:active': { backgroundColor: 'transparent', }, - [`${componentCls}-simple&`]: { backgroundColor: 'transparent', + '&:hover, &:active': { + backgroundColor: 'transparent', + }, }, }, @@ -120,6 +121,15 @@ const genPaginationDisabledStyle: GenerateStyle = (t color: token.colorTextDisabled, }, }, + [`&${componentCls}-simple`]: { + [`${componentCls}-prev, ${componentCls}-next`]: { + [`&${componentCls}-disabled ${componentCls}-item-link`]: { + '&:hover, &:active': { + backgroundColor: 'transparent', + }, + }, + }, + }, }; }; @@ -224,7 +234,12 @@ const genPaginationSimpleStyle: GenerateStyle = (tok height: token.paginationItemSizeSM, backgroundColor: 'transparent', border: 0, - + '&:hover': { + backgroundColor: token.colorBgTextHover, + }, + '&:active': { + backgroundColor: token.colorBgTextActive, + }, '&::after': { height: token.paginationItemSizeSM, lineHeight: `${token.paginationItemSizeSM}px`, From 9619c8c37e231e4c4777f80636961eb09c1a6fed Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 10 Apr 2023 10:29:26 +0800 Subject: [PATCH 11/17] style: remove Space font style (#40326) * refactor: simplify code * style: fix Space font style * demo: fix Select demo --- components/space/style/index.tsx | 20 +++++++++++-------- .../theme/util/genComponentStyleHook.ts | 8 +++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/components/space/style/index.tsx b/components/space/style/index.tsx index 7ebfc0b570..a83d8da914 100644 --- a/components/space/style/index.tsx +++ b/components/space/style/index.tsx @@ -38,17 +38,21 @@ const genSpaceStyle: GenerateStyle = (token) => { alignItems: 'baseline', }, }, - [`${componentCls}-item`]: { - '&:empty': { - display: 'none', - }, + [`${componentCls}-item:empty`]: { + display: 'none', }, }, }; }; // ============================== Export ============================== -export default genComponentStyleHook('Space', (token) => [ - genSpaceStyle(token), - genSpaceCompactStyle(token), -]); +export default genComponentStyleHook( + 'Space', + (token) => [genSpaceStyle(token), genSpaceCompactStyle(token)], + () => ({}), + { + // Space component don't apply extra font style + // https://github.com/ant-design/ant-design/issues/40315 + resetStyle: false, + }, +); diff --git a/components/theme/util/genComponentStyleHook.ts b/components/theme/util/genComponentStyleHook.ts index eafea9527d..e3f2666297 100644 --- a/components/theme/util/genComponentStyleHook.ts +++ b/components/theme/util/genComponentStyleHook.ts @@ -41,6 +41,9 @@ export default function genComponentStyleHook OverrideTokenWithoutDerivative[ComponentName]), + options?: { + resetStyle?: boolean; + }, ) { return (prefixCls: string): UseComponentStyleResult => { const [theme, token, hashId] = useToken(); @@ -93,7 +96,10 @@ export default function genComponentStyleHook Date: Mon, 10 Apr 2023 10:53:33 +0800 Subject: [PATCH 12/17] chore(deps): update dependency open to v9 (#41714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency open to v9 * rerun CI --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: 栗嘉男 <574980606@qq.com> --- .dumi/theme/builtins/TokenTable/index.tsx | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.dumi/theme/builtins/TokenTable/index.tsx b/.dumi/theme/builtins/TokenTable/index.tsx index 110d830bf8..3c2b17d685 100644 --- a/.dumi/theme/builtins/TokenTable/index.tsx +++ b/.dumi/theme/builtins/TokenTable/index.tsx @@ -104,7 +104,7 @@ const TokenTable: FC = ({ type }) => { name: token, desc: lang === 'cn' ? meta.desc : meta.descEn, type: meta.type, - value: (defaultToken as any)[token], + value: defaultToken[token], })), [type, lang], ); diff --git a/package.json b/package.json index 32370ebe47..a8a7013473 100644 --- a/package.json +++ b/package.json @@ -246,7 +246,7 @@ "lz-string": "^1.4.4", "mockdate": "^3.0.0", "node-notifier": "^10.0.1", - "open": "^8.4.2", + "open": "^9.0.0", "prettier": "^2.3.2", "prettier-plugin-jsdoc": "^0.4.2", "pretty-format": "^29.0.0", From 6761292bbd6e9e5e22a6b20b0f440f27efb59acc Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Mon, 10 Apr 2023 11:43:30 +0800 Subject: [PATCH 13/17] Revert "chore(deps): update dependency open to v9 (#41714)" (#41723) This reverts commit 005db798976d8e38a7c14f46dc9be13c4859efb7. --- .dumi/theme/builtins/TokenTable/index.tsx | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.dumi/theme/builtins/TokenTable/index.tsx b/.dumi/theme/builtins/TokenTable/index.tsx index 3c2b17d685..110d830bf8 100644 --- a/.dumi/theme/builtins/TokenTable/index.tsx +++ b/.dumi/theme/builtins/TokenTable/index.tsx @@ -104,7 +104,7 @@ const TokenTable: FC = ({ type }) => { name: token, desc: lang === 'cn' ? meta.desc : meta.descEn, type: meta.type, - value: defaultToken[token], + value: (defaultToken as any)[token], })), [type, lang], ); diff --git a/package.json b/package.json index a8a7013473..32370ebe47 100644 --- a/package.json +++ b/package.json @@ -246,7 +246,7 @@ "lz-string": "^1.4.4", "mockdate": "^3.0.0", "node-notifier": "^10.0.1", - "open": "^9.0.0", + "open": "^8.4.2", "prettier": "^2.3.2", "prettier-plugin-jsdoc": "^0.4.2", "pretty-format": "^29.0.0", From 0e65dad8e9337bd70175126b3825576b13461c65 Mon Sep 17 00:00:00 2001 From: Wuxh Date: Mon, 10 Apr 2023 12:02:06 +0800 Subject: [PATCH 14/17] chore: Form.Item should not support requiredMark (#41725) * test: add case * chore: Form.Item does not support requiredMark --- components/form/FormItem/ItemHolder.tsx | 2 +- components/form/FormItem/index.tsx | 2 +- components/form/FormItemLabel.tsx | 3 +++ components/form/__tests__/index.test.tsx | 25 ++++++++++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/components/form/FormItem/ItemHolder.tsx b/components/form/FormItem/ItemHolder.tsx index 3f9af59c35..d338594325 100644 --- a/components/form/FormItem/ItemHolder.tsx +++ b/components/form/FormItem/ItemHolder.tsx @@ -186,8 +186,8 @@ export default function ItemHolder(props: ItemHolderProps) { {/* Label */} diff --git a/components/form/FormItem/index.tsx b/components/form/FormItem/index.tsx index 4c0612c18e..bca2f3d289 100644 --- a/components/form/FormItem/index.tsx +++ b/components/form/FormItem/index.tsx @@ -51,7 +51,7 @@ const MemoInput = React.memo( ); export interface FormItemProps - extends FormItemLabelProps, + extends Omit, FormItemInputProps, RcFieldProps { prefixCls?: string; diff --git a/components/form/FormItemLabel.tsx b/components/form/FormItemLabel.tsx index 89f01ab0b8..a8f4dace0e 100644 --- a/components/form/FormItemLabel.tsx +++ b/components/form/FormItemLabel.tsx @@ -38,6 +38,9 @@ export interface FormItemLabelProps { label?: React.ReactNode; labelAlign?: FormLabelAlign; labelCol?: ColProps; + /** + * @internal Used for pass `requiredMark` from `
` + */ requiredMark?: RequiredMark; tooltip?: LabelTooltipType; } diff --git a/components/form/__tests__/index.test.tsx b/components/form/__tests__/index.test.tsx index e7a9cc3860..346e050467 100644 --- a/components/form/__tests__/index.test.tsx +++ b/components/form/__tests__/index.test.tsx @@ -1797,4 +1797,29 @@ describe('Form', () => { expect(onChange).toHaveBeenNthCalledWith(idx++, 'validating'); expect(onChange).toHaveBeenNthCalledWith(idx++, 'success'); }); + + // https://user-images.githubusercontent.com/32004925/230819163-464fe90d-422d-4a6d-9e35-44a25d4c64f1.png + it('should not render `requiredMark` when Form.Item has no required prop', () => { + // Escaping TypeScript error + const genProps = (value: any) => ({ ...value }); + + const { container } = render( + + + + + + + +
, + ); + + expect(container.querySelectorAll('.ant-form-item-required')).toHaveLength(2); + expect(container.querySelectorAll('.ant-form-item-required-mark-optional')).toHaveLength(2); + }); }); From 32f8134f4fe1083e7f0e800a2d91944535b17663 Mon Sep 17 00:00:00 2001 From: Wuxh Date: Mon, 10 Apr 2023 12:03:11 +0800 Subject: [PATCH 15/17] feat: improve `noStyle` validation message display logic (#41698) * test: add case * feat: improve `noStyle` validation message display logic When `noStyle=true` and `help=false`, the error message is blocked from being passed up * test: update test case * Revert "test: update test case" This reverts commit a3e5d84ea620becb9e72b6b71766c01114add9ae. * chore(type): update typo * Revert "chore(type): update typo" This reverts commit e13ec3ba5267394e8112fb742ec9bc9d4afdef5b. * test(deps): DO NOT MERGE * test: DO NOT MERGE * Revert "test: DO NOT MERGE" This reverts commit 2f4ea8e0ce64f88ab690c6e54b86034a92bcb55f. * Revert "test(deps): DO NOT MERGE" This reverts commit 48e700ef4aaa4675f29d3fbd23156bd8f692949e. --- components/form/FormItem/index.tsx | 7 +++-- components/form/__tests__/index.test.tsx | 37 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/components/form/FormItem/index.tsx b/components/form/FormItem/index.tsx index bca2f3d289..02b464736d 100644 --- a/components/form/FormItem/index.tsx +++ b/components/form/FormItem/index.tsx @@ -106,6 +106,7 @@ function InternalFormItem(props: FormItemProps): React.Rea trigger = 'onChange', validateTrigger, hidden, + help, } = props; const { getPrefixCls } = React.useContext(ConfigContext); const { name: formName } = React.useContext(FormContext); @@ -145,7 +146,7 @@ function InternalFormItem(props: FormItemProps): React.Rea setMeta(nextMeta.destroy ? genEmptyMeta() : nextMeta, true); // Bump to parent since noStyle - if (noStyle && notifyParentMetaChange) { + if (noStyle && help !== false && notifyParentMetaChange) { let namePath = nextMeta.name; if (!nextMeta.destroy) { @@ -322,9 +323,9 @@ function InternalFormItem(props: FormItemProps): React.Rea childProps.id = fieldId; } - if (props.help || mergedErrors.length > 0 || mergedWarnings.length > 0 || props.extra) { + if (help || mergedErrors.length > 0 || mergedWarnings.length > 0 || props.extra) { const describedbyArr = []; - if (props.help || mergedErrors.length > 0) { + if (help || mergedErrors.length > 0) { describedbyArr.push(`${fieldId}_help`); } if (props.extra) { diff --git a/components/form/__tests__/index.test.tsx b/components/form/__tests__/index.test.tsx index 346e050467..b5023db4f5 100644 --- a/components/form/__tests__/index.test.tsx +++ b/components/form/__tests__/index.test.tsx @@ -171,6 +171,43 @@ describe('Form', () => { await waitFakeTimer(2000, 2000); expect(container.querySelector('.ant-form-item-explain-error')).toHaveTextContent('aaa'); }); + + // https://github.com/ant-design/ant-design/issues/41620 + it('should not throw error when `help=false` and `noStyle=true`', async () => { + const App = (props: { help?: boolean | React.ReactNode }) => { + const { help = false } = props || {}; + return ( +
+ + + + + + + + + + + +
+ ); + }; + + const { container, getByRole, rerender } = render(); + + // click submit to trigger validate + fireEvent.click(getByRole('button')); + + await waitFakeTimer(); + expect(container.querySelectorAll('.ant-form-item-explain-error')).toHaveLength(1); + + // When noStyle=true but help is not false, help will be displayed + rerender(); + await waitFakeTimer(); + fireEvent.click(getByRole('button')); + await waitFakeTimer(); + expect(container.querySelectorAll('.ant-form-item-explain-error')).toHaveLength(3); + }); }); it('render functions require either `shouldUpdate` or `dependencies`', () => { From 4b2c5ded8da01bc0a00de9aaf15bebab958c4b7a Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 10 Apr 2023 13:11:34 +0800 Subject: [PATCH 16/17] fix: Empty style in small width container (#41727) close #41726 --- components/empty/style/index.ts | 1 + components/select/style/dropdown.tsx | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/components/empty/style/index.ts b/components/empty/style/index.ts index cbd26ad67b..79500e8251 100644 --- a/components/empty/style/index.ts +++ b/components/empty/style/index.ts @@ -34,6 +34,7 @@ const genSharedEmptyStyle: GenerateStyle = (token): CSSObject => { }, svg: { + maxWidth: '100%', height: '100%', margin: 'auto', }, diff --git a/components/select/style/dropdown.tsx b/components/select/style/dropdown.tsx index c9e0b83a69..1cc7202656 100644 --- a/components/select/style/dropdown.tsx +++ b/components/select/style/dropdown.tsx @@ -84,16 +84,6 @@ const genSingleStyle: GenerateStyle = (token) => { display: 'none', }, - '&-empty': { - color: token.colorTextDisabled, - }, - - // ========================= Options ========================= - [`${selectItemCls}-empty`]: { - ...genItemStyle(token), - color: token.colorTextDisabled, - }, - [`${selectItemCls}`]: { ...genItemStyle(token), cursor: 'pointer', From 0eed438d76219d435488eeeeda2a25377c0995de Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 10 Apr 2023 13:11:51 +0800 Subject: [PATCH 17/17] fix: Select width getting smaller when search (#41722) * bump rc-select * fix: Select width become 0px when searching --- .../select/__tests__/__snapshots__/demo-extend.test.ts.snap | 1 - components/select/__tests__/__snapshots__/demo.test.tsx.snap | 1 - components/select/demo/search.tsx | 1 - components/select/style/single.tsx | 2 +- package.json | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/select/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/select/__tests__/__snapshots__/demo-extend.test.ts.snap index 7e7d72f41d..f497d60695 100644 --- a/components/select/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/select/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -7771,7 +7771,6 @@ exports[`renders components/select/demo/responsive.tsx extend context correctly exports[`renders components/select/demo/search.tsx extend context correctly 1`] = `
{ const App: React.FC = () => (