mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-20 00:02:19 +00:00
fix: make DateInput reactive to external value changes and handle empty dateFormat
- Convert to Svelte 5 syntax with $props(), $bindable(), $derived() - Add $derived() to recompute date when value changes externally - Handle empty string dateFormat by falling back to default - Remove sendUserToast from derived computation (caused state mutation error) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,41 +1,49 @@
|
||||
<script lang="ts">
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import { format, isValid, parse } from 'date-fns'
|
||||
import { sendUserToast } from '$lib/toast'
|
||||
import { createBubbler } from 'svelte/legacy'
|
||||
|
||||
export let value: string | null | undefined = undefined
|
||||
export let autofocus: boolean | null = false
|
||||
export let minDate: string | undefined = undefined
|
||||
export let maxDate: string | undefined = undefined
|
||||
export let dateFormat: string | undefined = 'dd-MM-yyyy'
|
||||
export let disabled: boolean = false
|
||||
const bubble = createBubbler()
|
||||
|
||||
interface Props {
|
||||
value?: string | null | undefined
|
||||
autofocus?: boolean | null
|
||||
minDate?: string | undefined
|
||||
maxDate?: string | undefined
|
||||
dateFormat?: string | undefined
|
||||
disabled?: boolean
|
||||
}
|
||||
|
||||
let {
|
||||
value = $bindable(undefined),
|
||||
autofocus = false,
|
||||
minDate = undefined,
|
||||
maxDate = undefined,
|
||||
dateFormat = 'dd-MM-yyyy',
|
||||
disabled = false
|
||||
}: Props = $props()
|
||||
|
||||
const defaultDateFormat = 'dd-MM-yyyy'
|
||||
const defaultHtmlDateFormat = 'yyyy-MM-dd'
|
||||
|
||||
let date: string | undefined = computeDate(value)
|
||||
// Ensure we always have a valid format (prop can be undefined or empty string)
|
||||
function getFormat() {
|
||||
return dateFormat && dateFormat.length > 0 ? dateFormat : defaultDateFormat
|
||||
}
|
||||
|
||||
const dispatch = createEventDispatcher()
|
||||
|
||||
function computeDate(value: string | null | undefined) {
|
||||
if (dateFormat === undefined) {
|
||||
dateFormat = defaultDateFormat
|
||||
}
|
||||
if (value && value.length > 0) {
|
||||
function computeDate(v: string | null | undefined, formatStr: string) {
|
||||
if (v && v.length > 0) {
|
||||
try {
|
||||
let date = parse(value, dateFormat, new Date())
|
||||
if (date.toString() === 'Invalid Date') {
|
||||
let parsedDate = parse(v, formatStr, new Date())
|
||||
if (parsedDate.toString() === 'Invalid Date') {
|
||||
console.debug('falling back to default html date format')
|
||||
date = parse(value, defaultHtmlDateFormat, new Date())
|
||||
parsedDate = parse(v, defaultHtmlDateFormat, new Date())
|
||||
}
|
||||
const res = format(date, defaultHtmlDateFormat)
|
||||
return res
|
||||
return format(parsedDate, defaultHtmlDateFormat)
|
||||
} catch (error) {
|
||||
sendUserToast(
|
||||
`Failed to parse date: ${value} with format ${dateFormat} and ${defaultHtmlDateFormat}`,
|
||||
true
|
||||
)
|
||||
console.error(`Failed to parse date: ${value}`, error)
|
||||
console.error(`Failed to parse date: ${v} with format ${formatStr}`, error)
|
||||
return undefined
|
||||
}
|
||||
} else {
|
||||
@@ -43,26 +51,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
let date: string | undefined = $derived(computeDate(value, getFormat()))
|
||||
|
||||
function updateValue(newDate: string | undefined) {
|
||||
if (newDate && isValid(new Date(newDate))) {
|
||||
if (dateFormat === undefined) {
|
||||
dateFormat = defaultDateFormat
|
||||
}
|
||||
|
||||
try {
|
||||
let dateFromValue: Date | undefined = newDate ? new Date(newDate + 'T00:00:00') : undefined
|
||||
|
||||
if (dateFromValue === undefined) {
|
||||
return
|
||||
}
|
||||
|
||||
const parsedDate = format(dateFromValue, dateFormat)
|
||||
const dateFromValue = new Date(newDate + 'T00:00:00')
|
||||
const parsedDate = format(dateFromValue, getFormat())
|
||||
value = parsedDate
|
||||
|
||||
dispatch('change', value)
|
||||
} catch (error) {
|
||||
console.error('Failed to parse date:', error)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -70,19 +69,25 @@
|
||||
let randomId = 'datetarget-' + Math.random().toString(36).substring(7)
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row gap-1 items-center w-full" id={randomId} on:pointerdown on:focus>
|
||||
<!-- svelte-ignore a11y-autofocus -->
|
||||
<div
|
||||
class="flex flex-row gap-1 items-center w-full"
|
||||
id={randomId}
|
||||
onpointerdown={bubble('pointerdown')}
|
||||
onfocus={bubble('focus')}
|
||||
>
|
||||
<!-- svelte-ignore a11y_autofocus -->
|
||||
<input
|
||||
{disabled}
|
||||
type="date"
|
||||
bind:value={date}
|
||||
value={date}
|
||||
{autofocus}
|
||||
class="!w-full app-editor-input"
|
||||
min={minDate}
|
||||
max={maxDate}
|
||||
on:change={() => {
|
||||
if (date) {
|
||||
updateValue(date)
|
||||
onchange={(e) => {
|
||||
const newDate = e.currentTarget.value
|
||||
if (newDate) {
|
||||
updateValue(newDate)
|
||||
} else {
|
||||
value = null
|
||||
dispatch('change', value)
|
||||
|
||||
Reference in New Issue
Block a user