daisy-ui-kit 5.0.0-pre.21 → 5.0.0-pre.25

package/app/components/Calendar.vue

@@ -1,89 +1,175 @@
 <script setup lang="ts">
-import type { PikadayOptions } from 'pikaday'
-import { onMounted, ref } from 'vue'
-import { usePikaday } from '~/composables/use-pikaday'
-import CalendarSkeleton from './CalendarSkeleton.vue'
+import type { CalendarOptions } from '../composables/use-calendar'
+import { computed, watch } from 'vue'
+import { useCalendar } from '../composables/use-calendar'
 
 const props = defineProps<{
   /** Bound value: Date object or ISO string or null */
-  modelValue: Date | string | null
-  /** All Pikaday options (except `container` and `bound`) */
-  options?: Omit<PikadayOptions, 'container' | 'bound'>
+  modelValue?: Date | string | null
+  /** Calendar options */
+  options?: CalendarOptions
   /** If true, default to today when no value provided */
   autoDefault?: boolean
 }>()
+
 const emit = defineEmits<{
   (e: 'update:modelValue', v: Date | null): void
 }>()
 
-const containerRef = ref<HTMLElement | null>(null)
-const loading = ref(true)
-
-const defaultOptions: Partial<PikadayOptions> = {
-  format: 'D MMM YYYY',
+// Parse initial date from modelValue
+function parseDate(value: Date | string | null | undefined): Date | null {
+  if (!value) return null
+  if (value instanceof Date) return value
+  const d = new Date(value)
+  return Number.isNaN(d.getTime()) ? null : d
 }
 
-// Determine the date to use for the skeleton
-const skeletonDate = computed(() => {
-  // Try to use modelValue if it's a Date
-  if (props.modelValue instanceof Date) {
-    return props.modelValue
-  }
-  // Try to parse modelValue if it's a string
-  if (typeof props.modelValue === 'string') {
-    return new Date(props.modelValue)
-  }
-  // Use defaultDate from options if provided
-  if (props.options?.defaultDate instanceof Date) {
-    return props.options.defaultDate
-  }
-  // Fall back to today
-  return new Date()
+const initialDate = computed(() => {
+  const parsed = parseDate(props.modelValue)
+  if (parsed) return parsed
+  if (props.autoDefault) return new Date()
+  return null
 })
 
-function handleSelect(date: Date) {
+const {
+  selectedDate,
+  viewMonth,
+  viewYear,
+  monthName,
+  weekdayHeaders,
+  weekdayHeadersFull,
+  calendarDays,
+  prevMonth,
+  nextMonth,
+  selectDate,
+  goToDate,
+} = useCalendar(initialDate.value, props.options)
+
+// Sync selectedDate back to modelValue
+watch(selectedDate, date => {
   emit('update:modelValue', date)
-}
+})
 
-const { createPicker } = usePikaday(
-  {
-    ...defaultOptions,
-    ...props.options,
-    bound: false,
+// Watch for external modelValue changes
+watch(
+  () => props.modelValue,
+  newValue => {
+    const parsed = parseDate(newValue)
+    if (parsed && (!selectedDate.value || parsed.getTime() !== selectedDate.value.getTime())) {
+      selectDate(parsed)
+      goToDate(parsed)
+    }
   },
-  handleSelect,
 )
 
-onMounted(async () => {
-  if (containerRef.value) {
-    const picker = await createPicker(containerRef.value)
-    if (picker && picker.el && !containerRef.value.contains(picker.el)) {
-      containerRef.value.appendChild(picker.el)
-    }
-    loading.value = false
-  }
-})
+function handleDayClick(day: (typeof calendarDays.value)[0]) {
+  if (day.isDisabled) return
+  selectDate(day.date)
+}
 </script>
 
 <template>
-  <div class="relative w-[270px] h-[270px]">
-    <div class="absolute inset-0">
-      <CalendarSkeleton
-        :number-of-months="options?.numberOfMonths ?? 1"
-        :date="skeletonDate"
-        :first-day="options?.firstDay"
-        :class="loading ? '' : 'opacity-0 pointer-events-none transition-opacity duration-300'"
-      />
+  <div class="pika-single">
+    <div class="pika-lendar">
+      <!-- Header with navigation -->
+      <div class="pika-title">
+        <div class="pika-label">
+          {{ monthName }}
+          <select
+            class="pika-select pika-select-month"
+            :value="viewMonth"
+            @change="
+              e => {
+                const target = e.target as HTMLSelectElement
+                const newMonth = parseInt(target.value, 10)
+                const d = new Date(viewYear, newMonth, 1)
+                goToDate(d)
+              }
+            "
+          >
+            <option
+              v-for="(m, i) in [
+                'January',
+                'February',
+                'March',
+                'April',
+                'May',
+                'June',
+                'July',
+                'August',
+                'September',
+                'October',
+                'November',
+                'December',
+              ]"
+              :key="i"
+              :value="i"
+            >
+              {{ m }}
+            </option>
+          </select>
+        </div>
+        <div class="pika-label">
+          {{ viewYear }}
+          <select
+            class="pika-select pika-select-year"
+            :value="viewYear"
+            @change="
+              e => {
+                const target = e.target as HTMLSelectElement
+                const newYear = parseInt(target.value, 10)
+                const d = new Date(newYear, viewMonth, 1)
+                goToDate(d)
+              }
+            "
+          >
+            <option v-for="y in Array.from({ length: 21 }, (_, i) => viewYear - 10 + i)" :key="y" :value="y">
+              {{ y }}
+            </option>
+          </select>
+        </div>
+        <button type="button" class="pika-prev" @click="prevMonth">Previous Month</button>
+        <button type="button" class="pika-next" @click="nextMonth">Next Month</button>
+      </div>
+
+      <!-- Calendar grid -->
+      <table class="pika-table" role="grid">
+        <thead>
+          <tr>
+            <th v-for="(day, i) in weekdayHeaders" :key="i" scope="col">
+              <abbr :title="weekdayHeadersFull[i]">{{ day }}</abbr>
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="week in 6" :key="week" class="pika-row">
+            <td
+              v-for="dayIndex in 7"
+              :key="dayIndex"
+              :class="{
+                'is-today': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isToday,
+                'is-selected': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isSelected,
+                'is-disabled': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isDisabled,
+                'is-outside-current-month': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isOutsideMonth,
+              }"
+              :aria-selected="calendarDays[(week - 1) * 7 + dayIndex - 1]?.isSelected"
+              :data-day="calendarDays[(week - 1) * 7 + dayIndex - 1]?.day"
+            >
+              <button
+                type="button"
+                class="pika-button pika-day"
+                :disabled="calendarDays[(week - 1) * 7 + dayIndex - 1]?.isDisabled"
+                :data-pika-year="calendarDays[(week - 1) * 7 + dayIndex - 1]?.year"
+                :data-pika-month="calendarDays[(week - 1) * 7 + dayIndex - 1]?.month"
+                :data-pika-day="calendarDays[(week - 1) * 7 + dayIndex - 1]?.day"
+                @click="handleDayClick(calendarDays[(week - 1) * 7 + dayIndex - 1]!)"
+              >
+                {{ calendarDays[(week - 1) * 7 + dayIndex - 1]?.day }}
+              </button>
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
-    <div ref="containerRef" class="absolute inset-0 inline-block w-full h-full" />
-    <span class="pika-single hidden" />
   </div>
 </template>
-
-<style>
-.has-event {
-  .pika-button {
-    color: var(--color-primary);
-  }
-}
-</style>

package/app/components/CalendarInput.vue

@@ -1,15 +1,14 @@
 <script setup lang="ts">
-import type { PikadayOptions } from 'pikaday'
-import type { ComponentPublicInstance } from 'vue'
-import { onMounted, ref, watch } from 'vue'
-
-import { usePikaday } from '~/composables/use-pikaday'
+import type { CalendarOptions } from '../composables/use-calendar'
+import { computed, ref, watch } from 'vue'
+import { useCalendar } from '../composables/use-calendar'
+import { randomString } from '../utils/random-string'
 
 const props = defineProps<{
   /** Bound value: Date object or ISO string or null */
-  modelValue: Date | string | number | null
-  /** All Pikaday options (except `field`) */
-  options?: Omit<PikadayOptions, 'field'>
+  modelValue?: Date | string | number | null
+  /** Calendar options */
+  options?: CalendarOptions
   /** If true, default to today when no value provided */
   autoDefault?: boolean
   placeholder?: string
@@ -32,143 +31,245 @@ const props = defineProps<{
   sm?: boolean
   xs?: boolean
 }>()
+
 const emit = defineEmits<{
   (e: 'update:modelValue', v: Date | null): void
   (e: 'update:inputValue', v: string | null): void
 }>()
-const inputRef = ref<ComponentPublicInstance | null>(null)
-const inputValue = ref<string | null>(null)
-const visible = ref(false)
 
-const defaultOptions: Partial<PikadayOptions> = {
-  format: 'D MMM YYYY',
-}
+const popoverId = `calendar-popover-${randomString()}`
+const anchorName = `--calendar-anchor-${randomString()}`
+const inputRef = ref<HTMLInputElement | null>(null)
+const popoverRef = ref<HTMLElement | null>(null)
 
-const { picker, createPicker } = usePikaday(
-  {
-    ...defaultOptions,
-    ...props.options,
-    bound: true,
-    field: undefined, // will be set below
-  },
-  handleSelect,
-  handleOpen,
-  handleClose,
-)
-
-function handleSelect(date: Date) {
-  emit('update:modelValue', date)
-  inputValue.value = picker.value?.toString() ?? ''
-  emit('update:inputValue', inputValue.value)
-}
-function handleOpen() {
-  visible.value = true
-}
-function handleClose() {
-  visible.value = false
+// Parse date from various input types
+function parseDate(value: Date | string | number | null | undefined): Date | null {
+  if (!value) return null
+  if (value instanceof Date) return value
+  const d = new Date(value)
+  return Number.isNaN(d.getTime()) ? null : d
 }
 
-onMounted(async () => {
-  const inputEl = inputRef.value as HTMLInputElement | null
-  // Format and set the initial input value BEFORE initializing Pikaday
-  if (props.modelValue) {
-    let d: Date | null = null
-    if (props.modelValue instanceof Date) {
-      d = props.modelValue
-    } else if (typeof props.modelValue === 'string') {
-      const tmp = new Date(props.modelValue)
-      if (!Number.isNaN(tmp.getTime())) {
-        d = tmp
-      }
-    }
-    if (d) {
-      const day = d.getDate()
-      const month = d.toLocaleString('en-US', { month: 'short' })
-      const year = d.getFullYear()
-      inputValue.value = `${day} ${month} ${year}`
-    }
-  }
-  if (inputEl) {
-    picker.value = await createPicker(inputEl)
-    // Do not call setDate here
-    if (picker.value && (picker.value as any).config?.bound === false) {
-      picker.value.hide()
-    }
-  }
+const initialDate = computed(() => {
+  const parsed = parseDate(props.modelValue)
+  if (parsed) return parsed
+  if (props.autoDefault) return new Date()
+  return null
 })
 
-function onFocus() {
-  if (picker.value) {
-    let d: Date | null = null
-    if (props.modelValue instanceof Date) {
-      d = props.modelValue
-    } else if (typeof props.modelValue === 'string') {
-      const tmp = new Date(props.modelValue)
-      if (!Number.isNaN(tmp.getTime())) {
-        d = tmp
-      }
-    }
-    picker.value.setDate(d, true)
-  }
-}
+const {
+  selectedDate,
+  viewMonth,
+  viewYear,
+  monthName,
+  weekdayHeaders,
+  weekdayHeadersFull,
+  calendarDays,
+  prevMonth,
+  nextMonth,
+  selectDate,
+  goToDate,
+  formatDate,
+} = useCalendar(initialDate.value, props.options)
+
+// Input display value
+const inputValue = computed(() => formatDate('D MMM YYYY'))
 
+// Sync selectedDate back to modelValue
+watch(selectedDate, date => {
+  emit('update:modelValue', date)
+  emit('update:inputValue', formatDate('D MMM YYYY'))
+})
+
+// Watch for external modelValue changes
 watch(
   () => props.modelValue,
-  val => {
-    if (!picker.value) {
-      return
-    }
-    if (!visible.value) {
-      if (val instanceof Date) {
-        picker.value.setDate(val, true)
-        inputValue.value = picker.value.toString()
-      } else if (typeof val === 'string') {
-        const d = new Date(val)
-        if (!Number.isNaN(d.getTime())) {
-          picker.value.setDate(d, true)
-          inputValue.value = picker.value.toString()
-        }
-      } else {
-        picker.value.setDate(null, true)
-        inputValue.value = ''
-      }
+  newValue => {
+    const parsed = parseDate(newValue)
+    if (parsed && (!selectedDate.value || parsed.getTime() !== selectedDate.value.getTime())) {
+      selectDate(parsed)
+      goToDate(parsed)
+    } else if (!newValue && selectedDate.value) {
+      selectedDate.value = null
     }
   },
 )
+
+function handleDayClick(day: (typeof calendarDays.value)[0]) {
+  if (day.isDisabled) return
+  selectDate(day.date)
+  popoverRef.value?.hidePopover()
+}
+
+function handleClick() {
+  // Sync view to selected date when opening
+  if (selectedDate.value) {
+    goToDate(selectedDate.value)
+  }
+  popoverRef.value?.togglePopover()
+}
 </script>
 
 <template>
-  <input
-    ref="inputRef"
-    type="text"
-    :value="inputValue"
-    :placeholder="props.placeholder"
-    :disabled="props.disabled"
-    class="input"
-    :class="[
-      { validator: props.validator },
-      { 'input-primary': props.primary || props.color === 'primary' },
-      { 'input-secondary': props.secondary || props.color === 'secondary' },
-      { 'input-accent': props.accent || props.color === 'accent' },
-      { 'input-info': props.info || props.color === 'info' },
-      { 'input-success': props.success || props.color === 'success' },
-      { 'input-warning': props.warning || props.color === 'warning' },
-      { 'input-error': props.error || props.color === 'error' },
-      { 'input-ghost': props.ghost },
-      { 'input-xl': props.xl || props.size === 'xl' },
-      { 'input-lg': props.lg || props.size === 'lg' },
-      { 'input-md': props.md || props.size === 'md' },
-      { 'input-sm': props.sm || props.size === 'sm' },
-      { 'input-xs': props.xs || props.size === 'xs' },
-      { 'join-item': props.join },
-    ]"
-    v-bind="$attrs"
-    @focus="onFocus"
-    @input="
-      e => {
-        const val = (e.target as HTMLInputElement).value
-        emit('update:inputValue', val)
-      }
-    "
-  />
+  <div class="relative inline-block">
+    <input
+      ref="inputRef"
+      type="text"
+      readonly
+      :value="inputValue"
+      :placeholder="props.placeholder"
+      :disabled="props.disabled"
+      class="input cursor-pointer"
+      :class="[
+        { validator: props.validator },
+        { 'input-primary': props.primary || props.color === 'primary' },
+        { 'input-secondary': props.secondary || props.color === 'secondary' },
+        { 'input-accent': props.accent || props.color === 'accent' },
+        { 'input-info': props.info || props.color === 'info' },
+        { 'input-success': props.success || props.color === 'success' },
+        { 'input-warning': props.warning || props.color === 'warning' },
+        { 'input-error': props.error || props.color === 'error' },
+        { 'input-ghost': props.ghost },
+        { 'input-xl': props.xl || props.size === 'xl' },
+        { 'input-lg': props.lg || props.size === 'lg' },
+        { 'input-md': props.md || props.size === 'md' },
+        { 'input-sm': props.sm || props.size === 'sm' },
+        { 'input-xs': props.xs || props.size === 'xs' },
+        { 'join-item': props.join },
+      ]"
+      :style="{ 'anchor-name': anchorName } as any"
+      v-bind="$attrs"
+      @click="handleClick"
+    />
+
+    <!-- Dropdown calendar using Popover API -->
+    <div
+      :id="popoverId"
+      ref="popoverRef"
+      popover="auto"
+      class="pika-single calendar-popover"
+      :style="{ 'position-anchor': anchorName } as any"
+    >
+      <div class="pika-lendar">
+        <!-- Header with navigation -->
+        <div class="pika-title">
+          <div class="pika-label">
+            {{ monthName }}
+            <select
+              class="pika-select pika-select-month"
+              :value="viewMonth"
+              @change="
+                e => {
+                  const target = e.target as HTMLSelectElement
+                  const newMonth = parseInt(target.value, 10)
+                  const d = new Date(viewYear, newMonth, 1)
+                  goToDate(d)
+                }
+              "
+            >
+              <option
+                v-for="(m, i) in [
+                  'January',
+                  'February',
+                  'March',
+                  'April',
+                  'May',
+                  'June',
+                  'July',
+                  'August',
+                  'September',
+                  'October',
+                  'November',
+                  'December',
+                ]"
+                :key="i"
+                :value="i"
+              >
+                {{ m }}
+              </option>
+            </select>
+          </div>
+          <div class="pika-label">
+            {{ viewYear }}
+            <select
+              class="pika-select pika-select-year"
+              :value="viewYear"
+              @change="
+                e => {
+                  const target = e.target as HTMLSelectElement
+                  const newYear = parseInt(target.value, 10)
+                  const d = new Date(newYear, viewMonth, 1)
+                  goToDate(d)
+                }
+              "
+            >
+              <option v-for="y in Array.from({ length: 21 }, (_, i) => viewYear - 10 + i)" :key="y" :value="y">
+                {{ y }}
+              </option>
+            </select>
+          </div>
+          <button type="button" class="pika-prev" @click="prevMonth">Previous Month</button>
+          <button type="button" class="pika-next" @click="nextMonth">Next Month</button>
+        </div>
+
+        <!-- Calendar grid -->
+        <table class="pika-table" role="grid">
+          <thead>
+            <tr>
+              <th v-for="(day, i) in weekdayHeaders" :key="i" scope="col">
+                <abbr :title="weekdayHeadersFull[i]">{{ day }}</abbr>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="week in 6" :key="week" class="pika-row">
+              <td
+                v-for="dayIndex in 7"
+                :key="dayIndex"
+                :class="{
+                  'is-today': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isToday,
+                  'is-selected': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isSelected,
+                  'is-disabled': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isDisabled,
+                  'is-outside-current-month': calendarDays[(week - 1) * 7 + dayIndex - 1]?.isOutsideMonth,
+                }"
+                :aria-selected="calendarDays[(week - 1) * 7 + dayIndex - 1]?.isSelected"
+              >
+                <button
+                  type="button"
+                  class="pika-button pika-day"
+                  :disabled="calendarDays[(week - 1) * 7 + dayIndex - 1]?.isDisabled"
+                  @click="handleDayClick(calendarDays[(week - 1) * 7 + dayIndex - 1]!)"
+                >
+                  {{ calendarDays[(week - 1) * 7 + dayIndex - 1]?.day }}
+                </button>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
 </template>
+
+<style>
+.calendar-popover[popover] {
+  position-area: block-end span-inline-end;
+  position-try-fallbacks:
+    flip-block,
+    flip-inline,
+    flip-block flip-inline;
+  margin: 0;
+  margin-top: 0.25rem;
+  /* Reset default popover styles */
+  border: none;
+  inset: auto;
+}
+
+.calendar-popover[popover]:popover-open {
+  position: fixed;
+}
+
+.calendar-popover[popover]:not(:popover-open) {
+  display: none;
+}
+</style>

package/app/components/Toast.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { Toast } from '~/composables/use-toast'
+import type { Toast } from '../composables/use-toast'
 import { computed } from 'vue'
-import { useToast } from '~/composables/use-toast'
+import { useToast } from '../composables/use-toast'
 
 // Explicit slot typing (Vue 3.4+ / Volar)
 interface ToastSlotProps {