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

fix(date-picker): ensure proximitySelectionDisabled resets range on post-range-commit selection #9171

Merged
merged 1 commit into from
Apr 23, 2024
Merged

fix(date-picker): ensure proximitySelectionDisabled resets range on post-range-commit selection #9171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions packages/calcite-components/src/components/date-picker/date-picker.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,4 +526,26 @@ describe("calcite-date-picker", () => {
expect(await datePicker.getProperty("value")).toEqual(["2023-12-08", "2024-02-08"]);
});
});

it("restarts range on selection after a range is complete when proximitySelectionDisabled is set", async () => {
const page = await newE2EPage();
await page.setContent(
html` <calcite-date-picker range value="2020-09-01" proximity-selection-disabled></calcite-date-picker>`,
);
const datePicker = await page.find("calcite-date-picker");

await selectDay("20200908", page, "mouse");
await page.waitForChanges();
await selectDay("20200923", page, "mouse");
await page.waitForChanges();
expect(await datePicker.getProperty("value")).toEqual(["2020-09-08", "2020-09-23"]);

await selectDay("20200915", page, "mouse");
await page.waitForChanges();
expect(await datePicker.getProperty("value")).toEqual(["2020-09-15", ""]);

await selectDay("20200930", page, "mouse");
await page.waitForChanges();
expect(await datePicker.getProperty("value")).toEqual(["2020-09-15", "2020-09-30"]);
});
});
38 changes: 19 additions & 19 deletions packages/calcite-components/src/components/date-picker/date-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,21 @@ export class DatePicker implements LocalizedComponent, LoadableComponent, T9nCom
start,
end,
};
if (!this.proximitySelectionDisabled) {

if (this.proximitySelectionDisabled) {
if ((end && start) || (!end && date >= start)) {
this.hoverRange.focused = "end";
this.hoverRange.end = date;
} else if (!end && date < start) {
this.hoverRange = {
focused: "start",
start: date,
end: start,
};
} else {
this.hoverRange = undefined;
}
} else {
if (start && end) {
const startDiff = getDaysDiff(date, start);
const endDiff = getDaysDiff(date, end);
Expand Down Expand Up @@ -440,21 +454,6 @@ export class DatePicker implements LocalizedComponent, LoadableComponent, T9nCom
}
}
}
} else {
if (!end) {
if (date < start) {
this.hoverRange = {
focused: "start",
start: date,
end: start,
};
} else {
this.hoverRange.end = date;
this.hoverRange.focused = "end";
}
} else {
this.hoverRange = undefined;
}
}
event.stopPropagation();
};
Expand Down Expand Up @@ -594,7 +593,10 @@ export class DatePicker implements LocalizedComponent, LoadableComponent, T9nCom
} else if (!end) {
this.setEndDate(date);
} else {
if (!this.proximitySelectionDisabled) {
if (this.proximitySelectionDisabled) {
this.setStartDate(date);
this.setEndDate(null);
} else {
if (this.activeRange) {
if (this.activeRange == "end") {
this.setEndDate(date);
Expand All @@ -614,8 +616,6 @@ export class DatePicker implements LocalizedComponent, LoadableComponent, T9nCom
this.setEndDate(date);
}
}
} else {
this.setStartDate(date);
}
}
this.calciteDatePickerChange.emit();
Expand Down
Loading