Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions packages/bits-ui/src/lib/bits/date-field/date-field.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ export class DateFieldRootState {
descriptionNode = $state<HTMLElement | null>(null);
validationNode = $state<HTMLElement | null>(null);
states = initSegmentStates();
#segmentClearedValue = false;
dayPeriodNode = $state<HTMLElement | null>(null);
rangeRoot: DateRangeFieldRootState | undefined = undefined;
name = $state("");
Expand Down Expand Up @@ -311,6 +312,10 @@ export class DateFieldRootState {

$effect(() => {
if (this.value.current === undefined) {
if (this.#segmentClearedValue) {
this.#segmentClearedValue = false;
return;
}
this.segmentValues = initializeSegmentValues(this.inferredGranularity);
}
});
Expand Down Expand Up @@ -680,6 +685,7 @@ export class DateFieldRootState {
})
);
} else {
this.#segmentClearedValue = true;
this.setValue(undefined);
this.segmentValues = newSegmentValues;
}
Expand Down Expand Up @@ -1253,7 +1259,7 @@ class DateFieldYearSegmentState extends BaseNumericSegmentState {
return mergedIntStr;
});

if (this.#pressedKeys.length === 4 || this.#pressedKeys.length === this.#backspaceCount) {
if (this.#pressedKeys.length === 4) {
moveToNext = true;
}

Expand All @@ -1274,15 +1280,16 @@ class DateFieldYearSegmentState extends BaseNumericSegmentState {
this.announcer.announce(null);
return null;
}
const str = prev.toString();
if (str.length === 1) {
// Use integer division to strip the last significant digit, so that
// zero-padded values like "0001" don't leave a confusing "000" remnant
// that causes subsequent typing to misinterpret the year.
const next = Math.floor(Number.parseInt(prev) / 10);
if (next === 0) {
this.announcer.announce(null);
return null;
}
const next = str.slice(0, -1);
this.announcer.announce(next);

return `${next}`;
return prependYearZeros(next);
});

if (moveToPrev) {
Expand Down
4 changes: 3 additions & 1 deletion tests/src/tests/date-field/date-field.browser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,9 @@ describe("date field", () => {
await userEvent.keyboard(kbd.BACKSPACE);
await expect.element(t.year).toHaveTextContent("009");
await userEvent.keyboard(kbd.BACKSPACE);
await expect.element(t.year).toHaveTextContent("00");
await expect.element(t.year).toHaveTextContent("yyyy");
await userEvent.keyboard(`{0}`);
await userEvent.keyboard(`{0}`);
await userEvent.keyboard(`{8}`);
await userEvent.keyboard(`{7}`);
await expect.element(t.year).toHaveTextContent("0087");
Expand Down
Loading