@tamagui/sheet 3.0.0-beta.922.1 → 3.0.0

package/dist/cjs/{GestureDetectorWrapper.native.js → SheetDragSurface.native.js}

@@ -1,8 +1,10 @@
 "use strict";
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
 	for (var name in all) __defProp(target, name, {
@@ -19,31 +21,43 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var GestureDetectorWrapper_exports = {};
-__export(GestureDetectorWrapper_exports, { GestureDetectorWrapper: () => GestureDetectorWrapper });
-module.exports = __toCommonJS(GestureDetectorWrapper_exports);
+var SheetDragSurface_native_exports = {};
+__export(SheetDragSurface_native_exports, { SheetDragSurface: () => SheetDragSurface });
+module.exports = __toCommonJS(SheetDragSurface_native_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
+var React = __toESM(require("react"), 1);
 var import_react_native = require("react-native");
 var import_gestureState = require("./gestureState.native.js");
-function GestureDetectorWrapper(param) {
-	var { gesture, children, style } = param;
+function SheetDragSurface(param) {
+	var { gestureHandlerEnabled, panGesture, panConfig, children } = param;
 	var { GestureDetector } = (0, import_gestureState.getGestureHandlerState)();
-	var enabled = (0, import_gestureState.isGestureHandlerEnabled)();
-	if (enabled && GestureDetector && gesture) {
+	var panHandlers = React.useMemo(function() {
+		return panConfig ? import_react_native.PanResponder.create(panConfig).panHandlers : void 0;
+	}, [panConfig]);
+	if (gestureHandlerEnabled && panGesture && GestureDetector) {
 		return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GestureDetector, {
-			gesture,
+			gesture: panGesture,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {
-				style,
+				style: { flex: 1 },
 				collapsable: false,
 				children
 			})
 		});
 	}
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {
-		style,
+		...panHandlers,
+		style: {
+			flex: 1,
+			width: "100%",
+			height: "100%"
+		},
 		children
 	});
 }
 
-//# sourceMappingURL=GestureDetectorWrapper.native.js.map
+//# sourceMappingURL=SheetDragSurface.native.js.map

package/dist/cjs/SheetDragSurface.native.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SheetDragSurface.native.js","names":[],"sources":["cjs/SheetDragSurface.native.js"],"sourcesContent":["\"use strict\";\nvar __create = Object.create;\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __getProtoOf = Object.getPrototypeOf;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(\n  // If the importer is in node compatibility mode or this is not an ESM\n  // file that has been converted to a CommonJS file using a Babel-\n  // compatible transform (i.e. \"__esModule\" has not been set), then set\n  // \"default\" to the CommonJS \"module.exports\" for node compatibility.\n  isNodeMode || !mod || !mod.__esModule ? __defProp(target, \"default\", { value: mod, enumerable: true }) : target,\n  mod\n));\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar SheetDragSurface_native_exports = {};\n__export(SheetDragSurface_native_exports, {\n  SheetDragSurface: () => SheetDragSurface\n});\nmodule.exports = __toCommonJS(SheetDragSurface_native_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar React = __toESM(require(\"react\"), 1);\nvar import_react_native = require(\"react-native\");\nvar import_gestureState = require(\"./gestureState\");\nfunction SheetDragSurface(param) {\n  var { gestureHandlerEnabled, panGesture, panConfig, children } = param;\n  var { GestureDetector } = (0, import_gestureState.getGestureHandlerState)();\n  var panHandlers = React.useMemo(function() {\n    return panConfig ? import_react_native.PanResponder.create(panConfig).panHandlers : void 0;\n  }, [\n    panConfig\n  ]);\n  if (gestureHandlerEnabled && panGesture && GestureDetector) {\n    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GestureDetector, {\n      gesture: panGesture,\n      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {\n        style: {\n          flex: 1\n        },\n        collapsable: false,\n        children\n      })\n    });\n  }\n  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {\n    ...panHandlers,\n    style: {\n      flex: 1,\n      width: \"100%\",\n      height: \"100%\"\n    },\n    children\n  });\n}\n//# sourceMappingURL=SheetDragSurface.native.js.map\n"],"mappings":";;;AACA,IAAI,WAAW,OAAO;AACtB,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO;AAC1B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,WAAW,KAAK,YAAY,YAAY,SAAS,OAAO,OAAO,SAAS,aAAa,GAAG,CAAC,IAAI,CAAC,GAAG,YAKnG,cAAc,CAAC,OAAO,CAAC,IAAI,aAAa,UAAU,QAAQ,WAAW;CAAE,OAAO;CAAK,YAAY;AAAK,CAAC,IAAI,QACzG,GACF;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,kCAAkC,CAAC;AACvC,SAAS,iCAAiC,EACxC,wBAAwB,iBAC1B,CAAC;AACD,OAAO,UAAU,aAAa,+BAA+B;AAC7D,IAAI,qBAAqB,QAAQ,mBAAmB;AACpD,IAAI,QAAQ,QAAQ,QAAQ,OAAO,GAAG,CAAC;AACvC,IAAI,sBAAsB,QAAQ,cAAc;AAChD,IAAI,sBAAsB,QAAQ,0BAAgB;AAClD,SAAS,iBAAiB,OAAO;CAC/B,IAAI,EAAE,uBAAuB,YAAY,WAAW,aAAa;CACjE,IAAI,EAAE,qBAAqB,GAAG,oBAAoB,uBAAsB,CAAE;CAC1E,IAAI,cAAc,MAAM,QAAQ,WAAW;EACzC,OAAO,YAAY,oBAAoB,aAAa,OAAO,SAAS,CAAC,CAAC,cAAc,KAAK;CAC3F,GAAG,CACD,SACF,CAAC;CACD,IAAI,yBAAyB,cAAc,iBAAiB;EAC1D,OAAuB,iBAAC,GAAG,mBAAmB,IAAG,CAAE,iBAAiB;GAClE,SAAS;GACT,UAA0B,iBAAC,GAAG,mBAAmB,IAAG,CAAE,oBAAoB,MAAM;IAC9E,OAAO,EACL,MAAM,EACR;IACA,aAAa;IACb;GACF,CAAC;EACH,CAAC;CACH;CACA,OAAuB,iBAAC,GAAG,mBAAmB,IAAG,CAAE,oBAAoB,MAAM;EAC3E,GAAG;EACH,OAAO;GACL,MAAM;GACN,OAAO;GACP,QAAQ;EACV;EACA;CACF,CAAC;AACH"}

