downshift 6.1.2 → 6.1.3

package/dist/downshift.cjs.js

@@ -63,12 +63,14 @@ function scrollIntoView(node, menuNode) {
 /**
  * @param {HTMLElement} parent the parent node
  * @param {HTMLElement} child the child node
+ * @param {Window} environment The window context where downshift renders.
  * @return {Boolean} whether the parent is the child or the child is in the parent
  */
 
 
-function isOrContainsNode(parent, child) {
-  return parent === child || child instanceof Node && parent.contains && parent.contains(child);
+function isOrContainsNode(parent, child, environment) {
+  var result = parent === child || child instanceof environment.Node && parent.contains && parent.contains(child);
+  return result;
 }
 /**
  * Simple debounce implementation. Will call the given
@@ -416,20 +418,20 @@ function getNextNonDisabledIndex(moveAmount, baseIndex, itemCount, getItemNodeFr
  *
  * @param {EventTarget} target Target to check.
  * @param {HTMLElement[]} downshiftElements The elements that form downshift (list, toggle button etc).
- * @param {Document} document The document.
+ * @param {Window} environment The window context where downshift renders.
  * @param {boolean} checkActiveElement Whether to also check activeElement.
  *
  * @returns {boolean} Whether or not the target is within downshift elements.
  */
 
 
-function targetWithinDownshift(target, downshiftElements, document, checkActiveElement) {
+function targetWithinDownshift(target, downshiftElements, environment, checkActiveElement) {
   if (checkActiveElement === void 0) {
     checkActiveElement = true;
   }
 
   return downshiftElements.some(function (contextNode) {
-    return contextNode && (isOrContainsNode(contextNode, target) || checkActiveElement && isOrContainsNode(contextNode, document.activeElement));
+    return contextNode && (isOrContainsNode(contextNode, target, environment) || checkActiveElement && isOrContainsNode(contextNode, environment.document.activeElement, environment));
   });
 } // eslint-disable-next-line import/no-mutable-exports
 
@@ -1438,7 +1440,7 @@ var Downshift = /*#__PURE__*/function () {
           _this7.isMouseDown = false; // if the target element or the activeElement is within a downshift node
           // then we don't want to reset downshift
 
-          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment.document);
+          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment);
 
           if (!contextWithinDownshift && _this7.getState().isOpen) {
             _this7.reset({
@@ -1464,7 +1466,7 @@ var Downshift = /*#__PURE__*/function () {
         };
 
         var onTouchEnd = function onTouchEnd(event) {
-          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment.document, false);
+          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment, false);
 
           if (!_this7.isTouchMove && !contextWithinDownshift && _this7.getState().isOpen) {
             _this7.reset({
@@ -2017,7 +2019,7 @@ function useMouseAndTouchTracker(isOpen, downshiftElementRefs, environment, hand
 
       if (isOpen && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
         return ref.current;
-      }), environment.document)) {
+      }), environment)) {
         handleBlur();
       }
     };
@@ -2033,7 +2035,7 @@ function useMouseAndTouchTracker(isOpen, downshiftElementRefs, environment, hand
     var onTouchEnd = function onTouchEnd(event) {
       if (isOpen && !mouseAndTouchTrackersRef.current.isTouchMove && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
         return ref.current;
-      }), environment.document, false)) {
+      }), environment, false)) {
         handleBlur();
       }
     };

package/dist/downshift.esm.js

