@choice-ui/react 1.9.4 → 1.9.7

package/dist/components/scroll-area/dist/index.js

@@ -1,15 +1,29 @@
 import { forwardRef, useState, useId, useMemo, createContext, useCallback, useRef, useEffect, useContext } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { tcv, tcx } from "../../../shared/utils/tcx/tcx.js";
-var ScrollAreaContext = createContext(null);
-function useScrollAreaContext() {
-  const context = useContext(ScrollAreaContext);
+var ScrollAreaStateContext = createContext(null);
+var ScrollAreaConfigContext = createContext(null);
+var ERROR_MESSAGE = "ScrollArea compound components must be used within ScrollArea";
+function useScrollAreaStateContext() {
+  const context = useContext(ScrollAreaStateContext);
+  if (!context) {
+    throw new Error(ERROR_MESSAGE);
+  }
+  return context;
+}
+function useScrollAreaConfigContext() {
+  const context = useContext(ScrollAreaConfigContext);
   if (!context) {
-    throw new Error("ScrollArea compound components must be used within ScrollArea");
+    throw new Error(ERROR_MESSAGE);
   }
   return context;
 }
-function useScrollStateAndVisibility(viewport) {
+function useScrollAreaContext() {
+  const state = useScrollAreaStateContext();
+  const config = useScrollAreaConfigContext();
+  return { ...state, ...config };
+}
+function useScrollStateAndVisibility(viewport, content) {
   const [scrollState, setScrollState] = useState({
     scrollLeft: 0,
     scrollTop: 0,
@@ -23,8 +37,6 @@ function useScrollStateAndVisibility(viewport) {
   const scrollTimeoutRef = useRef();
   const rafRef = useRef();
   const resizeObserverRef = useRef();
-  const mutationObserverRef = useRef();
-  const mutationTimeoutRef = useRef();
   const lastUpdateTimeRef = useRef(0);
   const minUpdateIntervalRef = useRef(16);
   const updateScrollState = useCallback(() => {
@@ -36,36 +48,36 @@ function useScrollStateAndVisibility(viewport) {
         cancelAnimationFrame(rafRef.current);
       }
       rafRef.current = requestAnimationFrame(() => {
+        rafRef.current = void 0;
         updateScrollState();
       });
       return;
     }
     if (rafRef.current) {
       cancelAnimationFrame(rafRef.current);
+      rafRef.current = void 0;
     }
-    rafRef.current = requestAnimationFrame(() => {
-      const newState = {
-        scrollLeft: viewport.scrollLeft,
-        scrollTop: viewport.scrollTop,
-        scrollWidth: viewport.scrollWidth,
-        scrollHeight: viewport.scrollHeight,
-        clientWidth: viewport.clientWidth,
-        clientHeight: viewport.clientHeight
-      };
-      setScrollState((prevState) => {
-        const scrollLeftChanged = Math.abs(prevState.scrollLeft - newState.scrollLeft) > 0.5;
-        const scrollTopChanged = Math.abs(prevState.scrollTop - newState.scrollTop) > 0.5;
-        const scrollWidthChanged = prevState.scrollWidth !== newState.scrollWidth;
-        const scrollHeightChanged = prevState.scrollHeight !== newState.scrollHeight;
-        const clientWidthChanged = prevState.clientWidth !== newState.clientWidth;
-        const clientHeightChanged = prevState.clientHeight !== newState.clientHeight;
-        const hasChanges = scrollLeftChanged || scrollTopChanged || scrollWidthChanged || scrollHeightChanged || clientWidthChanged || clientHeightChanged;
-        if (hasChanges) {
-          lastUpdateTimeRef.current = now;
-          return newState;
-        }
-        return prevState;
-      });
+    const newState = {
+      scrollLeft: viewport.scrollLeft,
+      scrollTop: viewport.scrollTop,
+      scrollWidth: viewport.scrollWidth,
+      scrollHeight: viewport.scrollHeight,
+      clientWidth: viewport.clientWidth,
+      clientHeight: viewport.clientHeight
+    };
+    setScrollState((prevState) => {
+      const scrollLeftChanged = Math.abs(prevState.scrollLeft - newState.scrollLeft) > 0.5;
+      const scrollTopChanged = Math.abs(prevState.scrollTop - newState.scrollTop) > 0.5;
+      const scrollWidthChanged = prevState.scrollWidth !== newState.scrollWidth;
+      const scrollHeightChanged = prevState.scrollHeight !== newState.scrollHeight;
+      const clientWidthChanged = prevState.clientWidth !== newState.clientWidth;
+      const clientHeightChanged = prevState.clientHeight !== newState.clientHeight;
+      const hasChanges = scrollLeftChanged || scrollTopChanged || scrollWidthChanged || scrollHeightChanged || clientWidthChanged || clientHeightChanged;
+      if (hasChanges) {
+        lastUpdateTimeRef.current = now;
+        return newState;
+      }
+      return prevState;
     });
   }, [viewport]);
   const delayedUpdateScrollState = useCallback(() => {
@@ -102,54 +114,19 @@ function useScrollStateAndVisibility(viewport) {
       passive: true,
       signal,
       capture: false
-      // Avoid unnecessary event capture
     });
     window.addEventListener("resize", handleResize, {
       passive: true,
       signal
     });
     if (window.ResizeObserver) {
-      resizeObserverRef.current = new ResizeObserver((entries) => {
-        for (const entry of entries) {
-          if (entry.target === viewport) {
-            updateScrollState();
-            break;
-          }
-        }
+      resizeObserverRef.current = new ResizeObserver(() => {
+        updateScrollState();
       });
       resizeObserverRef.current.observe(viewport);
-    }
-    if (window.MutationObserver) {
-      mutationObserverRef.current = new MutationObserver((mutations) => {
-        const hasLayoutChanges = mutations.some((mutation) => {
-          if (mutation.type === "childList") {
-            return mutation.addedNodes.length > 0 || mutation.removedNodes.length > 0;
-          }
-          if (mutation.type === "attributes") {
-            const attr = mutation.attributeName;
-            return attr === "style" || attr === "class";
-          }
-          return mutation.type === "characterData";
-        });
-        if (!hasLayoutChanges) return;
-        if (mutationTimeoutRef.current) {
-          clearTimeout(mutationTimeoutRef.current);
-        }
-        mutationTimeoutRef.current = window.setTimeout(() => {
-          updateScrollState();
-        }, 16);
-      });
-      mutationObserverRef.current.observe(viewport, {
-        childList: true,
-        subtree: true,
-        attributes: true,
-        attributeFilter: ["style", "class"],
-        // Only listen to attributes that affect layout
-        characterData: true,
-        characterDataOldValue: false,
-        // No need for old value, improve performance
-        attributeOldValue: false
-      });
+      if (content) {
+        resizeObserverRef.current.observe(content);
+      }
     }
     delayedUpdateScrollState();
     return () => {
@@ -158,10 +135,6 @@ function useScrollStateAndVisibility(viewport) {
         clearTimeout(scrollTimeoutRef.current);
         scrollTimeoutRef.current = void 0;
       }
-      if (mutationTimeoutRef.current) {
-        clearTimeout(mutationTimeoutRef.current);
-        mutationTimeoutRef.current = void 0;
-      }
       if (rafRef.current) {
         cancelAnimationFrame(rafRef.current);
         rafRef.current = void 0;
@@ -170,12 +143,8 @@ function useScrollStateAndVisibility(viewport) {
         resizeObserverRef.current.disconnect();
         resizeObserverRef.current = void 0;
       }
-      if (mutationObserverRef.current) {
-        mutationObserverRef.current.disconnect();
-        mutationObserverRef.current = void 0;
-      }
     };
-  }, [viewport, handleScroll, delayedUpdateScrollState]);
+  }, [viewport, content, handleScroll, delayedUpdateScrollState, updateScrollState]);
   const handleMouseEnter = useCallback(() => setIsHovering(true), []);
   const handleMouseLeave = useCallback(() => setIsHovering(false), []);
   return {
@@ -229,16 +198,13 @@ function useThumbDrag(viewport, scrollState, orientation) {
   const isDragging = useRef(false);
   const startPos = useRef(0);
   const startScroll = useRef(0);
-  const rafId = useRef();
   const cleanupRef = useRef(null);
+  const scrollStateRef = useRef(scrollState);
+  scrollStateRef.current = scrollState;
   const dragContextRef = useRef(null);
   useEffect(() => {
     return () => {
       isDragging.current = false;
-      if (rafId.current) {
-        cancelAnimationFrame(rafId.current);
-        rafId.current = void 0;
-      }
       if (cleanupRef.current) {
         cleanupRef.current();
         cleanupRef.current = null;
@@ -248,13 +214,21 @@ function useThumbDrag(viewport, scrollState, orientation) {
   const handleMouseDown = useCallback(
     (e) => {
       if (!viewport) return;
+      const currentScrollState = scrollStateRef.current;
       const target = e.currentTarget;
       const scrollbar = target.closest('[role="scrollbar"]');
       if (!scrollbar) return;
       const scrollbarRect = scrollbar.getBoundingClientRect();
-      const scrollableRange = orientation === "vertical" ? Math.max(0, scrollState.scrollHeight - scrollState.clientHeight) : Math.max(0, scrollState.scrollWidth - scrollState.clientWidth);
+      const scrollableRange = orientation === "vertical" ? Math.max(0, currentScrollState.scrollHeight - currentScrollState.clientHeight) : Math.max(0, currentScrollState.scrollWidth - currentScrollState.clientWidth);
       const scrollbarRange = orientation === "vertical" ? scrollbarRect.height : scrollbarRect.width;
       if (scrollableRange <= 0 || scrollbarRange <= 0) return;
+      const thumbFraction = Math.max(
+        0.1,
+        orientation === "vertical" ? currentScrollState.clientHeight / currentScrollState.scrollHeight : currentScrollState.clientWidth / currentScrollState.scrollWidth
+      );
+      const thumbSizePixels = scrollbarRange * thumbFraction;
+      const effectiveTrackRange = scrollbarRange - thumbSizePixels;
+      if (effectiveTrackRange <= 0) return;
       dragContextRef.current = {
         scrollbarRect,
         scrollableRange,
@@ -262,34 +236,26 @@ function useThumbDrag(viewport, scrollState, orientation) {
       };
       isDragging.current = true;
       startPos.current = orientation === "vertical" ? e.clientY : e.clientX;
-      startScroll.current = orientation === "vertical" ? scrollState.scrollTop : scrollState.scrollLeft;
-      const scrollRatio = scrollableRange / scrollbarRange;
+      startScroll.current = orientation === "vertical" ? currentScrollState.scrollTop : currentScrollState.scrollLeft;
+      const scrollRatio = scrollableRange / effectiveTrackRange;
       const handleMouseMove = (e2) => {
         if (!isDragging.current || !viewport || !dragContextRef.current) return;
-        if (rafId.current) {
-          cancelAnimationFrame(rafId.current);
+        const currentPos = orientation === "vertical" ? e2.clientY : e2.clientX;
+        const delta = currentPos - startPos.current;
+        const scrollDelta = delta * scrollRatio;
+        const newScrollValue = Math.max(
+          0,
+          Math.min(startScroll.current + scrollDelta, dragContextRef.current.scrollableRange)
+        );
+        if (orientation === "vertical") {
+          viewport.scrollTop = newScrollValue;
+        } else {
+          viewport.scrollLeft = newScrollValue;
         }
-        rafId.current = requestAnimationFrame(() => {
-          const currentPos = orientation === "vertical" ? e2.clientY : e2.clientX;
-          const delta = currentPos - startPos.current;
-          const scrollDelta = delta * scrollRatio;
-          const newScrollValue = Math.max(
-            0,
-            Math.min(startScroll.current + scrollDelta, dragContextRef.current.scrollableRange)
-          );
-          if (orientation === "vertical") {
-            viewport.scrollTop = newScrollValue;
-          } else {
-            viewport.scrollLeft = newScrollValue;
-          }
-        });
       };
       const handleMouseUp = () => {
         isDragging.current = false;
         dragContextRef.current = null;
-        if (rafId.current) {
-          cancelAnimationFrame(rafId.current);
-        }
         document.removeEventListener("mousemove", handleMouseMove);
         document.removeEventListener("mouseup", handleMouseUp);
         cleanupRef.current = null;
@@ -303,7 +269,7 @@ function useThumbDrag(viewport, scrollState, orientation) {
       document.addEventListener("mouseup", handleMouseUp, { passive: true });
       e.preventDefault();
     },
-    [viewport, orientation, scrollState]
+    [viewport, orientation]
   );
   return {
     isDragging: isDragging.current,
@@ -609,6 +575,8 @@ var ScrollAreaScrollbar = forwardRef(
       scrollbarXId,
       scrollbarYId
     } = useScrollAreaContext();
+    const scrollStateRef = useRef(scrollState);
+    scrollStateRef.current = scrollState;
     const hasOverflow = useHasOverflow(scrollState, orientation);
     const shouldShow = useScrollbarShouldShow(type, hasOverflow, isScrolling, isHovering);
     const scrollPercentage = useMemo(() => {
@@ -619,15 +587,23 @@ var ScrollAreaScrollbar = forwardRef(
         const maxScroll = scrollState.scrollWidth - scrollState.clientWidth;
         return maxScroll > 0 ? Math.round(scrollState.scrollLeft / maxScroll * 100) : 0;
       }
-    }, [scrollState, orientation]);
+    }, [
+      orientation,
+      scrollState.scrollTop,
+      scrollState.scrollLeft,
+      scrollState.scrollHeight,
+      scrollState.clientHeight,
+      scrollState.scrollWidth,
+      scrollState.clientWidth
+    ]);
     const handleTrackClick = useCallback(
       (e) => {
         if (!viewport) return;
         if (e.target === e.currentTarget) {
-          handleScrollbarTrackClick(e, viewport, scrollState, orientation);
+          handleScrollbarTrackClick(e, viewport, scrollStateRef.current, orientation);
         }
       },
-      [viewport, scrollState, orientation]
+      [viewport, orientation]
     );
     const tv = useMemo(
       () => ScrollTv({
@@ -746,7 +722,7 @@ var ScrollAreaRoot = forwardRef(
     const viewportId = `scroll-viewport${reactId}`;
     const scrollbarXId = `scroll-x${reactId}`;
     const scrollbarYId = `scroll-y${reactId}`;
-    const { scrollState, isHovering, isScrolling, handleMouseEnter, handleMouseLeave } = useScrollStateAndVisibility(viewport);
+    const { scrollState, isHovering, isScrolling, handleMouseEnter, handleMouseLeave } = useScrollStateAndVisibility(viewport, content);
     const staticConfig = useMemo(
       () => ({
         orientation,
@@ -757,11 +733,14 @@ var ScrollAreaRoot = forwardRef(
       }),
       [orientation, scrollbarMode, hoverBoundary, variant, type]
     );
-    const contextValue = useMemo(
+    const stateValue = useMemo(
+      () => ({ scrollState, isHovering, isScrolling }),
+      [scrollState, isHovering, isScrolling]
+    );
+    const configValue = useMemo(
       () => ({
         content,
         orientation: staticConfig.orientation,
-        scrollState,
         scrollbarMode: staticConfig.scrollbarMode,
         hoverBoundary: staticConfig.hoverBoundary,
         scrollbarX,
@@ -777,9 +756,6 @@ var ScrollAreaRoot = forwardRef(
         variant: staticConfig.variant,
         viewport,
         type: staticConfig.type,
-        isHovering,
-        isScrolling,
-        // Add ID-related values
         rootId,
         viewportId,
         scrollbarXId,
@@ -787,14 +763,11 @@ var ScrollAreaRoot = forwardRef(
       }),
       [
         content,
-        scrollState,
         scrollbarX,
         scrollbarY,
         thumbX,
         thumbY,
         viewport,
-        isHovering,
-        isScrolling,
         staticConfig,
         rootId,
         viewportId,
@@ -859,7 +832,7 @@ var ScrollAreaRoot = forwardRef(
       }
       return scrollbars;
     }, [orientation]);
-    return /* @__PURE__ */ jsx(ScrollAreaContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsxs(
+    return /* @__PURE__ */ jsx(ScrollAreaConfigContext.Provider, { value: configValue, children: /* @__PURE__ */ jsx(ScrollAreaStateContext.Provider, { value: stateValue, children: /* @__PURE__ */ jsxs(
       "div",
       {
         ref,
@@ -875,13 +848,13 @@ var ScrollAreaRoot = forwardRef(
           autoScrollbars
         ]
       }
-    ) });
+    ) }) });
   }
 );
 ScrollAreaRoot.displayName = "ScrollArea.Root";
 var ScrollAreaViewport = forwardRef(
   ({ className, children, ...props }, ref) => {
-    const { setViewport, orientation, viewportId } = useScrollAreaContext();
+    const { setViewport, orientation, viewportId } = useScrollAreaConfigContext();
     const scrollClass = useMemo(() => {
       switch (orientation) {
         case "horizontal":
@@ -918,7 +891,7 @@ var ScrollAreaViewport = forwardRef(
 ScrollAreaViewport.displayName = "ScrollArea.Viewport";
 var ScrollAreaContent = forwardRef(
   ({ as: As = "div", className, children, ...props }, ref) => {
-    const { setContent, orientation } = useScrollAreaContext();
+    const { setContent, orientation } = useScrollAreaConfigContext();
     const setRef = useCallback(
       (node) => {
         setContent(node);

package/dist/components/scroll-area/src/components/scroll-area-content.js

@@ -1,10 +1,10 @@
 import { jsx } from "react/jsx-runtime";
 import { forwardRef, useCallback, useMemo } from "react";
-import { useScrollAreaContext } from "../context/scroll-area-context.js";
+import { useScrollAreaConfigContext } from "../context/scroll-area-context.js";
 import { tcx } from "../../../../shared/utils/tcx/tcx.js";
 const ScrollAreaContent = forwardRef(
   ({ as: As = "div", className, children, ...props }, ref) => {
-    const { setContent, orientation } = useScrollAreaContext();
+    const { setContent, orientation } = useScrollAreaConfigContext();
     const setRef = useCallback(
       (node) => {
         setContent(node);

package/dist/components/scroll-area/src/components/scroll-area-root.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { forwardRef, useState, useId, useMemo } from "react";
-import { ScrollAreaContext } from "../context/scroll-area-context.js";
+import { ScrollAreaConfigContext, ScrollAreaStateContext } from "../context/scroll-area-context.js";
 import { ScrollTv } from "../tv.js";
 import { ScrollAreaCorner } from "./scroll-area-corner.js";
 import { ScrollAreaScrollbar } from "./scroll-area-scrollbar.js";
@@ -32,7 +32,7 @@ const ScrollAreaRoot = forwardRef(
     const viewportId = `scroll-viewport${reactId}`;
     const scrollbarXId = `scroll-x${reactId}`;
     const scrollbarYId = `scroll-y${reactId}`;
-    const { scrollState, isHovering, isScrolling, handleMouseEnter, handleMouseLeave } = useScrollStateAndVisibility(viewport);
+    const { scrollState, isHovering, isScrolling, handleMouseEnter, handleMouseLeave } = useScrollStateAndVisibility(viewport, content);
     const staticConfig = useMemo(
       () => ({
         orientation,
@@ -43,11 +43,14 @@ const ScrollAreaRoot = forwardRef(
       }),
       [orientation, scrollbarMode, hoverBoundary, variant, type]
     );
-    const contextValue = useMemo(
+    const stateValue = useMemo(
+      () => ({ scrollState, isHovering, isScrolling }),
+      [scrollState, isHovering, isScrolling]
+    );
+    const configValue = useMemo(
       () => ({
         content,
         orientation: staticConfig.orientation,
-        scrollState,
         scrollbarMode: staticConfig.scrollbarMode,
         hoverBoundary: staticConfig.hoverBoundary,
         scrollbarX,
@@ -63,9 +66,6 @@ const ScrollAreaRoot = forwardRef(
         variant: staticConfig.variant,
         viewport,
         type: staticConfig.type,
-        isHovering,
-        isScrolling,
-        // Add ID-related values
         rootId,
         viewportId,
         scrollbarXId,
@@ -73,14 +73,11 @@ const ScrollAreaRoot = forwardRef(
       }),
       [
         content,
-        scrollState,
         scrollbarX,
         scrollbarY,
         thumbX,
         thumbY,
         viewport,
-        isHovering,
-        isScrolling,
         staticConfig,
         rootId,
         viewportId,
@@ -145,7 +142,7 @@ const ScrollAreaRoot = forwardRef(
       }
       return scrollbars;
     }, [orientation]);
-    return /* @__PURE__ */ jsx(ScrollAreaContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsxs(
+    return /* @__PURE__ */ jsx(ScrollAreaConfigContext.Provider, { value: configValue, children: /* @__PURE__ */ jsx(ScrollAreaStateContext.Provider, { value: stateValue, children: /* @__PURE__ */ jsxs(
       "div",
       {
         ref,
@@ -161,7 +158,7 @@ const ScrollAreaRoot = forwardRef(
           autoScrollbars
         ]
       }
-    ) });
+    ) }) });
   }
 );
 ScrollAreaRoot.displayName = "ScrollArea.Root";

package/dist/components/scroll-area/src/components/scroll-area-scrollbar.js

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { forwardRef, useMemo, useCallback } from "react";
+import { forwardRef, useRef, useMemo, useCallback } from "react";
 import { useScrollAreaContext } from "../context/scroll-area-context.js";
 import { ScrollTv } from "../tv.js";
 import { handleScrollbarTrackClick, getScrollbarPositionStyle } from "../utils/index.js";
@@ -22,6 +22,8 @@ const ScrollAreaScrollbar = forwardRef(
       scrollbarXId,
       scrollbarYId
     } = useScrollAreaContext();
+    const scrollStateRef = useRef(scrollState);
+    scrollStateRef.current = scrollState;
     const hasOverflow = useHasOverflow(scrollState, orientation);
     const shouldShow = useScrollbarShouldShow(type, hasOverflow, isScrolling, isHovering);
     const scrollPercentage = useMemo(() => {
@@ -32,15 +34,23 @@ const ScrollAreaScrollbar = forwardRef(
         const maxScroll = scrollState.scrollWidth - scrollState.clientWidth;
         return maxScroll > 0 ? Math.round(scrollState.scrollLeft / maxScroll * 100) : 0;
       }
-    }, [scrollState, orientation]);
+    }, [
+      orientation,
+      scrollState.scrollTop,
+      scrollState.scrollLeft,
+      scrollState.scrollHeight,
+      scrollState.clientHeight,
+      scrollState.scrollWidth,
+      scrollState.clientWidth
+    ]);
     const handleTrackClick = useCallback(
       (e) => {
         if (!viewport) return;
         if (e.target === e.currentTarget) {
-          handleScrollbarTrackClick(e, viewport, scrollState, orientation);
+          handleScrollbarTrackClick(e, viewport, scrollStateRef.current, orientation);
         }
       },
-      [viewport, scrollState, orientation]
+      [viewport, orientation]
     );
     const tv = useMemo(
       () => ScrollTv({

package/dist/components/scroll-area/src/components/scroll-area-viewport.js

@@ -1,10 +1,10 @@
 import { jsx } from "react/jsx-runtime";
 import { forwardRef, useMemo, useCallback } from "react";
-import { useScrollAreaContext } from "../context/scroll-area-context.js";
+import { useScrollAreaConfigContext } from "../context/scroll-area-context.js";
 import { tcx } from "../../../../shared/utils/tcx/tcx.js";
 const ScrollAreaViewport = forwardRef(
   ({ className, children, ...props }, ref) => {
-    const { setViewport, orientation, viewportId } = useScrollAreaContext();
+    const { setViewport, orientation, viewportId } = useScrollAreaConfigContext();
     const scrollClass = useMemo(() => {
       switch (orientation) {
         case "horizontal":

package/dist/components/scroll-area/src/context/scroll-area-context.d.ts

@@ -1,3 +1,18 @@
-import { ScrollAreaContextType } from '../types';
-export declare const ScrollAreaContext: import('react').Context<ScrollAreaContextType | null>;
+import { ScrollAreaConfigContextType, ScrollAreaContextType, ScrollAreaStateContextType } from '../types';
+export declare const ScrollAreaStateContext: import('react').Context<ScrollAreaStateContextType | null>;
+export declare const ScrollAreaConfigContext: import('react').Context<ScrollAreaConfigContextType | null>;
+/**
+ * Access only the frequently-changing state (scrollState, isHovering, isScrolling).
+ * Use this in components that need to react to scroll position changes.
+ */
+export declare function useScrollAreaStateContext(): ScrollAreaStateContextType;
+/**
+ * Access only the rarely-changing config (orientation, setters, refs, IDs).
+ * Use this in components that do NOT need scrollState — they won't re-render on scroll.
+ */
+export declare function useScrollAreaConfigContext(): ScrollAreaConfigContextType;
+/**
+ * Combined hook for components that need both state and config (Scrollbar, Thumb, Corner).
+ * Maintains backward compatibility with existing useScrollAreaContext() usage.
+ */
 export declare function useScrollAreaContext(): ScrollAreaContextType;

package/dist/components/scroll-area/src/context/scroll-area-context.js

@@ -1,13 +1,30 @@
 import { createContext, useContext } from "react";
-const ScrollAreaContext = createContext(null);
-function useScrollAreaContext() {
-  const context = useContext(ScrollAreaContext);
+const ScrollAreaStateContext = createContext(null);
+const ScrollAreaConfigContext = createContext(null);
+const ERROR_MESSAGE = "ScrollArea compound components must be used within ScrollArea";
+function useScrollAreaStateContext() {
+  const context = useContext(ScrollAreaStateContext);
   if (!context) {
-    throw new Error("ScrollArea compound components must be used within ScrollArea");
+    throw new Error(ERROR_MESSAGE);
   }
   return context;
 }
+function useScrollAreaConfigContext() {
+  const context = useContext(ScrollAreaConfigContext);
+  if (!context) {
+    throw new Error(ERROR_MESSAGE);
+  }
+  return context;
+}
+function useScrollAreaContext() {
+  const state = useScrollAreaStateContext();
+  const config = useScrollAreaConfigContext();
+  return { ...state, ...config };
+}
 export {
-  ScrollAreaContext,
-  useScrollAreaContext
+  ScrollAreaConfigContext,
+  ScrollAreaStateContext,
+  useScrollAreaConfigContext,
+  useScrollAreaContext,
+  useScrollAreaStateContext
 };

package/dist/components/scroll-area/src/hooks/index.d.ts

@@ -1,4 +1,3 @@
 export * from './use-scroll-state-and-visibility';
 export * from './use-thumb';
 export * from './use-scrollbar';
-export * from './use-scroll-performance-monitor';

package/dist/components/scroll-area/src/hooks/use-scroll-state-and-visibility.d.ts

@@ -1,8 +1,8 @@
 import { ScrollState } from '../types';
 /**
- * Merged scroll state and visibility management hook - avoid duplicate scroll event listening
+ * Merged scroll state and visibility management hook
  */
-export declare function useScrollStateAndVisibility(viewport: HTMLDivElement | null): {
+export declare function useScrollStateAndVisibility(viewport: HTMLDivElement | null, content: HTMLDivElement | null): {
     scrollState: ScrollState;
     isHovering: boolean;
     isScrolling: boolean;