From 214a5103f3e2914028206a13ba115c69a7ee07f1 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 21 Oct 2017 11:06:58 +0900
Subject: emit mapped keys from input-component

---
 test/content/components/common/input.test.js | 78 ++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 test/content/components/common/input.test.js

(limited to 'test/content/components')

diff --git a/test/content/components/common/input.test.js b/test/content/components/common/input.test.js
new file mode 100644
index 0000000..d4f554a
--- /dev/null
+++ b/test/content/components/common/input.test.js
@@ -0,0 +1,78 @@
+import InputComponent from 'content/components/common/input';
+import { expect } from "chai";
+
+describe('InputComponent', () => {
+  it('register callbacks', () => {
+    let component = new InputComponent(window.document);
+    component.onKey((key) => {
+      expect(key).is.equals('a');
+    });
+    component.onKeyDown({ key: 'a' });
+  });
+
+  it('invoke callback once', () => {
+    let component = new InputComponent(window.document);
+    let a = 0, b = 0;
+    component.onKey((key) => {
+      if (key == 'a') {
+        ++a;
+      } else {
+        key == 'b'
+        ++b;
+      }
+    });
+    component.onKeyDown({ key: 'a' });
+    component.onKeyDown({ key: 'b' });
+    component.onKeyPress({ key: 'a' });
+    component.onKeyUp({ key: 'a' });
+    component.onKeyPress({ key: 'b' });
+    component.onKeyUp({ key: 'b' });
+
+    expect(a).is.equals(1);
+    expect(b).is.equals(1);
+  })
+
+  it('add prefix when ctrl pressed', () => {
+    let component = new InputComponent(window.document);
+    component.onKey((key) => {
+      expect(key).is.equals('<C-A>');
+    });
+    component.onKeyDown({ key: 'a', ctrlKey: true });
+  })
+
+  it('does not invoke only meta keys', () => {
+    let component = new InputComponent(window.document);
+    component.onKey((key) => {
+      expect.fail();
+    });
+    component.onKeyDown({ key: 'Shift' });
+    component.onKeyDown({ key: 'Control' });
+    component.onKeyDown({ key: 'Alt' });
+    component.onKeyDown({ key: 'OS' });
+  })
+
+  it('ignores events from input elements', () => {
+    ['input', 'textarea', 'select'].forEach((name) => {
+      let target = window.document.createElement(name);
+      let component = new InputComponent(target);
+      component.onKey((key) => {
+        expect.fail();
+      });
+      component.onKeyDown({ key: 'x', target });
+    });
+  });
+
+  it('ignores events from contenteditable  elements', () => {
+    let target = window.document.createElement('div');
+    let component = new InputComponent(target);
+    component.onKey((key) => {
+      expect.fail();
+    });
+
+    target.setAttribute('contenteditable', '');
+    component.onKeyDown({ key: 'x', target });
+
+    target.setAttribute('contenteditable', 'true');
+    component.onKeyDown({ key: 'x', target });
+  })
+});
-- 
cgit v1.2.3


From cd6f7e77887f535e88690b84ad081f7cc630306f Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 21 Oct 2017 12:42:30 +0900
Subject: support shift modifier

---
 src/content/components/common/input.js       | 13 ++++++++++++-
 test/content/components/common/input.test.js | 24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'test/content/components')

diff --git a/src/content/components/common/input.js b/src/content/components/common/input.js
index 9af9fbe..f285b0c 100644
--- a/src/content/components/common/input.js
+++ b/src/content/components/common/input.js
@@ -1,6 +1,17 @@
+const modifierdKeyName = (name) => {
+  if (name.length === 1) {
+    return name.toUpperCase();
+  } else if (name === 'Escape') {
+    return 'Esc';
+  }
+  return name;
+};
+
 const mapKey = (e) => {
   if (e.ctrlKey) {
-    return '<C-' + e.key.toUpperCase() + '>';
+    return '<C-' + modifierdKeyName(e.key) + '>';
+  } else if (e.shiftKey && e.key.length !== 1) {
+    return '<S-' + modifierdKeyName(e.key) + '>';
   }
   return e.key;
 };
diff --git a/test/content/components/common/input.test.js b/test/content/components/common/input.test.js
index d4f554a..912ac34 100644
--- a/test/content/components/common/input.test.js
+++ b/test/content/components/common/input.test.js
@@ -40,6 +40,30 @@ describe('InputComponent', () => {
     component.onKeyDown({ key: 'a', ctrlKey: true });
   })
 
+  it('press X', () => {
+    let component = new InputComponent(window.document);
+    component.onKey((key) => {
+      expect(key).is.equals('X');
+    });
+    component.onKeyDown({ key: 'X', shiftKey: true });
+  })
+
+  it('press <Shift> + <Esc>', () => {
+    let component = new InputComponent(window.document);
+    component.onKey((key) => {
+      expect(key).is.equals('<S-Esc>');
+    });
+    component.onKeyDown({ key: 'Escape', shiftKey: true });
+  })
+
+  it('press <Ctrl> + <Esc>', () => {
+    let component = new InputComponent(window.document);
+    component.onKey((key) => {
+      expect(key).is.equals('<C-Esc>');
+    });
+    component.onKeyDown({ key: 'Escape', ctrlKey: true });
+  })
+
   it('does not invoke only meta keys', () => {
     let component = new InputComponent(window.document);
     component.onKey((key) => {
-- 
cgit v1.2.3