Skip to content
Open
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
4 changes: 3 additions & 1 deletion src/lib/ModalContainer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
import { onDestroy, onMount } from 'svelte';

import Modal from './Modal.svelte';
import { animating, destroyModals, stack, updateOptions } from './service';
import { animating, destroyModals, stack, updateOptions, modalContainerCount } from './service';

export let options: Record<string, any> = {};

$: updateOptions(options);

onMount(() => {
modalContainerCount.update(($count) => $count + 1);

let unsubscribeStack = stack.subscribe(($stack) => {
document.body.classList.toggle('spm-scrolling-disabled', $stack.length > 0);
});
Expand Down
7 changes: 7 additions & 0 deletions src/lib/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { derived, get, writable } from 'svelte/store';
import { Modal } from './modal';
import type { ModalOptions, PropsWithoutCloseModal } from './types';

export const modalContainerCount = writable<number>(0);
export const animating = writable<boolean>(false);
export const stack = writable<Modal<any>[]>([]);
export const count = derived(stack, ($stack) => $stack.filter((modal) => !modal.isClosing).length);
Expand All @@ -30,6 +31,12 @@ export const openModal = <T extends SvelteComponent>(
props?: PropsWithoutCloseModal<T> | null, // `null` is a convenience for when you don't want to pass any props but do want to pass options
options?: ModalOptions
): Modal<T> => {
if (get(modalContainerCount) === 0) {
throw new Error('<ModalContainer /> is missing');
} else if (get(modalContainerCount) > 1) {
throw new Error('Multiple <ModalContainer /> instances exist in the application. Please make sure there is only one rendered at a time.');
}

let modal: Modal<T> = new Modal(component, props ?? undefined, options);

stack.update((modals) => [...modals, modal]);
Expand Down
20 changes: 17 additions & 3 deletions tests-ct/TestApp.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,22 @@
export let modalContainerOptions = {};
export let modalProps: any;
export let openModalOptions = {};
export let modalContainerCount = 1;

export let resultCallback = (_: unknown) => {
/**/
};

let errorMessage: string | undefined;

async function openFooModal() {
let result = await openModal(TestModal, modalProps, openModalOptions);
resultCallback(result);
try {
await openModal(TestModal);
let result = await openModal(TestModal, modalProps, openModalOptions);
resultCallback(result);
} catch (error) {
errorMessage = (error as Error).toString();
}
}
</script>

Expand All @@ -44,4 +52,10 @@
</Wrapper>
{/if}

<ModalContainer options={modalContainerOptions} />
{#each Array.from({ length: modalContainerCount }) as _}
<ModalContainer options={modalContainerOptions} />
{/each}

{#if errorMessage}
<p data-testid="error-message">{errorMessage}</p>
{/if}
42 changes: 42 additions & 0 deletions tests-ct/modal-container.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { expect, test } from '@playwright/experimental-ct-svelte';

import TestApp from './TestApp.svelte';

test.describe('ModalContainer', () => {
test.beforeEach(async ({ page }) => {
// Reduced motion will speed up animations which comes handy for testing
await page.emulateMedia({ reducedMotion: 'reduce' });
});

test('missing', async ({ mount, page }) => {
await mount(TestApp, {
props: {
modalContainerCount: 0,
},
});

await expect(page.getByTestId('error-message')).toBeHidden();

await page.getByTestId('open-modal-button').click();

await expect(page.getByTestId('error-message')).toHaveText(
'Error: <ModalContainer /> is missing'
);
});

test('too many', async ({ mount, page, context }) => {
await mount(TestApp, {
props: {
modalContainerCount: 2,
},
});

await expect(page.getByTestId('error-message')).toBeHidden();

await page.getByTestId('open-modal-button').click();

await expect(page.getByTestId('error-message')).toHaveText(
'Error: Multiple <ModalContainer /> instances exist in the application. Please make sure there is only one rendered at a time.'
);
});
});