refactor: simplify the code by reusing the existing components

aradzie · Mar 28, 2024 · e7f65f7 · e7f65f7
1 parent 836fc2b
commit e7f65f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 39 deletions.
diff --git a/packages/keybr-keyboard/lib/keyboard.ts b/packages/keybr-keyboard/lib/keyboard.ts
@@ -4,7 +4,6 @@ import { KeyCharacters } from "./keycharacters.ts";
 import { KeyCombo } from "./keycombo.ts";
 import { KeyModifier } from "./keymodifier.ts";
 import { KeyShape } from "./keyshape.ts";
-import { keyWeights } from "./keyweights.ts";
 import { type Layout } from "./layout.ts";
 import {
   type CodePointDict,
@@ -101,9 +100,16 @@ export class Keyboard {
         (!combo.alt || alt)
       ) {
         list.push(combo.codePoint);
-        const weight = keyWeights.get(combo.id);
-        if (weight != null) {
-          weights.set(combo.codePoint, weight);
+        const shape = this.shapes.get(combo.id);
+        if (shape != null) {
+          switch (shape.row) {
+            case "home":
+              weights.set(combo.codePoint, 1);
+              break;
+            case "top":
+              weights.set(combo.codePoint, 2);
+              break;
+          }
         }
       }
     }

diff --git a/packages/keybr-keyboard/lib/keyweights.ts b/packages/keybr-keyboard/lib/keyweights.ts