tamagui 1.130.6 → 1.130.8

package/dist/test.native.js

@@ -8422,13 +8422,14 @@ var require_createComponent_native = __commonJS({
           onBlur,
           separator,
           // ignore from here on out
+          passThrough,
           forceStyle: _forceStyle,
           // @ts-ignore  for next/link compat etc
           onClick,
           theme: _themeProp,
           ...nonTamaguiProps
         } = viewPropsIn || {}, viewProps = nonTamaguiProps;
-        !isTaggable && props.forceStyle && (viewProps.forceStyle = props.forceStyle), isHOC && _themeProp && (viewProps.theme = _themeProp), tagProp && elementType.acceptTagProp && (viewProps.tag = tagProp);
+        !isTaggable && props.forceStyle && (viewProps.forceStyle = props.forceStyle), isHOC && (typeof _themeProp < "u" && (viewProps.theme = _themeProp), typeof passThrough < "u" && (viewProps.passThrough = passThrough)), tagProp && elementType.acceptTagProp && (viewProps.tag = tagProp);
         var animationStyles, shouldUseAnimation = (
           // if it supports css vars we run it on server too to get matching initial style
           (supportsCSS ? willBeAnimatedClient : willBeAnimated) && useAnimations && !isHOC
@@ -12873,23 +12874,35 @@ var require_index_native19 = __commonJS({
       }), mod);
     }, index_exports2 = {};
     __export2(index_exports2, {
+      createMeasure: function() {
+        return createMeasure;
+      },
+      createMeasureInWindow: function() {
+        return createMeasureInWindow;
+      },
+      createMeasureLayout: function() {
+        return createMeasureLayout;
+      },
       enable: function() {
         return enable;
       },
+      getBoundingClientRectAsync: function() {
+        return getBoundingClientRectAsync;
+      },
       getElementLayoutEvent: function() {
         return getElementLayoutEvent;
       },
-      getElementLayoutEventAsync: function() {
-        return getElementLayoutEventAsync;
+      measure: function() {
+        return measure;
       },
-      getRect: function() {
-        return getRect;
+      measureInWindow: function() {
+        return measureInWindow;
       },
       measureLayout: function() {
         return measureLayout;
       },
-      measureLayoutAsync: function() {
-        return measureLayoutAsync;
+      measureNode: function() {
+        return measureNode;
       },
       setOnLayoutStrategy: function() {
         return setOnLayoutStrategy3;
@@ -12909,7 +12922,7 @@ var require_index_native19 = __commonJS({
         return cb();
       }), queuedUpdates.clear()));
     }
-    function startGlobalIntersectionObserver() {
+    function startGlobalObservers() {
       !import_constants4.isClient || globalIntersectionObserver || (globalIntersectionObserver = new IntersectionObserver(function(entries) {
         entries.forEach(function(entry) {
           var node = entry.target;
@@ -12962,9 +12975,9 @@ var require_index_native19 = __commonJS({
           }
         }
       }
-      rAF(layoutOnAnimationFrame), frameCount = 0, RUN_EVERY_X_FRAMES = 8;
+      rAF(layoutOnAnimationFrame), frameCount = 0, userSkipVal = process.env.TAMAGUI_LAYOUT_FRAME_SKIP, RUN_EVERY_X_FRAMES = userSkipVal ? +userSkipVal : 10;
     }
-    var layoutOnAnimationFrame, layoutOnAnimationFrame2, supportsCheckVisibility, frameCount, RUN_EVERY_X_FRAMES, getElementLayoutEvent = function(nodeRect, parentRect) {
+    var layoutOnAnimationFrame, layoutOnAnimationFrame2, supportsCheckVisibility, frameCount, userSkipVal, RUN_EVERY_X_FRAMES, getElementLayoutEvent = function(nodeRect, parentRect) {
       return {
         nativeEvent: {
           layout: getRelativeDimensions(nodeRect, parentRect),
@@ -12972,45 +12985,6 @@ var require_index_native19 = __commonJS({
         },
         timeStamp: Date.now()
       };
-    }, measureLayout = function(node, relativeTo, callback) {
-      var relativeNode = relativeTo || (node == null ? void 0 : node.parentElement);
-      if (relativeNode instanceof HTMLElement) {
-        var nodeDim = node.getBoundingClientRect(), relativeNodeDim = relativeNode.getBoundingClientRect();
-        if (relativeNodeDim && nodeDim) {
-          var { x, y, width, height, left, top } = getRelativeDimensions(nodeDim, relativeNodeDim);
-          callback(x, y, width, height, left, top);
-        }
-      }
-    }, getElementLayoutEventAsync = async function(target) {
-      var layout = await measureLayoutAsync(target);
-      if (!layout) throw new Error("\u203C\uFE0F");
-      return {
-        nativeEvent: {
-          layout,
-          target
-        },
-        timeStamp: Date.now()
-      };
-    }, measureLayoutAsync = async function(node, relativeTo) {
-      var relativeNode = relativeTo || (node == null ? void 0 : node.parentElement);
-      if (relativeNode instanceof HTMLElement) {
-        var [nodeDim, relativeNodeDim] = await Promise.all([
-          getBoundingClientRectAsync(node),
-          getBoundingClientRectAsync(relativeNode)
-        ]);
-        if (relativeNodeDim && nodeDim) {
-          var { x, y, width, height, left, top } = getRelativeDimensions(nodeDim, relativeNodeDim);
-          return {
-            x,
-            y,
-            width,
-            height,
-            left,
-            top
-          };
-        }
-      }
-      return null;
     }, getRelativeDimensions = function(a, b) {
       var { height, left, top, width } = a, x = left - b.left, y = top - b.top;
       return {
@@ -13018,8 +12992,8 @@ var require_index_native19 = __commonJS({
         y,
         width,
         height,
-        left,
-        top
+        pageX: a.left,
+        pageY: a.top
       };
     };
     function useElementLayout(ref, onLayout) {
@@ -13029,7 +13003,7 @@ var require_index_native19 = __commonJS({
         if (onLayout) {
           var node2 = (_ref_current2 = ref.current) === null || _ref_current2 === void 0 ? void 0 : _ref_current2.host;
           if (node2) {
-            Nodes.add(node2), startGlobalIntersectionObserver(), globalIntersectionObserver && (globalIntersectionObserver.observe(node2), IntersectionState.set(node2, !0));
+            Nodes.add(node2), startGlobalObservers(), globalIntersectionObserver && (globalIntersectionObserver.observe(node2), IntersectionState.set(node2, !0));
             var parentNode = node2.parentNode;
             return parentNode && onLayout(getElementLayoutEvent(node2.getBoundingClientRect(), parentNode.getBoundingClientRect())), function() {
               Nodes.delete(node2), LayoutHandlers.delete(node2), NodeRectCache.delete(node2), LastChangeTime.delete(node2), IntersectionState.delete(node2), globalIntersectionObserver && globalIntersectionObserver.unobserve(node2);
@@ -13054,23 +13028,41 @@ var require_index_native19 = __commonJS({
         });
         io.observe(node);
       });
-    }, getBoundingClientRect = function(node) {
-      var _node_getBoundingClientRect;
-      if (!(!node || node.nodeType !== 1)) return (_node_getBoundingClientRect = node.getBoundingClientRect) === null || _node_getBoundingClientRect === void 0 ? void 0 : _node_getBoundingClientRect.call(node);
-    }, getRect = function(node) {
-      var rect = getBoundingClientRect(node);
-      if (rect) {
-        var { x, y, top, left } = rect;
-        return {
-          x,
-          y,
-          width: node.offsetWidth,
-          height: node.offsetHeight,
-          top,
-          left
-        };
+    }, measureNode = async function(node, relativeTo) {
+      var relativeNode = relativeTo || (node == null ? void 0 : node.parentElement);
+      if (relativeNode instanceof HTMLElement) {
+        var [nodeDim, relativeNodeDim] = await Promise.all([
+          getBoundingClientRectAsync(node),
+          getBoundingClientRectAsync(relativeNode)
+        ]);
+        if (relativeNodeDim && nodeDim) return getRelativeDimensions(nodeDim, relativeNodeDim);
       }
+      return null;
+    }, measure = async function(node, callback) {
+      var out = await measureNode(node, node.parentNode instanceof HTMLElement ? node.parentNode : null);
+      return out && (callback == null || callback(out.x, out.y, out.width, out.height, out.pageX, out.pageY)), out;
     };
+    function createMeasure(node) {
+      return function(callback) {
+        return measure(node, callback);
+      };
+    }
+    var measureInWindow = async function(node, callback) {
+      var out = await measureNode(node, null);
+      return out && (callback == null || callback(out.pageX, out.pageY, out.width, out.height)), out;
+    }, createMeasureInWindow = function(node) {
+      return function(callback) {
+        return measureInWindow(node, callback);
+      };
+    }, measureLayout = async function(node, relativeNode, callback) {
+      var out = await measureNode(node, relativeNode);
+      return out && (callback == null || callback(out.x, out.y, out.width, out.height, out.pageX, out.pageY)), out;
+    };
+    function createMeasureLayout(node) {
+      return function(relativeTo, callback) {
+        return measureLayout(node, relativeTo, callback);
+      };
+    }
   }
 });
 
@@ -13633,19 +13625,7 @@ var require_index_native20 = __commonJS({
     (0, import_web.setupHooks)({
       getBaseViews: import_getBaseViews.getBaseViews,
       setElementProps: function(node) {
-        if (node && !node.measure) {
-          var _node, _node1, _node2;
-          (_node = node).measure || (_node.measure = function(callback) {
-            return (0, import_use_element_layout.measureLayout)(node, null, callback);
-          }), (_node1 = node).measureLayout || (_node1.measureLayout = function(relativeToNode, success) {
-            return (0, import_use_element_layout.measureLayout)(node, relativeToNode, success);
-          }), (_node2 = node).measureInWindow || (_node2.measureInWindow = function(callback) {
-            setTimeout(function() {
-              var { height, left, top, width } = (0, import_use_element_layout.getRect)(node);
-              callback(left, top, width, height);
-            }, 0);
-          });
-        }
+        if (0) var _node, _node1, _node2;
       },
       usePropsTransform(elementType, propsIn, stateRef, willHydrate) {
         if (0) {
@@ -17679,6 +17659,7 @@ var require_useSheetProviderProps_native = __commonJS({
       if (!animationDriver) throw new Error("Must set animations in tamagui.config.ts");
       var scrollBridge = (0, import_use_constant.useConstant)(function() {
         var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
+          hasScrollableContent: !1,
           enabled: !1,
           y: 0,
           paneY: 0,
@@ -18093,7 +18074,7 @@ var require_SheetImplementationCustom_native = __commonJS({
         screenSize,
         frameSize
       ]), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
-        isAbleToPosition && animateTo(position);
+        isAbleToPosition && (animateTo(position), position === -1 && (scrollBridge.scrollLock = !1, scrollBridge.scrollStartY = -1));
       }, [
         isAbleToPosition,
         position
@@ -18125,9 +18106,13 @@ var require_SheetImplementationCustom_native = __commonJS({
           var { dy } = param;
           function getShouldSet() {
             if (e.target === providerProps.handleRef.current) return !0;
-            if (scrollBridge.scrollLock) return !1;
-            var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-            return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
+            if (scrollBridge.hasScrollableContent === !0) {
+              if (scrollBridge.scrollLock) return !1;
+              var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
+              if (isScrolled) return previouslyScrolling = !0, !1;
+              if (isNearTop && hasScrollView.current && isDraggingUp) return !1;
+            }
+            return Math.abs(dy) > 5;
           }
           var granted = getShouldSet();
           return granted && scrollBridge.setParentDragging(!0), granted;
@@ -18548,9 +18533,13 @@ var require_SheetScrollView_native = __commonJS({
         var [hasScrollableContent, setHasScrollableContent] = (0, import_react3.useState)(!0), parentHeight = (0, import_react3.useRef)(0), contentHeight = (0, import_react3.useRef)(0), setIsScrollable = function() {
           parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
         };
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
+        return (0, import_react3.useEffect)(function() {
+          scrollBridge.hasScrollableContent = hasScrollableContent;
+        }, [
+          hasScrollableContent
+        ]), /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
           onLayout: function(e) {
-            parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+            parentHeight.current = Math.ceil(e.nativeEvent.layout.height), setIsScrollable();
           },
           ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
           flex: 1,
@@ -18605,7 +18594,7 @@ var require_SheetScrollView_native = __commonJS({
               pointerEvents: "none",
               zIndex: -1,
               onLayout: function(e) {
-                contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+                contentHeight.current = Math.floor(e.nativeEvent.layout.height), setIsScrollable();
               }
             }),
             children