Compare commits

...

17 Commits

Author SHA1 Message Date
14f4e3e20b fix: remove debug modal stack entry 2025-09-06 15:20:13 +10:00
06bea06363 fix: modal stack 2025-08-31 14:33:52 +10:00
4c42edf5ad fix: type errors 2025-08-09 18:19:01 +10:00
04125e89be fix: fade in fade out + styling 2025-07-27 20:25:21 +10:00
893a4fe8a9 feat: add text input modal 2025-07-27 20:09:29 +10:00
0c68363608 feat: remove overflow-hidden 2025-07-27 18:56:36 +10:00
a14d1b7081 fix: types 2025-04-26 22:35:08 +10:00
26698e5b06 fix: rounding issue on modal template 2025-04-26 22:34:26 +10:00
e32cc36f33 fix: fix types 2025-04-05 09:40:25 +11:00
ce59647cda feat: custom sizing for modal 2025-03-11 12:15:47 +11:00
637b4e1e9b fix: unmerged changes 2025-02-15 08:35:16 +11:00
77b85c97d0 fix: loading button styles 2025-02-14 20:07:40 +11:00
533eb483ea fix: requiring disabled param 2025-01-28 15:56:20 +11:00
b7127c645d fix: loading button disabled styles 2025-01-28 15:55:11 +11:00
de0d1b4660 feat: ui and functionality changes 2025-01-28 15:18:04 +11:00
01fd41c65a fix(cleanup): remove app.vue and clear nuxt.config.ts of options 2024-12-27 20:39:41 +11:00
80674ef87d fix(submodule): remove playground so can be used as submodule 2024-12-27 20:33:22 +11:00
14 changed files with 237 additions and 763 deletions

View File

@ -1,15 +0,0 @@
import { fileURLToPath } from 'node:url'
export default defineNuxtConfig({
extends: ['..'],
modules: ['@nuxt/eslint'],
eslint: {
config: {
// Use the generated ESLint config for lint root project as well
rootDir: fileURLToPath(new URL('..', import.meta.url))
}
},
compatibilityDate: '2024-12-24'
})

27
app.vue
View File

@ -1,27 +0,0 @@
<template>
<ModalStack />
</template>
<script setup lang="ts">
onMounted(() => {
createModal(
ModalType.Confirmation,
{
title: "Are you sure?",
description:
"Are you sure you want to complete this action? It may have unintended side effects.",
},
async (event, close) => {
switch (event) {
case "confirm":
await new Promise((r) => setTimeout(r, 3000));
close();
break;
case "cancel":
close();
break;
}
}
);
});
</script>

View File

