Add fr-FR keyboard layout

Author: vidartf

packages/keyboard/src/layouts/en-US.ts

@@ -136,8 +136,7 @@ export const EN_US: IKeyboardLayout = new KeycodeLayout(
     222: "'",
     224: 'Meta' // firefox
   },
-  // TODO: Figure out Ctrl vs Control
-  [...MODIFIER_KEYS, 'Ctrl'],
+  MODIFIER_KEYS,
   {
     AltLeft: 'Alt',
     AltRight: 'Alt',

packages/keyboard/src/layouts/fr-FR.ts

@@ -0,0 +1,117 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import { IKeyboardLayout, KeycodeLayout } from '../core';
+
+import { MODIFIER_KEYS } from '../special-keys';
+
+/**
+ * A code-based keyboard layout for a common Norwegian keyboard.
+ *
+ * Note that this does not include Apple's magic Keyboards, as they map
+ * the keys next to the Enter key differently (BracketRight and
+ * Backslash on en-US).
+ */
+export const FR_FR: IKeyboardLayout = new KeycodeLayout(
+  'fr-FR',
+  {},
+  MODIFIER_KEYS,
+  {
+    AltLeft: 'Alt',
+    AltRight: 'AltGraph',
+    ArrowDown: 'ArrowDown',
+    ArrowLeft: 'ArrowLeft',
+    ArrowRight: 'ArrowRight',
+    ArrowUp: 'ArrowUp',
+    Backquote: '²',
+    Backslash: '*',
+    Backspace: 'Backspace',
+    BracketRight: '$',
+    Comma: ';',
+    ControlLeft: 'Control',
+    ControlRight: 'Control',
+    Delete: 'Delete',
+    Digit0: 'À',
+    Digit1: '&',
+    Digit2: 'É',
+    Digit3: '"',
+    Digit4: "'",
+    Digit5: '(',
+    Digit6: '-',
+    Digit7: 'È',
+    Digit8: '_',
+    Digit9: 'Ç',
+    End: 'End',
+    Enter: 'Enter',
+    Equal: '=',
+    Escape: 'Escape',
+    F1: 'F1',
+    F10: 'F10',
+    F11: 'F11',
+    F12: 'F12',
+    F2: 'F2',
+    F3: 'F3',
+    F4: 'F4',
+    F5: 'F5',
+    F6: 'F6',
+    F7: 'F7',
+    F8: 'F8',
+    F9: 'F9',
+    Home: 'Home',
+    Insert: 'Insert',
+    IntlBackslash: '<',
+    KeyA: 'Q',
+    KeyB: 'B',
+    KeyC: 'C',
+    KeyD: 'D',
+    KeyE: 'E',
+    KeyF: 'F',
+    KeyG: 'G',
+    KeyH: 'H',
+    KeyI: 'I',
+    KeyJ: 'J',
+    KeyK: 'K',
+    KeyL: 'L',
+    KeyM: ',',
+    KeyN: 'N',
+    KeyO: 'O',
+    KeyP: 'P',
+    KeyQ: 'A',
+    KeyR: 'R',
+    KeyS: 'S',
+    KeyT: 'T',
+    KeyU: 'U',
+    KeyV: 'V',
+    KeyW: 'Z',
+    KeyX: 'X',
+    KeyY: 'Y',
+    KeyZ: 'W',
+    Minus: ')',
+    Numpad0: '0',
+    Numpad1: '1',
+    Numpad2: '2',
+    Numpad3: '3',
+    Numpad4: '4',
+    Numpad5: '5',
+    Numpad6: '6',
+    Numpad7: '7',
+    Numpad8: '8',
+    Numpad9: '9',
+    NumpadAdd: '+',
+    NumpadDecimal: '.',
+    NumpadDivide: '/',
+    NumpadEnter: 'Enter',
+    NumpadMultiply: '*',
+    NumpadSubtract: '-',
+    PageDown: 'PageDown',
+    PageUp: 'PageUp',
+    Period: ':',
+    Quote: 'Ù',
+    ScrollLock: 'ScrollLock',
+    Semicolon: 'M',
+    ShiftLeft: 'Shift',
+    ShiftRight: 'Shift',
+    Slash: '!',
+    Tab: 'Tab'
+  }
+);

packages/keyboard/src/layouts/index.ts

@@ -2,4 +2,5 @@
 // Distributed under the terms of the Modified BSD License.
 
 export { EN_US } from './en-US';
+export { FR_FR } from './fr-FR';
 export { NB_NO } from './nb-NO';

packages/keyboard/tests/src/index.spec.ts

@@ -11,8 +11,10 @@ import { expect } from 'chai';
 
 import {
   EN_US,
+  FR_FR,
   getKeyboardLayout,
   KeycodeLayout,
+  NB_NO,
   setKeyboardLayout
 } from '@lumino/keyboard';
 
@@ -192,4 +194,63 @@ describe('@lumino/keyboard', () => {
       expect(EN_US.isModifierKey('Meta')).to.equal(true);
     });
   });
