Skip to content

fix: correct latest notice when removed #316

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 3 commits into from
Sep 7, 2023
Merged

fix: correct latest notice when removed #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a80c6b
fix: correct latest notice when removed
MadCcc Sep 7, 2023
47b4737
chore: code clean
MadCcc Sep 7, 2023
236f4f4
chore: code clean
MadCcc Sep 7, 2023
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 docs/examples/maxCount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useNotification } from '../../src';
import motion from './motion';

export default () => {
const [notice, contextHolder] = useNotification({ motion, maxCount: 3, top: 100 });
const [notice, contextHolder] = useNotification({ motion, maxCount: 3 });

return (
<>
Expand Down
22 changes: 12 additions & 10 deletions src/NoticeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,19 @@ const NoticeList: FC<NoticeListProps> = (props) => {

// Clean hover key
useEffect(() => {
if (hoverKeys.length > 1) {
if (stack && hoverKeys.length > 1) {
setHoverKeys((prev) =>
prev.filter((key) => keys.some(({ key: dataKey }) => key === dataKey)),
);
}
}, [hoverKeys, keys]);
}, [hoverKeys, keys, stack]);

// Force update latest notice
useEffect(() => {
if (stack && dictRef.current[keys[keys.length - 1]?.key]) {
setLatestNotice(dictRef.current[keys[keys.length - 1]?.key]);
}
}, [keys, stack]);

return (
<CSSMotionList
Expand All @@ -83,11 +90,6 @@ const NoticeList: FC<NoticeListProps> = (props) => {
onAllRemoved={() => {
onAllNoticeRemoved(placement);
}}
onAppearPrepare={(element) => {
if (element.parentNode.lastElementChild === element) {
setLatestNotice(element as HTMLDivElement);
}
}}
>
{(
{ config, className: motionClassName, style: motionStyle, index: motionIndex },
Expand All @@ -99,10 +101,10 @@ const NoticeList: FC<NoticeListProps> = (props) => {

// If dataIndex is -1, that means this notice has been removed in data, but still in dom
// Should minus (motionIndex - 1) to get the correct index because keys.length is not the same as dom length
const index = keys.length - 1 - (dataIndex > -1 ? dataIndex : motionIndex - 1);
const transformX = placement === 'top' || placement === 'bottom' ? '-50%' : '0';
const stackStyle: CSSProperties = {};
if (stack) {
const index = keys.length - 1 - (dataIndex > -1 ? dataIndex : motionIndex - 1);
const transformX = placement === 'top' || placement === 'bottom' ? '-50%' : '0';
if (index > 0) {
stackStyle.height = expanded
? dictRef.current[key]?.offsetHeight
Expand Down Expand Up @@ -156,7 +158,7 @@ const NoticeList: FC<NoticeListProps> = (props) => {
key={key}
eventKey={key}
onNoticeClose={onNoticeClose}
hovering={hoverKeys.length > 0}
hovering={stack && hoverKeys.length > 0}
/>
</div>
);
Expand Down