Skip to content

refactor: use shared renderability guards #410

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

Merged
yoyo837 merged 1 commit into from
Sep 3, 2026
Merged

refactor: use shared renderability guards #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"dependencies": {
"@rc-component/motion": "^1.1.4",
"@rc-component/util": "^1.11.0",
"@rc-component/util": "^1.13.0",
"clsx": "^2.1.1"
},
"devDependencies": {
Expand Down
34 changes: 16 additions & 18 deletions src/Notification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { clsx } from 'clsx';
import useNoticeTimer from './hooks/useNoticeTimer';
import { useEvent } from '@rc-component/util';
import { isNonNullable, isReactRenderable, useEvent } from '@rc-component/util';
import useClosable, { type ClosableType } from './hooks/useClosable';
import DefaultProgress from './Progress';
import type { NotificationProgressProps } from './Progress';
Expand Down Expand Up @@ -173,22 +173,20 @@ const Notification = React.forwardRef<HTMLDivElement, NotificationProps>((props,
const mergedNotificationIndex = notificationIndex ?? notificationIndexRef.current ?? 0;

// ======================== Content =========================
const titleNode =
title !== undefined && title !== null ? (
<div className={clsx(`${noticePrefixCls}-title`, classNames?.title)} style={styles?.title}>
{title}
</div>
) : null;
const titleNode = isNonNullable(title) ? (
<div className={clsx(`${noticePrefixCls}-title`, classNames?.title)} style={styles?.title}>
{title}
</div>
) : null;

const descNode =
description !== undefined && description !== null ? (
<div
className={clsx(`${noticePrefixCls}-description`, classNames?.description)}
style={styles?.description}
>
{description}
</div>
) : null;
const descNode = isNonNullable(description) ? (
<div
className={clsx(`${noticePrefixCls}-description`, classNames?.description)}
style={styles?.description}
>
{description}
</div>
) : null;

const hasTitle = titleNode !== null;
const hasDescription = descNode !== null;
Expand All @@ -208,7 +206,7 @@ const Notification = React.forwardRef<HTMLDivElement, NotificationProps>((props,
contentNode = titleNode || descNode;
}

if (icon !== undefined && icon !== null) {
if (isNonNullable(icon)) {
contentNode = (
<div
className={clsx(`${noticePrefixCls}-wrapper`, classNames?.wrapper)}
Expand All @@ -222,7 +220,7 @@ const Notification = React.forwardRef<HTMLDivElement, NotificationProps>((props,
);
}

const actionsNode = actions ? (
const actionsNode = isReactRenderable(actions) ? (
<div
className={clsx(`${noticePrefixCls}-actions`, classNames?.actions)}
style={styles?.actions}
Expand Down
Loading