Merge pull request #64 from ten1seven/jf/tab-key-inputs

Replicates functionality resolved in #50
ten1seven · Jun 13, 2017 · 018f5d2 · 018f5d2
2 parents dab188a + f15c0f6
commit 018f5d2
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -2,10 +2,14 @@
 
 __A global utility for tracking the current input method (mouse, keyboard or touch).__
 
-## What Input is now v4.1.6
+## What Input is now v4.2.0
 
 What Input adds data attributes to the `<html>` tag based on the type of input being used. It also exposes a simple API that can be used for scripting interactions.
 
+### June 13, 2017
+
+* Updated: Typing _in_ form inputs does not change input type, but tabbing between inputs _does_ initiate a switch from `mouse` to `keyboard`.
+
 ### June 12, 2017
 
 * Added: passive event listener for `wheel` event.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "what-input",
-  "version": "4.1.6",
+  "version": "4.2.0",
   "homepage": "https://github.com/ten1seven/what-input",
   "repository": {
     "url": "https://github.com/ten1seven/what-input.git",

diff --git a/dist/what-input.js b/dist/what-input.js
@@ -1,6 +1,6 @@
 /**
  * what-input - A global utility for tracking the current input method (mouse, keyboard or touch).
- * @version v4.1.6
+ * @version v4.2.0
  * @link https://github.com/ten1seven/what-input
  * @license MIT
  */
@@ -90,6 +90,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  93 // Windows menu / right Apple cmd
 	  ];
 
+	  // list of keys for which we change intent even for form inputs
+	  var changeIntentMap = [9 // tab
+	  ];
+
 	  // mapping of events to input types
 	  var inputMap = {
 	    keydown: 'keyboard',
@@ -194,8 +198,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	      if (currentInput !== value || currentIntent !== value) {
 	        var activeElem = document.activeElement;
 	        var activeInput = false;
+	        var notFormInput = activeElem && activeElem.nodeName && formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1;
 
-	        if (activeElem && activeElem.nodeName && formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1) {
+	        if (notFormInput || changeIntentMap.indexOf(eventKey) !== -1) {
 	          activeInput = true;
 	        }
 

diff --git a/dist/what-input.min.js b/dist/what-input.min.js
diff --git a/docs/scripts/what-input.js b/docs/scripts/what-input.js
@@ -1,6 +1,6 @@
 /**
  * what-input - A global utility for tracking the current input method (mouse, keyboard or touch).
- * @version v4.1.6
+ * @version v4.2.0
  * @link https://github.com/ten1seven/what-input
  * @license MIT
  */
@@ -90,6 +90,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  93 // Windows menu / right Apple cmd
 	  ];
 
+	  // list of keys for which we change intent even for form inputs
+	  var changeIntentMap = [9 // tab
+	  ];
+
 	  // mapping of events to input types
 	  var inputMap = {
 	    keydown: 'keyboard',
@@ -194,8 +198,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	      if (currentInput !== value || currentIntent !== value) {
 	        var activeElem = document.activeElement;
 	        var activeInput = false;
+	        var notFormInput = activeElem && activeElem.nodeName && formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1;
 
-	        if (activeElem && activeElem.nodeName && formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1) {
+	        if (notFormInput || changeIntentMap.indexOf(eventKey) !== -1) {
 	          activeInput = true;
 	        }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "what-input",
-  "version": "4.1.6",
+  "version": "4.2.0",
   "description": "A global utility for tracking the current input method (mouse, keyboard or touch).",
   "main": "dist/what-input.js",
   "repository": {

diff --git a/src/what-input.js b/src/what-input.js
@@ -27,6 +27,11 @@ module.exports = (() => {
     93 // Windows menu / right Apple cmd
   ]
 
+  // list of keys for which we change intent even for form inputs
+  const changeIntentMap = [
+    9 // tab
+  ]
+
   // mapping of events to input types
   const inputMap = {
     keydown: 'keyboard',
@@ -135,12 +140,12 @@ module.exports = (() => {
       if (currentInput !== value || currentIntent !== value) {
         let activeElem = document.activeElement
         let activeInput = false
-
-        if (
+        let notFormInput =
           activeElem &&
           activeElem.nodeName &&
           formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1
-        ) {
+
+        if (notFormInput || changeIntentMap.indexOf(eventKey) !== -1) {
           activeInput = true
         }