mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-07 09:26:06 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix: typography expanded should not break lines (#48340)

Browse Source
This commit is contained in:
二货爱吃白萝卜 2024-04-08 23:00:25 +08:00 committed by GitHub
parent 4a25c9f505
commit 61c8a439fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BUG_VERSIONS.json
View File

@ -52,5 +52,6 @@
"5.12.6": ["https://github.com/ant-design/ant-design/issues/46719"],
"5.13.0": ["https://github.com/ant-design/ant-design/pull/46962"],
"5.14.0": ["https://github.com/ant-design/ant-design/issues/47354"],
"5.15.0": ["https://github.com/ant-design/ant-design/pull/47504#issuecomment-1980459433"]
"5.15.0": ["https://github.com/ant-design/ant-design/pull/47504#issuecomment-1980459433"],
">= 5.16.0 <= 5.16.1": ["https://github.com/ant-design/ant-design/issues/48200"]
}

2
components/typography/Base/index.tsx
View File

@ -461,7 +461,7 @@ const Base = React.forwardRef<HTMLElement, BlockProps>((props, ref) => {
[`${prefixCls}-${type}`]: type,
[`${prefixCls}-disabled`]: disabled,
[`${prefixCls}-ellipsis`]: enableEllipsis,
[`${prefixCls}-single-line`]: mergedEnableEllipsis && rows === 1,
[`${prefixCls}-single-line`]: mergedEnableEllipsis && rows === 1 && !expanded,
[`${prefixCls}-ellipsis-single-line`]: cssTextOverflow,
[`${prefixCls}-ellipsis-multiple-line`]: cssLineClamp,
},

14
components/typography/__tests__/ellipsis.test.tsx
View File

@ -507,4 +507,18 @@ describe('Typography.Ellipsis', () => {
await waitFakeTimer();
expect(document.querySelector('.ant-tooltip')).toBeTruthy();
});
it('not force single line if expanded', () => {
const renderDemo = (expanded: boolean) => (
<Base ellipsis={{ rows: 1, expanded, expandable: 'collapsible' }} component="p">
{fullStr}
</Base>
);
const { container, rerender } = render(renderDemo(false));
expect(container.querySelector('.ant-typography-single-line')).toBeTruthy();
rerender(renderDemo(true));
expect(container.querySelector('.ant-typography-single-line')).toBeFalsy();
});
});