Update conditional logic to maintain activeElement check, ref #38

ten1seven · May 29, 2019 · a73ddba · a73ddba
1 parent 5566379
commit a73ddba
Show file tree

Hide file tree

Showing 6 changed files with 519 additions and 410 deletions.
diff --git a/dist/maps/what-input.min.js.map b/dist/maps/what-input.min.js.map
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 v5.2.1
+ * @version v5.2.2
  * @link https://github.com/ten1seven/what-input
  * @license MIT
  */
@@ -270,7 +270,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (shouldUpdate && currentIntent !== value) {
 	      // preserve intent for keyboard interaction with form fields
 	      var activeElem = document.activeElement;
-	      var notFormInput = activeElem && activeElem.nodeName && formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1 || activeElem.nodeName.toLowerCase() === 'button' && !checkClosest(activeElem, 'form');
+	      var notFormInput = activeElem && activeElem.nodeName && (formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1 || activeElem.nodeName.toLowerCase() === 'button' && !checkClosest(activeElem, 'form'));
 
 	      if (notFormInput) {
 	        currentIntent = value;

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

diff --git a/src/scripts/what-input.js b/src/scripts/what-input.js
@@ -71,7 +71,7 @@ module.exports = (() => {
     17, // control
     18, // alt
     91, // Windows key / left Apple cmd
-    93  // Windows menu / right Apple cmd
+    93 // Windows menu / right Apple cmd
   ]
 
   let specificMap = []
@@ -182,8 +182,7 @@ module.exports = (() => {
       value = pointerType(event)
     }
 
-    let ignoreMatch =
-      !specificMap.length && ignoreMap.indexOf(eventKey) === -1
+    let ignoreMatch = !specificMap.length && ignoreMap.indexOf(eventKey) === -1
 
     let specificMatch =
       specificMap.length && specificMap.indexOf(eventKey) !== -1
@@ -212,11 +211,11 @@ module.exports = (() => {
       // preserve intent for keyboard interaction with form fields
       let activeElem = document.activeElement
       let notFormInput =
-        (activeElem &&
-          activeElem.nodeName &&
-          formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1) ||
-        (activeElem.nodeName.toLowerCase() === 'button' &&
-          !checkClosest(activeElem, 'form'))
+        activeElem &&
+        activeElem.nodeName &&
+        (formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1 ||
+          (activeElem.nodeName.toLowerCase() === 'button' &&
+            !checkClosest(activeElem, 'form')))
 
       if (notFormInput) {
         currentIntent = value
@@ -371,7 +370,9 @@ module.exports = (() => {
     const ElementPrototype = window.Element.prototype
 
     if (!ElementPrototype.matches) {
-      ElementPrototype.matches = ElementPrototype.msMatchesSelector || ElementPrototype.webkitMatchesSelector
+      ElementPrototype.matches =
+        ElementPrototype.msMatchesSelector ||
+        ElementPrototype.webkitMatchesSelector
     }
 
     if (!ElementPrototype.closest) {