daisy-ui-kit 5.0.0-pre.27 → 5.0.0-pre.29

package/app/components/Range.vue

@@ -1,61 +1,201 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-const props = defineProps<{
-  modelValue?: number | string
-  min?: number | string
-  max?: number | string
-  step?: number | string
-  disabled?: boolean
-
-  color?: string
-  neutral?: boolean
-  primary?: boolean
-  secondary?: boolean
-  accent?: boolean
-  success?: boolean
-  warning?: boolean
-  info?: boolean
-  error?: boolean
-
-  size?: 'xl' | 'lg' | 'md' | 'sm' | 'xs'
-  xl?: boolean
-  lg?: boolean
-  md?: boolean
-  sm?: boolean
-  xs?: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number | [number, number]
+    min?: number
+    max?: number
+    step?: number
+    disabled?: boolean
+
+    color?: string
+    neutral?: boolean
+    primary?: boolean
+    secondary?: boolean
+    accent?: boolean
+    success?: boolean
+    warning?: boolean
+    info?: boolean
+    error?: boolean
+
+    size?: 'xl' | 'lg' | 'md' | 'sm' | 'xs'
+    xl?: boolean
+    lg?: boolean
+    md?: boolean
+    sm?: boolean
+    xs?: boolean
+  }>(),
+  {
+    min: 0,
+    max: 100,
+    step: 1,
+  },
+)
 const emit = defineEmits(['update:modelValue'])
 
-const currentValue = computed({
-  get: () => props.modelValue,
-  set: val => emit('update:modelValue', val),
+const isRange = computed(() => {
+  return Array.isArray(props.modelValue)
+})
+
+const singleValue = computed({
+  get: () => (isRange.value ? 0 : (props.modelValue as number)),
+  set: val => emit('update:modelValue', Number(val)),
+})
+
+const lowValue = computed({
+  get: () => (isRange.value ? (props.modelValue as [number, number])[0] : 0),
+  set: val => {
+    const v = Number(val)
+    const high = (props.modelValue as [number, number])[1]
+    emit('update:modelValue', [Math.min(v, high), high])
+  },
+})
+
+const highValue = computed({
+  get: () => (isRange.value ? (props.modelValue as [number, number])[1] : 100),
+  set: val => {
+    const v = Number(val)
+    const low = (props.modelValue as [number, number])[0]
+    emit('update:modelValue', [low, Math.max(v, low)])
+  },
+})
+
+const rangeClasses = computed(() => ({
+  'range-neutral': props.neutral || props.color === 'neutral',
+  'range-primary': props.primary || props.color === 'primary',
+  'range-secondary': props.secondary || props.color === 'secondary',
+  'range-accent': props.accent || props.color === 'accent',
+  'range-success': props.success || props.color === 'success',
+  'range-info': props.info || props.color === 'info',
+  'range-warning': props.warning || props.color === 'warning',
+  'range-error': props.error || props.color === 'error',
+  'range-xl': props.xl || props.size === 'xl',
+  'range-lg': props.lg || props.size === 'lg',
+  'range-md': props.md || props.size === 'md',
+  'range-sm': props.sm || props.size === 'sm',
+  'range-xs': props.xs || props.size === 'xs',
+}))
+
+// Calculate percentage positions for the filled track
+const lowPercent = computed(() => {
+  const range = props.max - props.min
+  return ((lowValue.value - props.min) / range) * 100
+})
+
+const highPercent = computed(() => {
+  const range = props.max - props.min
+  return ((highValue.value - props.min) / range) * 100
 })
 </script>
 
 <template>
+  <!-- Single value mode -->
   <input
-    v-model="currentValue"
+    v-if="!isRange"
+    v-model="singleValue"
     type="range"
     class="range"
-    :class="{
-      'range-neutral': neutral || color === 'neutral',
-      'range-primary': primary || color === 'primary',
-      'range-secondary': secondary || color === 'secondary',
-      'range-accent': accent || color === 'accent',
-      'range-success': success || color === 'success',
-      'range-info': info || color === 'info',
-      'range-warning': warning || color === 'warning',
-      'range-error': error || color === 'error',
-      'range-xl': xl || size === 'xl',
-      'range-lg': lg || size === 'lg',
-      'range-md': md || size === 'md',
-      'range-sm': sm || size === 'sm',
-      'range-xs': xs || size === 'xs',
-    }"
+    :class="rangeClasses"
     :min="min"
     :max="max"
     :step="step"
     :disabled="disabled"
   />
+
+  <!-- Dual handle range mode -->
+  <div v-else class="range range-slider-wrapper" :class="rangeClasses">
+    <div class="range-slider-track" />
+    <div
+      class="range-slider-fill"
+      :style="{
+        left: `calc(${lowPercent}% + (var(--range-thumb-size, 1.5rem) / 2) - (${lowPercent} * var(--range-thumb-size, 1.5rem) / 100))`,
+        width: `calc(${highPercent - lowPercent}% - (${highPercent - lowPercent} * var(--range-thumb-size, 1.5rem) / 100))`,
+      }"
+    />
+    <input
+      v-model="lowValue"
+      type="range"
+      class="range range-slider-input"
+      :class="rangeClasses"
+      :min="min"
+      :max="max"
+      :step="step"
+      :disabled="disabled"
+    />
+    <input
+      v-model="highValue"
+      type="range"
+      class="range range-slider-input"
+      :class="rangeClasses"
+      :min="min"
+      :max="max"
+      :step="step"
+      :disabled="disabled"
+    />
+  </div>
 </template>
