fix(Keyboard): make row render when key is empty (#472)

* fix(Keyboard): when empty key, make row render * fix(KeyboardInput): updating snapshot * fix(Keyboard): removing testing code * fix(KeybaordQwerty): making shift an xl size key
rdkcentral · Feb 22, 2024 · 334bf88 · 334bf88
1 parent b77db31
commit 334bf88
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 123 deletions.
diff --git a/packages/@lightningjs/ui-components/src/components/Keyboard/Keyboard.js b/packages/@lightningjs/ui-components/src/components/Keyboard/Keyboard.js
@@ -139,7 +139,12 @@ export default class Keyboard extends Base {
   _createKeys(keys = [], keyboard) {
     return keys.map(keyProps => {
       if (!keyProps) {
-        return { skipFocus: true };
+        return {
+          type: this.keyComponent || Key, // allows use of a custom Key component if specified
+          keySpacing: this.style.keySpacing,
+          skipFocus: true,
+          alpha: 0.01
+        };
       }
 
       const key = {

diff --git a/packages/@lightningjs/ui-components/src/components/Keyboard/KeyboardEmail.js b/packages/@lightningjs/ui-components/src/components/Keyboard/KeyboardEmail.js
@@ -307,28 +307,12 @@ export default class KeyboardEmail extends Keyboard {
           'û',
           'ã',
           'ñ',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
           { title: '_', announce: 'underscore, button' },
           { title: '.', announce: 'period, button' },
           { title: '-', announce: 'dash, button' },
           {
             title: 'shift',
-            size: 'md',
+            size: 'xl',
             toggle: 'accentsUpper',
             announce: 'shift off, button',
             keyId: 'shift'
@@ -425,28 +409,12 @@ export default class KeyboardEmail extends Keyboard {
           'Û',
           'Ã',
           'Ñ',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          { title: '_', announce: 'underscore, button' },
           { title: '.', announce: 'period, button' },
           { title: '-', announce: 'dash, button' },
+          { title: '_', announce: 'underscore, button' },
           {
             title: 'shift',
-            size: 'md',
+            size: 'xl',
             toggle: 'accents',
             announce: 'shift off, button',
             keyId: 'shift'

diff --git a/packages/@lightningjs/ui-components/src/components/Keyboard/KeyboardQwerty.js b/packages/@lightningjs/ui-components/src/components/Keyboard/KeyboardQwerty.js
@@ -291,28 +291,12 @@ export default class KeyboardQwerty extends Keyboard {
           'û',
           'ã',
           'ñ',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
           { title: '_', announce: 'underscore, button' },
           { title: '.', announce: 'period, button' },
           { title: '-', announce: 'dash, button' },
           {
             title: 'shift',
-            size: 'md',
+            size: 'xl',
             toggle: 'accentsUpper',
             announce: 'shift off, button',
             keyId: 'shift'
@@ -401,28 +385,12 @@ export default class KeyboardQwerty extends Keyboard {
           'Û',
           'Ã',
           'Ñ',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
           { title: '.', announce: 'period, button' },
           { title: '-', announce: 'dash, button' },
           { title: '_', announce: 'underscore, button' },
           {
             title: 'shift',
-            size: 'md',
+            size: 'xl',
             toggle: 'accents',
             announce: 'shift off, button',
             keyId: 'shift'