package/dist/cjs/SheetImplementationCustom.cjs

@@ -32,16 +32,17 @@ __export(SheetImplementationCustom_exports, {
 module.exports = __toCommonJS(SheetImplementationCustom_exports);
 require("@tamagui/adapt");
 var import_animate_presence = require("@tamagui/animate-presence");
+var import_transitionResolver = require("@tamagui/animation-helpers/transitionResolver");
 var import_compose_refs = require("@tamagui/compose-refs");
 var import_constants = require("@tamagui/constants");
 var import_core = require("@tamagui/core");
 var import_portal = require("@tamagui/portal");
 var import_react = __toESM(require("react"), 1);
-var import_react_native = require("react-native-web");
 var import_contexts = require("./contexts.cjs");
 var import_constants2 = require("./constants.cjs");
-var import_GestureDetectorWrapper = require("./GestureDetectorWrapper.cjs");
 var import_gestureState = require("./gestureState.cjs");
+var import_SheetDragSurface = require("./SheetDragSurface.cjs");
+var import_stableViewportHeight = require("./stableViewportHeight.cjs");
 var import_GestureSheetContext = require("./GestureSheetContext.cjs");
 var import_helpers = require("./helpers.cjs");
 var import_keyboardAvoidance = require("./keyboardAvoidance.cjs");
@@ -64,11 +65,6 @@ const rnghRootStyleClosed = {
 };
 let sheetHiddenStyleSheet = null;
 const sheetEscapeLayers = [];
-const relativeDimensionTo = import_constants.isWeb ? "window" : "screen";
-function getStableViewportHeight() {
-	if (import_constants.isWeb && typeof window !== "undefined") return (0, import_webViewport.getStableLayoutViewportHeight)();
-	return import_react_native.Dimensions.get(relativeDimensionTo).height;
-}
 const SheetImplementationCustom = (0, import_core.createRefComponent)(function SheetImplementationCustom2(props, forwardedRef) {
 	const parentSheet = import_react.default.useContext(import_contexts.ParentSheetContext);
 	const safeAreaTopInset = (0, import_useSafeAreaInsets.useSafeAreaInsets)()?.top ?? 0;
@@ -84,16 +80,18 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 	const animationDriver = (0, import_core.useAnimationDriver)();
 	const transitionConfig = (() => {
 		if (transitionConfigProp) return transitionConfigProp;
-		const [animationProp, animationPropConfig] = !transition ? [] : Array.isArray(transition) ? transition : [transition];
-		const namedConfig = animationProp && animationDriver.animations?.[animationProp];
-		if (namedConfig) {
-			if (typeof namedConfig === "string") return animationPropConfig ?? null;
-			return {
-				...namedConfig,
-				...animationPropConfig
-			};
-		}
-		return null;
+		const timing = (transition ? (0, import_transitionResolver.getTransitionResolver)()?.resolve(transition, { animations: animationDriver.animations }) : null)?.all?.timing;
+		if (!timing) return null;
+		if (timing.kind === "timing") return {
+			type: "timing",
+			duration: timing.durationMs
+		};
+		return {
+			type: "spring",
+			stiffness: timing.stiffness,
+			damping: timing.damping,
+			mass: timing.mass
+		};
 	})();
 	const [isShowingInnerSheet, setIsShowingInnerSheet] = import_react.default.useState(false);
 	const shouldHideParentSheet = !import_constants.isWeb && modal && isShowingInnerSheet && (0, import_portal.needsPortalRepropagation)();
@@ -117,7 +115,7 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 		isKeyboardVisible,
 		frameSize
 	]);
-	const effScreenSize = isWebKbSheet ? getStableViewportHeight() : screenSize;
+	const effScreenSize = isWebKbSheet ? (0, import_stableViewportHeight.getStableViewportHeight)() : screenSize;
 	const effectiveFrameSize = open ? frameSize : stableFrameSize.current || frameSize;
 	const positions = import_react.default.useMemo(() => snapPoints.map((point) => getYPositions(snapPointsMode, point, effScreenSize, effectiveFrameSize)), [
 		effScreenSize,
@@ -307,15 +305,11 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 	(0, import_constants.useIsomorphicLayoutEffect)(() => {
 		if (hasntMeasured && screenSize && frameSize) {
 			at.current = screenSize;
-			animatedNumber.setValue(screenSize, {
-				type: "timing",
-				duration: 0
-			}, () => {
-				syncAnimatedPosition(screenSize);
-				setTimeout(() => {
-					setDisableAnimation(false);
-				}, 10);
-			});
+			animatedNumber.setValue(screenSize, { type: "direct" });
+			syncAnimatedPosition(screenSize);
+			setTimeout(() => {
+				setDisableAnimation(false);
+			}, 10);
 			return;
 		}
 		if (disableAnimation) return;
@@ -349,10 +343,10 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 	const disableDrag = props.disableDrag ?? controller?.disableDrag;
 	(0, import_core.useThemeName)();
 	const [blockPan, setBlockPan] = import_react.default.useState(false);
-	const panResponder = import_react.default.useMemo(() => {
-		if (disableDrag) return;
-		if (!frameSize) return;
-		if (isShowingInnerSheet) return;
+	const panConfig = import_react.default.useMemo(() => {
+		if (disableDrag) return null;
+		if (!frameSize) return null;
+		if (isShowingInnerSheet) return null;
 		const minY = activePositions[0];
 		scrollBridge.paneMinY = minY;
 		let startY = at.current;
@@ -438,7 +432,7 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 			setPosition(positionIndex);
 			animateTo(positionIndex);
 		};
-		return import_react_native.PanResponder.create({
+		return {
 			onMoveShouldSetPanResponder: onMoveShouldSet,
 			onPanResponderTerminationRequest: () => false,
 			onPanResponderGrant: grant,
@@ -452,7 +446,7 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 			onPanResponderEnd: finish,
 			onPanResponderTerminate: finish,
 			onPanResponderRelease: finish
-		});
+		};
 	}, [
 		disableDrag,
 		isShowingInnerSheet,
@@ -533,13 +527,13 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 		if (!open && stableFrameSize.current !== 0) return;
 		const layoutHeight = e.nativeEvent?.layout.height;
 		if (ignoreLayoutForKeyboard() && frameSize > 0) return;
-		const next = modal ? Math.min(layoutHeight, getStableViewportHeight()) : layoutHeight;
+		const next = modal ? Math.min(layoutHeight, (0, import_stableViewportHeight.getStableViewportHeight)()) : layoutHeight;
 		if (!next) return;
 		setFrameSize(Math.round(next));
 	});
 	const handleMaxContentViewLayout = import_react.default.useCallback((e) => {
 		if (ignoreLayoutForKeyboard() && screenSize > 0) return;
-		const next = Math.min(e.nativeEvent?.layout.height, getStableViewportHeight());
+		const next = Math.min(e.nativeEvent?.layout.height, (0, import_stableViewportHeight.getStableViewportHeight)());
 		if (!next) return;
 		setMaxContentSize(Math.round(next));
 	}, [ignoreLayoutForKeyboard, screenSize]);
@@ -597,16 +591,11 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 									children: shouldHideParentSheet || !open ? null : overlayChildren
 								})
 							}),
-							snapPointsMode !== "percent" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {
-								style: {
-									opacity: 0,
-									position: "absolute",
-									top: 0,
-									left: 0,
-									right: 0,
-									bottom: 0,
-									pointerEvents: "none"
-								},
+							snapPointsMode !== "percent" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.View, {
+								opacity: 0,
+								position: "absolute",
+								inset: 0,
+								pointerEvents: "none",
 								onLayout: handleMaxContentViewLayout
 							}),
 							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnimatedView, {
@@ -623,17 +612,10 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 									...applyHidden && { display: "none" },
 									...(shouldHideParentSheet || !open) && { pointerEvents: "none" }
 								}, animatedStyle],
-								children: gestureHandlerEnabled && panGesture ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_GestureDetectorWrapper.GestureDetectorWrapper, {
-									gesture: panGesture,
-									style: { flex: 1 },
-									children: animatedChildren
-								}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {
-									...panResponder?.panHandlers,
-									style: {
-										flex: 1,
-										width: "100%",
-										height: "100%"
-									},
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_SheetDragSurface.SheetDragSurface, {
+									gestureHandlerEnabled,
+									panGesture,
+									panConfig,
 									children: animatedChildren
 								})
 							})
