tamagui 1.135.0 → 1.135.2

package/dist/test.native.js

@@ -3401,7 +3401,10 @@ var require_mergeProps_native = __commonJS({
       ];
       var out = {};
       for (var key in defaultProps) key in props || (out[key] = defaultProps[key]);
-      for (var key1 in contextProps) key1 in props || (out[key1] = contextProps[key1]);
+      for (var key1 in contextProps) if (!(key1 in props)) {
+        var contextValue = contextProps[key1];
+        contextValue !== void 0 && (out[key1] = contextValue);
+      }
       for (var key2 in props) mergeProp(out, defaultProps, props, key2), contextProps && key2 in contextProps && (overriddenContext || (overriddenContext = {}), overriddenContext[key2] = props[key2]);
       return [
         out,
@@ -17949,26 +17952,27 @@ var require_SheetImplementationCustom_native = __commonJS({
             ...animationConfig
           }));
         }
-      }), isAbleToPosition = /* @__PURE__ */ function() {
-        return !(disableAnimation || !frameSize || !screenSize || isHidden || hasntMeasured && !open);
-      }();
+      });
       (0, import_constants4.useIsomorphicLayoutEffect)(function() {
-        hasntMeasured && screenSize && frameSize && (at.current = screenSize, animatedNumber.setValue(screenSize, {
-          type: "timing",
-          duration: 0
-        }, function() {
-          setTimeout(function() {
-            setDisableAnimation(!1);
-          }, 10);
-        }));
+        if (hasntMeasured && screenSize && frameSize) {
+          at.current = screenSize, animatedNumber.setValue(screenSize, {
+            type: "timing",
+            duration: 0
+          }, function() {
+            setTimeout(function() {
+              setDisableAnimation(!1);
+            }, 10);
+          });
+          return;
+        }
+        disableAnimation || !frameSize || !screenSize || isHidden || hasntMeasured && !open || (animateTo(position), position === -1 && (scrollBridge.scrollLock = !1, scrollBridge.scrollStartY = -1));
       }, [
         hasntMeasured,
+        disableAnimation,
+        isHidden,
+        frameSize,
         screenSize,
-        frameSize
-      ]), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
-        isAbleToPosition && (animateTo(position), position === -1 && (scrollBridge.scrollLock = !1, scrollBridge.scrollStartY = -1));
-      }, [
-        isAbleToPosition,
+        open,
         position
       ]);
       var _props_disableDrag, disableDrag = (_props_disableDrag = props.disableDrag) !== null && _props_disableDrag !== void 0 ? _props_disableDrag : controller == null ? void 0 : controller.disableDrag, themeName = (0, import_core12.useThemeName)(), [isDragging, setIsDragging] = import_react3.default.useState(!1), panResponder = import_react3.default.useMemo(function() {