Skip to content

Commit a388503

Browse files
fix: remove usage of deprecated KeyboardEvent.keyCode (#45)
* Remove usage of depracated KeyboardEvent.keyCode - pushbutton-element - membrane-keypad-element - move `SPACE_KEYS` to common file
1 parent 4c19007 commit a388503

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

src/membrane-keypad-element.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { customElement, html, LitElement, property, svg } from 'lit-element';
22
import { pinsFemalePattern } from './patterns/pins-female';
33
import { ElementPin } from './pin';
4-
5-
const SPACE_KEY = 32;
4+
import { SPACE_KEYS } from './utils/keys';
65

76
const rowPositions = [10.7, 25, 39.3, 53.6];
87
const columnPositions = [7, 22, 37, 52];
@@ -81,9 +80,9 @@ export class MembraneKeypadElement extends LitElement {
8180
@touchstart=${() => this.down(text)}
8281
@touchend=${() => this.up(text)}
8382
@keydown=${(e: KeyboardEvent) =>
84-
e.keyCode === SPACE_KEY && this.down(text, e.currentTarget as SVGElement)}
83+
SPACE_KEYS.includes(e.key) && this.down(text, e.currentTarget as SVGElement)}
8584
@keyup=${(e: KeyboardEvent) =>
86-
e.keyCode === SPACE_KEY && this.up(text, e.currentTarget as SVGElement)}
85+
SPACE_KEYS.includes(e.key) && this.up(text, e.currentTarget as SVGElement)}
8786
>
8887
<use xlink:href="#key" />
8988
<text x="5.6" y="8.1">${text}</text>

src/pushbutton-element.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { css, customElement, html, LitElement, property } from 'lit-element';
22
import { ElementPin } from './pin';
3-
4-
const SPACE_KEY = 32;
3+
import { SPACE_KEYS } from './utils/keys';
54

65
@customElement('wokwi-pushbutton')
76
export class PushbuttonElement extends LitElement {
@@ -46,8 +45,8 @@ export class PushbuttonElement extends LitElement {
4645
@mouseup=${this.up}
4746
@touchstart=${this.down}
4847
@touchend=${this.up}
49-
@keydown=${(e: KeyboardEvent) => e.keyCode === SPACE_KEY && this.down()}
50-
@keyup=${(e: KeyboardEvent) => e.keyCode === SPACE_KEY && this.up()}
48+
@keydown=${(e: KeyboardEvent) => SPACE_KEYS.includes(e.key) && this.down()}
49+
@keyup=${(e: KeyboardEvent) => SPACE_KEYS.includes(e.key) && this.up()}
5150
>
5251
<svg
5352
width="18mm"

src/utils/keys.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const SPACE_KEYS = [' ', 'Spacebar'];

0 commit comments

Comments
 (0)