Skip to content

Commit

Permalink
Continue fleshing out Modal.svelte
Browse files Browse the repository at this point in the history
  • Loading branch information
@seancolsen
seancolsen committed Nov 18, 2021
1 parent 279aaa9 commit 8c6db29
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 34 deletions.
53 changes: 36 additions & 17 deletions mathesar_ui/src/component-library/modal/Modal.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,49 @@
right: 0;
bottom: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.3);
z-index: 50;
display: flex;
align-items: center;
justify-content: center;
}

.modal {
background-color: white;
border-radius: 0.4em;
max-height: calc(100vh - 10em);
min-height: 110px;
overflow-y: auto;

>.body, >.footer {
padding: 1em;
.overlay {
background-color: rgba(0, 0, 0, 0.3);
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 51;
}

>.footer {
border-top: 1px solid #f5f5f5;
background: #f9fafb;
}
.modal {
background-color: white;
border-radius: 0.4em;
max-height: calc(100vh - 10em);
min-height: 110px;
overflow-y: auto;
position: relative;
z-index: 52;

&.modal-size-medium {
width: 500px;
.close-button {
position: absolute;
top: 0.2em;
right: 0.2em;
}

>.body, >.footer {
padding: 1em;
}

>.footer {
border-top: 1px solid #f5f5f5;
background: #f9fafb;
}

&.modal-size-medium {
width: 500px;
}
}
}


34 changes: 27 additions & 7 deletions mathesar_ui/src/component-library/modal/Modal.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,50 @@
<script lang="ts">
import type { Writable } from 'svelte/store';
import { faTimes } from '@fortawesome/free-solid-svg-icons';
import type { Size } from '@mathesar-component-library/types';
import { portal } from '@mathesar-component-library';
import type { ModalVisibilityStore } from './ModalVisibilityStore';
import { Button, Icon, portal } from '@mathesar-component-library';
import type { ModalCloseAction } from './modal';
export let isOpen: ModalVisibilityStore;
export let title: string;
export let isOpen: Writable<boolean>;
// eslint-disable-next-line no-undef-init
export let title: string | undefined = undefined;
let classes = '';
export { classes as class };
export let style = '';
export let size: Size = 'medium';
export let closeOn: ModalCloseAction[] = ['button', 'esc', 'overlay'];
$: closeOnButton = closeOn.includes('button');
$: closeOnEsc = closeOn.includes('esc');
$: closeOnOverlay = closeOn.includes('overlay');
function close() {
$isOpen = false;
}
function handleKeydown(event: KeyboardEvent) {
if (event.key === 'Escape' && $isOpen && closeOn.includes('esc')) {
$isOpen = false;
if (event.key === 'Escape' && $isOpen && closeOnEsc) {
close();
}
}
function handleOverlayClick() {
if (closeOnOverlay) {
close();
}
}
</script>

<svelte:window on:keydown={handleKeydown}/>

{#if $isOpen}
<div class="modal-wrapper" use:portal>
<div class="modal-wrapper" use:portal >
<div class="overlay" on:click={handleOverlayClick}/>
<div class={['modal', `modal-size-${size}`, classes].join(' ')} {style}>
{#if closeOnButton}
<Button class="close-button" on:click={close}><Icon data={faTimes}/></Button>
{/if}

{#if $$slots.title || title}
<div class="title">
Expand Down
54 changes: 44 additions & 10 deletions mathesar_ui/src/component-library/modal/__meta__/Modal.stories.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,64 @@
const modal = new ModalMultiplexer();
const exampleA = modal.createVisibilityStore();
const exampleB = modal.createVisibilityStore();
const basicModal = modal.createVisibilityStore();
const chainModal = modal.createVisibilityStore();
const hardToCloseModal = modal.createVisibilityStore();
const titleFreeModal = modal.createVisibilityStore();
const verboseModal = modal.createVisibilityStore();
let answer = '';
$: answerIsCorrect = answer === '4';
</script>

<Meta {...meta} />

<Story name="Basic">
<Button on:click={() => exampleA.open()}>Open Modal A</Button>
<Button on:click={() => exampleB.open()}>Open Modal B</Button>
<h2>Modal openers:</h2>
<ul>
<li><Button on:click={() => basicModal.open()}>One that's pretty basic</Button></li>
<li><Button on:click={() => chainModal.open()}>One that opens another one</Button></li>
<li><Button on:click={() => hardToCloseModal.open()}>One that's hard to close</Button></li>
<li><Button on:click={() => titleFreeModal.open()}>One without a title</Button></li>
<li><Button on:click={() => verboseModal.open()}>One with a lot of text</Button></li>
</ul>

<Modal isOpen={exampleA} title="Modal A">
<Modal isOpen={basicModal} title="Basic modal">
Here is modal content

<div slot="footer">
<p>This is the modal footer</p>
<p><Button on:click={() => exampleA.close()}>Close</Button></p>
<p><Button on:click={() => basicModal.close()}>Here is a custom close button</Button></p>
</div>
</Modal>

<Modal isOpen={chainModal} title="Go ahead and open another modal">
<p>This modal has a button which opens another modal. Generally we don't want to do this, because it's poor UX, but this demonstrates what happens.</p>
<Button on:click={() => basicModal.open()}>Open that basic modal (this one will close)</Button>
</Modal>

<Modal isOpen={exampleB} title="Modal B">
<p>Here is modal content</p>
<Modal isOpen={hardToCloseModal} title="No way to close this one" closeOn={[]}>
<p>Answer the quesion to unlock the close button.</p>
<p>2 + 2 = <input type="text" bind:value={answer} /></p>
<Button
on:click={() => hardToCloseModal.close()}
disabled={!answerIsCorrect}
>Close</Button>
</Modal>

<Button on:click={() => exampleA.open()}>Open Modal A instead (Modal B will close)</Button>
<Modal isOpen={titleFreeModal}>
Wow, this one is small
</Modal>

<Modal isOpen={verboseModal}>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
<p>At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.</p>
</Modal>

</Story>

<style>
li {
margin: 1em 0;
}
</style>

0 comments on commit 8c6db29

Please sign in to comment.