From 923645b4b3598402593a09152b0672b249483fb8 Mon Sep 17 00:00:00 2001
From: Dmitri <19738862+Dmitri-2@users.noreply.github.com>
Date: Sun, 2 Oct 2022 17:25:01 -0700
Subject: [PATCH] Address PR comments

---
 .../modal/examples/ModalExample.vue           | 10 ++++++----
 .../modal/examples/ModalSizeExample.vue       |  8 ++++----
 src/components/Modal/Modal.vue                | 19 +++++++++++--------
 src/components/Modal/types.ts                 |  2 ++
 4 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 src/components/Modal/types.ts

diff --git a/docs/components/modal/examples/ModalExample.vue b/docs/components/modal/examples/ModalExample.vue
index c590f72..10886cf 100644
--- a/docs/components/modal/examples/ModalExample.vue
+++ b/docs/components/modal/examples/ModalExample.vue
@@ -39,8 +39,10 @@
     </Modal>
   </div>
 </template>
-<script setup>
-import { Modal } from '../../../../src/index';
+<script lang="ts" setup>
+import { Modal } from '../../../../src/index'
+import type { PropType } from 'vue'
+import type { ModalSize, ModalPosition } from '../../../../src/components/Modal/types'
 const props = defineProps({
   children: {
     type: Array,
@@ -53,7 +55,7 @@ const props = defineProps({
     default: false,
   },
   position: {
-    type: String, // 'bottom-left' | 'bottom-right' | 'bottom-center' | 'top-left' | 'top-center' | 'top-right' | 'center-left' | 'center' | 'center-right'
+    type: String as PropType<ModalPosition>,
     default: 'center',
   },
   show: {
@@ -61,7 +63,7 @@ const props = defineProps({
     default: false,
   },
   size: {
-    type: String, // 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl' | '6xl' | '7xl'
+    type: String as PropType<ModalSize>,
     default: '2xl',
   },
   triggerText: {
diff --git a/docs/components/modal/examples/ModalSizeExample.vue b/docs/components/modal/examples/ModalSizeExample.vue
index 15c82b4..0120350 100644
--- a/docs/components/modal/examples/ModalSizeExample.vue
+++ b/docs/components/modal/examples/ModalSizeExample.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="vp-raw flex justify-between">
     <span>
-      <ModalExample size="xs" trigger-text="XS Modal"/>
+      <ModalExample size="xs" trigger-text="XS Modal" />
     </span>
     <span>
-      <ModalExample size="md" trigger-text="MD Modal"/>
+      <ModalExample size="md" trigger-text="MD Modal" />
     </span>
     <span>
-      <ModalExample size="xl" trigger-text="XL Modal"/>
+      <ModalExample size="xl" trigger-text="XL Modal" />
     </span>
     <span>
-      <ModalExample size="5xl" trigger-text="5XL Modal"/>
+      <ModalExample size="5xl" trigger-text="5XL Modal" />
     </span>
   </div>
 </template>
diff --git a/src/components/Modal/Modal.vue b/src/components/Modal/Modal.vue
index da29f54..83cf819 100644
--- a/src/components/Modal/Modal.vue
+++ b/src/components/Modal/Modal.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <slot name="trigger" :show="showModal" :hide="hideModal" :toggle="toggleModal"></slot>
-    <div v-if="!isHidden" class="bg-gray-900 bg-opacity-50 dark:bg-opacity-80 fixed inset-0 z-40"></div>
+    <slot name="trigger" :show="showModal" :hide="hideModal" :toggle="toggleModal"/>
+    <div v-if="!isHidden" class="bg-gray-900 bg-opacity-50 dark:bg-opacity-80 fixed inset-0 z-40"/>
     <div v-if="!isHidden" tabindex="-1" :aria-hidden="isHidden ? 'true' : 'false'"
          class="overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 w-full md:inset-0 h-modal md:h-full justify-center items-center flex">
       <div class="relative p-4 w-full h-full md:h-auto"
@@ -11,15 +11,15 @@
           <!-- Modal header -->
           <div class="p-4 rounded-t"
                :class="$slots.header ? 'border-b' : ''">
-            <slot name="header" :show="showModal" :hide="hideModal" :toggle="toggleModal"></slot>
+            <slot name="header" :show="showModal" :hide="hideModal" :toggle="toggleModal"/>
           </div>
           <!-- Modal body -->
           <div class="p-6" :class="$slots.header ? '' : 'pt-0'">
-            <slot name="body" :show="showModal" :hide="hideModal" :toggle="toggleModal"></slot>
+            <slot name="body" :show="showModal" :hide="hideModal" :toggle="toggleModal"/>
           </div>
           <!-- Modal footer -->
           <div v-if="$slots.footer" class="p-6 rounded-b border-gray-200">
-            <slot name="footer"  :show="showModal" :hide="hideModal" :toggle="toggleModal"/>
+            <slot name="footer" :show="showModal" :hide="hideModal" :toggle="toggleModal"/>
           </div>
         </div>
       </div>
@@ -28,7 +28,8 @@
 </template>
 <script lang="ts" setup>
 import { ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
+import type { ModalSize, ModalPosition } from './types'
 
 const props = defineProps({
   children: {
@@ -42,7 +43,7 @@ const props = defineProps({
     default: false,
   },
   position: {
-    type: String, // 'bottom-left' | 'bottom-right' | 'bottom-center' | 'top-left' | 'top-center' | 'top-right' | 'center-left' | 'center' | 'center-right'
+    type: String as PropType<ModalPosition>,
     default: 'center',
   },
   show: {
@@ -50,7 +51,7 @@ const props = defineProps({
     default: false,
   },
   size: {
-    type: String, // 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl' | '6xl' | '7xl'
+    type: String as PropType<ModalSize>,
     default: '2xl',
   },
 })
@@ -74,9 +75,11 @@ const isHidden: Ref<boolean> = ref(!props.show)
 function toggleModal() {
   isHidden.value = !isHidden.value
 }
+
 function hideModal() {
   isHidden.value = true
 }
+
 function showModal() {
   isHidden.value = false
 }
diff --git a/src/components/Modal/types.ts b/src/components/Modal/types.ts
new file mode 100644
index 0000000..8e49a60
--- /dev/null
+++ b/src/components/Modal/types.ts
@@ -0,0 +1,2 @@
+export type ModalPosition = 'bottom-left' | 'bottom-right' | 'bottom-center' | 'top-left' | 'top-center' | 'top-right' | 'center-left' | 'center' | 'center-right';
+export type ModalSize = 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl' | '6xl' | '7xl';
\ No newline at end of file