@@ -50,12 +50,14 @@ function scrollIntoView(node, menuNode) {
 /**
  * @param {HTMLElement} parent the parent node
  * @param {HTMLElement} child the child node
+ * @param {Window} environment The window context where downshift renders.
  * @return {Boolean} whether the parent is the child or the child is in the parent
  */
 
 
-function isOrContainsNode(parent, child) {
-  return parent === child || child instanceof Node && parent.contains && parent.contains(child);
+function isOrContainsNode(parent, child, environment) {
+  var result = parent === child || child instanceof environment.Node && parent.contains && parent.contains(child);
+  return result;
 }
 /**
  * Simple debounce implementation. Will call the given
@@ -403,20 +405,20 @@ function getNextNonDisabledIndex(moveAmount, baseIndex, itemCount, getItemNodeFr
  *
  * @param {EventTarget} target Target to check.
  * @param {HTMLElement[]} downshiftElements The elements that form downshift (list, toggle button etc).
- * @param {Document} document The document.
+ * @param {Window} environment The window context where downshift renders.
  * @param {boolean} checkActiveElement Whether to also check activeElement.
  *
  * @returns {boolean} Whether or not the target is within downshift elements.
  */
 
 
-function targetWithinDownshift(target, downshiftElements, document, checkActiveElement) {
+function targetWithinDownshift(target, downshiftElements, environment, checkActiveElement) {
   if (checkActiveElement === void 0) {
     checkActiveElement = true;
   }
 
   return downshiftElements.some(function (contextNode) {
-    return contextNode && (isOrContainsNode(contextNode, target) || checkActiveElement && isOrContainsNode(contextNode, document.activeElement));
+    return contextNode && (isOrContainsNode(contextNode, target, environment) || checkActiveElement && isOrContainsNode(contextNode, environment.document.activeElement, environment));
   });
 } // eslint-disable-next-line import/no-mutable-exports
 
@@ -1425,7 +1427,7 @@ var Downshift = /*#__PURE__*/function () {
           _this7.isMouseDown = false; // if the target element or the activeElement is within a downshift node
           // then we don't want to reset downshift
 
-          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment.document);
+          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment);
 
           if (!contextWithinDownshift && _this7.getState().isOpen) {
             _this7.reset({
@@ -1451,7 +1453,7 @@ var Downshift = /*#__PURE__*/function () {
         };
 
         var onTouchEnd = function onTouchEnd(event) {
-          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment.document, false);
+          var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment, false);
 
           if (!_this7.isTouchMove && !contextWithinDownshift && _this7.getState().isOpen) {
             _this7.reset({
@@ -2004,7 +2006,7 @@ function useMouseAndTouchTracker(isOpen, downshiftElementRefs, environment, hand
 
       if (isOpen && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
         return ref.current;
-      }), environment.document)) {
+      }), environment)) {
         handleBlur();
       }
     };
@@ -2020,7 +2022,7 @@ function useMouseAndTouchTracker(isOpen, downshiftElementRefs, environment, hand
     var onTouchEnd = function onTouchEnd(event) {
       if (isOpen && !mouseAndTouchTrackersRef.current.isTouchMove && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
         return ref.current;
-      }), environment.document, false)) {
+      }), environment, false)) {
         handleBlur();
       }
     };

package/dist/downshift.native.cjs.js

@@ -63,12 +63,14 @@ function scrollIntoView(node, menuNode) {
 /**
  * @param {HTMLElement} parent the parent node
  * @param {HTMLElement} child the child node
+ * @param {Window} environment The window context where downshift renders.
  * @return {Boolean} whether the parent is the child or the child is in the parent
  */
 
 
-function isOrContainsNode(parent, child) {
-  return parent === child || child instanceof Node && parent.contains && parent.contains(child);
+function isOrContainsNode(parent, child, environment) {
+  var result = parent === child || child instanceof environment.Node && parent.contains && parent.contains(child);
+  return result;
 }
 /**
  * Simple debounce implementation. Will call the given
@@ -416,20 +418,20 @@ function getNextNonDisabledIndex(moveAmount, baseIndex, itemCount, getItemNodeFr
  *
  * @param {EventTarget} target Target to check.
  * @param {HTMLElement[]} downshiftElements The elements that form downshift (list, toggle button etc).
- * @param {Document} document The document.
+ * @param {Window} environment The window context where downshift renders.
  * @param {boolean} checkActiveElement Whether to also check activeElement.
  *
  * @returns {boolean} Whether or not the target is within downshift elements.
  */
 
 
-function targetWithinDownshift(target, downshiftElements, document, checkActiveElement) {
+function targetWithinDownshift(target, downshiftElements, environment, checkActiveElement) {
   if (checkActiveElement === void 0) {
     checkActiveElement = true;
   }
 
   return downshiftElements.some(function (contextNode) {
-    return contextNode && (isOrContainsNode(contextNode, target) || checkActiveElement && isOrContainsNode(contextNode, document.activeElement));
+    return contextNode && (isOrContainsNode(contextNode, target, environment) || checkActiveElement && isOrContainsNode(contextNode, environment.document.activeElement, environment));
   });
 } // eslint-disable-next-line import/no-mutable-exports
 
@@ -1946,7 +1948,7 @@ function useMouseAndTouchTracker(isOpen, downshiftElementRefs, environment, hand
 
       if (isOpen && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
         return ref.current;
-      }), environment.document)) {
+      }), environment)) {
         handleBlur();
       }
     };
