Skip to content

fix again #366

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
merged 2 commits into from
Feb 25, 2025
Merged

fix again #366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
965991a
revert solution
Wxh16144 Feb 25, 2025
9d78016
fix again
Wxh16144 Feb 25, 2025
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
36 changes: 16 additions & 20 deletions src/hooks/useNotification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as React from 'react';
import type { NotificationsProps, NotificationsRef } from '../Notifications';
import Notifications from '../Notifications';
import type { OpenConfig, Placement, StackConfig } from '../interface';
import { useEvent } from 'rc-util';

const defaultGetContainer = () => document.body;

Expand Down Expand Up @@ -107,34 +108,29 @@ export default function useNotification(

const [taskQueue, setTaskQueue] = React.useState<Task[]>([]);

// memorized shareConfig
const { closeIcon, closable, duration, showProgress, pauseOnHover } = shareConfig;
const memoShareConfig = React.useMemo<typeof shareConfig>(() => {
return {
...shareConfig,
};
}, [closeIcon, closable, duration, showProgress, pauseOnHover]);
const open = useEvent<NotificationAPI['open']>((config) => {
const mergedConfig = mergeConfig(shareConfig, config);
if (mergedConfig.key === null || mergedConfig.key === undefined) {
mergedConfig.key = `rc-notification-${uniqueKey}`;
uniqueKey += 1;
}

// ========================= Refs =========================
const api = React.useMemo<NotificationAPI>(() => {
return {
open: (config) => {
const mergedConfig = mergeConfig(memoShareConfig, config);
if (mergedConfig.key === null || mergedConfig.key === undefined) {
mergedConfig.key = `rc-notification-${uniqueKey}`;
uniqueKey += 1;
}
setTaskQueue((queue) => [...queue, { type: 'open', config: mergedConfig }]);
});

setTaskQueue((queue) => [...queue, { type: 'open', config: mergedConfig }]);
},
// ========================= Refs =========================
const api = React.useMemo<NotificationAPI>(
() => ({
open: open,
close: (key) => {
setTaskQueue((queue) => [...queue, { type: 'close', key }]);
},
destroy: () => {
setTaskQueue((queue) => [...queue, { type: 'destroy' }]);
},
};
}, [memoShareConfig]);
}),
[],
);

// ======================= Container ======================
// React 18 should all in effect that we will check container in each render
Expand Down