tamagui 1.126.4 → 1.126.6

package/dist/test.native.js

@@ -6628,14 +6628,16 @@ var require_mergeProps_native = __commonJS({
     };
     function mergeProp(out, a, b, key, inverseShorthands) {
       var longhand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null, val = a[key];
-      if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
-        out[key] = {
-          ...out[key],
-          ...val
-        };
-        return;
+      if (!(b && (key in b || longhand && longhand in b))) {
+        if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
+          out[key] = {
+            ...out[key],
+            ...val
+          };
+          return;
+        }
+        out[longhand || key] = val;
       }
-      b && (key in b || longhand && longhand in b) || (out[longhand || key] = val);
     }
   }
 });
@@ -17792,9 +17794,9 @@ var require_SheetImplementationCustom_native = __commonJS({
           });
         }, previouslyScrolling = !1, onMoveShouldSet = function(e, param) {
           var { dy } = param;
-          if (e.target === providerProps.handleRef.current || !scrollEnabled.current || !hasScrollView.current) return !0;
+          if (e.target === providerProps.handleRef.current || !scrollEnabled.current) return !0;
           var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && scrollEnabled.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
+          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && scrollEnabled.current && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 10;
         }, grant = function() {
           setScrollEnabled(!1), setPanning(!0), stopSpring(), startY = at.current;
         }, isExternalDrag = !1;