From c0aab02c89e5a83351db55d5804cc8815e46cfd7 Mon Sep 17 00:00:00 2001 From: Yongbeen Im Date: Fri, 5 Jul 2024 23:03:23 +0900 Subject: [PATCH] fix: Set current to null if no overlay remains on unmount (#40) * fix: Set current to null if no overlay remains on unmount Co-authored-by: jgjgill <79239852+jgjgill@users.noreply.github.com> * chore: changeset --------- Co-authored-by: jgjgill <79239852+jgjgill@users.noreply.github.com> --- .changeset/soft-jokes-move.md | 5 +++++ packages/src/context/reducer.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/soft-jokes-move.md diff --git a/.changeset/soft-jokes-move.md b/.changeset/soft-jokes-move.md new file mode 100644 index 0000000..d60035b --- /dev/null +++ b/.changeset/soft-jokes-move.md @@ -0,0 +1,5 @@ +--- +'overlay-kit': patch +--- + +Set current to null if no overlay remains on unmount diff --git a/packages/src/context/reducer.ts b/packages/src/context/reducer.ts index 2831cb2..9bdcc90 100644 --- a/packages/src/context/reducer.ts +++ b/packages/src/context/reducer.ts @@ -54,7 +54,7 @@ export function overlayReducer(state: OverlayData, action: OverlayReducerAction) delete copiedOverlayData[action.overlayId]; return { - current: remainingOverlays.at(-1) || state.current, + current: remainingOverlays.at(-1) ?? null, overlayOrderList: remainingOverlays, overlayData: copiedOverlayData, }; @@ -75,7 +75,7 @@ export function overlayReducer(state: OverlayData, action: OverlayReducerAction) }; } case 'REMOVE_ALL': { - return { current: state.current, overlayOrderList: [], overlayData: {} }; + return { current: null, overlayOrderList: [], overlayData: {} }; } } }