@falcondev-oss/nuxt-layers-base 0.6.2 → 0.7.0

package/app/components/u/UAuthForm.vue

@@ -12,17 +12,13 @@ import type {
   InferInput,
   InferOutput,
 } from '@nuxt/ui'
-import type { Merge } from 'type-fest'
 import type { Reactive } from 'vue'
 import { useForwardProps } from 'reka-ui'
 
 const props = defineProps<
-  Merge<
-    AuthFormProps<T, F>,
-    {
-      onSubmit?: (event: FormSubmitEvent<InferOutput<T>>) => void | Promise<void>
-    }
-  >
+  Omit<AuthFormProps<T, F>, 'onSubmit'> & {
+    onSubmit?: (event: FormSubmitEvent<InferOutput<T>>) => void | Promise<void>
+  }
 >()
 const slots = defineSlots<AuthFormSlots<Reactive<InferInput<T>>, F>>()
 

package/app/components/u/UInputDatePicker.vue

@@ -8,31 +8,48 @@ const open = ref(false)
 </script>
 
 <template>
-  <UInputDate ref="inputDate" v-model="model">
+  <UInputDate
+    ref="inputDate"
+    :model-value="model"
+    :range="false"
+    @update:model-value="
+      (val) => {
+        model = val ?? null
+      }
+    "
+  >
     <template #trailing>
       <UPopover v-model:open="open" :reference="inputDate?.inputsRef[3]?.$el">
-        <UButton
-          color="neutral"
-          variant="link"
-          size="sm"
-          icon="i-lucide-calendar"
-          aria-label="Datum auswählen"
-          class="px-0"
-        />
+        <UButton color="neutral" variant="link" size="sm" icon="i-lucide-calendar" class="px-0" />
 
         <template #content>
-          <UCalendar
-            :model-value="model ?? undefined"
-            :multiple="false"
-            :range="false"
-            class="p-2"
-            @update:model-value="
-              (val) => {
-                model = val ?? null
-                open = false
-              }
-            "
-          />
+          <div class="p-2">
+            <UCalendar
+              :model-value="model ?? undefined"
+              :multiple="false"
+              :range="false"
+              @update:model-value="
+                (val) => {
+                  model = val ?? null
+                  open = false
+                }
+              "
+            />
+            <div v-if="model" class="flex justify-end">
+              <UButton
+                variant="ghost"
+                icon="tabler:trash"
+                color="error"
+                label="Löschen"
+                size="sm"
+                @click="
+                  () => {
+                    model = null
+                  }
+                "
+              />
+            </div>
+          </div>
         </template>
       </UPopover>
     </template>

package/app/components/u/UInputDateRangePicker.vue

@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import type { CalendarDate, DateValue } from '@internationalized/date'
+import { toCalendarDate } from '@internationalized/date'
+
+const inputDate = useTemplateRef('inputDate')
+
+const model = defineModel<{
+  start: CalendarDate
+  end: CalendarDate
+} | null>({
+  required: true,
+})
+
+const localModel = shallowRef({
+  // eslint-disable-next-line vue/no-ref-object-reactivity-loss
+  start: model.value?.start,
+  // eslint-disable-next-line vue/no-ref-object-reactivity-loss
+  end: model.value?.end,
+} as
+  | {
+      start: DateValue | undefined
+      end: DateValue | undefined
+    }
+  | undefined
+  | null)
+
+const open = ref(false)
+
+let syncingModelValue = false
+watch(
+  localModel,
+  (newValue) => {
+    // prevent infinite loop
+    if (syncingModelValue) return
+
+    if (newValue?.start && newValue.end) {
+      model.value = {
+        start: toCalendarDate(newValue.start),
+        end: toCalendarDate(newValue.end),
+      }
+      open.value = false
+    } else if (!newValue?.start && !newValue?.end) {
+      model.value = null
+      open.value = false
+    }
+  },
+  {
+    flush: 'sync',
+  },
+)
+
+watch(model, (newValue) => {
+  syncingModelValue = true
+  if (newValue) {
+    localModel.value = {
+      start: newValue.start,
+      end: newValue.end,
+    }
+  } else {
+    localModel.value = {
+      start: undefined,
+      end: undefined,
+    }
+  }
+  syncingModelValue = false
+})
+</script>
+
+<template>
+  <UInputDate ref="inputDate" v-model="localModel" range>
+    <template #trailing>
+      <UPopover v-model:open="open" :reference="inputDate?.inputsRef[0]?.$el">
+        <UButton color="neutral" variant="link" size="sm" icon="i-lucide-calendar" class="px-0" />
+
+        <template #content>
+          <div class="p-2">
+            <UCalendar v-model="localModel" :number-of-months="2" range />
+            <div v-if="model" class="flex justify-end">
+              <UButton
+                variant="ghost"
+                icon="tabler:trash"
+                color="error"
+                label="Löschen"
+                size="sm"
+                @click="
+                  () => {
+                    localModel = {
+                      start: undefined,
+                      end: undefined,
+                    }
+                  }
+                "
+              />
+            </div>
+          </div>
+        </template>
+      </UPopover>
+    </template>
+  </UInputDate>
+</template>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@falcondev-oss/nuxt-layers-base",
   "type": "module",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "Nuxt layer with lots of useful helpers and @nuxt/ui components",
   "license": "MIT",
   "repository": "github:falcondev-oss/nuxt-layers",