Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make DateField format and mask reactive to locale changes #206

Merged
merged 2 commits into from
Jan 10, 2024
Merged

make DateField format and mask reactive to locale changes #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ffc9a
make DateField format and mask reactive to locale changes
dimfeld Jan 10, 2024
95c91ea
Make Input component reactive to changes in mask
dimfeld Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/svelte-ux/src/lib/components/DateField.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
const { format: format_ux } = getSettings();

export let value: Date | null = null;
export let format = $format_ux.settings.formats.dates.baseParsing ?? 'MM/dd/yyyy';
export let mask = format.toLowerCase();
export let format: string | undefined = undefined;
export let mask: string | undefined = undefined;
export let replace = 'dmyh';
export let picker = false;

$: actualFormat = format ?? $format_ux.settings.formats.dates.baseParsing ?? 'MM/dd/yyyy';
$: actualMask = mask ?? actualFormat.toLowerCase();

// Field props
export let label = '';
export let error = '';
Expand All @@ -38,7 +41,7 @@
function onInputChange(e: any) {
inputValue = e.detail.value;
const lastValue = value;
const parsedValue = parseDate(inputValue ?? '', format, new Date());
const parsedValue = parseDate(inputValue ?? '', actualFormat, new Date());
value = isNaN(parsedValue.valueOf()) ? null : parsedValue;
if (value != lastValue) {
dispatch('change', { value });
Expand All @@ -65,8 +68,8 @@
let:id
>
<Input
value={value ? $format_ux(value, PeriodType.Day, { custom: format }) : inputValue}
{mask}
value={value ? $format_ux(value, PeriodType.Day, { custom: actualFormat }) : inputValue}
mask={actualMask}
{replace}
{id}
on:change={onInputChange}
Expand Down
13 changes: 10 additions & 3 deletions packages/svelte-ux/src/lib/components/Input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
export let mask = '';
export let replace = '_';
export let accept: string | RegExp = '\\d';
export let placeholder = mask;
let placeholderProp: string | undefined = undefined;
export { placeholderProp as placeholder };
export let disabled = false;

$: placeholder = placeholderProp ?? mask;

const settingsClasses = getComponentClasses('Input');

let isFocused = false;
Expand Down Expand Up @@ -61,7 +64,11 @@

function onInput(e: Event & { currentTarget: HTMLInputElement }) {
const el = e.currentTarget;
applyMask(el, mask);
dispatch('change', { value });
}

function applyMask(el: HTMLInputElement, mask: string) {
if (mask) {
// For selection (including just cursor position), ...
const [i, j] = [el.selectionStart, el.selectionEnd].map((i) => {
Expand All @@ -73,10 +80,10 @@
el.setSelectionRange(i, j);
backspace = false;
}

dispatch('change', { value });
}

$: if (inputEl) applyMask(inputEl, mask);

onMount(() => {
// Format on initial to handle partial values as well as different (but compatible) formats (ex. phone numbers)
if (mask) {
Expand Down