mcp/carbon-components-svelte
1
0
Fork 0
mirror of https://github.com/carbon-design-system/carbon-components-svelte.git synced 2025-09-15 10:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(modal): simply nested modals logic (#1339)

Browse source 
Cleans up #1331 to reuse shared logic between `Modal`, `ComposedModal`.
This commit is contained in:
brunnerh 2022-06-07 16:43:02 +02:00 • committed by GitHub
commit 37aa207c85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/Modal/Modal.svelte
View file

@ -89,10 +89,11 @@
/** Obtain a reference to the top-level HTML element */
export let ref = null;
import { createEventDispatcher, onMount, afterUpdate } from "svelte";
import { createEventDispatcher, afterUpdate } from "svelte";
import Close from "../icons/Close.svelte";
import Button from "../Button/Button.svelte";
import { modalsOpen, addModalId, removeModalId } from "./modalStore";
import { trackModal } from "./modalStore";
import { writable } from "svelte/store";
const dispatch = createEventDispatcher();
@ -107,12 +108,9 @@
node.focus();
}
onMount(() => {
return () => {
removeModalId(id);
document.body.classList.remove("bx--body--with-modal-open");
};
});
const openStore = writable(open);
$: $openStore = open;
trackModal(openStore);
afterUpdate(() => {
if (opened) {
@ -125,12 +123,6 @@
focus();
dispatch("open");
}
if ($modalsOpen.length > 0) {
document.body.classList.add("bx--body--with-modal-open");
} else {
document.body.classList.remove("bx--body--with-modal-open");
}
});
$: modalLabelId = `bx--modal-header__label--modal-${id}`;
@ -138,12 +130,6 @@
$: modalBodyId = `bx--modal-body--${id}`;
$: ariaLabel =
modalLabel || $$props["aria-label"] || modalAriaLabel || modalHeading;
$: if (open) {
addModalId(id);
} else {
removeModalId(id);
}
</script>
<!-- svelte-ignore a11y-mouse-events-have-key-events -->