Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(popover): fix the problem that popover display when the props'con… #33835

Merged
merged 6 commits into from Feb 7, 2022
Merged

fix(popover): fix the problem that popover display when the props'con… #33835

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de18817
fix(popover): fix the problem that popover display when the props'con…
DawnLck Jan 25, 2022
e96ce6d
refactor(popover): 更新代码判断逻辑
DawnLck Jan 26, 2022
a3828c7
test(popover): 添加popover的test
DawnLck Jan 27, 2022
9d36298
feat(popover): 更新snapshot
DawnLck Jan 29, 2022
fdb1952
feat(popover): 更新剩余的snapshot
DawnLck Jan 29, 2022
40a38e6
Merge remote-tracking branch 'antd/master'
DawnLck Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions components/popover/index.tsx
View file
Open in desktop
Expand Up @@ -13,12 +13,18 @@ const Popover = React.forwardRef<unknown, PopoverProps>(
({ prefixCls: customizePrefixCls, title, content, ...otherProps }, ref) => {
const { getPrefixCls } = React.useContext(ConfigContext);

const getOverlay = (prefixCls: string) => (
<>
{title && <div className={`${prefixCls}-title`}>{getRenderPropValue(title)}</div>}
<div className={`${prefixCls}-inner-content`}>{getRenderPropValue(content)}</div>
</>
);
const getOverlay = (prefixCls: string) => {
const isTitleEmpty = !title || title.toString() === '';
const isContentEmpty = !content || content.toString() === '';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

title.toString() === ''
是在判断什么？

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

判断是否为空字符串，如果是则不出现气泡

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

空字符串 !title 就可以判断出来吧，toString 如果用户传进来的东西没有那就会报错了

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

了解，我更新一下PR

if (isTitleEmpty && isContentEmpty) return undefined;

return (
<>
{title && <div className={`${prefixCls}-title`}>{getRenderPropValue(title)}</div>}
<div className={`${prefixCls}-inner-content`}>{getRenderPropValue(content)}</div>
</>
);
};

const prefixCls = getPrefixCls('popover', customizePrefixCls);
const rootPrefixCls = getPrefixCls();
Expand Down