@ -1,82 +1,52 @@
<template>
<TransitionRoot
as="template"
:show="true"
:style="{ 'z-index': props.zHeight }"
>
<Dialog class="relative z-50" @close="emit('event', 'cancel')">
<TransitionChild
as="template"
enter="ease-out duration-300"
enter-from="opacity-0"
enter-to="opacity-100"
leave="ease-in duration-200"
leave-from="opacity-100"
leave-to="opacity-0"
<div class="relative z-50" @close="emit('event', 'cancel')">
<div class="fixed inset-0 bg-zinc-950/75" />
<div class="fixed inset-0 z-10 w-screen overflow-y-auto">
<div
class="flex min-h-full items-start justify-center p-4 text-center sm:items-center sm:p-0"
>
<div
class="fixed inset-0 bg-zinc-950 bg-opacity-75 transition-opacity"
/>
</TransitionChild>
<div class="fixed inset-0 z-10 w-screen overflow-y-auto">
<div
class="flex min-h-full items-start justify-center p-4 text-center sm:items-center sm:p-0"
class="relative transform rounded-lg bg-zinc-900 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg"
>
<TransitionChild
as="template"
enter="ease-out duration-300"
enter-from="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
enter-to="opacity-100 translate-y-0 sm:scale-100"
leave="ease-in duration-200"
leave-from="opacity-100 translate-y-0 sm:scale-100"
leave-to="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<div
class="relative transform rounded-lg bg-zinc-900 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg"
>
<div class="px-4 pb-4 pt-5 space-y-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class="mt-3 text-center sm:mt-0 sm:text-left">
<DialogTitle
as="h3"
class="text-base font-semibold text-zinc-100"
>{{ props.data.title }}
</DialogTitle>
<div class="mt-2">
<p class="text-sm text-zinc-400">
{{ props.data.description }}
</p>
</div>
</div>
<div class="px-4 pb-4 pt-5 space-y-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class="mt-3 text-center sm:mt-0 sm:text-left">
<h3 class="text-base font-semibold text-zinc-100">
{{ props.data.title }}
</h3>
<div class="mt-2">
<p class="text-sm text-zinc-400">
{{ props.data.description }}
</p>
</div>
</div>
<div
class="rounded-b-lg bg-zinc-800 px-4 py-3 sm:flex sm:gap-x-2 sm:flex-row-reverse sm:px-6"
>
<LoadingButton
:loading="props.loading"
@click="emit('event', 'confirm')"
type="submit"
class="w-full sm:w-fit"
>
{{ props.data.buttonText ?? "Confirm" }}
</LoadingButton>
<button
type="button"
class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 hover:bg-zinc-900 sm:mt-0 sm:w-auto"
@click="emit('event', 'cancel')"
ref="cancelButtonRef"
>
Cancel
</button>
</div>
</div>
</TransitionChild>
</div>
<div
class="rounded-b-lg bg-zinc-800 px-4 py-3 sm:flex sm:gap-x-2 sm:flex-row-reverse sm:px-6"
>
<LoadingButton
:loading="props.loading"
@click="emit('event', 'confirm')"
type="submit"
class="w-full sm:w-fit"
>
{{ props.data.buttonText ?? "Confirm" }}
</LoadingButton>
<button
type="button"
class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 hover:bg-zinc-900 sm:mt-0 sm:w-auto"
@click="emit('event', 'cancel')"
ref="cancelButtonRef"
>
Cancel
</button>
</div>
</div>
</div>
</Dialog>
</TransitionRoot>
</div>
</div>
</template>
<script setup lang="ts">

View File

@ -1,7 +1,11 @@
<template>
<button
type="submit"
class="inline-flex h-9 items-center justify-center rounded-md px-3 py-1.5 text-sm font-semibold leading-6 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600 text-white bg-blue-600 hover:bg-blue-500 disabled:text-zinc-400 disabled:bg-blue-600/10 disabled:hover:bg-blue-600/10"
:class="[
styles[style].base,
props.disabled ? styles[style].disabled : styles[style].dft,
]"
:disabled="props.disabled"
>
<div v-if="props.loading" role="status">
<svg
@ -22,12 +26,29 @@
</svg>
<span class="sr-only">Loading...</span>
</div>
<span v-else>
<slot />
</span>
<slot v-else />
</button>
</template>
<script setup lang="ts">
const props = defineProps<{ loading: boolean }>();
type Style = "default" | "none";
const props = defineProps<{
loading: boolean;
style?: Style;
disabled?: boolean;
}>();
const style = props.style ?? "default";
const styles: {
[key in Style]: { base: string; dft: string; disabled: string };
} = {
["default"]: {
base: "inline-flex min-h-9 items-center justify-center rounded-md px-3 py-1.5 text-sm font-semibold leading-6 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600",
dft: "text-white bg-blue-600 hover:bg-blue-500",
disabled:
"text-zinc-400 bg-blue-600/10 hover:bg-blue-600/10",
},
["none"]: { base: "", dft: "", disabled: "" },
};
</script>

View File

