design.estate/dees-domtools
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2022-04-21 23:52:45 +02:00
parent 7192d3fbf7
commit 79e64c4cc2
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ts/domtools.classes.keyboard.ts
View File

@ -140,12 +140,9 @@ export class Keyboard {
public keyEnum = Key; public keyEnum = Key;
public on(keys: Key[] | KeyCombo[]) { public on(keys: Key[]) {
const combos = this.toCombos(keys);
const subject = new plugins.smartrx.rxjs.Subject<KeyboardEvent>(); const subject = new plugins.smartrx.rxjs.Subject<KeyboardEvent>();
combos.forEach((combo) => { this.registerKeys(keys, subject);
this.registerComboCallback(combo, subject);
});
return subject; return subject;
} }
@ -168,8 +165,8 @@ export class Keyboard {
private handleKeyDown = (event: KeyboardEvent) => { private handleKeyDown = (event: KeyboardEvent) => {
this.pressedKeys.add(event.keyCode); this.pressedKeys.add(event.keyCode);
this.mapCombosToHandlers.forEach((subjectArg, comboArg) => { this.mapCombosToHandlers.forEach((subjectArg, keysArg) => {
if (this.isComboPressed(comboArg)) { if (this.areAllKeysPressed(keysArg)) {
subjectArg.next(event); subjectArg.next(event);
} }
}); });
@ -179,7 +176,7 @@ export class Keyboard {
this.pressedKeys.delete(event.keyCode); this.pressedKeys.delete(event.keyCode);
}; };
private isComboPressed(combo: number[]) { private areAllKeysPressed(combo: number[]) {
let result = true; let result = true;
combo.forEach((key) => { combo.forEach((key) => {
@ -191,33 +188,15 @@ export class Keyboard {
return result; return result;
} }
private registerComboCallback( private registerKeys(
comboArg: Array<Key>, keysArg: Array<Key>,
subjectArg: plugins.smartrx.rxjs.Subject<KeyboardEvent> subjectArg: plugins.smartrx.rxjs.Subject<KeyboardEvent>
) { ) {
if (!this.mapCombosToHandlers.has(comboArg)) { if (!this.mapCombosToHandlers.has(keysArg)) {
this.mapCombosToHandlers.set(comboArg, subjectArg); this.mapCombosToHandlers.set(keysArg, subjectArg);
} else { } else {
const subject = this.mapCombosToHandlers.get(comboArg); const subject = this.mapCombosToHandlers.get(keysArg);
return subject; return subject;
} }
} }
private toCombos(keys: KeyCombo[] | Key[]) {
if (keys.length === 0) {
return [];
}
const isKeys = !Array.isArray(keys[0]);
let combos: KeyCombo[] = [];
if (isKeys) {
combos = (keys as Key[]).map((key) => [key]);
} else {
combos = keys as KeyCombo[];
combos = combos.filter((combo) => combo.length > 0);
}
return combos;
}
} }