Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/stupid-boxes-pay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"overlay-kit": patch
---

fix: initializing current overlay after close all overlays
1 change: 1 addition & 0 deletions packages/src/context/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export function overlayReducer(state: OverlayData, action: OverlayReducerAction)
case 'CLOSE_ALL': {
return {
...state,
current: null,
overlayData: Object.keys(state.overlayData).reduce(
(prev, curr) => ({
...prev,
Expand Down
33 changes: 33 additions & 0 deletions packages/src/event.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,39 @@ describe('overlay object', () => {
});
});

it('should not be able to get current overlay when all overlays are closed', async () => {
const contents = {
first: 'overlay-content-1',
second: 'overlay-content-2',
};

function Component() {
const current = useCurrentOverlay();

useEffect(() => {
// Open 2 overlays sequentially
overlay.open(({ isOpen }) => isOpen && <div data-testid="overlay-1">{contents.first}</div>);
overlay.open(({ isOpen }) => isOpen && <div data-testid="overlay-2">{contents.second}</div>);
}, []);

return <div data-testid="current-overlay">{current}</div>;
}

render(<Component />, { wrapper });

// Wait for all overlays to be mounted
await waitFor(() => {
expect(screen.getByTestId('overlay-1')).toBeInTheDocument();
expect(screen.getByTestId('overlay-2')).toBeInTheDocument();
});

// close all overlays
overlay.closeAll();
await waitFor(() => {
expect(screen.getByTestId('current-overlay')).toHaveTextContent('');
});
});

it('should be able to unmount all overlays', async () => {
const contents = {
first: 'overlay-content-1',
Expand Down