@ -1,18 +1,43 @@
<template>
<component
v-for="(modal, modalIdx) in stack"
:is="modal.component"
:z-height="(modalIdx + 1) * 50"
:loading="modal.loading"
:data="modal.data"
@event="(event: string) => handleCallback(modalIdx, event)"
/>
<TransitionGroup name="modal">
<component
v-for="(modal, modalIdx) in stack"
:key="modal.data"
:is="modal.component"
:z-height="(modalIdx + 1) * 50"
:loading="modal.loading"
:data="modal.data"
@event="
(event: string, ...args: any[]) => handleCallback(modalIdx, event, args)
"
/>
</TransitionGroup>
<div id="modalstack"></div>
</template>
<style>
.modal-enter-active,
.modal-leave-active {
transition: all 0.2s ease;
}
.modal-enter-from {
opacity: 0;
}
.modal-enter-to {
opacity: 100;
}
.modal-leave-from {
opacity: 100;
}
.modal-leave-to {
opacity: 0;
}
</style>
<script setup lang="ts">
const stack = useModalStack();
async function handleCallback(modalIdx: number, event: string) {
async function handleCallback(modalIdx: number, event: string, args: any[]) {
const modal = stack.value[modalIdx];
console.log(modal);
const close = () => {
@ -23,7 +48,7 @@ async function handleCallback(modalIdx: number, event: string) {
// I kinda hate this but it's how Vue works so....
(modal.loading as unknown as boolean) = true;
try {
await modal.callback(event, close);
await modal.callback(event, close, ...args);
} finally {
(modal.loading as unknown as boolean) = false;
}

View File

@ -29,7 +29,7 @@
leave-to="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<div
class="relative transform rounded-lg bg-zinc-900 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg"
:class="['relative transform rounded-lg bg-zinc-900 text-left shadow-xl transition-all sm:my-8 sm:w-full', props.sizeClass ?? 'sm:max-w-lg']"
>
<div class="px-4 pb-4 pt-5 space-y-4 sm:p-6 sm:pb-4">
<slot />
@ -55,7 +55,8 @@ import {
TransitionRoot,
} from "@headlessui/vue";
const open = defineModel<boolean>();
const open: Ref<boolean> = defineModel<boolean>() as any;
const props = defineProps<{sizeClass?: string}>();
function close() {
open.value = false;

View File

@ -1,48 +1,23 @@
<template>
<TransitionRoot
as="template"
:show="true"
:style="{ 'z-index': props.zHeight }"
>
<Dialog class="relative z-50" @close="emit('event', 'close')">
<TransitionChild
as="template"
enter="ease-out duration-300"
enter-from="opacity-0"
enter-to="opacity-100"
leave="ease-in duration-200"
leave-from="opacity-100"
leave-to="opacity-0"
>
<div class="relative z-50" @close="emit('event', 'close')">
<div
class="fixed inset-0 bg-zinc-950 bg-opacity-75 transition-opacity"
class="fixed inset-0 bg-zinc-950/75"
/>
</TransitionChild>
<div class="fixed inset-0 z-10 w-screen overflow-y-auto">
<div
class="flex min-h-full items-start justify-center p-4 text-center sm:items-center sm:p-0"
>
<TransitionChild
as="template"
enter="ease-out duration-300"
enter-from="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
enter-to="opacity-100 translate-y-0 sm:scale-100"
leave="ease-in duration-200"
leave-from="opacity-100 translate-y-0 sm:scale-100"
leave-to="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<div
class="relative transform rounded-lg bg-zinc-900 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg"
>
<div class="px-4 pb-4 pt-5 space-y-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class="mt-3 text-center sm:mt-0 sm:text-left">
<DialogTitle
as="h3"
<h3
class="text-base font-semibold text-zinc-100"
>{{ props.data.title }}
</DialogTitle>
</h3>
<div class="mt-2">
<p class="text-sm text-zinc-400">
{{ props.data.description }}
@ -60,15 +35,13 @@
type="submit"
class="w-full sm:w-fit"
>
{{ props.data.buttonText ?? "Confirm" }}
{{ props.data.buttonText ?? "Close" }}
</LoadingButton>
</div>
</div>
</TransitionChild>
</div>
</div>
</Dialog>
</TransitionRoot>
</div>
</template>
<script setup lang="ts">

View File

@ -0,0 +1,87 @@
<template>
<div class="relative z-50" @close="emit('event', 'cancel')">
<div class="fixed inset-0 bg-zinc-950/75" />
<div class="fixed inset-0 z-10 w-screen overflow-y-auto">
<div
class="flex min-h-full items-start justify-center p-4 text-center sm:items-center sm:p-0"
>
<div
class="relative transform rounded-lg bg-zinc-900 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg"
>
<div class="px-4 pb-4 pt-5 space-y-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class="mt-3 text-center sm:mt-0 sm:text-left w-full">
<h3 class="text-base font-semibold text-zinc-100">
{{ props.data.title }}
</h3>
<div class="mt-1">
<p class="text-sm text-zinc-400">
{{ props.data.description }}
</p>
</div>
<form
class="mt-4 w-full"
@submit.prevent="() => emit('event', 'submit', v)"
>
<input
v-model="v"
type="text"
:placeholder="props.data.placeholder"
class="block w-full rounded-md border-0 bg-zinc-800 py-1.5 text-white shadow-sm ring-1 ring-inset ring-zinc-700 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6"
/>
<button class="hidden" type="submit" />
</form>
</div>
</div>
</div>
<div
class="rounded-b-lg bg-zinc-800 px-4 py-3 sm:flex sm:gap-x-2 sm:flex-row-reverse sm:px-6"
>
<LoadingButton
:loading="props.loading"
@click="emit('event', 'submit', v)"
type="submit"
class="w-full sm:w-fit"
>
{{ props.data.buttonText ?? "Submit" }}
</LoadingButton>
<button
type="button"
class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 hover:bg-zinc-900 sm:mt-0 sm:w-auto"
@click="emit('event', 'cancel')"
ref="cancelButtonRef"
>
Cancel
</button>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import {
Dialog,
DialogTitle,
TransitionChild,
TransitionRoot,
} from "@headlessui/vue";
import type {
ModalDatas,
ModalEvents,
ModalType,
} from "../composables/modal-stack";
const props = defineProps<{
zHeight: number;
loading: boolean;
data: ModalDatas[ModalType.TextInput];
}>();
const emit = defineEmits<{
(e: "event", v: ModalEvents[ModalType.TextInput], s?: string): void;
}>();
const v = ref(props.data.dft || "");
</script>

View File

@ -1,10 +1,12 @@
import type { Component } from "vue";
import ConfirmationModal from "../components/ConfirmationModal.vue";
import NotificationModal from "../components/NotificationModal.vue";
import TextInputModal from "../components/TextInputModal.vue";
export type ModalCallbackType<T extends ModalType> = (
event: ModalEvents[T],
close: () => void
close: () => void,
...args: any[]
) => Promise<void> | void;
export interface ModalStackElement<T extends ModalType> {
@ -18,11 +20,13 @@ export interface ModalStackElement<T extends ModalType> {
export enum ModalType {
Confirmation,
Notification,
TextInput
}
export type ModalEvents = {
[ModalType.Confirmation]: "confirm" | "cancel";
[ModalType.Notification]: "close";
[ModalType.TextInput]: "cancel" | "submit"
};
export type ModalDatas = {
@ -36,11 +40,19 @@ export type ModalDatas = {
description: string;
buttonText?: string;
};
[ModalType.TextInput]: {
title: string,
description: string,
buttonText?: string,
dft?: string,
placeholder?: string,
}
};
const modalComponents: { [key in ModalType]: Component } = {
[ModalType.Confirmation]: ConfirmationModal,
[ModalType.Notification]: NotificationModal,
[ModalType.TextInput]: TextInputModal,
};
export function createModal<T extends ModalType>(

View File

@ -1,6 +1,2 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
devtools: { enabled: true },
modules: ["@nuxtjs/tailwindcss"],
ssr: false,
});
export default defineNuxtConfig({});

View File

@ -13,7 +13,6 @@
},
"devDependencies": {
"@nuxt/eslint": "latest",
"@nuxtjs/tailwindcss": "6.12.2",
"eslint": "^9.17.0",
"nuxt": "^3.14.1592",
"typescript": "^5.7.2",

View File

@ -1,9 +0,0 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [],
theme: {
extend: {},
},
plugins: [],
}

View File

@ -1,3 +0,0 @@
{
"extends": "./.playground/.nuxt/tsconfig.json"
}

608
yarn.lock

File diff suppressed because it is too large Load Diff