diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte index 11bd78fd8..6a904cd53 100644 --- a/src/lib/elements/forms/inputDateTime.svelte +++ b/src/lib/elements/forms/inputDateTime.svelte @@ -4,7 +4,7 @@ export let id: string; export let label: string = ''; - export let value: string; + export let value: string | null; export let required = false; export let nullable = false; export let disabled = false; @@ -17,6 +17,7 @@ let error: string; let element: HTMLInputElement; + let previousValue: string | null = null; onMount(() => { if (element && autofocus) { @@ -24,14 +25,16 @@ } }); - let prevValue = ''; function handleNullChange(e: CustomEvent) { const isNull = e.detail; + if (isNull) { - prevValue = value; + if (value !== null) { + previousValue = value; + } value = null; } else { - value = prevValue; + value = previousValue; } } @@ -39,9 +42,7 @@ error = null; } - function onChange(event: CustomEvent) { - value = (event.target as HTMLInputElement).value; - } + $: isValueNull = value === null; @@ -51,20 +52,20 @@ {disabled} {readonly} {required} - {value} + bind:value {step} {type} helper={error} {leadingIcon} - on:change={onChange} autocomplete={autocomplete ? 'on' : 'off'}> - {#if nullable} - - {/if} + + {#if nullable} + + {/if} + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte index c1c3cbeae..827d77798 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte @@ -68,6 +68,7 @@ array: false, ...data }); + $: listen(data); $: handleDefaultState($required || $array); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte index 582d7a894..6923ba7e7 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte @@ -1217,6 +1217,10 @@ padding-inline: 8px !important; } + & :global(.input:has([type^='date'])) { + padding: 12px !important; + } + & :global(.input:focus-within) { top: 0 !important; }