@react-aria/overlays 3.31.0 → 3.31.2

package/dist/ariaHideOutside.main.js

@@ -1,4 +1,5 @@
 var $4MDXc$reactariautils = require("@react-aria/utils");
+var $4MDXc$reactstatelyflags = require("@react-stately/flags");
 
 
 function $parcel$export(e, n, v, s) {
@@ -18,6 +19,7 @@ $parcel$export(module.exports, "keepVisible", () => $08ef1685902b6011$export$102
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 const $08ef1685902b6011$var$supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;
 // Keeps a ref count of all hidden elements. Added to when hiding an element, and
 // subtracted from when showing it again. When it reaches zero, aria-hidden is removed.
@@ -46,6 +48,17 @@ function $08ef1685902b6011$export$1c3ebcada18427bf(targets, options) {
             element.inert = false;
         }
     };
+    let shadowRootsToWatch = new Set();
+    if ((0, $4MDXc$reactstatelyflags.shadowDOM)()) // find all shadow roots that are ancestors of the targets
+    // traverse upwards until the root is reached
+    for (let target of targets){
+        let node = target;
+        while(node && node !== root){
+            let root = node.getRootNode();
+            if ('shadowRoot' in root) shadowRootsToWatch.add(root.shadowRoot);
+            node = root.parentNode;
+        }
+    }
     let walk = (root)=>{
         // Keep live announcer and top layer elements (e.g. toasts) visible.
         for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]'))visibleNodes.add(element);
@@ -57,11 +70,11 @@ function $08ef1685902b6011$export$1c3ebcada18427bf(targets, options) {
             if (hiddenNodes.has(node) || visibleNodes.has(node) || node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row') return NodeFilter.FILTER_REJECT;
             // Skip this node but continue to children if one of the targets is inside the node.
             for (let target of visibleNodes){
-                if (node.contains(target)) return NodeFilter.FILTER_SKIP;
+                if ((0, $4MDXc$reactariautils.nodeContains)(node, target)) return NodeFilter.FILTER_SKIP;
             }
             return NodeFilter.FILTER_ACCEPT;
         };
-        let walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, {
+        let walker = (0, $4MDXc$reactariautils.createShadowTreeWalker)((0, $4MDXc$reactariautils.getOwnerDocument)(root), root, NodeFilter.SHOW_ELEMENT, {
             acceptNode: acceptNode
         });
         // TreeWalker does not include the root.
@@ -94,19 +107,56 @@ function $08ef1685902b6011$export$1c3ebcada18427bf(targets, options) {
             if (change.type !== 'childList') continue;
             // If the parent element of the added nodes is not within one of the targets,
             // and not already inside a hidden node, hide all of the new children.
-            if (![
+            if (change.target.isConnected && ![
                 ...visibleNodes,
                 ...hiddenNodes
-            ].some((node)=>node.contains(change.target))) for (let node of change.addedNodes){
+            ].some((node)=>(0, $4MDXc$reactariautils.nodeContains)(node, change.target))) for (let node of change.addedNodes){
                 if ((node instanceof HTMLElement || node instanceof SVGElement) && (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')) visibleNodes.add(node);
                 else if (node instanceof Element) walk(node);
             }
+            if ((0, $4MDXc$reactstatelyflags.shadowDOM)()) {
+                // if any of the observed shadow roots were removed, stop observing them
+                for (let shadowRoot of shadowRootsToWatch)if (!shadowRoot.isConnected) {
+                    observer.disconnect();
+                    break;
+                }
+            }
         }
     });
     observer.observe(root, {
         childList: true,
         subtree: true
     });
+    let shadowObservers = new Set();
+    if ((0, $4MDXc$reactstatelyflags.shadowDOM)()) for (let shadowRoot of shadowRootsToWatch){
+        // Disconnect single target instead of all https://github.com/whatwg/dom/issues/126
+        let shadowObserver = new MutationObserver((changes)=>{
+            for (let change of changes){
+                if (change.type !== 'childList') continue;
+                // If the parent element of the added nodes is not within one of the targets,
+                // and not already inside a hidden node, hide all of the new children.
+                if (change.target.isConnected && ![
+                    ...visibleNodes,
+                    ...hiddenNodes
+                ].some((node)=>(0, $4MDXc$reactariautils.nodeContains)(node, change.target))) for (let node of change.addedNodes){
+                    if ((node instanceof HTMLElement || node instanceof SVGElement) && (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')) visibleNodes.add(node);
+                    else if (node instanceof Element) walk(node);
+                }
+                if ((0, $4MDXc$reactstatelyflags.shadowDOM)()) {
+                    // if any of the observed shadow roots were removed, stop observing them
+                    for (let shadowRoot of shadowRootsToWatch)if (!shadowRoot.isConnected) {
+                        observer.disconnect();
+                        break;
+                    }
+                }
+            }
+        });
+        shadowObserver.observe(shadowRoot, {
+            childList: true,
+            subtree: true
+        });
+        shadowObservers.add(shadowObserver);
+    }
     let observerWrapper = {
         visibleNodes: visibleNodes,
         hiddenNodes: hiddenNodes,
@@ -123,6 +173,7 @@ function $08ef1685902b6011$export$1c3ebcada18427bf(targets, options) {
     $08ef1685902b6011$var$observerStack.push(observerWrapper);
     return ()=>{
         observer.disconnect();
+        if ((0, $4MDXc$reactstatelyflags.shadowDOM)()) for (let shadowObserver of shadowObservers)shadowObserver.disconnect();
         for (let node of hiddenNodes){
             let count = $08ef1685902b6011$var$refCountMap.get(node);
             if (count == null) continue;

package/dist/ariaHideOutside.main.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-aria/overlays/src/ariaHideOutside.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {getOwnerWindow} from '@react-aria/utils';\nconst supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;\n\ninterface AriaHideOutsideOptions {\n  root?: Element,\n  shouldUseInert?: boolean\n}\n\n// Keeps a ref count of all hidden elements. Added to when hiding an element, and\n// subtracted from when showing it again. When it reaches zero, aria-hidden is removed.\nlet refCountMap = new WeakMap<Element, number>();\ninterface ObserverWrapper {\n  visibleNodes: Set<Element>,\n  hiddenNodes: Set<Element>,\n  observe: () => void,\n  disconnect: () => void\n}\nlet observerStack: Array<ObserverWrapper> = [];\n\n/**\n * Hides all elements in the DOM outside the given targets from screen readers using aria-hidden,\n * and returns a function to revert these changes. In addition, changes to the DOM are watched\n * and new elements outside the targets are automatically hidden.\n * @param targets - The elements that should remain visible.\n * @param root - Nothing will be hidden above this element.\n * @returns - A function to restore all hidden elements.\n */\nexport function ariaHideOutside(targets: Element[], options?: AriaHideOutsideOptions | Element) {\n  let windowObj = getOwnerWindow(targets?.[0]);\n  let opts = options instanceof windowObj.Element ? {root: options} : options;\n  let root = opts?.root ?? document.body;\n  let shouldUseInert = opts?.shouldUseInert && supportsInert;\n  let visibleNodes = new Set<Element>(targets);\n  let hiddenNodes = new Set<Element>();\n\n  let getHidden = (element: Element) => {\n    return shouldUseInert && element instanceof windowObj.HTMLElement ? element.inert : element.getAttribute('aria-hidden') === 'true';\n  };\n\n  let setHidden = (element: Element, hidden: boolean) => {\n    if (shouldUseInert && element instanceof windowObj.HTMLElement) {\n      element.inert = hidden;\n    } else if (hidden) {\n      element.setAttribute('aria-hidden', 'true');\n    } else {\n      element.removeAttribute('aria-hidden');\n      if (element instanceof windowObj.HTMLElement) {\n        // We only ever call setHidden with hidden = false when the nodeCount is 1 aka\n        // we are trying to make the element visible to screen readers again, so remove inert as well\n        element.inert = false;\n      }\n    }\n  };\n\n  let walk = (root: Element) => {\n    // Keep live announcer and top layer elements (e.g. toasts) visible.\n    for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]')) {\n      visibleNodes.add(element);\n    }\n\n    let acceptNode = (node: Element) => {\n      // Skip this node and its children if it is one of the target nodes, or a live announcer.\n      // Also skip children of already hidden nodes, as aria-hidden is recursive. An exception is\n      // made for elements with role=\"row\" since VoiceOver on iOS has issues hiding elements with role=\"row\".\n      // For that case we want to hide the cells inside as well (https://bugs.webkit.org/show_bug.cgi?id=222623).\n      if (\n        hiddenNodes.has(node) ||\n        visibleNodes.has(node) ||\n        (node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row')\n      ) {\n        return NodeFilter.FILTER_REJECT;\n      }\n\n      // Skip this node but continue to children if one of the targets is inside the node.\n      for (let target of visibleNodes) {\n        if (node.contains(target)) {\n          return NodeFilter.FILTER_SKIP;\n        }\n      }\n\n      return NodeFilter.FILTER_ACCEPT;\n    };\n\n    let walker = document.createTreeWalker(\n      root,\n      NodeFilter.SHOW_ELEMENT,\n      {acceptNode}\n    );\n\n    // TreeWalker does not include the root.\n    let acceptRoot = acceptNode(root);\n    if (acceptRoot === NodeFilter.FILTER_ACCEPT) {\n      hide(root);\n    }\n\n    if (acceptRoot !== NodeFilter.FILTER_REJECT) {\n      let node = walker.nextNode() as Element;\n      while (node != null) {\n        hide(node);\n        node = walker.nextNode() as Element;\n      }\n    }\n  };\n\n  let hide = (node: Element) => {\n    let refCount = refCountMap.get(node) ?? 0;\n\n    // If already aria-hidden, and the ref count is zero, then this element\n    // was already hidden and there's nothing for us to do.\n    if (getHidden(node) && refCount === 0) {\n      return;\n    }\n\n    if (refCount === 0) {\n      setHidden(node, true);\n    }\n\n    hiddenNodes.add(node);\n    refCountMap.set(node, refCount + 1);\n  };\n\n  // If there is already a MutationObserver listening from a previous call,\n  // disconnect it so the new on takes over.\n  if (observerStack.length) {\n    observerStack[observerStack.length - 1].disconnect();\n  }\n\n  walk(root);\n\n  let observer = new MutationObserver(changes => {\n    for (let change of changes) {\n      if (change.type !== 'childList') {\n        continue;\n      }\n\n      // If the parent element of the added nodes is not within one of the targets,\n      // and not already inside a hidden node, hide all of the new children.\n      if (![...visibleNodes, ...hiddenNodes].some(node => node.contains(change.target))) {\n        for (let node of change.addedNodes) {\n          if (\n            (node instanceof HTMLElement || node instanceof SVGElement) &&\n            (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')\n          ) {\n            visibleNodes.add(node);\n          } else if (node instanceof Element) {\n            walk(node);\n          }\n        }\n      }\n    }\n  });\n\n  observer.observe(root, {childList: true, subtree: true});\n\n  let observerWrapper: ObserverWrapper = {\n    visibleNodes,\n    hiddenNodes,\n    observe() {\n      observer.observe(root, {childList: true, subtree: true});\n    },\n    disconnect() {\n      observer.disconnect();\n    }\n  };\n\n  observerStack.push(observerWrapper);\n\n  return (): void => {\n    observer.disconnect();\n\n    for (let node of hiddenNodes) {\n      let count = refCountMap.get(node);\n      if (count == null) {\n        continue;\n      }\n      if (count === 1) {\n        setHidden(node, false);\n        refCountMap.delete(node);\n      } else {\n        refCountMap.set(node, count - 1);\n      }\n    }\n\n    // Remove this observer from the stack, and start the previous one.\n    if (observerWrapper === observerStack[observerStack.length - 1]) {\n      observerStack.pop();\n      if (observerStack.length) {\n        observerStack[observerStack.length - 1].observe();\n      }\n    } else {\n      observerStack.splice(observerStack.indexOf(observerWrapper), 1);\n    }\n  };\n}\n\nexport function keepVisible(element: Element): (() => void) | undefined {\n  let observer = observerStack[observerStack.length - 1];\n  if (observer && !observer.visibleNodes.has(element)) {\n    observer.visibleNodes.add(element);\n    return () => {\n      observer.visibleNodes.delete(element);\n    };\n  }\n}\n"],"names":[],"version":3,"file":"ariaHideOutside.main.js.map"}
+{"mappings":"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","sources":["packages/@react-aria/overlays/src/ariaHideOutside.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {createShadowTreeWalker, getOwnerDocument, getOwnerWindow, nodeContains} from '@react-aria/utils';\nimport {shadowDOM} from '@react-stately/flags';\n\nconst supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;\n\ninterface AriaHideOutsideOptions {\n  root?: Element,\n  shouldUseInert?: boolean\n}\n\n// Keeps a ref count of all hidden elements. Added to when hiding an element, and\n// subtracted from when showing it again. When it reaches zero, aria-hidden is removed.\nlet refCountMap = new WeakMap<Element, number>();\ninterface ObserverWrapper {\n  visibleNodes: Set<Element>,\n  hiddenNodes: Set<Element>,\n  observe: () => void,\n  disconnect: () => void\n}\nlet observerStack: Array<ObserverWrapper> = [];\n\n/**\n * Hides all elements in the DOM outside the given targets from screen readers using aria-hidden,\n * and returns a function to revert these changes. In addition, changes to the DOM are watched\n * and new elements outside the targets are automatically hidden.\n * @param targets - The elements that should remain visible.\n * @param root - Nothing will be hidden above this element.\n * @returns - A function to restore all hidden elements.\n */\nexport function ariaHideOutside(targets: Element[], options?: AriaHideOutsideOptions | Element) {\n  let windowObj = getOwnerWindow(targets?.[0]);\n  let opts = options instanceof windowObj.Element ? {root: options} : options;\n  let root = opts?.root ?? document.body;\n  let shouldUseInert = opts?.shouldUseInert && supportsInert;\n  let visibleNodes = new Set<Element>(targets);\n  let hiddenNodes = new Set<Element>();\n\n  let getHidden = (element: Element) => {\n    return shouldUseInert && element instanceof windowObj.HTMLElement ? element.inert : element.getAttribute('aria-hidden') === 'true';\n  };\n\n  let setHidden = (element: Element, hidden: boolean) => {\n    if (shouldUseInert && element instanceof windowObj.HTMLElement) {\n      element.inert = hidden;\n    } else if (hidden) {\n      element.setAttribute('aria-hidden', 'true');\n    } else {\n      element.removeAttribute('aria-hidden');\n      if (element instanceof windowObj.HTMLElement) {\n        // We only ever call setHidden with hidden = false when the nodeCount is 1 aka\n        // we are trying to make the element visible to screen readers again, so remove inert as well\n        element.inert = false;\n      }\n    }\n  };\n\n  let shadowRootsToWatch = new Set<ShadowRoot>();\n  if (shadowDOM()) {\n    // find all shadow roots that are ancestors of the targets\n    // traverse upwards until the root is reached\n    for (let target of targets) {\n      let node = target;\n      while (node && node !== root) {\n        let root = node.getRootNode();\n        if ('shadowRoot' in root) {\n          shadowRootsToWatch.add(root.shadowRoot as ShadowRoot);\n        }\n        node = root.parentNode as Element;\n      }\n    }\n  }\n\n  let walk = (root: Element) => {\n    // Keep live announcer and top layer elements (e.g. toasts) visible.\n    for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]')) {\n      visibleNodes.add(element);\n    }\n\n    let acceptNode = (node: Element) => {\n      // Skip this node and its children if it is one of the target nodes, or a live announcer.\n      // Also skip children of already hidden nodes, as aria-hidden is recursive. An exception is\n      // made for elements with role=\"row\" since VoiceOver on iOS has issues hiding elements with role=\"row\".\n      // For that case we want to hide the cells inside as well (https://bugs.webkit.org/show_bug.cgi?id=222623).\n      if (\n        hiddenNodes.has(node) ||\n        visibleNodes.has(node) ||\n        (node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row')\n      ) {\n        return NodeFilter.FILTER_REJECT;\n      }\n\n      // Skip this node but continue to children if one of the targets is inside the node.\n      for (let target of visibleNodes) {\n        if (nodeContains(node, target)) {\n          return NodeFilter.FILTER_SKIP;\n        }\n      }\n\n      return NodeFilter.FILTER_ACCEPT;\n    };\n\n    let walker = createShadowTreeWalker(\n      getOwnerDocument(root),\n      root,\n      NodeFilter.SHOW_ELEMENT,\n      {acceptNode}\n    );\n\n    // TreeWalker does not include the root.\n    let acceptRoot = acceptNode(root);\n    if (acceptRoot === NodeFilter.FILTER_ACCEPT) {\n      hide(root);\n    }\n\n    if (acceptRoot !== NodeFilter.FILTER_REJECT) {\n      let node = walker.nextNode() as Element;\n      while (node != null) {\n        hide(node);\n        node = walker.nextNode() as Element;\n      }\n    }\n  };\n\n  let hide = (node: Element) => {\n    let refCount = refCountMap.get(node) ?? 0;\n\n    // If already aria-hidden, and the ref count is zero, then this element\n    // was already hidden and there's nothing for us to do.\n    if (getHidden(node) && refCount === 0) {\n      return;\n    }\n\n    if (refCount === 0) {\n      setHidden(node, true);\n    }\n\n    hiddenNodes.add(node);\n    refCountMap.set(node, refCount + 1);\n  };\n\n  // If there is already a MutationObserver listening from a previous call,\n  // disconnect it so the new on takes over.\n  if (observerStack.length) {\n    observerStack[observerStack.length - 1].disconnect();\n  }\n\n  walk(root);\n\n  let observer = new MutationObserver(changes => {\n    for (let change of changes) {\n      if (change.type !== 'childList') {\n        continue;\n      }\n\n      // If the parent element of the added nodes is not within one of the targets,\n      // and not already inside a hidden node, hide all of the new children.\n      if (\n        change.target.isConnected &&\n        ![...visibleNodes, ...hiddenNodes].some((node) =>\n          nodeContains(node, change.target)\n        )\n      ) {\n        for (let node of change.addedNodes) {\n          if (\n            (node instanceof HTMLElement || node instanceof SVGElement) &&\n            (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')\n          ) {\n            visibleNodes.add(node);\n          } else if (node instanceof Element) {\n            walk(node);\n          }\n        }\n      }\n\n      if (shadowDOM()) {\n        // if any of the observed shadow roots were removed, stop observing them\n        for (let shadowRoot of shadowRootsToWatch) {\n          if (!shadowRoot.isConnected) {\n            observer.disconnect();\n            break;\n          }\n        }\n      }\n    }\n  });\n\n  observer.observe(root, {childList: true, subtree: true});\n  let shadowObservers = new Set<MutationObserver>();\n  if (shadowDOM()) {\n    for (let shadowRoot of shadowRootsToWatch) {\n      // Disconnect single target instead of all https://github.com/whatwg/dom/issues/126\n      let shadowObserver = new MutationObserver(changes => {\n        for (let change of changes) {\n          if (change.type !== 'childList') {\n            continue;\n          }\n\n          // If the parent element of the added nodes is not within one of the targets,\n          // and not already inside a hidden node, hide all of the new children.\n          if (\n            change.target.isConnected &&\n            ![...visibleNodes, ...hiddenNodes].some((node) =>\n              nodeContains(node, change.target)\n            )\n          ) {\n            for (let node of change.addedNodes) {\n              if (\n                (node instanceof HTMLElement || node instanceof SVGElement) &&\n                (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')\n              ) {\n                visibleNodes.add(node);\n              } else if (node instanceof Element) {\n                walk(node);\n              }\n            }\n          }\n\n          if (shadowDOM()) {\n            // if any of the observed shadow roots were removed, stop observing them\n            for (let shadowRoot of shadowRootsToWatch) {\n              if (!shadowRoot.isConnected) {\n                observer.disconnect();\n                break;\n              }\n            }\n          }\n        }\n      });\n      shadowObserver.observe(shadowRoot, {childList: true, subtree: true});\n      shadowObservers.add(shadowObserver);\n    }\n  }\n\n  let observerWrapper: ObserverWrapper = {\n    visibleNodes,\n    hiddenNodes,\n    observe() {\n      observer.observe(root, {childList: true, subtree: true});\n    },\n    disconnect() {\n      observer.disconnect();\n    }\n  };\n\n  observerStack.push(observerWrapper);\n\n  return (): void => {\n    observer.disconnect();\n    if (shadowDOM()) {\n      for (let shadowObserver of shadowObservers) {\n        shadowObserver.disconnect();\n      }\n    }\n\n    for (let node of hiddenNodes) {\n      let count = refCountMap.get(node);\n      if (count == null) {\n        continue;\n      }\n      if (count === 1) {\n        setHidden(node, false);\n        refCountMap.delete(node);\n      } else {\n        refCountMap.set(node, count - 1);\n      }\n    }\n\n    // Remove this observer from the stack, and start the previous one.\n    if (observerWrapper === observerStack[observerStack.length - 1]) {\n      observerStack.pop();\n      if (observerStack.length) {\n        observerStack[observerStack.length - 1].observe();\n      }\n    } else {\n      observerStack.splice(observerStack.indexOf(observerWrapper), 1);\n    }\n  };\n}\n\nexport function keepVisible(element: Element): (() => void) | undefined {\n  let observer = observerStack[observerStack.length - 1];\n  if (observer && !observer.visibleNodes.has(element)) {\n    observer.visibleNodes.add(element);\n    return () => {\n      observer.visibleNodes.delete(element);\n    };\n  }\n}\n"],"names":[],"version":3,"file":"ariaHideOutside.main.js.map"}

package/dist/ariaHideOutside.mjs

@@ -1,4 +1,5 @@
-import {getOwnerWindow as $fF94N$getOwnerWindow} from "@react-aria/utils";
+import {getOwnerWindow as $fF94N$getOwnerWindow, nodeContains as $fF94N$nodeContains, createShadowTreeWalker as $fF94N$createShadowTreeWalker, getOwnerDocument as $fF94N$getOwnerDocument} from "@react-aria/utils";
+import {shadowDOM as $fF94N$shadowDOM} from "@react-stately/flags";
 
 /*
  * Copyright 2020 Adobe. All rights reserved.
@@ -11,6 +12,7 @@ import {getOwnerWindow as $fF94N$getOwnerWindow} from "@react-aria/utils";
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 const $5e3802645cc19319$var$supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;
 // Keeps a ref count of all hidden elements. Added to when hiding an element, and
 // subtracted from when showing it again. When it reaches zero, aria-hidden is removed.
@@ -39,6 +41,17 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
             element.inert = false;
         }
     };
+    let shadowRootsToWatch = new Set();
+    if ((0, $fF94N$shadowDOM)()) // find all shadow roots that are ancestors of the targets
+    // traverse upwards until the root is reached
+    for (let target of targets){
+        let node = target;
+        while(node && node !== root){
+            let root = node.getRootNode();
+            if ('shadowRoot' in root) shadowRootsToWatch.add(root.shadowRoot);
+            node = root.parentNode;
+        }
+    }
     let walk = (root)=>{
         // Keep live announcer and top layer elements (e.g. toasts) visible.
         for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]'))visibleNodes.add(element);
@@ -50,11 +63,11 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
             if (hiddenNodes.has(node) || visibleNodes.has(node) || node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row') return NodeFilter.FILTER_REJECT;
             // Skip this node but continue to children if one of the targets is inside the node.
             for (let target of visibleNodes){
-                if (node.contains(target)) return NodeFilter.FILTER_SKIP;
+                if ((0, $fF94N$nodeContains)(node, target)) return NodeFilter.FILTER_SKIP;
             }
             return NodeFilter.FILTER_ACCEPT;
         };
-        let walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, {
+        let walker = (0, $fF94N$createShadowTreeWalker)((0, $fF94N$getOwnerDocument)(root), root, NodeFilter.SHOW_ELEMENT, {
             acceptNode: acceptNode
         });
         // TreeWalker does not include the root.
@@ -87,19 +100,56 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
             if (change.type !== 'childList') continue;
             // If the parent element of the added nodes is not within one of the targets,
             // and not already inside a hidden node, hide all of the new children.
-            if (![
+            if (change.target.isConnected && ![
                 ...visibleNodes,
                 ...hiddenNodes
-            ].some((node)=>node.contains(change.target))) for (let node of change.addedNodes){
+            ].some((node)=>(0, $fF94N$nodeContains)(node, change.target))) for (let node of change.addedNodes){
                 if ((node instanceof HTMLElement || node instanceof SVGElement) && (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')) visibleNodes.add(node);
                 else if (node instanceof Element) walk(node);
             }
+            if ((0, $fF94N$shadowDOM)()) {
+                // if any of the observed shadow roots were removed, stop observing them
+                for (let shadowRoot of shadowRootsToWatch)if (!shadowRoot.isConnected) {
+                    observer.disconnect();
+                    break;
+                }
+            }
         }
     });
     observer.observe(root, {
         childList: true,
         subtree: true
     });
+    let shadowObservers = new Set();
+    if ((0, $fF94N$shadowDOM)()) for (let shadowRoot of shadowRootsToWatch){
+        // Disconnect single target instead of all https://github.com/whatwg/dom/issues/126
+        let shadowObserver = new MutationObserver((changes)=>{
+            for (let change of changes){
+                if (change.type !== 'childList') continue;
+                // If the parent element of the added nodes is not within one of the targets,
+                // and not already inside a hidden node, hide all of the new children.
+                if (change.target.isConnected && ![
+                    ...visibleNodes,
+                    ...hiddenNodes
+                ].some((node)=>(0, $fF94N$nodeContains)(node, change.target))) for (let node of change.addedNodes){
+                    if ((node instanceof HTMLElement || node instanceof SVGElement) && (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')) visibleNodes.add(node);
+                    else if (node instanceof Element) walk(node);
+                }
+                if ((0, $fF94N$shadowDOM)()) {
+                    // if any of the observed shadow roots were removed, stop observing them
+                    for (let shadowRoot of shadowRootsToWatch)if (!shadowRoot.isConnected) {
+                        observer.disconnect();
+                        break;
+                    }
+                }
+            }
+        });
+        shadowObserver.observe(shadowRoot, {
+            childList: true,
+            subtree: true
+        });
+        shadowObservers.add(shadowObserver);
+    }
     let observerWrapper = {
         visibleNodes: visibleNodes,
         hiddenNodes: hiddenNodes,
@@ -116,6 +166,7 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
     $5e3802645cc19319$var$observerStack.push(observerWrapper);
     return ()=>{
         observer.disconnect();
+        if ((0, $fF94N$shadowDOM)()) for (let shadowObserver of shadowObservers)shadowObserver.disconnect();
         for (let node of hiddenNodes){
             let count = $5e3802645cc19319$var$refCountMap.get(node);
             if (count == null) continue;

package/dist/ariaHideOutside.module.js

@@ -1,4 +1,5 @@
-import {getOwnerWindow as $fF94N$getOwnerWindow} from "@react-aria/utils";
+import {getOwnerWindow as $fF94N$getOwnerWindow, nodeContains as $fF94N$nodeContains, createShadowTreeWalker as $fF94N$createShadowTreeWalker, getOwnerDocument as $fF94N$getOwnerDocument} from "@react-aria/utils";
+import {shadowDOM as $fF94N$shadowDOM} from "@react-stately/flags";
 
 /*
  * Copyright 2020 Adobe. All rights reserved.
@@ -11,6 +12,7 @@ import {getOwnerWindow as $fF94N$getOwnerWindow} from "@react-aria/utils";
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 const $5e3802645cc19319$var$supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;
 // Keeps a ref count of all hidden elements. Added to when hiding an element, and
 // subtracted from when showing it again. When it reaches zero, aria-hidden is removed.
@@ -39,6 +41,17 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
             element.inert = false;
         }
     };
+    let shadowRootsToWatch = new Set();
+    if ((0, $fF94N$shadowDOM)()) // find all shadow roots that are ancestors of the targets
+    // traverse upwards until the root is reached
+    for (let target of targets){
+        let node = target;
+        while(node && node !== root){
+            let root = node.getRootNode();
+            if ('shadowRoot' in root) shadowRootsToWatch.add(root.shadowRoot);
+            node = root.parentNode;
+        }
+    }
     let walk = (root)=>{
         // Keep live announcer and top layer elements (e.g. toasts) visible.
         for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]'))visibleNodes.add(element);
@@ -50,11 +63,11 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
             if (hiddenNodes.has(node) || visibleNodes.has(node) || node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row') return NodeFilter.FILTER_REJECT;
             // Skip this node but continue to children if one of the targets is inside the node.
             for (let target of visibleNodes){
-                if (node.contains(target)) return NodeFilter.FILTER_SKIP;
+                if ((0, $fF94N$nodeContains)(node, target)) return NodeFilter.FILTER_SKIP;
             }
             return NodeFilter.FILTER_ACCEPT;
         };
-        let walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, {
+        let walker = (0, $fF94N$createShadowTreeWalker)((0, $fF94N$getOwnerDocument)(root), root, NodeFilter.SHOW_ELEMENT, {
             acceptNode: acceptNode
         });
         // TreeWalker does not include the root.
@@ -87,19 +100,56 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
             if (change.type !== 'childList') continue;
             // If the parent element of the added nodes is not within one of the targets,
             // and not already inside a hidden node, hide all of the new children.
-            if (![
+            if (change.target.isConnected && ![
                 ...visibleNodes,
                 ...hiddenNodes
-            ].some((node)=>node.contains(change.target))) for (let node of change.addedNodes){
+            ].some((node)=>(0, $fF94N$nodeContains)(node, change.target))) for (let node of change.addedNodes){
                 if ((node instanceof HTMLElement || node instanceof SVGElement) && (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')) visibleNodes.add(node);
                 else if (node instanceof Element) walk(node);
             }
+            if ((0, $fF94N$shadowDOM)()) {
+                // if any of the observed shadow roots were removed, stop observing them
+                for (let shadowRoot of shadowRootsToWatch)if (!shadowRoot.isConnected) {
+                    observer.disconnect();
+                    break;
+                }
+            }
         }
     });
     observer.observe(root, {
         childList: true,
         subtree: true
     });
+    let shadowObservers = new Set();
+    if ((0, $fF94N$shadowDOM)()) for (let shadowRoot of shadowRootsToWatch){
+        // Disconnect single target instead of all https://github.com/whatwg/dom/issues/126
+        let shadowObserver = new MutationObserver((changes)=>{
+            for (let change of changes){
+                if (change.type !== 'childList') continue;
+                // If the parent element of the added nodes is not within one of the targets,
+                // and not already inside a hidden node, hide all of the new children.
+                if (change.target.isConnected && ![
+                    ...visibleNodes,
+                    ...hiddenNodes
+                ].some((node)=>(0, $fF94N$nodeContains)(node, change.target))) for (let node of change.addedNodes){
+                    if ((node instanceof HTMLElement || node instanceof SVGElement) && (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')) visibleNodes.add(node);
+                    else if (node instanceof Element) walk(node);
+                }
+                if ((0, $fF94N$shadowDOM)()) {
+                    // if any of the observed shadow roots were removed, stop observing them
+                    for (let shadowRoot of shadowRootsToWatch)if (!shadowRoot.isConnected) {
+                        observer.disconnect();
+                        break;
+                    }
+                }
+            }
+        });
+        shadowObserver.observe(shadowRoot, {
+            childList: true,
+            subtree: true
+        });
+        shadowObservers.add(shadowObserver);
+    }
     let observerWrapper = {
         visibleNodes: visibleNodes,
         hiddenNodes: hiddenNodes,
@@ -116,6 +166,7 @@ function $5e3802645cc19319$export$1c3ebcada18427bf(targets, options) {
     $5e3802645cc19319$var$observerStack.push(observerWrapper);
     return ()=>{
         observer.disconnect();
+        if ((0, $fF94N$shadowDOM)()) for (let shadowObserver of shadowObservers)shadowObserver.disconnect();
         for (let node of hiddenNodes){
             let count = $5e3802645cc19319$var$refCountMap.get(node);
             if (count == null) continue;

package/dist/ariaHideOutside.module.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-aria/overlays/src/ariaHideOutside.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {getOwnerWindow} from '@react-aria/utils';\nconst supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;\n\ninterface AriaHideOutsideOptions {\n  root?: Element,\n  shouldUseInert?: boolean\n}\n\n// Keeps a ref count of all hidden elements. Added to when hiding an element, and\n// subtracted from when showing it again. When it reaches zero, aria-hidden is removed.\nlet refCountMap = new WeakMap<Element, number>();\ninterface ObserverWrapper {\n  visibleNodes: Set<Element>,\n  hiddenNodes: Set<Element>,\n  observe: () => void,\n  disconnect: () => void\n}\nlet observerStack: Array<ObserverWrapper> = [];\n\n/**\n * Hides all elements in the DOM outside the given targets from screen readers using aria-hidden,\n * and returns a function to revert these changes. In addition, changes to the DOM are watched\n * and new elements outside the targets are automatically hidden.\n * @param targets - The elements that should remain visible.\n * @param root - Nothing will be hidden above this element.\n * @returns - A function to restore all hidden elements.\n */\nexport function ariaHideOutside(targets: Element[], options?: AriaHideOutsideOptions | Element) {\n  let windowObj = getOwnerWindow(targets?.[0]);\n  let opts = options instanceof windowObj.Element ? {root: options} : options;\n  let root = opts?.root ?? document.body;\n  let shouldUseInert = opts?.shouldUseInert && supportsInert;\n  let visibleNodes = new Set<Element>(targets);\n  let hiddenNodes = new Set<Element>();\n\n  let getHidden = (element: Element) => {\n    return shouldUseInert && element instanceof windowObj.HTMLElement ? element.inert : element.getAttribute('aria-hidden') === 'true';\n  };\n\n  let setHidden = (element: Element, hidden: boolean) => {\n    if (shouldUseInert && element instanceof windowObj.HTMLElement) {\n      element.inert = hidden;\n    } else if (hidden) {\n      element.setAttribute('aria-hidden', 'true');\n    } else {\n      element.removeAttribute('aria-hidden');\n      if (element instanceof windowObj.HTMLElement) {\n        // We only ever call setHidden with hidden = false when the nodeCount is 1 aka\n        // we are trying to make the element visible to screen readers again, so remove inert as well\n        element.inert = false;\n      }\n    }\n  };\n\n  let walk = (root: Element) => {\n    // Keep live announcer and top layer elements (e.g. toasts) visible.\n    for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]')) {\n      visibleNodes.add(element);\n    }\n\n    let acceptNode = (node: Element) => {\n      // Skip this node and its children if it is one of the target nodes, or a live announcer.\n      // Also skip children of already hidden nodes, as aria-hidden is recursive. An exception is\n      // made for elements with role=\"row\" since VoiceOver on iOS has issues hiding elements with role=\"row\".\n      // For that case we want to hide the cells inside as well (https://bugs.webkit.org/show_bug.cgi?id=222623).\n      if (\n        hiddenNodes.has(node) ||\n        visibleNodes.has(node) ||\n        (node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row')\n      ) {\n        return NodeFilter.FILTER_REJECT;\n      }\n\n      // Skip this node but continue to children if one of the targets is inside the node.\n      for (let target of visibleNodes) {\n        if (node.contains(target)) {\n          return NodeFilter.FILTER_SKIP;\n        }\n      }\n\n      return NodeFilter.FILTER_ACCEPT;\n    };\n\n    let walker = document.createTreeWalker(\n      root,\n      NodeFilter.SHOW_ELEMENT,\n      {acceptNode}\n    );\n\n    // TreeWalker does not include the root.\n    let acceptRoot = acceptNode(root);\n    if (acceptRoot === NodeFilter.FILTER_ACCEPT) {\n      hide(root);\n    }\n\n    if (acceptRoot !== NodeFilter.FILTER_REJECT) {\n      let node = walker.nextNode() as Element;\n      while (node != null) {\n        hide(node);\n        node = walker.nextNode() as Element;\n      }\n    }\n  };\n\n  let hide = (node: Element) => {\n    let refCount = refCountMap.get(node) ?? 0;\n\n    // If already aria-hidden, and the ref count is zero, then this element\n    // was already hidden and there's nothing for us to do.\n    if (getHidden(node) && refCount === 0) {\n      return;\n    }\n\n    if (refCount === 0) {\n      setHidden(node, true);\n    }\n\n    hiddenNodes.add(node);\n    refCountMap.set(node, refCount + 1);\n  };\n\n  // If there is already a MutationObserver listening from a previous call,\n  // disconnect it so the new on takes over.\n  if (observerStack.length) {\n    observerStack[observerStack.length - 1].disconnect();\n  }\n\n  walk(root);\n\n  let observer = new MutationObserver(changes => {\n    for (let change of changes) {\n      if (change.type !== 'childList') {\n        continue;\n      }\n\n      // If the parent element of the added nodes is not within one of the targets,\n      // and not already inside a hidden node, hide all of the new children.\n      if (![...visibleNodes, ...hiddenNodes].some(node => node.contains(change.target))) {\n        for (let node of change.addedNodes) {\n          if (\n            (node instanceof HTMLElement || node instanceof SVGElement) &&\n            (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')\n          ) {\n            visibleNodes.add(node);\n          } else if (node instanceof Element) {\n            walk(node);\n          }\n        }\n      }\n    }\n  });\n\n  observer.observe(root, {childList: true, subtree: true});\n\n  let observerWrapper: ObserverWrapper = {\n    visibleNodes,\n    hiddenNodes,\n    observe() {\n      observer.observe(root, {childList: true, subtree: true});\n    },\n    disconnect() {\n      observer.disconnect();\n    }\n  };\n\n  observerStack.push(observerWrapper);\n\n  return (): void => {\n    observer.disconnect();\n\n    for (let node of hiddenNodes) {\n      let count = refCountMap.get(node);\n      if (count == null) {\n        continue;\n      }\n      if (count === 1) {\n        setHidden(node, false);\n        refCountMap.delete(node);\n      } else {\n        refCountMap.set(node, count - 1);\n      }\n    }\n\n    // Remove this observer from the stack, and start the previous one.\n    if (observerWrapper === observerStack[observerStack.length - 1]) {\n      observerStack.pop();\n      if (observerStack.length) {\n        observerStack[observerStack.length - 1].observe();\n      }\n    } else {\n      observerStack.splice(observerStack.indexOf(observerWrapper), 1);\n    }\n  };\n}\n\nexport function keepVisible(element: Element): (() => void) | undefined {\n  let observer = observerStack[observerStack.length - 1];\n  if (observer && !observer.visibleNodes.has(element)) {\n    observer.visibleNodes.add(element);\n    return () => {\n      observer.visibleNodes.delete(element);\n    };\n  }\n}\n"],"names":[],"version":3,"file":"ariaHideOutside.module.js.map"}
+{"mappings":";;;AAAA;;;;;;;;;;CAUC;;AAKD,MAAM,sCAAgB,OAAO,gBAAgB,eAAe,WAAW,YAAY,SAAS;AAO5F,iFAAiF;AACjF,uFAAuF;AACvF,IAAI,oCAAc,IAAI;AAOtB,IAAI,sCAAwC,EAAE;AAUvC,SAAS,0CAAgB,OAAkB,EAAE,OAA0C;IAC5F,IAAI,YAAY,CAAA,GAAA,qBAAa,EAAE,oBAAA,8BAAA,OAAS,CAAC,EAAE;IAC3C,IAAI,OAAO,mBAAmB,UAAU,OAAO,GAAG;QAAC,MAAM;IAAO,IAAI;QACzD;IAAX,IAAI,OAAO,CAAA,aAAA,iBAAA,2BAAA,KAAM,IAAI,cAAV,wBAAA,aAAc,SAAS,IAAI;IACtC,IAAI,iBAAiB,CAAA,iBAAA,2BAAA,KAAM,cAAc,KAAI;IAC7C,IAAI,eAAe,IAAI,IAAa;IACpC,IAAI,cAAc,IAAI;IAEtB,IAAI,YAAY,CAAC;QACf,OAAO,kBAAkB,mBAAmB,UAAU,WAAW,GAAG,QAAQ,KAAK,GAAG,QAAQ,YAAY,CAAC,mBAAmB;IAC9H;IAEA,IAAI,YAAY,CAAC,SAAkB;QACjC,IAAI,kBAAkB,mBAAmB,UAAU,WAAW,EAC5D,QAAQ,KAAK,GAAG;aACX,IAAI,QACT,QAAQ,YAAY,CAAC,eAAe;aAC/B;YACL,QAAQ,eAAe,CAAC;YACxB,IAAI,mBAAmB,UAAU,WAAW,EAC1C,8EAA8E;YAC9E,6FAA6F;YAC7F,QAAQ,KAAK,GAAG;QAEpB;IACF;IAEA,IAAI,qBAAqB,IAAI;IAC7B,IAAI,CAAA,GAAA,gBAAQ,KACV,0DAA0D;IAC1D,6CAA6C;IAC7C,KAAK,IAAI,UAAU,QAAS;QAC1B,IAAI,OAAO;QACX,MAAO,QAAQ,SAAS,KAAM;YAC5B,IAAI,OAAO,KAAK,WAAW;YAC3B,IAAI,gBAAgB,MAClB,mBAAmB,GAAG,CAAC,KAAK,UAAU;YAExC,OAAO,KAAK,UAAU;QACxB;IACF;IAGF,IAAI,OAAO,CAAC;QACV,oEAAoE;QACpE,KAAK,IAAI,WAAW,KAAK,gBAAgB,CAAC,sDACxC,aAAa,GAAG,CAAC;QAGnB,IAAI,aAAa,CAAC;YAChB,yFAAyF;YACzF,2FAA2F;YAC3F,uGAAuG;YACvG,2GAA2G;YAC3G,IACE,YAAY,GAAG,CAAC,SAChB,aAAa,GAAG,CAAC,SAChB,KAAK,aAAa,IAAI,YAAY,GAAG,CAAC,KAAK,aAAa,KAAK,KAAK,aAAa,CAAC,YAAY,CAAC,YAAY,OAE1G,OAAO,WAAW,aAAa;YAGjC,oFAAoF;YACpF,KAAK,IAAI,UAAU,aAAc;gBAC/B,IAAI,CAAA,GAAA,mBAAW,EAAE,MAAM,SACrB,OAAO,WAAW,WAAW;YAEjC;YAEA,OAAO,WAAW,aAAa;QACjC;QAEA,IAAI,SAAS,CAAA,GAAA,6BAAqB,EAChC,CAAA,GAAA,uBAAe,EAAE,OACjB,MACA,WAAW,YAAY,EACvB;wBAAC;QAAU;QAGb,wCAAwC;QACxC,IAAI,aAAa,WAAW;QAC5B,IAAI,eAAe,WAAW,aAAa,EACzC,KAAK;QAGP,IAAI,eAAe,WAAW,aAAa,EAAE;YAC3C,IAAI,OAAO,OAAO,QAAQ;YAC1B,MAAO,QAAQ,KAAM;gBACnB,KAAK;gBACL,OAAO,OAAO,QAAQ;YACxB;QACF;IACF;IAEA,IAAI,OAAO,CAAC;YACK;QAAf,IAAI,WAAW,CAAA,mBAAA,kCAAY,GAAG,CAAC,mBAAhB,8BAAA,mBAAyB;QAExC,uEAAuE;QACvE,uDAAuD;QACvD,IAAI,UAAU,SAAS,aAAa,GAClC;QAGF,IAAI,aAAa,GACf,UAAU,MAAM;QAGlB,YAAY,GAAG,CAAC;QAChB,kCAAY,GAAG,CAAC,MAAM,WAAW;IACnC;IAEA,yEAAyE;IACzE,0CAA0C;IAC1C,IAAI,oCAAc,MAAM,EACtB,mCAAa,CAAC,oCAAc,MAAM,GAAG,EAAE,CAAC,UAAU;IAGpD,KAAK;IAEL,IAAI,WAAW,IAAI,iBAAiB,CAAA;QAClC,KAAK,IAAI,UAAU,QAAS;YAC1B,IAAI,OAAO,IAAI,KAAK,aAClB;YAGF,6EAA6E;YAC7E,sEAAsE;YACtE,IACE,OAAO,MAAM,CAAC,WAAW,IACzB,CAAC;mBAAI;mBAAiB;aAAY,CAAC,IAAI,CAAC,CAAC,OACvC,CAAA,GAAA,mBAAW,EAAE,MAAM,OAAO,MAAM,IAGlC,KAAK,IAAI,QAAQ,OAAO,UAAU,CAAE;gBAClC,IACE,AAAC,CAAA,gBAAgB,eAAe,gBAAgB,UAAS,KACxD,CAAA,KAAK,OAAO,CAAC,aAAa,KAAK,UAAU,KAAK,OAAO,CAAC,iBAAiB,KAAK,MAAK,GAElF,aAAa,GAAG,CAAC;qBACZ,IAAI,gBAAgB,SACzB,KAAK;YAET;YAGF,IAAI,CAAA,GAAA,gBAAQ,KAAK;gBACf,wEAAwE;gBACxE,KAAK,IAAI,cAAc,mBACrB,IAAI,CAAC,WAAW,WAAW,EAAE;oBAC3B,SAAS,UAAU;oBACnB;gBACF;YAEJ;QACF;IACF;IAEA,SAAS,OAAO,CAAC,MAAM;QAAC,WAAW;QAAM,SAAS;IAAI;IACtD,IAAI,kBAAkB,IAAI;IAC1B,IAAI,CAAA,GAAA,gBAAQ,KACV,KAAK,IAAI,cAAc,mBAAoB;QACzC,mFAAmF;QACnF,IAAI,iBAAiB,IAAI,iBAAiB,CAAA;YACxC,KAAK,IAAI,UAAU,QAAS;gBAC1B,IAAI,OAAO,IAAI,KAAK,aAClB;gBAGF,6EAA6E;gBAC7E,sEAAsE;gBACtE,IACE,OAAO,MAAM,CAAC,WAAW,IACzB,CAAC;uBAAI;uBAAiB;iBAAY,CAAC,IAAI,CAAC,CAAC,OACvC,CAAA,GAAA,mBAAW,EAAE,MAAM,OAAO,MAAM,IAGlC,KAAK,IAAI,QAAQ,OAAO,UAAU,CAAE;oBAClC,IACE,AAAC,CAAA,gBAAgB,eAAe,gBAAgB,UAAS,KACxD,CAAA,KAAK,OAAO,CAAC,aAAa,KAAK,UAAU,KAAK,OAAO,CAAC,iBAAiB,KAAK,MAAK,GAElF,aAAa,GAAG,CAAC;yBACZ,IAAI,gBAAgB,SACzB,KAAK;gBAET;gBAGF,IAAI,CAAA,GAAA,gBAAQ,KAAK;oBACf,wEAAwE;oBACxE,KAAK,IAAI,cAAc,mBACrB,IAAI,CAAC,WAAW,WAAW,EAAE;wBAC3B,SAAS,UAAU;wBACnB;oBACF;gBAEJ;YACF;QACF;QACA,eAAe,OAAO,CAAC,YAAY;YAAC,WAAW;YAAM,SAAS;QAAI;QAClE,gBAAgB,GAAG,CAAC;IACtB;IAGF,IAAI,kBAAmC;sBACrC;qBACA;QACA;YACE,SAAS,OAAO,CAAC,MAAM;gBAAC,WAAW;gBAAM,SAAS;YAAI;QACxD;QACA;YACE,SAAS,UAAU;QACrB;IACF;IAEA,oCAAc,IAAI,CAAC;IAEnB,OAAO;QACL,SAAS,UAAU;QACnB,IAAI,CAAA,GAAA,gBAAQ,KACV,KAAK,IAAI,kBAAkB,gBACzB,eAAe,UAAU;QAI7B,KAAK,IAAI,QAAQ,YAAa;YAC5B,IAAI,QAAQ,kCAAY,GAAG,CAAC;YAC5B,IAAI,SAAS,MACX;YAEF,IAAI,UAAU,GAAG;gBACf,UAAU,MAAM;gBAChB,kCAAY,MAAM,CAAC;YACrB,OACE,kCAAY,GAAG,CAAC,MAAM,QAAQ;QAElC;QAEA,mEAAmE;QACnE,IAAI,oBAAoB,mCAAa,CAAC,oCAAc,MAAM,GAAG,EAAE,EAAE;YAC/D,oCAAc,GAAG;YACjB,IAAI,oCAAc,MAAM,EACtB,mCAAa,CAAC,oCAAc,MAAM,GAAG,EAAE,CAAC,OAAO;QAEnD,OACE,oCAAc,MAAM,CAAC,oCAAc,OAAO,CAAC,kBAAkB;IAEjE;AACF;AAEO,SAAS,0CAAY,OAAgB;IAC1C,IAAI,WAAW,mCAAa,CAAC,oCAAc,MAAM,GAAG,EAAE;IACtD,IAAI,YAAY,CAAC,SAAS,YAAY,CAAC,GAAG,CAAC,UAAU;QACnD,SAAS,YAAY,CAAC,GAAG,CAAC;QAC1B,OAAO;YACL,SAAS,YAAY,CAAC,MAAM,CAAC;QAC/B;IACF;AACF","sources":["packages/@react-aria/overlays/src/ariaHideOutside.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {createShadowTreeWalker, getOwnerDocument, getOwnerWindow, nodeContains} from '@react-aria/utils';\nimport {shadowDOM} from '@react-stately/flags';\n\nconst supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;\n\ninterface AriaHideOutsideOptions {\n  root?: Element,\n  shouldUseInert?: boolean\n}\n\n// Keeps a ref count of all hidden elements. Added to when hiding an element, and\n// subtracted from when showing it again. When it reaches zero, aria-hidden is removed.\nlet refCountMap = new WeakMap<Element, number>();\ninterface ObserverWrapper {\n  visibleNodes: Set<Element>,\n  hiddenNodes: Set<Element>,\n  observe: () => void,\n  disconnect: () => void\n}\nlet observerStack: Array<ObserverWrapper> = [];\n\n/**\n * Hides all elements in the DOM outside the given targets from screen readers using aria-hidden,\n * and returns a function to revert these changes. In addition, changes to the DOM are watched\n * and new elements outside the targets are automatically hidden.\n * @param targets - The elements that should remain visible.\n * @param root - Nothing will be hidden above this element.\n * @returns - A function to restore all hidden elements.\n */\nexport function ariaHideOutside(targets: Element[], options?: AriaHideOutsideOptions | Element) {\n  let windowObj = getOwnerWindow(targets?.[0]);\n  let opts = options instanceof windowObj.Element ? {root: options} : options;\n  let root = opts?.root ?? document.body;\n  let shouldUseInert = opts?.shouldUseInert && supportsInert;\n  let visibleNodes = new Set<Element>(targets);\n  let hiddenNodes = new Set<Element>();\n\n  let getHidden = (element: Element) => {\n    return shouldUseInert && element instanceof windowObj.HTMLElement ? element.inert : element.getAttribute('aria-hidden') === 'true';\n  };\n\n  let setHidden = (element: Element, hidden: boolean) => {\n    if (shouldUseInert && element instanceof windowObj.HTMLElement) {\n      element.inert = hidden;\n    } else if (hidden) {\n      element.setAttribute('aria-hidden', 'true');\n    } else {\n      element.removeAttribute('aria-hidden');\n      if (element instanceof windowObj.HTMLElement) {\n        // We only ever call setHidden with hidden = false when the nodeCount is 1 aka\n        // we are trying to make the element visible to screen readers again, so remove inert as well\n        element.inert = false;\n      }\n    }\n  };\n\n  let shadowRootsToWatch = new Set<ShadowRoot>();\n  if (shadowDOM()) {\n    // find all shadow roots that are ancestors of the targets\n    // traverse upwards until the root is reached\n    for (let target of targets) {\n      let node = target;\n      while (node && node !== root) {\n        let root = node.getRootNode();\n        if ('shadowRoot' in root) {\n          shadowRootsToWatch.add(root.shadowRoot as ShadowRoot);\n        }\n        node = root.parentNode as Element;\n      }\n    }\n  }\n\n  let walk = (root: Element) => {\n    // Keep live announcer and top layer elements (e.g. toasts) visible.\n    for (let element of root.querySelectorAll('[data-live-announcer], [data-react-aria-top-layer]')) {\n      visibleNodes.add(element);\n    }\n\n    let acceptNode = (node: Element) => {\n      // Skip this node and its children if it is one of the target nodes, or a live announcer.\n      // Also skip children of already hidden nodes, as aria-hidden is recursive. An exception is\n      // made for elements with role=\"row\" since VoiceOver on iOS has issues hiding elements with role=\"row\".\n      // For that case we want to hide the cells inside as well (https://bugs.webkit.org/show_bug.cgi?id=222623).\n      if (\n        hiddenNodes.has(node) ||\n        visibleNodes.has(node) ||\n        (node.parentElement && hiddenNodes.has(node.parentElement) && node.parentElement.getAttribute('role') !== 'row')\n      ) {\n        return NodeFilter.FILTER_REJECT;\n      }\n\n      // Skip this node but continue to children if one of the targets is inside the node.\n      for (let target of visibleNodes) {\n        if (nodeContains(node, target)) {\n          return NodeFilter.FILTER_SKIP;\n        }\n      }\n\n      return NodeFilter.FILTER_ACCEPT;\n    };\n\n    let walker = createShadowTreeWalker(\n      getOwnerDocument(root),\n      root,\n      NodeFilter.SHOW_ELEMENT,\n      {acceptNode}\n    );\n\n    // TreeWalker does not include the root.\n    let acceptRoot = acceptNode(root);\n    if (acceptRoot === NodeFilter.FILTER_ACCEPT) {\n      hide(root);\n    }\n\n    if (acceptRoot !== NodeFilter.FILTER_REJECT) {\n      let node = walker.nextNode() as Element;\n      while (node != null) {\n        hide(node);\n        node = walker.nextNode() as Element;\n      }\n    }\n  };\n\n  let hide = (node: Element) => {\n    let refCount = refCountMap.get(node) ?? 0;\n\n    // If already aria-hidden, and the ref count is zero, then this element\n    // was already hidden and there's nothing for us to do.\n    if (getHidden(node) && refCount === 0) {\n      return;\n    }\n\n    if (refCount === 0) {\n      setHidden(node, true);\n    }\n\n    hiddenNodes.add(node);\n    refCountMap.set(node, refCount + 1);\n  };\n\n  // If there is already a MutationObserver listening from a previous call,\n  // disconnect it so the new on takes over.\n  if (observerStack.length) {\n    observerStack[observerStack.length - 1].disconnect();\n  }\n\n  walk(root);\n\n  let observer = new MutationObserver(changes => {\n    for (let change of changes) {\n      if (change.type !== 'childList') {\n        continue;\n      }\n\n      // If the parent element of the added nodes is not within one of the targets,\n      // and not already inside a hidden node, hide all of the new children.\n      if (\n        change.target.isConnected &&\n        ![...visibleNodes, ...hiddenNodes].some((node) =>\n          nodeContains(node, change.target)\n        )\n      ) {\n        for (let node of change.addedNodes) {\n          if (\n            (node instanceof HTMLElement || node instanceof SVGElement) &&\n            (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')\n          ) {\n            visibleNodes.add(node);\n          } else if (node instanceof Element) {\n            walk(node);\n          }\n        }\n      }\n\n      if (shadowDOM()) {\n        // if any of the observed shadow roots were removed, stop observing them\n        for (let shadowRoot of shadowRootsToWatch) {\n          if (!shadowRoot.isConnected) {\n            observer.disconnect();\n            break;\n          }\n        }\n      }\n    }\n  });\n\n  observer.observe(root, {childList: true, subtree: true});\n  let shadowObservers = new Set<MutationObserver>();\n  if (shadowDOM()) {\n    for (let shadowRoot of shadowRootsToWatch) {\n      // Disconnect single target instead of all https://github.com/whatwg/dom/issues/126\n      let shadowObserver = new MutationObserver(changes => {\n        for (let change of changes) {\n          if (change.type !== 'childList') {\n            continue;\n          }\n\n          // If the parent element of the added nodes is not within one of the targets,\n          // and not already inside a hidden node, hide all of the new children.\n          if (\n            change.target.isConnected &&\n            ![...visibleNodes, ...hiddenNodes].some((node) =>\n              nodeContains(node, change.target)\n            )\n          ) {\n            for (let node of change.addedNodes) {\n              if (\n                (node instanceof HTMLElement || node instanceof SVGElement) &&\n                (node.dataset.liveAnnouncer === 'true' || node.dataset.reactAriaTopLayer === 'true')\n              ) {\n                visibleNodes.add(node);\n              } else if (node instanceof Element) {\n                walk(node);\n              }\n            }\n          }\n\n          if (shadowDOM()) {\n            // if any of the observed shadow roots were removed, stop observing them\n            for (let shadowRoot of shadowRootsToWatch) {\n              if (!shadowRoot.isConnected) {\n                observer.disconnect();\n                break;\n              }\n            }\n          }\n        }\n      });\n      shadowObserver.observe(shadowRoot, {childList: true, subtree: true});\n      shadowObservers.add(shadowObserver);\n    }\n  }\n\n  let observerWrapper: ObserverWrapper = {\n    visibleNodes,\n    hiddenNodes,\n    observe() {\n      observer.observe(root, {childList: true, subtree: true});\n    },\n    disconnect() {\n      observer.disconnect();\n    }\n  };\n\n  observerStack.push(observerWrapper);\n\n  return (): void => {\n    observer.disconnect();\n    if (shadowDOM()) {\n      for (let shadowObserver of shadowObservers) {\n        shadowObserver.disconnect();\n      }\n    }\n\n    for (let node of hiddenNodes) {\n      let count = refCountMap.get(node);\n      if (count == null) {\n        continue;\n      }\n      if (count === 1) {\n        setHidden(node, false);\n        refCountMap.delete(node);\n      } else {\n        refCountMap.set(node, count - 1);\n      }\n    }\n\n    // Remove this observer from the stack, and start the previous one.\n    if (observerWrapper === observerStack[observerStack.length - 1]) {\n      observerStack.pop();\n      if (observerStack.length) {\n        observerStack[observerStack.length - 1].observe();\n      }\n    } else {\n      observerStack.splice(observerStack.indexOf(observerWrapper), 1);\n    }\n  };\n}\n\nexport function keepVisible(element: Element): (() => void) | undefined {\n  let observer = observerStack[observerStack.length - 1];\n  if (observer && !observer.visibleNodes.has(element)) {\n    observer.visibleNodes.add(element);\n    return () => {\n      observer.visibleNodes.delete(element);\n    };\n  }\n}\n"],"names":[],"version":3,"file":"ariaHideOutside.module.js.map"}

package/dist/calculatePosition.main.js

@@ -333,11 +333,35 @@ function $5935ba4d7da2c103$export$b3ceb0cbf1056d98(opts) {
     // Otherwise this returns the height/width of a arbitrary boundary element, and its top/left with respect to the viewport (NOTE THIS MEANS IT DOESNT INCLUDE SCROLL)
     let boundaryDimensions = $5935ba4d7da2c103$var$getContainerDimensions(boundaryElement, visualViewport);
     let containerDimensions = $5935ba4d7da2c103$var$getContainerDimensions(container, visualViewport);
-    // If the container is the HTML element wrapping the body element, the retrieved scrollTop/scrollLeft will be equal to the
-    // body element's scroll. Set the container's scroll values to 0 since the overlay's edge position value in getDelta don't then need to be further offset
-    // by the container scroll since they are essentially the same containing element and thus in the same coordinate system
-    let containerOffsetWithBoundary = $5935ba4d7da2c103$var$getPosition(boundaryElement, container, false);
-    let isContainerDescendentOfBoundary = boundaryElement.contains(container);
+    // There are several difference cases of how to calculate the containerOffsetWithBoundary:
+    // - boundaryElement is body or HTML and the container is an arbitrary element in the boundary (aka submenu with parent menu as container in v3)
+    // - boundaryElement and container are both body or HTML element (aka standard popover case)
+    // - boundaryElement is customized by the user. Container can also be arbitrary (either body/HTML or some other element)
+    // containerOffsetWithBoundary should always return a value that is the boundary's coordinate offset with respect to the container coord system (container is 0, 0)
+    let containerOffsetWithBoundary;
+    if ((boundaryElement.tagName === 'BODY' || boundaryElement.tagName === 'HTML') && !isViewportContainer) {
+        // Use getRect instead of getOffset because boundaryDimensions for BODY/HTML is in viewport coordinate space,
+        // not document coordinate space
+        let containerRect = $5935ba4d7da2c103$export$4b834cebd9e5cebe(container, false);
+        // the offset should be negative because if container is at viewport position x,y, then viewport top (aka 0)
+        // is at position -x,y in container-relative coordinates
+        containerOffsetWithBoundary = {
+            top: -(containerRect.top - boundaryDimensions.top),
+            left: -(containerRect.left - boundaryDimensions.left),
+            width: 0,
+            height: 0
+        };
+    } else if ((boundaryElement.tagName === 'BODY' || boundaryElement.tagName === 'HTML') && isViewportContainer) // both are the same viewport container, no offset needed
+    containerOffsetWithBoundary = {
+        top: 0,
+        left: 0,
+        width: 0,
+        height: 0
+    };
+    else // This returns the boundary's coordinate with respect to the container. This case captures cases such as when you provide a custom boundary
+    // like in ScrollingBoundaryContainerExample in Popover.stories.
+    containerOffsetWithBoundary = $5935ba4d7da2c103$var$getPosition(boundaryElement, container, false);
+    let isContainerDescendentOfBoundary = (0, $6E71I$reactariautils.nodeContains)(boundaryElement, container);
     return $5935ba4d7da2c103$export$6839422d1f33cee9(placement, childOffset, overlaySize, scrollSize, margins, padding, shouldFlip, boundaryDimensions, containerDimensions, containerOffsetWithBoundary, offset, crossOffset, isContainerPositioned, maxHeight, arrowSize, arrowBoundaryOffset, isContainerDescendentOfBoundary, visualViewport);
 }
 function $5935ba4d7da2c103$export$4b834cebd9e5cebe(node, ignoreScale) {