@@ -1962,7 +1964,7 @@ function useMouseAndTouchTracker(isOpen, downshiftElementRefs, environment, hand
     var onTouchEnd = function onTouchEnd(event) {
       if (isOpen && !mouseAndTouchTrackersRef.current.isTouchMove && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
         return ref.current;
-      }), environment.document, false)) {
+      }), environment, false)) {
         handleBlur();
       }
     };

package/dist/downshift.umd.js

@@ -1513,12 +1513,14 @@
   /**
    * @param {HTMLElement} parent the parent node
    * @param {HTMLElement} child the child node
+   * @param {Window} environment The window context where downshift renders.
    * @return {Boolean} whether the parent is the child or the child is in the parent
    */
 
 
-  function isOrContainsNode(parent, child) {
-    return parent === child || child instanceof Node && parent.contains && parent.contains(child);
+  function isOrContainsNode(parent, child, environment) {
+    var result = parent === child || child instanceof environment.Node && parent.contains && parent.contains(child);
+    return result;
   }
   /**
    * Simple debounce implementation. Will call the given
@@ -1866,20 +1868,20 @@
    *
    * @param {EventTarget} target Target to check.
    * @param {HTMLElement[]} downshiftElements The elements that form downshift (list, toggle button etc).
-   * @param {Document} document The document.
+   * @param {Window} environment The window context where downshift renders.
    * @param {boolean} checkActiveElement Whether to also check activeElement.
    *
    * @returns {boolean} Whether or not the target is within downshift elements.
    */
 
 
-  function targetWithinDownshift(target, downshiftElements, document, checkActiveElement) {
+  function targetWithinDownshift(target, downshiftElements, environment, checkActiveElement) {
     if (checkActiveElement === void 0) {
       checkActiveElement = true;
     }
 
     return downshiftElements.some(function (contextNode) {
-      return contextNode && (isOrContainsNode(contextNode, target) || checkActiveElement && isOrContainsNode(contextNode, document.activeElement));
+      return contextNode && (isOrContainsNode(contextNode, target, environment) || checkActiveElement && isOrContainsNode(contextNode, environment.document.activeElement, environment));
     });
   } // eslint-disable-next-line import/no-mutable-exports
 
@@ -2882,7 +2884,7 @@
             _this7.isMouseDown = false; // if the target element or the activeElement is within a downshift node
             // then we don't want to reset downshift
 
-            var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment.document);
+            var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment);
 
             if (!contextWithinDownshift && _this7.getState().isOpen) {
               _this7.reset({
@@ -2908,7 +2910,7 @@
           };
 
           var onTouchEnd = function onTouchEnd(event) {
-            var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment.document, false);
+            var contextWithinDownshift = targetWithinDownshift(event.target, [_this7._rootNode, _this7._menuNode], _this7.props.environment, false);
 
             if (!_this7.isTouchMove && !contextWithinDownshift && _this7.getState().isOpen) {
               _this7.reset({
@@ -3457,7 +3459,7 @@
 
         if (isOpen && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
           return ref.current;
-        }), environment.document)) {
+        }), environment)) {
           handleBlur();
         }
       };
@@ -3473,7 +3475,7 @@
       var onTouchEnd = function onTouchEnd(event) {
         if (isOpen && !mouseAndTouchTrackersRef.current.isTouchMove && !targetWithinDownshift(event.target, downshiftElementRefs.map(function (ref) {
           return ref.current;
-        }), environment.document, false)) {
+        }), environment, false)) {
           handleBlur();
         }
       };