From bc01136da7e838004088fffbf2acfd6788f3c5fb Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Wed, 19 Feb 2025 17:10:25 +0100 Subject: [PATCH] fix(Modal/Slideover): add wrapper around title & description Follow up of https://github.com/nuxt/ui/commit/d33a83e147b009ebe1e52b7d677d364d18f24333 --- src/runtime/components/Modal.vue | 22 ++-- src/runtime/components/Slideover.vue | 22 ++-- src/theme/modal.ts | 1 + src/theme/slideover.ts | 1 + .../__snapshots__/Modal-vue.spec.ts.snap | 96 ++++++++++------ .../__snapshots__/Modal.spec.ts.snap | 96 ++++++++++------ .../__snapshots__/Slideover-vue.spec.ts.snap | 108 ++++++++++++------ .../__snapshots__/Slideover.spec.ts.snap | 108 ++++++++++++------ 8 files changed, 298 insertions(+), 156 deletions(-) diff --git a/src/runtime/components/Modal.vue b/src/runtime/components/Modal.vue index 6fb10ab0..cb10f3e2 100644 --- a/src/runtime/components/Modal.vue +++ b/src/runtime/components/Modal.vue @@ -144,17 +144,19 @@ const ui = computed(() => modal({
- - - {{ title }} - - +
+ + + {{ title }} + + - - - {{ description }} - - + + + {{ description }} + + +
diff --git a/src/runtime/components/Slideover.vue b/src/runtime/components/Slideover.vue index efdfbbd6..22cc22df 100644 --- a/src/runtime/components/Slideover.vue +++ b/src/runtime/components/Slideover.vue @@ -144,17 +144,19 @@ const ui = computed(() => slideover({
- - - {{ title }} - - +
+ + + {{ title }} + + - - - {{ description }} - - + + + {{ description }} + + +
diff --git a/src/theme/modal.ts b/src/theme/modal.ts index 7705b710..159dcf7b 100644 --- a/src/theme/modal.ts +++ b/src/theme/modal.ts @@ -3,6 +3,7 @@ export default { overlay: 'fixed inset-0 bg-(--ui-bg-elevated)/75', content: 'fixed bg-(--ui-bg) divide-y divide-(--ui-border) flex flex-col focus:outline-none', header: 'flex items-center gap-1.5 p-4 sm:px-6 min-h-16', + wrapper: '', body: 'flex-1 overflow-y-auto p-4 sm:p-6', footer: 'flex items-center gap-1.5 p-4 sm:px-6', title: 'text-(--ui-text-highlighted) font-semibold', diff --git a/src/theme/slideover.ts b/src/theme/slideover.ts index adffe8ac..14f28e80 100644 --- a/src/theme/slideover.ts +++ b/src/theme/slideover.ts @@ -3,6 +3,7 @@ export default { overlay: 'fixed inset-0 bg-(--ui-bg-elevated)/75', content: 'fixed bg-(--ui-bg) divide-y divide-(--ui-border) sm:ring ring-(--ui-border) sm:shadow-lg flex flex-col focus:outline-none', header: 'flex items-center gap-1.5 p-4 sm:px-6 min-h-16', + wrapper: '', body: 'flex-1 overflow-y-auto p-4 sm:p-6', footer: 'flex items-center gap-1.5 p-4 sm:px-6', title: 'text-(--ui-text-highlighted) font-semibold', diff --git a/test/components/__snapshots__/Modal-vue.spec.ts.snap b/test/components/__snapshots__/Modal-vue.spec.ts.snap index c856ce51..e0dbddf8 100644 --- a/test/components/__snapshots__/Modal-vue.spec.ts.snap +++ b/test/components/__snapshots__/Modal-vue.spec.ts.snap @@ -9,8 +9,10 @@ exports[`Modal > renders with body slot correctly 1`] = `