+
+  describe('FR_FR', () => {
+    it('should be a keycode layout', () => {
+      expect(FR_FR).to.be.an.instanceof(KeycodeLayout);
+    });
+
+    it('should have standardized keys', () => {
+      expect(FR_FR.isValidKey('A')).to.equal(true);
+      expect(FR_FR.isValidKey('Z')).to.equal(true);
+      expect(FR_FR.isValidKey('0')).to.equal(true);
+      expect(FR_FR.isValidKey('a')).to.equal(false);
+      expect(FR_FR.isValidKey('Ù')).to.equal(true);
+    });
+
+    it('should have modifier keys', () => {
+      expect(FR_FR.isValidKey('Shift')).to.equal(true);
+      expect(FR_FR.isValidKey('Control')).to.equal(true);
+      expect(FR_FR.isValidKey('Alt')).to.equal(true);
+      expect(NB_NO.isValidKey('AltGraph')).to.equal(true);
+      expect(FR_FR.isValidKey('Meta')).to.equal(true);
+    });
+
+    it('should correctly detect modifier keys', () => {
+      expect(FR_FR.isModifierKey('Shift')).to.equal(true);
+      expect(FR_FR.isModifierKey('Control')).to.equal(true);
+      expect(FR_FR.isModifierKey('Alt')).to.equal(true);
+      expect(FR_FR.isModifierKey('Meta')).to.equal(true);
+    });
+  });
+
+  describe('NB_NO', () => {
+    it('should be a keycode layout', () => {
+      expect(NB_NO).to.be.an.instanceof(KeycodeLayout);
+    });
+
+    it('should have standardized keys', () => {
+      expect(NB_NO.isValidKey('A')).to.equal(true);
+      expect(NB_NO.isValidKey('Z')).to.equal(true);
+      expect(NB_NO.isValidKey('0')).to.equal(true);
+      expect(NB_NO.isValidKey('a')).to.equal(false);
+      expect(NB_NO.isValidKey('Æ')).to.equal(true);
+    });
+
+    it('should have modifier keys', () => {
+      expect(NB_NO.isValidKey('Shift')).to.equal(true);
+      expect(NB_NO.isValidKey('Control')).to.equal(true);
+      expect(NB_NO.isValidKey('Alt')).to.equal(true);
+      expect(NB_NO.isValidKey('AltGraph')).to.equal(true);
+      expect(NB_NO.isValidKey('Meta')).to.equal(true);
+    });
+
+    it('should correctly detect modifier keys', () => {
+      expect(NB_NO.isModifierKey('Shift')).to.equal(true);
+      expect(NB_NO.isModifierKey('Control')).to.equal(true);
+      expect(NB_NO.isModifierKey('Alt')).to.equal(true);
+      expect(NB_NO.isModifierKey('AltGraph')).to.equal(true);
+      expect(NB_NO.isModifierKey('Meta')).to.equal(true);
+    });
+  });
 });