Skip to content

Commit 16eea44

Browse files
nielslyngsoenielslyngsoe
authored
stop using keypress (#960)
1 parent 4b814df commit 16eea44

File tree

8 files changed

+27
-31
lines changed

8 files changed

+27
-31
lines changed

‎packages/uui-boolean-input/lib/uui-boolean-input.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ export abstract class UUIBooleanInputElement extends UUIFormControlMixin(
114114
this._value = 'on';
115115
}
116116
this.inputRole = inputRole;
117-
this.addEventListener('keypress', this._onKeypress);
117+
this.addEventListener('keydown', this.#onKeyDown);
118118
}
119119

120120
protected getFormElement(): HTMLInputElement {
121121
return this._input;
122122
}
123123

124-
private _onKeypress(e: KeyboardEvent): void {
124+
#onKeyDown(e: KeyboardEvent): void {
125125
if (e.key == 'Enter') {
126126
this.submit();
127127
}

‎packages/uui-boolean-input/lib/uui-boolean-input.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ describe('BooleanInputBaseElement in a Form', () => {
128128

129129
describe('submit', () => {
130130
it('should submit when pressing enter', async () => {
131-
const listener = oneEvent(formElement, 'submit', false);
132-
element.dispatchEvent(new KeyboardEvent('keypress', { key: 'Enter' }));
131+
const listener = oneEvent(formElement, 'submit');
132+
element.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }));
133133

134134
const event = await listener;
135135
expect(event).to.exist;

‎packages/uui-input/lib/uui-input.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export class UUIInputElement extends UUIFormControlMixin(
212212
this.addEventListener('blur', () => {
213213
this.style.setProperty('--uui-show-focus-outline', '');
214214
});
215-
this.addEventListener('keypress', this._onKeypress);
215+
this.addEventListener('keydown', this.#onKeyDown);
216216

217217
this.addValidator(
218218
'tooShort',
@@ -230,7 +230,7 @@ export class UUIInputElement extends UUIFormControlMixin(
230230
});
231231
}
232232

233-
private _onKeypress(e: KeyboardEvent): void {
233+
#onKeyDown(e: KeyboardEvent): void {
234234
if (this.type !== 'color' && e.key == 'Enter') {
235235
this.submit();
236236
}

‎packages/uui-input/lib/uui-input.test.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('UuiInputElement', () => {
9999
describe('events', () => {
100100
describe('focus', () => {
101101
it('emits a focus event when focused', async () => {
102-
const listener = oneEvent(element, 'focus', false);
102+
const listener = oneEvent(element, 'focus');
103103
element.focus();
104104
const event = await listener;
105105
expect(event).to.exist;
@@ -108,7 +108,7 @@ describe('UuiInputElement', () => {
108108
});
109109
describe('change', () => {
110110
it('emits a change event when native input fires one', async () => {
111-
const listener = oneEvent(element, UUIInputEvent.CHANGE, false);
111+
const listener = oneEvent(element, UUIInputEvent.CHANGE);
112112

113113
input.dispatchEvent(new Event('change'));
114114

@@ -133,11 +133,7 @@ describe('UuiInputElement', () => {
133133
'input',
134134
) as HTMLInputElement;
135135

136-
const innerListener = oneEvent(
137-
innerElement!,
138-
UUIInputEvent.CHANGE,
139-
false,
140-
);
136+
const innerListener = oneEvent(innerElement!, UUIInputEvent.CHANGE);
141137
outerElement!.addEventListener(UUIInputEvent.CHANGE, () => {
142138
outerEventTriggered = true;
143139
});
@@ -208,8 +204,8 @@ describe('UuiInput in Form', () => {
208204

209205
describe('submit', () => {
210206
it('should submit when pressing enter', async () => {
211-
const listener = oneEvent(formElement, 'submit', false);
212-
element.dispatchEvent(new KeyboardEvent('keypress', { key: 'Enter' }));
207+
const listener = oneEvent(formElement, 'submit');
208+
element.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }));
213209

214210
const event = await listener;
215211
expect(event).to.exist;
@@ -223,11 +219,11 @@ describe('UuiInput in Form', () => {
223219

224220
let isFulfilled = false;
225221

226-
const listener = oneEvent(formElement, 'submit', false);
222+
const listener = oneEvent(formElement, 'submit');
227223

228224
listener.then(() => (isFulfilled = true));
229225

230-
element.dispatchEvent(new KeyboardEvent('keypress', { key: 'Enter' }));
226+
element.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }));
231227

232228
await sleep(100);
233229

‎packages/uui-range-slider/lib/uui-range-slider.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export class UUIRangeSliderElement extends UUIFormControlMixin(LitElement, '') {
304304
constructor() {
305305
super();
306306
// Keyboard
307-
this.addEventListener('keypress', this._onKeypress);
307+
this.addEventListener('keydown', this.#onKeyDown);
308308
// Mouse
309309
this.addEventListener('mousedown', this._onMouseDown);
310310
// Touch
@@ -452,7 +452,7 @@ export class UUIRangeSliderElement extends UUIFormControlMixin(LitElement, '') {
452452

453453
/** Events */
454454

455-
private _onKeypress = (e: KeyboardEvent) => {
455+
#onKeyDown = (e: KeyboardEvent) => {
456456
if (e.key == 'Enter') {
457457
this.submit();
458458
}

‎packages/uui-range-slider/lib/uui-range-slider.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ describe('UUIRangeSliderElement', () => {
7878
describe('events', () => {
7979
describe('change', () => {
8080
it('emits a change event from inputLow when native input fires one', async () => {
81-
const listener = oneEvent(element, UUIRangeSliderEvent.CHANGE, false);
81+
const listener = oneEvent(element, UUIRangeSliderEvent.CHANGE);
8282
inputLow.dispatchEvent(new Event('change'));
8383
const event = await listener;
8484
expect(event).to.exist;
8585
expect(event.type).to.equal(UUIRangeSliderEvent.CHANGE);
8686
expect(event!.target).to.equal(element);
8787
});
8888
it('emits a change event from inputHigh when native input fires one', async () => {
89-
const listener = oneEvent(element, UUIRangeSliderEvent.CHANGE, false);
89+
const listener = oneEvent(element, UUIRangeSliderEvent.CHANGE);
9090
inputHigh.dispatchEvent(new Event('change'));
9191
const event = await listener;
9292
expect(event).to.exist;
@@ -96,15 +96,15 @@ describe('UUIRangeSliderElement', () => {
9696
});
9797
describe('input', () => {
9898
it('emits an input event from inputLow when native input fires one', async () => {
99-
const listener = oneEvent(element, UUIRangeSliderEvent.INPUT, false);
99+
const listener = oneEvent(element, UUIRangeSliderEvent.INPUT);
100100
inputLow.dispatchEvent(new Event('input'));
101101
const event = await listener;
102102
expect(event).to.exist;
103103
expect(event.type).to.equal(UUIRangeSliderEvent.INPUT);
104104
expect(event!.target).to.equal(element);
105105
});
106106
it('emits an input event from inputHigh when native input fires one', async () => {
107-
const listener = oneEvent(element, UUIRangeSliderEvent.INPUT, false);
107+
const listener = oneEvent(element, UUIRangeSliderEvent.INPUT);
108108
inputHigh.dispatchEvent(new Event('input'));
109109
const event = await listener;
110110
expect(event).to.exist;
@@ -164,8 +164,8 @@ describe('UUIRangeSlider in a form', () => {
164164

165165
describe('submit', () => {
166166
it('should submit when pressing enter', async () => {
167-
const listener = oneEvent(formElement, 'submit', false);
168-
element.dispatchEvent(new KeyboardEvent('keypress', { key: 'Enter' }));
167+
const listener = oneEvent(formElement, 'submit');
168+
element.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }));
169169

170170
const event = await listener;
171171
expect(event).to.exist;

‎packages/uui-slider/lib/uui-slider.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export class UUISliderElement extends UUIFormControlMixin(LitElement, '') {
160160
this.addEventListener('blur', () => {
161161
this.style.setProperty('--uui-show-focus-outline', '');
162162
});
163-
this.addEventListener('keypress', this._onKeypress);
163+
this.addEventListener('keydown', this.#onKeyDown);
164164
}
165165

166166
/**
@@ -236,7 +236,7 @@ export class UUISliderElement extends UUIFormControlMixin(LitElement, '') {
236236
this._stepWidth = this._calculateStepWidth();
237237
};
238238

239-
private _onKeypress(e: KeyboardEvent): void {
239+
#onKeyDown(e: KeyboardEvent): void {
240240
if (e.key == 'Enter') {
241241
this.submit();
242242
}

‎packages/uui-slider/lib/uui-slider.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe('UuiSlider', () => {
7373
describe('events', () => {
7474
describe('change', () => {
7575
it('emits a change event when native input fires one', async () => {
76-
const listener = oneEvent(element, UUISliderEvent.CHANGE, false);
76+
const listener = oneEvent(element, UUISliderEvent.CHANGE);
7777

7878
input.dispatchEvent(new Event('change'));
7979

@@ -85,7 +85,7 @@ describe('UuiSlider', () => {
8585
});
8686
describe('input', () => {
8787
it('emits a input event when native input fires one', async () => {
88-
const listener = oneEvent(element, UUISliderEvent.INPUT, false);
88+
const listener = oneEvent(element, UUISliderEvent.INPUT);
8989

9090
input.dispatchEvent(new Event('input'));
9191

@@ -150,8 +150,8 @@ describe('UuiSlider in Form', () => {
150150

151151
describe('submit', () => {
152152
it('should submit when pressing enter', async () => {
153-
const listener = oneEvent(formElement, 'submit', false);
154-
element.dispatchEvent(new KeyboardEvent('keypress', { key: 'Enter' }));
153+
const listener = oneEvent(formElement, 'submit');
154+
element.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }));
155155

156156
const event = await listener;
157157
expect(event).to.exist;

0 commit comments

Comments
 (0)