@underverse-ui/underverse 1.0.31 → 1.0.32

package/api-reference.json

@@ -1,6 +1,6 @@
 {
   "package": "@underverse-ui/underverse",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "sourceEntry": "src/index.ts",
   "totalExports": 206,
   "exports": [

package/dist/index.cjs

@@ -107,7 +107,7 @@ __export(index_exports, {
   NotificationModal: () => NotificationModal_default,
   NumberInput: () => NumberInput,
   OverlayControls: () => OverlayControls,
-  OverlayScrollbarProvider: () => OverlayScrollbarProvider,
+  OverlayScrollbarProvider: () => OverlayScrollbarProvider_default,
   PageLoading: () => PageLoading,
   Pagination: () => Pagination,
   PasswordInput: () => PasswordInput,
@@ -19018,16 +19018,14 @@ var LoadingBar = ({
 // ../../components/ui/OverlayScrollbarProvider.tsx
 var import_react33 = require("react");
 var import_overlayscrollbars = require("overlayscrollbars");
-var EXPLICIT_SCROLLABLE_SELECTOR = [".thin-scrollbar", ".scrollbar-thin", ".custom-scrollbar", "[data-os-scrollbar]"].join(", ");
-var GENERIC_SCROLLABLE_SELECTOR = [
-  ".overflow-auto",
-  ".overflow-x-auto",
-  ".overflow-y-auto",
-  ".overflow-scroll",
-  ".overflow-x-scroll",
-  ".overflow-y-scroll"
+var EXPLICIT_SELECTOR = [".thin-scrollbar", ".scrollbar-thin", ".custom-scrollbar", "[data-os-scrollbar]"].join(", ");
+var PORTAL_EXCLUDE_SELECTOR = [
+  "[data-radix-portal]",
+  "[role='dialog']",
+  "[aria-modal='true']",
+  "[data-sonner-toaster]"
 ].join(", ");
-var SCROLLBAR_OPTIONS = {
+var OPTIONS = {
   scrollbars: {
     theme: "os-theme-underverse",
     visibility: "auto",
@@ -19037,42 +19035,27 @@ var SCROLLBAR_OPTIONS = {
     clickScroll: false
   }
 };
+function shouldSkip(element) {
+  if (element === document.body || element === document.documentElement) return true;
+  if (element.hasAttribute("data-os-ignore")) return true;
+  if (element.hasAttribute("data-overlayscrollbars")) return true;
+  if (element.closest(PORTAL_EXCLUDE_SELECTOR)) return true;
+  return false;
+}
 function OverlayScrollbarProvider() {
   (0, import_react33.useEffect)(() => {
-    const bodyInstance = (0, import_overlayscrollbars.OverlayScrollbars)(document.body, SCROLLBAR_OPTIONS);
     const instances = /* @__PURE__ */ new Map();
-    const shouldSkip = (element) => {
-      if (element === document.body) return true;
-      if (element.hasAttribute("data-os-ignore")) return true;
-      if (element.hasAttribute("data-overlayscrollbars")) return true;
-      return false;
-    };
-    const initElement = (element) => {
+    let rafId = 0;
+    const init = (element) => {
       if (shouldSkip(element)) return;
       if (instances.has(element)) return;
-      instances.set(element, (0, import_overlayscrollbars.OverlayScrollbars)(element, SCROLLBAR_OPTIONS));
-    };
-    const collectCandidates = (root, selector) => {
-      const candidates = [];
-      if (root instanceof HTMLElement && root.matches(selector)) {
-        candidates.push(root);
-      }
-      if ("querySelectorAll" in root) {
-        root.querySelectorAll(selector).forEach((element) => {
-          candidates.push(element);
-        });
-      }
-      return candidates.filter((element, index) => candidates.indexOf(element) === index);
+      instances.set(element, (0, import_overlayscrollbars.OverlayScrollbars)(element, OPTIONS));
     };
     const scan = (root) => {
-      const explicitCandidates = collectCandidates(root, EXPLICIT_SCROLLABLE_SELECTOR).filter((element) => !shouldSkip(element));
-      explicitCandidates.forEach(initElement);
-      const genericCandidates = collectCandidates(root, GENERIC_SCROLLABLE_SELECTOR).filter((element) => !shouldSkip(element));
-      const filteredGeneric = genericCandidates.filter(
-        (element) => !explicitCandidates.some((explicit) => explicit === element || explicit.contains(element) || element.contains(explicit))
-      );
-      const leafGeneric = filteredGeneric.filter((element) => !filteredGeneric.some((other) => other !== element && element.contains(other)));
-      leafGeneric.forEach(initElement);
+      if (root instanceof HTMLElement && root.matches(EXPLICIT_SELECTOR)) {
+        init(root);
+      }
+      root.querySelectorAll(EXPLICIT_SELECTOR).forEach(init);
     };
     const cleanup = () => {
       instances.forEach((instance, element) => {
@@ -19083,14 +19066,13 @@ function OverlayScrollbarProvider() {
       });
     };
     scan(document.body);
-    let rafId = 0;
     const observer = new MutationObserver((mutations) => {
       if (rafId) return;
-      rafId = window.requestAnimationFrame(() => {
+      rafId = requestAnimationFrame(() => {
         rafId = 0;
         const scanRoots = /* @__PURE__ */ new Set();
         mutations.forEach((mutation) => {
-          if (mutation.target instanceof Element || mutation.target instanceof Document || mutation.target instanceof DocumentFragment) {
+          if (mutation.target instanceof HTMLElement || mutation.target instanceof Document || mutation.target instanceof DocumentFragment) {
             scanRoots.add(mutation.target);
           }
           mutation.addedNodes.forEach((node) => {
@@ -19103,16 +19085,17 @@ function OverlayScrollbarProvider() {
         cleanup();
       });
     });
-    observer.observe(document.body, { childList: true, subtree: true });
+    observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ["class"] });
     return () => {
-      if (rafId) window.cancelAnimationFrame(rafId);
+      if (rafId) cancelAnimationFrame(rafId);
       observer.disconnect();
       instances.forEach((instance) => instance.destroy());
-      bodyInstance.destroy();
+      instances.clear();
     };
   }, []);
   return null;
 }
+var OverlayScrollbarProvider_default = OverlayScrollbarProvider;
 
 // ../../components/ui/Table.tsx
 var import_react34 = __toESM(require("react"), 1);