@@ -645,13 +627,14 @@ const SheetImplementationCustom = (0, import_core.createRefComponent)(function S
 	});
 	const shouldMountChildren = unmountChildrenWhenHidden ? !isFullyClosed : true;
 	if (modal) {
+		if (!shouldMountChildren) return null;
 		const RNGHRoot = (0, import_gestureState.getGestureHandlerState)().RootView;
-		const mountedContents = shouldMountChildren ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContainerComponent, { children: contents }) : null;
+		const mountedContents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContainerComponent, { children: contents });
 		const modalContents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.Portal, {
 			stackZIndex: zIndex,
 			hidden: !isVisuallyActive,
 			...portalProps,
-			children: mountedContents && RNGHRoot ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RNGHRoot, {
+			children: RNGHRoot ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RNGHRoot, {
 				style: open ? rnghRootStyleOpen : rnghRootStyleClosed,
 				children: mountedContents
 			}) : mountedContents

package/dist/cjs/SheetImplementationCustom.native.cjs

@@ -35,16 +35,17 @@ module.exports = __toCommonJS(SheetImplementationCustom_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_adapt = require("@tamagui/adapt");
 var import_animate_presence = require("@tamagui/animate-presence");
+var import_transitionResolver = require("@tamagui/animation-helpers/transitionResolver");
 var import_compose_refs = require("@tamagui/compose-refs");
 var import_constants = require("@tamagui/constants");
 var import_core = require("@tamagui/core");
 var import_portal = require("@tamagui/portal");
 var import_react = __toESM(require("react"), 1);
-var import_react_native = require("react-native");
 var import_contexts = require("./contexts.native.js");
 var import_constants2 = require("./constants.native.js");
-var import_GestureDetectorWrapper = require("./GestureDetectorWrapper.native.js");
 var import_gestureState = require("./gestureState.native.js");
+var import_SheetDragSurface = require("./SheetDragSurface.native.js");
+var import_stableViewportHeight = require("./stableViewportHeight.native.js");
 var import_GestureSheetContext = require("./GestureSheetContext.native.js");
 var import_helpers = require("./helpers.native.js");
 var import_keyboardAvoidance = require("./keyboardAvoidance.native.js");
@@ -65,11 +66,6 @@ var rnghRootStyleClosed = {
 	height: 0
 };
 var sheetEscapeLayers = [];
-var relativeDimensionTo = import_constants.isWeb ? "window" : "screen";
-function getStableViewportHeight() {
-	if (import_constants.isWeb && typeof window !== "undefined") return (0, import_webViewport.getStableLayoutViewportHeight)();
-	return import_react_native.Dimensions.get(relativeDimensionTo).height;
-}
 var SheetImplementationCustom = (0, import_core.createRefComponent)(function SheetImplementationCustom2(props, forwardedRef) {
 	var parentSheet = import_react.default.useContext(import_contexts.ParentSheetContext);
 	var safeAreaInsets = (0, import_useSafeAreaInsets.useSafeAreaInsets)();
@@ -86,18 +82,21 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 	var ref = (0, import_compose_refs.useComposedRefs)(forwardedRef, sheetRef, providerProps.contentRef);
 	var animationDriver = (0, import_core.useAnimationDriver)();
 	var transitionConfig = (function() {
-		var _animationDriver_animations;
+		var _getTransitionResolver, _resolved_all;
 		if (transitionConfigProp) return transitionConfigProp;
-		var [animationProp, animationPropConfig] = !transition ? [] : Array.isArray(transition) ? transition : [transition];
-		var namedConfig = animationProp && ((_animationDriver_animations = animationDriver.animations) === null || _animationDriver_animations === void 0 ? void 0 : _animationDriver_animations[animationProp]);
-		if (namedConfig) {
-			if (typeof namedConfig === "string") return animationPropConfig !== null && animationPropConfig !== void 0 ? animationPropConfig : null;
-			return {
-				...namedConfig,
-				...animationPropConfig
-			};
-		}
-		return null;
+		var resolved = transition ? (_getTransitionResolver = (0, import_transitionResolver.getTransitionResolver)()) === null || _getTransitionResolver === void 0 ? void 0 : _getTransitionResolver.resolve(transition, { animations: animationDriver.animations }) : null;
+		var timing = resolved === null || resolved === void 0 ? void 0 : (_resolved_all = resolved.all) === null || _resolved_all === void 0 ? void 0 : _resolved_all.timing;
+		if (!timing) return null;
+		if (timing.kind === "timing") return {
+			type: "timing",
+			duration: timing.durationMs
+		};
+		return {
+			type: "spring",
+			stiffness: timing.stiffness,
+			damping: timing.damping,
+			mass: timing.mass
+		};
 	})();
 	var [isShowingInnerSheet, setIsShowingInnerSheet] = import_react.default.useState(false);
 	var shouldHideParentSheet = !import_constants.isWeb && modal && isShowingInnerSheet && (0, import_portal.needsPortalRepropagation)();
@@ -121,7 +120,7 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 		isKeyboardVisible,
 		frameSize
 	]);
-	var effScreenSize = isWebKbSheet ? getStableViewportHeight() : screenSize;
+	var effScreenSize = isWebKbSheet ? (0, import_stableViewportHeight.getStableViewportHeight)() : screenSize;
 	var effectiveFrameSize = open ? frameSize : stableFrameSize.current || frameSize;
 	var positions = import_react.default.useMemo(function() {
 		return snapPoints.map(function(point) {
@@ -326,15 +325,11 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 	(0, import_constants.useIsomorphicLayoutEffect)(function() {
 		if (hasntMeasured && screenSize && frameSize) {
 			at.current = screenSize;
-			animatedNumber.setValue(screenSize, {
-				type: "timing",
-				duration: 0
-			}, function() {
-				syncAnimatedPosition(screenSize);
-				setTimeout(function() {
-					setDisableAnimation(false);
-				}, 10);
-			});
+			animatedNumber.setValue(screenSize, { type: "direct" });
+			syncAnimatedPosition(screenSize);
+			setTimeout(function() {
+				setDisableAnimation(false);
+			}, 10);
 			return;
 		}
 		if (disableAnimation) return;
@@ -371,10 +366,10 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 	var disableDrag = (_props_disableDrag = props.disableDrag) !== null && _props_disableDrag !== void 0 ? _props_disableDrag : controller === null || controller === void 0 ? void 0 : controller.disableDrag;
 	(0, import_core.useThemeName)();
 	var [blockPan, setBlockPan] = import_react.default.useState(false);
-	var panResponder = import_react.default.useMemo(function() {
-		if (disableDrag) return;
-		if (!frameSize) return;
-		if (isShowingInnerSheet) return;
+	var panConfig = import_react.default.useMemo(function() {
+		if (disableDrag) return null;
+		if (!frameSize) return null;
+		if (isShowingInnerSheet) return null;
 		var minY = activePositions[0];
 		scrollBridge.paneMinY = minY;
 		var startY = at.current;
@@ -456,7 +451,7 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 			setPosition(positionIndex);
 			animateTo(positionIndex);
 		};
-		return import_react_native.PanResponder.create({
+		return {
 			onMoveShouldSetPanResponder: onMoveShouldSet,
 			onPanResponderTerminationRequest: function() {
 				return false;
@@ -473,7 +468,7 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 			onPanResponderEnd: finish,
 			onPanResponderTerminate: finish,
 			onPanResponderRelease: finish
-		});
+		};
 	}, [
 		disableDrag,
 		isShowingInnerSheet,
@@ -557,14 +552,14 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 		if (!open && stableFrameSize.current !== 0) return;
 		var layoutHeight = (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height;
 		if (ignoreLayoutForKeyboard() && frameSize > 0) return;
-		var next = modal ? Math.min(layoutHeight, getStableViewportHeight()) : layoutHeight;
+		var next = modal ? Math.min(layoutHeight, (0, import_stableViewportHeight.getStableViewportHeight)()) : layoutHeight;
 		if (!next) return;
 		setFrameSize(Math.round(next));
 	});
 	var handleMaxContentViewLayout = import_react.default.useCallback(function(e) {
 		var _e_nativeEvent;
 		if (ignoreLayoutForKeyboard() && screenSize > 0) return;
-		var next = Math.min((_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, getStableViewportHeight());
+		var next = Math.min((_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, (0, import_stableViewportHeight.getStableViewportHeight)());
 		if (!next) return;
 		setMaxContentSize(Math.round(next));
 	}, [ignoreLayoutForKeyboard, screenSize]);
@@ -627,16 +622,11 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 									children: shouldHideParentSheet || !open ? null : overlayChildren
 								})
 							}),
-							snapPointsMode !== "percent" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {
-								style: {
-									opacity: 0,
-									position: "absolute",
-									top: 0,
-									left: 0,
-									right: 0,
-									bottom: 0,
-									pointerEvents: "none"
-								},
+							snapPointsMode !== "percent" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.View, {
+								opacity: 0,
+								position: "absolute",
+								inset: 0,
+								pointerEvents: "none",
 								onLayout: handleMaxContentViewLayout
 							}),
 							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnimatedView, {
@@ -653,17 +643,10 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 									...applyHidden && { display: "none" },
 									...(shouldHideParentSheet || !open) && { pointerEvents: "none" }
 								}, animatedStyle],
-								children: gestureHandlerEnabled && panGesture ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_GestureDetectorWrapper.GestureDetectorWrapper, {
-									gesture: panGesture,
-									style: { flex: 1 },
-									children: animatedChildren
-								}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, {
-									...panResponder === null || panResponder === void 0 ? void 0 : panResponder.panHandlers,
-									style: {
-										flex: 1,
-										width: "100%",
-										height: "100%"
-									},
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_SheetDragSurface.SheetDragSurface, {
+									gestureHandlerEnabled,
+									panGesture,
+									panConfig,
 									children: animatedChildren
 								})
 							})
@@ -685,13 +668,14 @@ var SheetImplementationCustom = (0, import_core.createRefComponent)(function She
 	}
 	var shouldMountChildren = unmountChildrenWhenHidden ? !isFullyClosed : true;
 	if (modal) {
+		if (!shouldMountChildren) return null;
 		var RNGHRoot = (0, import_gestureState.getGestureHandlerState)().RootView;
-		var mountedContents = shouldMountChildren ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContainerComponent, { children: contents }) : null;
+		var mountedContents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContainerComponent, { children: contents });
 		var modalContents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.Portal, {
 			stackZIndex: zIndex,
 			hidden: !isVisuallyActive,
 			...portalProps,
-			children: mountedContents && RNGHRoot ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RNGHRoot, {
+			children: RNGHRoot ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RNGHRoot, {
 				style: open ? rnghRootStyleOpen : rnghRootStyleClosed,
 				children: mountedContents
 			}) : mountedContents