+
+<style>
+.range-slider-wrapper {
+  position: relative;
+  width: 100%;
+  height: var(--range-thumb-size, 1.5rem);
+}
+
+.range-slider-track {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  right: 0;
+  height: calc(var(--range-thumb-size, 1.5rem) / 3);
+  transform: translateY(-50%);
+  background: color-mix(in oklab, currentColor 10%, transparent);
+  border-radius: var(--radius-selector, 1rem);
+}
+
+.range-slider-fill {
+  position: absolute;
+  top: 50%;
+  height: var(--range-thumb-size, 1.5rem);
+  transform: translateY(-50%);
+  background: currentColor;
+  border-radius: 0;
+  z-index: 1;
+}
+
+.range-slider-input {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  background: transparent;
+  --range-fill: 0 !important;
+}
+
+/* Hide both tracks - we draw our own */
+.range-slider-input::-webkit-slider-runnable-track {
+  background: transparent !important;
+  box-shadow: none !important;
+}
+
+.range-slider-input::-moz-range-track {
+  background: transparent !important;
+  box-shadow: none !important;
+}
+
+/* Enable pointer events only on thumbs */
+.range-slider-input::-webkit-slider-thumb {
+  pointer-events: auto;
+  position: relative;
+  z-index: 3;
+}
+
+.range-slider-input::-moz-range-thumb {
+  pointer-events: auto;
+  position: relative;
+  z-index: 3;
+}
+</style>

package/app/components/TextArea.vue

@@ -1,9 +1,13 @@
 <script setup lang="ts">
+import { nextTick, onMounted, ref, watch } from 'vue'
+
 const props = withDefaults(
   defineProps<{
     modelValue?: string
     placeholder?: string
     type?: 'text' | 'phone' | 'email' | 'search'
+    rows?: number
+    autoExpand?: boolean
 
     color?: string
     neutral?: boolean
@@ -28,15 +32,48 @@ const props = withDefaults(
   }>(),
   {
     type: 'text',
+    rows: 2,
   },
 )
 defineEmits(['update:modelValue'])
+
+const textareaRef = ref<HTMLTextAreaElement | null>(null)
+
+let minHeight = 0
+
+function adjustHeight() {
+  if (!props.autoExpand || !textareaRef.value) return
+  const el = textareaRef.value
+
+  // Capture the initial rendered height as minimum (respects rows attribute)
+  if (minHeight === 0) {
+    minHeight = el.offsetHeight
+  }
+
+  el.style.height = 'auto'
+  el.style.height = `${Math.max(el.scrollHeight, minHeight)}px`
+}
+
+watch(
+  () => props.modelValue,
+  () => {
+    nextTick(adjustHeight)
+  },
+)
+
+onMounted(() => {
+  if (props.autoExpand) {
+    nextTick(adjustHeight)
+  }
+})
 </script>
 
 <template>
   <textarea
+    ref="textareaRef"
     :value="modelValue"
     :type="type"
+    :rows="rows"
     :placeholder="placeholder"
     :disabled="disabled"
     class="textarea"
@@ -59,6 +96,11 @@ defineEmits(['update:modelValue'])
       'textarea-sm': props.sm || props.size === 'sm',
       'textarea-xs': props.xs || props.size === 'xs',
     }"
-    @input="event => $emit('update:modelValue', (event.target as HTMLTextAreaElement).value)"
+    @input="
+      event => {
+        $emit('update:modelValue', (event.target as HTMLTextAreaElement).value)
+        adjustHeight()
+      }
+    "
   />
 </template>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "daisy-ui-kit",
   "type": "module",
-  "version": "5.0.0-pre.27",
+  "version": "5.0.0-pre.29",
   "packageManager": "pnpm@10.10.0",
   "author": "feathers.dev",
   "exports": {