unpoly-rails 3.2.1 → 3.2.2

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.2.1'
+    version: '3.2.2'
 };
 
 
@@ -941,7 +941,7 @@ up.element = (function () {
         results.push(...root.querySelectorAll(selector));
         return results;
     }
-    function isInSubtree(root, selectorOrElement) {
+    function contains(root, selectorOrElement) {
         const element = getOne(selectorOrElement);
         return Node.prototype.contains.call(root, element);
     }
@@ -1440,7 +1440,7 @@ up.element = (function () {
     }
     return {
         subtree,
-        isInSubtree,
+        contains,
         closestAttr,
         ancestor,
         around,
@@ -7901,8 +7901,13 @@ up.fragment = (function () {
         selector = buildSelector(selector, element, options);
         return selector.subtree(element);
     }
-    function contains(element, selector) {
-        return getSubtree(element, selector).length > 0;
+    function contains(root, selectorOrElement) {
+        if (u.isElement(selectorOrElement)) {
+            return e.contains(root, selectorOrElement) && up.layer.get(root).contains(selectorOrElement);
+        }
+        else {
+            return getSubtree(root, selectorOrElement).length > 0;
+        }
     }
     function closest(element, selector, options) {
         element = e.get(element);
@@ -8548,7 +8553,7 @@ up.viewport = (function () {
     }
     function focusedElementWithin(scopeElement) {
         const focusedElement = document.activeElement;
-        if (e.isInSubtree(scopeElement, focusedElement)) {
+        if (up.fragment.contains(scopeElement, focusedElement)) {
             return focusedElement;
         }
     }