Using manual version of closest() to mitigate browser support

ten1seven · Mar 27, 2019 · 1229446 · 1229446
1 parent 8c6a5e2
commit 1229446
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 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
@@ -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' && !activeElem.closest('form');
+	      var notFormInput = activeElem && activeElem.nodeName && formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1 || activeElem.nodeName.toLowerCase() === 'button' && !checkClosest(activeElem, 'form');
 
 	      if (notFormInput) {
 	        currentIntent = value;
@@ -407,6 +407,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	  };
 
+	  // manual version of `closest()`
+	  var checkClosest = function checkClosest(elem, tag) {
+	    do {
+	      if (elem.matches(tag)) {
+	        return elem;
+	      }
+
+	      elem = elem.parentElement || elem.parentNode;
+	    } while (elem !== null && elem.nodeType === 1);
+
+	    return null;
+	  };
+
 	  /*
 	   * init
 	   */

diff --git a/dist/what-input.min.js b/dist/what-input.min.js
diff --git a/src/scripts/what-input.js b/src/scripts/what-input.js
@@ -216,7 +216,7 @@ module.exports = (() => {
           activeElem.nodeName &&
           formInputs.indexOf(activeElem.nodeName.toLowerCase()) === -1) ||
         (activeElem.nodeName.toLowerCase() === 'button' &&
-          !activeElem.closest('form'))
+          !checkClosest(activeElem, 'form'))
 
       if (notFormInput) {
         currentIntent = value
@@ -366,6 +366,19 @@ module.exports = (() => {
     }
   }
 
+  // manual version of `closest()`
+  const checkClosest = (elem, tag) => {
+    do {
+      if (elem.matches(tag)) {
+        return elem
+      }
+
+      elem = elem.parentElement || elem.parentNode
+    } while (elem !== null && elem.nodeType === 1)
+
+    return null;
+  }
+
   /*
    * init
    */