feat: merge changes form development to fix bugs in layout editor

Signed-off-by: Alejandro Parcet <[email protected]>
Dygmalab · Sep 5, 2024 · 72d5d01 · 72d5d01
2 parents 6681789 + 19e8aea
commit 72d5d01
Show file tree

Hide file tree

Showing 29 changed files with 1,466 additions and 79 deletions.
diff --git a/src/api/hardware-dygma-defy-wired/components/Keymap.js b/src/api/hardware-dygma-defy-wired/components/Keymap.js
diff --git a/src/api/hardware-dygma-defy-wireless/components/Keymap.js b/src/api/hardware-dygma-defy-wireless/components/Keymap.js
diff --git a/src/api/hardware-dygma-raise-ansi/components/Keymap-ANSI.js b/src/api/hardware-dygma-raise-ansi/components/Keymap-ANSI.js
diff --git a/src/api/hardware-dygma-raise-iso/components/Keymap-ISO.js b/src/api/hardware-dygma-raise-iso/components/Keymap-ISO.js
diff --git a/src/api/hardware-dygma-raise2-ansi/components/Keymap-ANSI.js b/src/api/hardware-dygma-raise2-ansi/components/Keymap-ANSI.js
diff --git a/src/api/hardware-dygma-raise2-iso/components/Keymap-ISO.js b/src/api/hardware-dygma-raise2-iso/components/Keymap-ISO.js
diff --git a/src/api/hardware/Key.tsx b/src/api/hardware/Key.tsx
@@ -149,7 +149,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={x} y={y} width={width + 6} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -244,7 +244,7 @@ function Key(props: KeyShapeProps) {
             </div>
           </foreignObject>
           <foreignObject x={40} y={1} width={widthShape2 - 52} height={height}>
-            <ListModifiersKey keyCode={keyCode} size="xs" />
+            <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
           </foreignObject>
         </g>
       ) : (
@@ -338,7 +338,7 @@ function Key(props: KeyShapeProps) {
             </div>
           </foreignObject>
           <foreignObject x={0} y={1} width={width - 52} height={height}>
-            <ListModifiersKey keyCode={keyCode} size="xs" />
+            <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
           </foreignObject>
         </g>
       ) : (
@@ -442,7 +442,7 @@ function Key(props: KeyShapeProps) {
             </div>
           </foreignObject>
           <foreignObject x={0} y={1} width={width} height={60}>
-            <ListModifiersKey keyCode={keyCode} size="xs" />
+            <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
           </foreignObject>
         </g>
       ) : (
@@ -538,7 +538,7 @@ function Key(props: KeyShapeProps) {
             </div>
           </foreignObject>
           <foreignObject x={0} y={1} width={width} height={height}>
-            <ListModifiersKey keyCode={keyCode} size="xs" />
+            <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
           </foreignObject>
         </g>
       ) : (
@@ -634,7 +634,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -730,7 +730,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -827,7 +827,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -923,7 +923,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={12} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1019,7 +1019,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1115,7 +1115,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1211,7 +1211,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1307,7 +1307,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1403,7 +1403,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1499,7 +1499,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1595,7 +1595,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1691,7 +1691,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1787,7 +1787,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1883,7 +1883,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>
@@ -1979,7 +1979,7 @@ function Key(props: KeyShapeProps) {
               </div>
             </foreignObject>
             <foreignObject x={0} y={1} width={width} height={height}>
-              <ListModifiersKey keyCode={keyCode} size="xs" />
+              <ListModifiersKey keyCode={keyCode} size="xs" selectedKey={selectedKey} />
             </foreignObject>
           </g>
         </g>

diff --git a/src/api/keymap/db.ts b/src/api/keymap/db.ts
@@ -338,6 +338,7 @@ class KeymapDB {
       label: key.labels.primary,
       extraLabel: key.labels.top,
       verbose: key.labels.verbose,
+      alt: key.alt,
     };
   }
 

diff --git a/src/api/keymap/db/digits.ts b/src/api/keymap/db/digits.ts
@@ -91,60 +91,70 @@ const ShiftedDigitTable = {
       labels: {
         primary: "!",
       },
+      alt: true,
     },
     {
       code: 2079,
       labels: {
         primary: "@",
       },
+      alt: true,
     },
     {
       code: 2080,
       labels: {
         primary: "#",
       },
+      alt: true,
     },
     {
       code: 2081,
       labels: {
         primary: "$",
       },
+      alt: true,
     },
     {
       code: 2082,
       labels: {
         primary: "%",
       },
+      alt: true,
     },
     {
       code: 2083,
       labels: {
         primary: "^",
       },
+      alt: true,
     },
     {
       code: 2084,
       labels: {
         primary: "&",
       },
+      alt: true,
     },
     {
       code: 2085,
       labels: {
         primary: "*",
       },
+      alt: true,
     },
     {
       code: 2086,
       labels: {
         primary: "(",
       },
+      alt: true,
     },
     {
       code: 2087,
       labels: {
         primary: ")",
       },
+      alt: true,
     },
   ],
 };

diff --git a/src/api/keymap/db/punctuation.ts b/src/api/keymap/db/punctuation.ts
@@ -111,73 +111,85 @@ const ShiftedPunctuationTable = {
       labels: {
         primary: "_",
       },
+      alt: true,
     },
     {
       code: 2094,
       labels: {
         primary: "+",
       },
+      alt: true,
     },
     {
       code: 2095,
       labels: {
         primary: "{",
       },
+      alt: true,
     },
     {
       code: 2096,
       labels: {
         primary: "}",
       },
+      alt: true,
     },
     {
       code: 2097,
       labels: {
         primary: "|",
       },
+      alt: true,
     },
     {
       code: 2099,
       labels: {
         primary: ":",
       },
+      alt: true,
     },
     {
       code: 2100,
       labels: {
         primary: '"',
       },
+      alt: true,
     },
     {
       code: 2101,
       labels: {
         primary: "~",
       },
+      alt: true,
     },
     {
       code: 2102,
       labels: {
         primary: "<",
       },
+      alt: true,
     },
     {
       code: 2103,
       labels: {
         primary: ">",
       },
+      alt: true,
     },
     {
       code: 2104,
       labels: {
         primary: "?",
       },
+      alt: true,
     },
     {
       code: 2148,
       labels: {
         primary: "Alt. |",
         verbose: "Non-US |",
       },
+      alt: true,
     },
   ],
 };
@@ -224,5 +236,5 @@ const ModifiedPunctuationTables = [
   // All
   withModifiers(PunctuationTable, "Hyper + AltGr +", "", 7936),
 ];
-
-export { PunctuationTable as default, ModifiedPunctuationTables };
+export default PunctuationTable;
+export { ModifiedPunctuationTables };