allow customizing ModalDialog close button

ServiceStack · Oct 10, 2024 · 861e43c · 861e43c
1 parent 5641139
commit 861e43c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
@@ -23,7 +23,7 @@
             </svg>
         </button>
 
-        <ul v-if="expanded" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white dark:bg-black py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm"
+        <ul v-if="expanded" class="absolute z-20 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white dark:bg-black py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm"
             @keydown="keyDown" :id="`${id}-options`" role="listbox">
             <li v-for="option in filteredValues" 
                 :class="[option === active ? 'active bg-indigo-600 text-white' : 'text-gray-900 dark:text-gray-100', 'relative cursor-default select-none py-2 pl-3 pr-9']"

diff --git a/src/components/ModalDialog.vue b/src/components/ModalDialog.vue
@@ -6,12 +6,11 @@
 
     <div class="fixed inset-0 z-10 overflow-y-auto">
         <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-            <div :class="[modalClass, sizeClass, transition2]"
-                @mousedown.stop="">
+            <div :class="[modalClass, sizeClass, transition2]" @mousedown.stop="">
                 <div>
-                    <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4 z-10">
-                        <button type="button" @click="close"
-                            class="bg-white dark:bg-black rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:ring-offset-black">
+                    <slot v-if="slots.closebutton" name="createform"></slot>
+                    <div v-else class="hidden sm:block absolute top-0 right-0 pt-4 pr-4 z-10">
+                        <button type="button" @click="close":class="closeButtonClass">
                             <span class="sr-only">Close</span>
                             <!-- Heroicon name: outline/x -->
                             <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
@@ -24,6 +23,7 @@
                     <slot></slot>
                 </div>
             </div>
+            <slot name="bottom"></slot>
         </div>
     </div>
 
@@ -33,18 +33,22 @@
 
 <script setup lang="ts">
 import type { ModalProvider } from "@/types"
-import { onMounted, onUnmounted, watch, ref, provide } from "vue"
+import { onMounted, onUnmounted, watch, ref, provide, useSlots } from "vue"
 import { transition } from '@/use/utils'
 import * as css from "./css"
 
+const slots = useSlots()
+
 const props = withDefaults(defineProps<{
     id?: string
     modalClass?: string
     sizeClass?: string
+    closeButtonClass?: string
 }>(), {
     id: 'ModalDialog',
     modalClass: css.modal.modalClass,
     sizeClass: css.modal.sizeClass,
+    closeButtonClass: "bg-white dark:bg-black rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:ring-offset-black",
 })
 
 const emit = defineEmits<{