tamagui 1.79.7 → 1.79.8

package/dist/native.js

@@ -10407,7 +10407,7 @@ var require_SheetScrollView_native = __commonJS({
     });
     module2.exports = __toCommonJS2(SheetScrollView_exports);
     var import_core13 = require_index_native15(), import_scroll_view = require_index_native33(), import_react2 = require("react"), import_SheetContext = require_SheetContext_native(), import_jsx_runtime6 = require("react/jsx-runtime"), SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = (0, import_react2.forwardRef)(
-      ({ __scopeSheet, children, ...props }, ref) => {
+      ({ __scopeSheet, children, onScroll, ...props }, ref) => {
         let context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = (0, import_react2.useRef)(null), state = (0, import_react2.useRef)({
           lastPageY: 0,
           dragAt: 0,
@@ -10437,7 +10437,7 @@ var require_SheetScrollView_native = __commonJS({
             scrollEventThrottle: 8,
             onScroll: (e) => {
               let { y } = e.nativeEvent.contentOffset;
-              scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1);
+              scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
             },
             onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0),
             onMoveShouldSetResponder: () => !1,
@@ -17230,8 +17230,8 @@ var require_SliderImpl_native = __commonJS({
             onStartShouldSetResponder: () => !0,
             onResponderTerminationRequest: () => !1,
             onResponderGrant: (0, import_core13.composeEventHandlers)(props.onResponderGrant, (event) => {
-              let target = event.target, isStartingOnThumb = context.thumbs.has(target);
-              import_core13.isWeb && target instanceof HTMLElement && context.thumbs.has(target) && target.focus(), onSlideStart(event, isStartingOnThumb ? "thumb" : "track");
+              let target = event.target, thumbIndex = context.thumbs.get(target), isStartingOnThumb = thumbIndex !== void 0;
+              import_core13.isWeb && target instanceof HTMLElement && context.thumbs.has(target) && target.focus(), !import_core13.isWeb && isStartingOnThumb && (context.valueIndexToChangeRef.current = thumbIndex), onSlideStart(event, isStartingOnThumb ? "thumb" : "track");
             }),
             onResponderMove: (0, import_core13.composeEventHandlers)(props.onResponderMove, (event) => {
               event.stopPropagation(), onSlideMove(event);
@@ -17518,10 +17518,10 @@ var require_Slider_native = __commonJS({
       ), value = context.values[index], percent = value === void 0 ? 0 : (0, import_helpers2.convertValueToPercentage)(value, context.min, context.max), label = (0, import_helpers2.getLabel)(index, context.values.length), sizeIn = sizeProp ?? context.size ?? "$true", [size2, setSize] = React2.useState(() => (0, import_core13.getVariableValue)(getThumbSize(sizeIn).width)), thumbInBoundsOffset = size2 ? (0, import_helpers2.getThumbInBoundsOffset)(size2, percent, orientation.direction) : 0;
       React2.useEffect(() => {
         if (thumb)
-          return context.thumbs.add(thumb), () => {
+          return context.thumbs.set(thumb, index), () => {
             context.thumbs.delete(thumb);
           };
-      }, [thumb, context.thumbs]);
+      }, [thumb, context.thumbs, index]);
       let positionalStyles = context.orientation === "horizontal" ? {
         x: thumbInBoundsOffset - size2 / 2,
         y: -size2 / 2,
@@ -17584,13 +17584,12 @@ var require_Slider_native = __commonJS({
           onSlideMove,
           onSlideStart,
           ...sliderProps
-        } = props, sliderRef = React2.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(sliderRef, forwardedRef), thumbRefs = React2.useRef(/* @__PURE__ */ new Set()), valueIndexToChangeRef = React2.useRef(0), isHorizontal = orientation === "horizontal", [values = [], setValues] = (0, import_use_controllable_state.useControllableState)({
+        } = props, sliderRef = React2.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(sliderRef, forwardedRef), thumbRefs = React2.useRef(/* @__PURE__ */ new Map()), valueIndexToChangeRef = React2.useRef(0), isHorizontal = orientation === "horizontal", [values = [], setValues] = (0, import_use_controllable_state.useControllableState)({
           prop: value,
           defaultProp: defaultValue,
           transition: !0,
           onChange: (value2) => {
-            var _a;
-            import_core13.isWeb && ((_a = [...thumbRefs.current][valueIndexToChangeRef.current]) == null || _a.focus()), onValueChange(value2);
+            updateThumbFocus(valueIndexToChangeRef.current), onValueChange(value2);
           }
         });
         import_core13.isWeb && React2.useEffect(() => {
@@ -17604,6 +17603,15 @@ var require_Slider_native = __commonJS({
             node.removeEventListener("touchstart", preventDefault);
           };
         }, []);
+        function updateThumbFocus(focusIndex) {
+          if (import_core13.isWeb) {
+            for (let [node, index] of thumbRefs.current.entries())
+              if (index === focusIndex) {
+                node.focus();
+                return;
+              }
+          }
+        }
         function handleSlideMove(value2, event) {
           updateValues(value2, valueIndexToChangeRef.current), onSlideMove == null || onSlideMove(event, value2);
         }