Skip to content

Commit

Permalink
refactor: use toggle button click instead of tap (#3406)
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan authored Feb 7, 2022
1 parent 67b8a7c commit ad822bb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 1 addition & 3 deletions packages/date-picker/src/vaadin-date-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import './vaadin-date-picker-overlay.js';
import './vaadin-date-picker-overlay-content.js';
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
import { addListener } from '@vaadin/component-base/src/gestures.js';
import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js';
import { InputController } from '@vaadin/field-base/src/input-controller.js';
import { LabelledInputController } from '@vaadin/field-base/src/labelled-input-controller.js';
Expand Down Expand Up @@ -145,7 +144,7 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
<slot name="prefix" slot="prefix"></slot>
<slot name="input"></slot>
<div id="clearButton" part="clear-button" slot="suffix" aria-hidden="true"></div>
<div part="toggle-button" slot="suffix" aria-hidden="true"></div>
<div part="toggle-button" slot="suffix" aria-hidden="true" on-click="_toggle"></div>
</vaadin-input-container>
<div part="helper-text">
Expand Down Expand Up @@ -215,7 +214,6 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
this.addController(new LabelledInputController(this.inputElement, this._labelController));

const toggleButton = this.shadowRoot.querySelector('[part="toggle-button"]');
addListener(toggleButton, 'tap', this._toggle.bind(this));
toggleButton.addEventListener('mousedown', (e) => e.preventDefault());
}

Expand Down
8 changes: 8 additions & 0 deletions packages/date-picker/test/basic.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,14 @@ describe('basic features', () => {
await oneEvent(datepicker.$.overlay, 'vaadin-overlay-open');
});

it('should close on subsequent toggle button click', () => {
toggleButton.click();
expect(datepicker.opened).to.be.true;

toggleButton.click();
expect(datepicker.opened).to.be.false;
});

it('should scroll to a date on open', async () => {
const overlayContent = getOverlayContent(datepicker);
// We must scroll to a date on every open because at least IE11 seems to reset
Expand Down

0 comments on commit ad822bb

Please sign in to comment.