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

fix: commit focused date on outside click #5670

Merged
merged 7 commits into from
Mar 16, 2023
Merged

fix: commit focused date on outside click #5670

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79995c3
fix: apply input value on outside click
ugur-vaadin Mar 14, 2023
b322a99
fix: select focused date on outside click except input element click
ugur-vaadin Mar 15, 2023
c9d14ed
fix: use default selection behaviour
ugur-vaadin Mar 15, 2023
0a6dc67
fix: reset userConfirmedDate if a date is deselected
ugur-vaadin Mar 16, 2023
12c33d1
test: add deselect test
ugur-vaadin Mar 16, 2023
5af0686
test: move test to dropdown tests
ugur-vaadin Mar 16, 2023
2274463
test: convert arrowdown to arrowright and change test date
ugur-vaadin Mar 16, 2023
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
5 changes: 3 additions & 2 deletions packages/date-picker/src/vaadin-date-picker-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,10 @@ export const DatePickerMixin = (subclass) =>
this._close();
});

// User confirmed selected date by pressing Enter or Today.
// User confirmed selected date by pressing Enter, Space, or Today.
content.addEventListener('date-selected', (e) => {
this.__userConfirmedDate = true;
// Reset if a date is deselected.
this.__userConfirmedDate = !!e.detail.date;

this._selectDate(e.detail.date);
});
Expand Down
26 changes: 26 additions & 0 deletions packages/date-picker/test/dropdown.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,32 @@ describe('dropdown', () => {
await aTimeout(0);
expect(datePicker.hasAttribute('focus-ring')).to.be.false;
});

it('should commit focused date on outside click', async () => {
datePicker.value = '2001-02-13';
vursen marked this conversation as resolved.
Show resolved Hide resolved
await open(datePicker);
// Move focus to the calendar
await sendKeys({ press: 'Tab' });
// Navigate to another date
await sendKeys({ press: 'ArrowDown' });
outsideClick();
await aTimeout(0);
expect(datePicker.value).to.equal('2001-02-20');
vursen marked this conversation as resolved.
Show resolved Hide resolved
});

it('should commit focused date on outside click after deselecting', async () => {
datePicker.value = '2001-02-13';
await open(datePicker);
// Move focus to the calendar
await sendKeys({ press: 'Tab' });
// De-select the selected date
await sendKeys({ press: 'Space' });
// Navigate to another date
await sendKeys({ press: 'ArrowDown' });
outsideClick();
await aTimeout(0);
expect(datePicker.value).to.equal('2001-02-20');
});
});

describe('date tap', () => {
Expand Down