tamagui 2.3.3 → 2.4.0

package/dist/test.cjs

@@ -12349,6 +12349,43 @@ function updateMediaListeners() {
 		return cb(getMedia());
 	});
 }
+function buildTouchTrackerProto() {
+	var proto = {};
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		var _loop = function() {
+			var fullKey = _step.value;
+			var key = fullKey[0] === "$" ? fullKey.slice(1) : fullKey;
+			proto[key] = {
+				enumerable: true,
+				configurable: true,
+				get() {
+					var slot = this[refSlot];
+					if (!disableMediaTouch) slot.keys.add(key);
+					return slot.proxyTarget[key];
+				}
+			};
+		};
+		for (var _iterator = mediaKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+		} finally {
+			if (_didIteratorError) throw _iteratorError;
+		}
+	}
+	return Object.create(null, proto);
+}
+function getTouchTrackerProto() {
+	if (!touchTrackerProto) touchTrackerProto = buildTouchTrackerProto();
+	return touchTrackerProto;
+}
+function resetMediaTouchTracker() {
+	touchTrackerProto = null;
+}
 function setMediaShouldUpdate(ref, enabled, keys) {
 	var cur = States.get(ref);
 	if (!cur || cur.enabled !== enabled || keys) States.set(ref, _objectSpread2(_objectSpread2({}, cur), {}, {
@@ -12364,53 +12401,99 @@ function subscribe$1(subscriber) {
 }
 function useMedia(componentContext, debug) {
 	"use no memo";
-	var componentState = componentContext ? States.get(componentContext) : null;
 	var internalRef = (0, react$1.useRef)(null);
-	if (!internalRef.current) internalRef.current = {
-		keys: /* @__PURE__ */ new Set(),
-		lastState: getMedia()
-	};
-	if (internalRef.current.pendingState) {
-		internalRef.current.lastState = internalRef.current.pendingState;
-		internalRef.current.pendingState = void 0;
-	}
-	var { keys } = internalRef.current;
-	if (keys.size) keys.clear();
-	var state = (0, react$1.useSyncExternalStore)(subscribe$1, function() {
-		var curKeys = (componentState === null || componentState === void 0 ? void 0 : componentState.keys) || keys;
-		var { lastState, pendingState } = internalRef.current;
-		if (!curKeys.size) return lastState;
-		var ms = getMedia();
-		var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-		try {
-			for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-				var key = _step.value;
-				if (ms[key] !== (pendingState || lastState)[key]) {
-					if (componentContext === null || componentContext === void 0 ? void 0 : componentContext.mediaEmit) {
-						componentContext.mediaEmit(ms);
-						internalRef.current.pendingState = ms;
-						return lastState;
+	if (!internalRef.current) {
+		var initial = getMedia();
+		var r = {
+			keys: /* @__PURE__ */ new Set(),
+			lastState: initial,
+			renderVersion: 0,
+			proxyTarget: initial,
+			proxy: void 0,
+			getSnapshot: void 0,
+			componentContext,
+			debug
+		};
+		var tracker = Object.create(getTouchTrackerProto());
+		tracker[refSlot] = {
+			proxyTarget: initial,
+			keys: r.keys
+		};
+		r.proxy = tracker;
+		r.getSnapshot = function() {
+			var _States_get;
+			var curKeys = r.componentContext ? ((_States_get = States.get(r.componentContext)) === null || _States_get === void 0 ? void 0 : _States_get.keys) || r.keys : r.keys;
+			var { lastState, pendingState } = r;
+			if (!curKeys.size) return lastState;
+			var ms = getMedia();
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var key = _step.value;
+					if (ms[key] !== (pendingState || lastState)[key]) {
+						var _r_componentContext;
+						if ((_r_componentContext = r.componentContext) === null || _r_componentContext === void 0 ? void 0 : _r_componentContext.mediaEmit) {
+							r.componentContext.mediaEmit(ms);
+							r.pendingState = ms;
+							return lastState;
+						}
+						r.lastState = ms;
+						return ms;
 					}
-					internalRef.current.lastState = ms;
-					return ms;
 				}
-			}
-		} catch (err) {
-			_didIteratorError = true;
-			_iteratorError = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
 			} finally {
-				if (_didIteratorError) throw _iteratorError;
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+				} finally {
+					if (_didIteratorError) throw _iteratorError;
+				}
 			}
+			return lastState;
+		};
+		internalRef.current = r;
+	} else {
+		internalRef.current.componentContext = componentContext;
+		internalRef.current.debug = debug;
+	}
+	var ref = internalRef.current;
+	ref.renderVersion++;
+	if (ref.pendingState) {
+		ref.lastState = ref.pendingState;
+		ref.pendingState = void 0;
+	}
+	if (ref.keys.size) ref.keys.clear();
+	var [, forceUpdate] = (0, react$1.useReducer)(incReducer$1, 0);
+	var state = ref.getSnapshot();
+	ref.proxyTarget = state;
+	ref.proxy[refSlot].proxyTarget = state;
+	(0, react$1.useEffect)(function() {
+		var _States_get;
+		var renderVersion = ref.renderVersion;
+		if (!ref.componentContext || !!((_States_get = States.get(ref.componentContext)) === null || _States_get === void 0 ? void 0 : _States_get.enabled)) {
+			if (!ref.unsubscribe) ref.unsubscribe = subscribe$1(function() {
+				var next = ref.getSnapshot();
+				if (next !== ref.proxyTarget) {
+					ref.proxyTarget = next;
+					ref.proxy[refSlot].proxyTarget = next;
+					forceUpdate();
+				}
+			});
+		} else if (ref.unsubscribe) {
+			ref.unsubscribe();
+			ref.unsubscribe = void 0;
 		}
-		return lastState;
-	}, getServerSnapshot);
-	return new Proxy(state, { get(_, key) {
-		if (!disableMediaTouch && typeof key === "string") keys.add(key);
-		return Reflect.get(state, key);
-	} });
+		return function() {
+			if (ref.renderVersion === renderVersion) {
+				var _ref_unsubscribe;
+				(_ref_unsubscribe = ref.unsubscribe) === null || _ref_unsubscribe === void 0 || _ref_unsubscribe.call(ref);
+				ref.unsubscribe = void 0;
+			}
+		};
+	});
+	return ref.proxy;
 }
 function getMediaState(mediaGroups, layout) {
 	disableMediaTouch = true;
@@ -12433,7 +12516,7 @@ function mediaKeyMatch(key, dimensions) {
 		return isMax ? givenVal < expectedVal : givenVal > expectedVal;
 	});
 }
-var mediaKeyRegex, getMediaKey, initState, mediaKeysOrdered, getMediaKeyImportance, dispose, mediaVersion, configureMedia, setupVersion, listeners, States, getServerSnapshot, disableMediaTouch, getMediaImportanceIfMoreImportant;
+var mediaKeyRegex, getMediaKey, mediaKeysOrdered, getMediaKeyImportance, dispose, mediaVersion, configureMedia, setupVersion, listeners, States, touchTrackerProto, refSlot, incReducer$1, disableMediaTouch, getMediaImportanceIfMoreImportant;
 var init_useMedia_native = __esmMin((() => {
 	init_index_native$7();
 	init_config_native();
@@ -12462,20 +12545,23 @@ var init_useMedia_native = __esmMin((() => {
 		if (!media) return;
 		mediaVersion++;
 		resetMediaStyleCache();
+		resetMediaTouchTracker();
 		for (var key in media) {
 			getMedia()[key] = (mediaQueryDefaultActive === null || mediaQueryDefaultActive === void 0 ? void 0 : mediaQueryDefaultActive[key]) || false;
 			mediaKeys.add(`$${key}`);
 		}
 		Object.assign(mediaQueryConfig, media);
-		initState = _objectSpread2({}, getMedia());
+		_objectSpread2({}, getMedia());
 		mediaKeysOrdered = Object.keys(media);
 		setupMediaListeners();
 	};
 	setupVersion = -1;
 	listeners = /* @__PURE__ */ new Set();
 	States = /* @__PURE__ */ new WeakMap();
-	getServerSnapshot = function() {
-		return initState;
+	touchTrackerProto = null;
+	refSlot = /* @__PURE__ */ Symbol("mediaRefSlot");
+	incReducer$1 = function(c) {
+		return c + 1;
 	};
 	disableMediaTouch = false;
 	getMediaImportanceIfMoreImportant = function(mediaKey, key, styleState, isSizeMedia) {
@@ -13100,6 +13186,18 @@ var init_getDynamicVal_native = __esmMin((() => {
 }));
 //#endregion
 //#region ../../core/web/dist/esm/hooks/useThemeState.native.js
+function cleanupThemeSubscription(r) {
+	var _r_unsubscribe;
+	(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
+}
+function cleanupThemeState(r) {
+	if (r.unsubscribe) cleanupThemeSubscription(r);
+	else {
+		localStates.delete(r.id);
+		states.delete(r.id);
+		PendingUpdate.delete(r.id);
+	}
+}
 function scheduleUpdate(id) {
 	var queue = [id];
 	var visited = /* @__PURE__ */ new Set();
@@ -13273,7 +13371,7 @@ function getNewThemeName() {
 	themeNameCache.set(cacheKey, found);
 	return found;
 }
-var ThemeStateContext, allListeners, listenersByParent, HasRenderedOnce, HadTheme, PendingUpdate, states, localStates, shouldForce, forceUpdateThemes, getThemeState, cacheVersion, themeNameCache, themeNameCacheVer, themes, rootThemeState, getRootThemeState, getThemeBaseName, useThemeState, getNextState, validSchemes, getPropsKey, hasThemeUpdatingProps;
+var ThemeStateContext, allListeners, listenersByParent, HasRenderedOnce, HadTheme, PendingUpdate, states, localStates, shouldForce, forceUpdateThemes, getThemeState, cacheVersion, themeNameCache, themeNameCacheVer, themes, rootThemeState, getRootThemeState, getThemeBaseName, incReducer, useThemeState, shouldSubscribeToTheme, getSnapshotImpl, getNextState, validSchemes, getPropsKey, hasThemeUpdatingProps;
 var init_useThemeState_native = __esmMin((() => {
 	init_index_native$7();
 	init_config_native();
@@ -13310,9 +13408,12 @@ var init_useThemeState_native = __esmMin((() => {
 	getThemeBaseName = function(name) {
 		return name.replace(/^(light|dark)_/, "");
 	};
+	incReducer = function(c) {
+		return c + 1;
+	};
 	useThemeState = function(props) {
 		"use no memo";
-		var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, keys = arguments.length > 2 ? arguments[2] : void 0, schemeKeys = arguments.length > 3 ? arguments[3] : void 0;
+		var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, keys = arguments.length > 2 ? arguments[2] : void 0, schemeKeys = arguments.length > 3 ? arguments[3] : void 0, cascadeOnChange = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
 		var { disable } = props;
 		var parentId = (0, react$1.useContext)(ThemeStateContext);
 		if (!parentId && !isRoot) throw new Error(MISSING_THEME_MESSAGE);
@@ -13322,53 +13423,69 @@ var init_useThemeState_native = __esmMin((() => {
 			theme: getConfig().themes.light
 		};
 		var id = (0, react$1.useId)();
-		var subscribe = (0, react$1.useCallback)(function(cb) {
-			listenersByParent[parentId] = listenersByParent[parentId] || /* @__PURE__ */ new Set();
-			listenersByParent[parentId].add(id);
-			allListeners.set(id, function() {
-				PendingUpdate.set(id, shouldForce ? "force" : true);
-				cb();
-			});
-			return function() {
-				allListeners.delete(id);
-				listenersByParent[parentId].delete(id);
-				localStates.delete(id);
-				states.delete(id);
-				PendingUpdate.delete(id);
-			};
-		}, [id, parentId]);
 		var propsKey = getPropsKey(props);
-		var getSnapshot = function() {
-			var _keys_current, _schemeKeys_current, _keys_current1, _props_needsUpdate;
-			var local = localStates.get(id);
-			var parentState = states.get(parentId);
-			if (local && !PendingUpdate.has(id)) {
-				if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
-			}
-			var isSchemeOnlyChange = supportsDynamicColorIOS && getSetting("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
-			var _keys_current_size;
-			var keysSize = (_keys_current_size = keys === null || keys === void 0 ? void 0 : (_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) !== null && _keys_current_size !== void 0 ? _keys_current_size : 0;
-			var _schemeKeys_current_size;
-			var allKeysSchemeOptimized = ((_schemeKeys_current_size = schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) !== null && _schemeKeys_current_size !== void 0 ? _schemeKeys_current_size : 0) === keysSize && keysSize > 0;
-			var canSkipForSchemeChange = isSchemeOnlyChange && allKeysSchemeOptimized;
-			var needsUpdate = props.passThrough ? false : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
-			var [rerender, next] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
-			PendingUpdate.delete(id);
-			if (!local || rerender) {
-				local = _objectSpread2({}, next);
-				localStates.set(id, local);
-			}
-			if (next !== local) {
-				Object.assign(local, next);
-				local.id = id;
-			}
-			local._parentName = parentState === null || parentState === void 0 ? void 0 : parentState.name;
-			local._propsKey = propsKey;
-			states.set(id, next);
-			return local;
+		var ref = (0, react$1.useRef)(null);
+		if (!ref.current) ref.current = {
+			id,
+			parentId,
+			props,
+			propsKey,
+			isRoot,
+			keys,
+			schemeKeys,
+			renderVersion: 0
 		};
-		var state = (0, react$1.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
-		useIsomorphicLayoutEffect(function() {
+		else {
+			ref.current.props = props;
+			ref.current.propsKey = propsKey;
+			ref.current.isRoot = isRoot;
+			ref.current.keys = keys;
+			ref.current.schemeKeys = schemeKeys;
+			ref.current.parentId = parentId;
+		}
+		ref.current.renderVersion++;
+		var [, forceUpdate] = (0, react$1.useReducer)(incReducer, 0);
+		var state = getSnapshotImpl(ref.current);
+		ref.current.lastSnap = state;
+		(0, react$1.useEffect)(function() {
+			var r = ref.current;
+			var renderVersion = r.renderVersion;
+			if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
+			if (shouldSubscribeToTheme(r, cascadeOnChange)) {
+				if (!r.unsubscribe) {
+					var pid = r.parentId;
+					var sid = r.id;
+					var cb = function() {
+						var next = getSnapshotImpl(r);
+						if (next !== r.lastSnap) {
+							r.lastSnap = next;
+							forceUpdate();
+						}
+					};
+					listenersByParent[pid] = listenersByParent[pid] || /* @__PURE__ */ new Set();
+					listenersByParent[pid].add(sid);
+					allListeners.set(sid, function() {
+						PendingUpdate.set(sid, shouldForce ? "force" : true);
+						cb();
+					});
+					r.subscribedParentId = pid;
+					r.unsubscribe = function() {
+						var _listenersByParent_pid;
+						allListeners.delete(sid);
+						(_listenersByParent_pid = listenersByParent[pid]) === null || _listenersByParent_pid === void 0 || _listenersByParent_pid.delete(sid);
+						localStates.delete(sid);
+						states.delete(sid);
+						PendingUpdate.delete(sid);
+						r.unsubscribe = void 0;
+						r.subscribedParentId = void 0;
+					};
+				}
+			} else if (r.unsubscribe) cleanupThemeSubscription(r);
+			return function() {
+				if (r.renderVersion === renderVersion) cleanupThemeState(r);
+			};
+		});
+		if (cascadeOnChange) useIsomorphicLayoutEffect(function() {
 			if (!HasRenderedOnce.get(keys)) {
 				HasRenderedOnce.set(keys, true);
 				return;
@@ -13383,6 +13500,40 @@ var init_useThemeState_native = __esmMin((() => {
 		}, [keys, propsKey]);
 		return state;
 	};
+	shouldSubscribeToTheme = function(r, cascadeOnChange) {
+		var _r_keys_current, _r_props_needsUpdate, _r_props;
+		return r.isRoot || cascadeOnChange || hasThemeUpdatingProps(r.props) || !!((_r_keys_current = r.keys.current) === null || _r_keys_current === void 0 ? void 0 : _r_keys_current.size) || !!((_r_props_needsUpdate = (_r_props = r.props).needsUpdate) === null || _r_props_needsUpdate === void 0 ? void 0 : _r_props_needsUpdate.call(_r_props));
+	};
+	getSnapshotImpl = function(r) {
+		var _keys_current, _schemeKeys_current, _keys_current1, _props_needsUpdate;
+		var { id, parentId, props, propsKey, isRoot, keys, schemeKeys } = r;
+		var local = localStates.get(id);
+		var parentState = states.get(parentId);
+		if (local && !PendingUpdate.has(id)) {
+			if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
+		}
+		var isSchemeOnlyChange = supportsDynamicColorIOS && getSetting("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
+		var _keys_current_size;
+		var keysSize = (_keys_current_size = keys === null || keys === void 0 ? void 0 : (_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) !== null && _keys_current_size !== void 0 ? _keys_current_size : 0;
+		var _schemeKeys_current_size;
+		var allKeysSchemeOptimized = ((_schemeKeys_current_size = schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) !== null && _schemeKeys_current_size !== void 0 ? _schemeKeys_current_size : 0) === keysSize && keysSize > 0;
+		var canSkipForSchemeChange = isSchemeOnlyChange && allKeysSchemeOptimized;
+		var needsUpdate = props.passThrough ? false : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
+		var [rerender, next] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
+		PendingUpdate.delete(id);
+		if (!local || rerender) {
+			local = _objectSpread2({}, next);
+			localStates.set(id, local);
+		}
+		if (next !== local) {
+			Object.assign(local, next);
+			local.id = id;
+		}
+		local._parentName = parentState === null || parentState === void 0 ? void 0 : parentState.name;
+		local._propsKey = propsKey;
+		states.set(id, next);
+		return local;
+	};
 	getNextState = function(lastState, props, propsKey) {
 		var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false, id = arguments.length > 4 ? arguments[4] : void 0, parentId = arguments.length > 5 ? arguments[5] : void 0, needsUpdate = arguments.length > 6 ? arguments[6] : void 0, pendingUpdate = arguments.length > 7 ? arguments[7] : void 0;
 		var { debug } = props;
@@ -13397,9 +13548,13 @@ var init_useThemeState_native = __esmMin((() => {
 			return [shouldRerender, _objectSpread2(_objectSpread2({}, parentState), {}, { isNew: false })];
 		}
 		if (!name) {
-			var next = lastState !== null && lastState !== void 0 ? lastState : parentState;
-			if (!next) throw new Error(MISSING_THEME_MESSAGE);
-			if (shouldRerender) return [true, _objectSpread2({}, parentState || lastState)];
+			var _ref, _ref1;
+			var next = (_ref1 = (_ref = lastState !== null && lastState !== void 0 ? lastState : parentState) !== null && _ref !== void 0 ? _ref : rootThemeState) !== null && _ref1 !== void 0 ? _ref1 : {
+				id,
+				name: "light",
+				theme: getConfig().themes.light
+			};
+			if (shouldRerender) return [true, _objectSpread2({}, parentState || lastState || next)];
 			return [false, next];
 		}
 		var scheme = getScheme(name);
@@ -13520,10 +13675,14 @@ var init_useTheme_native = __esmMin((() => {
 	};
 	useThemeWithState = function(props) {
 		"use no memo";
-		var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-		var keys = (0, react$1.useRef)(null);
-		var schemeKeys = (0, react$1.useRef)(null);
-		var themeState = useThemeState(props, isRoot, keys, schemeKeys);
+		var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, forThemeView = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+		var bag = (0, react$1.useRef)(null);
+		if (!bag.current) bag.current = {
+			keys: { current: null },
+			schemeKeys: { current: null }
+		};
+		var { keys, schemeKeys } = bag.current;
+		var themeState = useThemeState(props, isRoot, keys, schemeKeys, forThemeView);
 		return [props.passThrough ? {} : getThemeProxied(props, themeState, keys, schemeKeys), themeState];
 	};
 }));
@@ -15602,6 +15761,11 @@ function normalizeGroupKey(key, groupContext) {
 function isValidStyleKey(key, validStyles, accept) {
 	return key in validStyles ? true : accept && key in accept;
 }
+function shouldSkipNativeHoverProp(key, isMedia) {
+	if (key === "hoverStyle") return true;
+	if (isMedia === "group") return getGroupPropParts(key.slice(1)).pseudo === "hover";
+	return false;
+}
 function mergeFlatTransforms(target, flatTransforms) {
 	Object.entries(flatTransforms).sort(function(param, param1) {
 		var [a] = param, [b] = param1;
@@ -15711,6 +15875,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 				viewProps[keyInit] = valInit;
 				return "continue";
 			}
+			if (keyInit[0] === "d" && keyInit.startsWith("data-")) return "continue";
 			if (keyInit === "jestAnimatedStyle") return "continue";
 			if (accept) {
 				var accepted = accept[keyInit];
@@ -15753,6 +15918,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 			var isMediaOrPseudo = Boolean(isMedia || isPseudo);
 			if (isMediaOrPseudo && isMedia === "group") keyInit = normalizeGroupKey(keyInit, groupContext);
 			var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !noExpand;
+			if (shouldSkipNativeHoverProp(keyInit, isMedia)) return "continue";
 			if (isStyleProp && (asChild === "except-style" || asChild === "except-style-web")) return "continue";
 			var shouldPassProp = !isStyleProp && isHOC || isHOC && parentVariants && keyInit in parentVariants || (inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(keyInit));
 			var parentVariant = parentVariants === null || parentVariants === void 0 ? void 0 : parentVariants[keyInit];
@@ -15790,6 +15956,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 				isMediaOrPseudo = Boolean(isMedia || isPseudo);
 				isVariant = variants && key5 in variants;
 				if (isMedia === "group") key5 = normalizeGroupKey(key5, groupContext);
+				if (shouldSkipNativeHoverProp(key5, isMedia)) return;
 				if ((inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(key5)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened === null || inlineWhenUnflattened === void 0 ? void 0 : inlineWhenUnflattened.has(key5))) {
 					var _props_key;
 					viewProps[key5] = (_props_key = props[key5]) !== null && _props_key !== void 0 ? _props_key : val2;
@@ -15954,6 +16121,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 							var groupState = groupContext === null || groupContext === void 0 ? void 0 : (_groupContext_groupName = groupContext[groupName]) === null || _groupContext_groupName === void 0 ? void 0 : _groupContext_groupName.state;
 							var groupPseudoKey = groupInfo.pseudo;
 							var groupMediaKey = groupInfo.media;
+							if (groupPseudoKey === "hover") return;
 							if (!groupState) {
 								pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set());
 								return;
@@ -16307,13 +16475,17 @@ var init_mergeRenderElementProps_native = __esmMin((() => {
 function usePointerEvents(props, viewProps) {
 	var { onPointerDown, onPointerUp, onPointerMove, onPointerCancel, onPointerEnter, onPointerLeave } = props;
 	var hasPointerEvents = onPointerDown || onPointerUp || onPointerMove || onPointerCancel || onPointerEnter || onPointerLeave;
-	var isInsideRef = (0, react$1.useRef)(false);
-	var layoutRef = (0, react$1.useRef)({
-		width: 0,
-		height: 0
-	});
-	var isCapturedRef = (0, react$1.useRef)(false);
+	var ref = (0, react$1.useRef)(null);
+	if (!ref.current) ref.current = {
+		isInside: false,
+		layout: {
+			width: 0,
+			height: 0
+		},
+		isCaptured: false
+	};
 	if (!hasPointerEvents) return;
+	var bag = ref.current;
 	var createNormalizedEvent = function(e) {
 		var touch = e.nativeEvent;
 		var _touch_identifier;
@@ -16329,10 +16501,10 @@ function usePointerEvents(props, viewProps) {
 			nativeEvent: touch,
 			target: {
 				setPointerCapture: function(_pointerId) {
-					isCapturedRef.current = true;
+					bag.isCaptured = true;
 				},
 				releasePointerCapture: function(_pointerId) {
-					isCapturedRef.current = false;
+					bag.isCaptured = false;
 				}
 			}
 		});
@@ -16341,46 +16513,46 @@ function usePointerEvents(props, viewProps) {
 		onPointerDown(createNormalizedEvent(e));
 	});
 	if (onPointerUp) viewProps.onTouchEnd = composeEventHandlers(viewProps.onTouchEnd, function(e) {
-		isCapturedRef.current = false;
+		bag.isCaptured = false;
 		onPointerUp(createNormalizedEvent(e));
 	});
 	if (onPointerMove) viewProps.onTouchMove = composeEventHandlers(viewProps.onTouchMove, function(e) {
 		var { locationX, locationY } = e.nativeEvent;
-		var { width, height } = layoutRef.current;
+		var { width, height } = bag.layout;
 		var isInBounds = locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height;
-		if (isCapturedRef.current || isInBounds) onPointerMove(createNormalizedEvent(e));
+		if (bag.isCaptured || isInBounds) onPointerMove(createNormalizedEvent(e));
 	});
 	if (onPointerCancel) viewProps.onTouchCancel = composeEventHandlers(viewProps.onTouchCancel, function(e) {
-		isCapturedRef.current = false;
+		bag.isCaptured = false;
 		onPointerCancel(createNormalizedEvent(e));
 	});
 	if (onPointerEnter || onPointerLeave || onPointerMove) viewProps.onLayout = composeEventHandlers(viewProps.onLayout, function(e) {
-		layoutRef.current = {
+		bag.layout = {
 			width: e.nativeEvent.layout.width,
 			height: e.nativeEvent.layout.height
 		};
 	});
 	if (onPointerEnter) viewProps.onTouchStart = composeEventHandlers(viewProps.onTouchStart, function(e) {
 		var { locationX, locationY } = e.nativeEvent;
-		var { width, height } = layoutRef.current;
+		var { width, height } = bag.layout;
 		if (locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height) {
-			isInsideRef.current = true;
+			bag.isInside = true;
 			onPointerEnter(createNormalizedEvent(e));
 		}
 	});
 	if (onPointerLeave) {
 		viewProps.onTouchMove = composeEventHandlers(viewProps.onTouchMove, function(e) {
 			var { locationX, locationY } = e.nativeEvent;
-			var { width, height } = layoutRef.current;
+			var { width, height } = bag.layout;
 			var isInside = locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height;
-			if (isInsideRef.current && !isInside) {
-				isInsideRef.current = false;
+			if (bag.isInside && !isInside) {
+				bag.isInside = false;
 				onPointerLeave(createNormalizedEvent(e));
 			}
 		});
 		viewProps.onTouchEnd = composeEventHandlers(viewProps.onTouchEnd, function(e) {
-			if (isInsideRef.current) {
-				isInsideRef.current = false;
+			if (bag.isInside) {
+				bag.isInside = false;
 				onPointerLeave(createNormalizedEvent(e));
 			}
 		});
@@ -16576,7 +16748,7 @@ var init_Theme_native = __esmMin((() => {
 		if (props.disable) return props.children;
 		var { passThrough } = props;
 		var isRoot = !!props["_isRoot"];
-		var [_, themeState] = useThemeWithState(props, isRoot);
+		var [_, themeState] = useThemeWithState(props, isRoot, true);
 		var finalChildren = props["disable-child-theme"] ? react$1.Children.map(props.children, function(child) {
 			return passThrough || !/* @__PURE__ */ (0, react$1.isValidElement)(child) ? child : /* @__PURE__ */ (0, react$1.cloneElement)(child, { ["data-disable-theme"]: true });
 		}) : props.children;
@@ -16745,7 +16917,15 @@ var init_useComponentState_native = __esmMin((() => {
 			});
 		}
 		var groupName = props.group;
-		var setStateShallow = useCreateShallowSetState(setState, props.debug);
+		if (!stateRef.current.baseSetStateShallow) {
+			var r = stateRef.current;
+			r.baseSetStateShallow = function(stateOrGetState) {
+				setState(function(prev) {
+					return mergeIfNotShallowEqual(prev, typeof stateOrGetState === "function" ? stateOrGetState(prev) : stateOrGetState);
+				});
+			};
+		}
+		var setStateShallow = stateRef.current.baseSetStateShallow;
 		if (presenceState && isAnimated && isHydrated && staticConfig.variants) {
 			var { enterVariant, exitVariant, enterExitVariant, custom } = presenceState;
 			if (isObj(custom)) Object.assign(props, custom);
@@ -16870,7 +17050,7 @@ function createComponent(staticConfig) {
 		var overriddenContextProps = null;
 		var componentContext = react$1.default.useContext(ComponentContext);
 		var hasTextAncestor = false;
-		var isInsideNativeMenu = react$1.default.useContext(NativeMenuContext);
+		var isInsideNativeMenu = isAndroid$1 ? react$1.default.useContext(NativeMenuContext) : false;
 		var props = propsIn;
 		var componentName = props.componentName || staticConfig.componentName;
 		var [nextProps, overrides] = mergeComponentProps(getDefaultProps(staticConfig, props.componentName), styledContextValue, propsIn);
@@ -20625,6 +20805,7 @@ function PortalHostNonNative(props) {
 //#region ../portal/dist/esm/GorhomPortalItem.native.js
 init_index_native$7();
 init_index_native$3();
+init_index_native();
 var GorhomPortalItem = function(props) {
 	var { name: _providedName, hostName = "root", handleOnMount: _providedHandleOnMount, handleOnUnmount: _providedHandleOnUnmount, handleOnUpdate: _providedHandleOnUpdate, children, passThrough } = props;
 	if (getPortal().state.type === "teleport") {
@@ -20649,11 +20830,16 @@ var GorhomPortalItemFallback = function(props) {
 	var { addPortal: addUpdatePortal, removePortal } = usePortal(hostName);
 	var id = (0, react$1.useId)();
 	var name = _providedName || id;
+	var themeName = useThemeName();
+	var themedChildren = passThrough ? children : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Theme, {
+		name: themeName,
+		children
+	});
 	var handleOnMount = useEvent(function() {
 		if (_providedHandleOnMount) _providedHandleOnMount(function() {
-			return addUpdatePortal(name, children);
+			return addUpdatePortal(name, themedChildren);
 		});
-		else addUpdatePortal(name, children);
+		else addUpdatePortal(name, themedChildren);
 	});
 	var handleOnUnmount = useEvent(function() {
 		if (_providedHandleOnUnmount) _providedHandleOnUnmount(function() {
@@ -20663,9 +20849,9 @@ var GorhomPortalItemFallback = function(props) {
 	});
 	var handleOnUpdate = useEvent(function() {
 		if (_providedHandleOnUpdate) _providedHandleOnUpdate(function() {
-			return addUpdatePortal(name, children);
+			return addUpdatePortal(name, themedChildren);
 		});
-		else addUpdatePortal(name, children);
+		else addUpdatePortal(name, themedChildren);
 	});
 	useIsomorphicLayoutEffect(function() {
 		if (passThrough) return;
@@ -20677,7 +20863,7 @@ var GorhomPortalItemFallback = function(props) {
 	(0, react$1.useEffect)(function() {
 		if (passThrough) return;
 		handleOnUpdate();
-	}, [children]);
+	}, [children, themeName]);
 	return passThrough ? children : null;
 };
 //#endregion
@@ -28651,6 +28837,7 @@ function getKeyboardOccludedHeight(param) {
 //#region ../sheet/dist/esm/useGestureHandlerPan.native.js
 init_index_native$7();
 var AT_TOP_THRESHOLD = 5;
+var SCROLL_HANDOFF_THRESHOLD = 160;
 function useGestureHandlerPan(config) {
 	var { positions, frameSize, setPosition, animateTo, stopSpring, scrollBridge, setIsDragging, getCurrentPosition, resisted, disableDrag, isShowingInnerSheet, setAnimatedPosition, scrollGestureRef } = config;
 	var gestureHandlerEnabled = isGestureHandlerEnabled();
@@ -28676,16 +28863,45 @@ function useGestureHandlerPan(config) {
 		frozenPositions: [],
 		frozenMinY: 0,
 		frozenIsKeyboardVisible: false,
-		panStarted: false
+		panStarted: false,
+		startedBelowTop: false,
+		upwardDragAfterTop: 0,
+		scrollUnlockedAfterTop: false,
+		keepScrollLockedAfterEnd: false
 	});
+	var unlockScrollTimer = (0, react$1.useRef)(null);
+	(0, react$1.useEffect)(function() {
+		return function() {
+			if (unlockScrollTimer.current) {
+				clearTimeout(unlockScrollTimer.current);
+				unlockScrollTimer.current = null;
+			}
+		};
+	}, []);
 	var onStart = (0, react$1.useCallback)(function() {
 		stopSpring();
 	}, [stopSpring]);
 	var onEnd = (0, react$1.useCallback)(function(closestPoint, animationOverride) {
-		var _scrollBridge_setScrollEnabled;
+		var keepScrollLocked = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+		if (unlockScrollTimer.current) {
+			clearTimeout(unlockScrollTimer.current);
+			unlockScrollTimer.current = null;
+		}
 		setIsDragging(false);
 		scrollBridge.setParentDragging(false);
-		(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 || _scrollBridge_setScrollEnabled.call(scrollBridge, true);
+		scrollBridge.lockScrollAtTop = false;
+		if (keepScrollLocked) {
+			var _scrollBridge_setScrollEnabled;
+			(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 || _scrollBridge_setScrollEnabled.call(scrollBridge, false, 0);
+			unlockScrollTimer.current = setTimeout(function() {
+				var _scrollBridge_setScrollEnabled2;
+				unlockScrollTimer.current = null;
+				(_scrollBridge_setScrollEnabled2 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled2 === void 0 || _scrollBridge_setScrollEnabled2.call(scrollBridge, true);
+			}, 160);
+		} else {
+			var _scrollBridge_setScrollEnabled1;
+			(_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 || _scrollBridge_setScrollEnabled1.call(scrollBridge, true);
+		}
 		setPosition(closestPoint);
 		animateTo(closestPoint, animationOverride);
 	}, [
@@ -28715,6 +28931,15 @@ function useGestureHandlerPan(config) {
 				gs.frozenPositions = [...positions];
 				gs.frozenMinY = minY;
 				gs.frozenIsKeyboardVisible = releaseConfigRef.current.isKeyboardVisible;
+				gs.startedBelowTop = !atTop;
+				gs.upwardDragAfterTop = 0;
+				gs.scrollUnlockedAfterTop = false;
+				gs.keepScrollLockedAfterEnd = false;
+				scrollBridge.lockScrollAtTop = false;
+				if (unlockScrollTimer.current) {
+					clearTimeout(unlockScrollTimer.current);
+					unlockScrollTimer.current = null;
+				}
 				if (!atTop) {
 					var _scrollBridge_setScrollEnabled;
 					(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 || _scrollBridge_setScrollEnabled.call(scrollBridge, false, 0);
@@ -28740,10 +28965,17 @@ function useGestureHandlerPan(config) {
 				else if (isSwipingDown) if (nodeIsScrolling && hasScrollableContent) panHandles = false;
 				else if (gs.scrollEngaged && hasScrollableContent) panHandles = true;
 				else panHandles = true;
-				else if (hasScrollableContent) panHandles = false;
+				else if (hasScrollableContent) if (gs.startedBelowTop && !gs.scrollUnlockedAfterTop) {
+					gs.upwardDragAfterTop += Math.max(0, -deltaY);
+					if (gs.upwardDragAfterTop >= SCROLL_HANDOFF_THRESHOLD) {
+						gs.scrollUnlockedAfterTop = true;
+						panHandles = false;
+					} else panHandles = true;
+				} else panHandles = false;
 				else panHandles = true;
 				if (panHandles) {
 					var _scrollBridge_setScrollEnabled;
+					scrollBridge.lockScrollAtTop = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
 					var lockTo = isCurrentlyAtTop && isSwipingDown && gs.scrollEngaged ? void 0 : 0;
 					(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 || _scrollBridge_setScrollEnabled.call(scrollBridge, false, lockTo);
 					gs.accumulatedOffset += deltaY;
@@ -28753,15 +28985,20 @@ function useGestureHandlerPan(config) {
 					scrollBridge.setParentDragging(newPosition > minY);
 				} else {
 					var _scrollBridge_setScrollEnabled1;
+					scrollBridge.lockScrollAtTop = false;
 					(_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 || _scrollBridge_setScrollEnabled1.call(scrollBridge, true);
+					scrollBridge.setParentDragging(false);
 				}
 			}).onEnd(function(event) {
 				var { velocityY } = event;
 				var currentPos = gs.startY + gs.accumulatedOffset;
-				scrollBridge.scrollLockY = void 0;
+				var keepScrollLockedAfterEnd = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
+				scrollBridge.lockScrollAtTop = false;
+				scrollBridge.scrollLockY = keepScrollLockedAfterEnd ? 0 : void 0;
+				gs.keepScrollLockedAfterEnd = keepScrollLockedAfterEnd;
 				var snapPositions = gs.frozenPositions.length > 0 ? gs.frozenPositions : positions;
 				if (currentPos <= (gs.frozenPositions.length > 0 ? gs.frozenMinY : minY) + AT_TOP_THRESHOLD && scrollBridge.y > 0) {
-					onEnd(0);
+					onEnd(0, void 0, keepScrollLockedAfterEnd);
 					return;
 				}
 				var projectedEnd = currentPos + frameSize * (velocityY / 1e3) * .2;
@@ -28775,9 +29012,10 @@ function useGestureHandlerPan(config) {
 					snapPointsMode: releaseConfig.snapPointsMode,
 					isKeyboardVisible: gs.frozenIsKeyboardVisible,
 					isWeb: false
-				}));
+				}), void 0, keepScrollLockedAfterEnd);
 			}).onFinalize(function() {
-				scrollBridge.scrollLockY = void 0;
+				scrollBridge.lockScrollAtTop = false;
+				scrollBridge.scrollLockY = gs.keepScrollLockedAfterEnd ? 0 : void 0;
 				if (gs.panStarted) setIsDragging(false);
 				else if (config.pauseKeyboardHandler) config.pauseKeyboardHandler.current = false;
 			}).runOnJS(true);
@@ -28930,8 +29168,7 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 	var { open, controller, isHidden } = state;
 	var openRef = react$1.default.useRef(open);
 	openRef.current = open;
-	var sheetRef = react$1.default.useRef(void 0);
-	var ref = useComposedRefs(forwardedRef, sheetRef, providerProps.contentRef);
+	var ref = useComposedRefs(forwardedRef, react$1.default.useRef(void 0), providerProps.contentRef);
 	var { animationDriver } = useConfiguration();
 	if (!animationDriver) throw new Error(`Sheet requires an animation driver to be set`);
 	var transitionConfig = function() {
@@ -28953,6 +29190,16 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 		if (open && frameSize) stableFrameSize.current = frameSize;
 	}, [open, frameSize]);
 	var isWebKbSheet = false;
+	var isNativeKbFitSheet = hasFit && Boolean(moveOnKeyboardChange);
+	var preKeyboardFrameSize = react$1.default.useRef(0);
+	react$1.default.useEffect(function() {
+		if (isNativeKbFitSheet && open && !isKeyboardVisible && frameSize > 0) preKeyboardFrameSize.current = frameSize;
+	}, [
+		isNativeKbFitSheet,
+		open,
+		isKeyboardVisible,
+		frameSize
+	]);
 	var effScreenSize = isWebKbSheet ? getStableViewportHeight() : screenSize;
 	var effectiveFrameSize = open ? frameSize : stableFrameSize.current || frameSize;
 	var positions = react$1.default.useMemo(function() {
@@ -29005,8 +29252,8 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 		screenSize: effScreenSize,
 		sheetY: position >= 0 ? activePositions[position] : void 0
 	});
-	var keyboardStableFrameHeight = isWebKbSheet && isKeyboardVisible && frameSize > 0 ? frameSize : 0;
-	var { useAnimatedNumber, useAnimatedNumberStyle, useAnimatedNumberReaction } = animationDriver;
+	var keyboardStableFrameHeight = isWebKbSheet && isKeyboardVisible && frameSize > 0 ? frameSize : isNativeKbFitSheet && isKeyboardVisible && preKeyboardFrameSize.current > 0 ? preKeyboardFrameSize.current : 0;
+	var { useAnimatedNumber, useAnimatedNumberStyle } = animationDriver;
 	var _animationDriver_View;
 	var AnimatedView = (_animationDriver_View = animationDriver.View) !== null && _animationDriver_View !== void 0 ? _animationDriver_View : View;
 	useIsomorphicLayoutEffect(function() {
@@ -29028,33 +29275,49 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 	if (controller === null || controller === void 0 ? void 0 : controller.skipNextAnimation) skipAdaptAnimation.current = true;
 	var hasScrollView = react$1.default.useRef(false);
 	var opacityFallbackTimer = react$1.default.useRef(null);
-	useAnimatedNumberReaction({
-		value: animatedNumber,
-		hostRef: sheetRef
-	}, react$1.default.useCallback(function(value) {
+	var syncAnimatedPosition = useEvent(function(value) {
 		at.current = value;
 		scrollBridge.paneY = value;
 		var minY = activePositions[0];
 		var wasAtTop = scrollBridge.isAtTop;
 		var nowAtTop = value <= minY + 5;
-		if (wasAtTop !== nowAtTop) {
-			scrollBridge.isAtTop = nowAtTop;
-			if (nowAtTop) {
-				var _scrollBridge_setScrollEnabled;
+		if (wasAtTop === nowAtTop) return;
+		scrollBridge.isAtTop = nowAtTop;
+		if (nowAtTop) {
+			var _scrollBridge_setScrollEnabled;
+			if (scrollBridge.lockScrollAtTop) {
+				var _scrollBridge_setScrollEnabled1;
 				if (scrollBridge.y > 0) {
 					var _scrollBridge_forceScrollTo;
 					(_scrollBridge_forceScrollTo = scrollBridge.forceScrollTo) === null || _scrollBridge_forceScrollTo === void 0 || _scrollBridge_forceScrollTo.call(scrollBridge, 0);
 					scrollBridge.y = 0;
 				}
-				scrollBridge.scrollLockY = void 0;
-				(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 || _scrollBridge_setScrollEnabled.call(scrollBridge, true);
-			} else {
-				var _scrollBridge_setScrollEnabled1;
 				scrollBridge.scrollLockY = 0;
-				(_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 || _scrollBridge_setScrollEnabled1.call(scrollBridge, false);
+				(_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 || _scrollBridge_setScrollEnabled1.call(scrollBridge, false, 0);
+				return;
 			}
+			if (scrollBridge.y > 0) {
+				var _scrollBridge_forceScrollTo1;
+				(_scrollBridge_forceScrollTo1 = scrollBridge.forceScrollTo) === null || _scrollBridge_forceScrollTo1 === void 0 || _scrollBridge_forceScrollTo1.call(scrollBridge, 0);
+				scrollBridge.y = 0;
+			}
+			scrollBridge.scrollLockY = void 0;
+			(_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 || _scrollBridge_setScrollEnabled.call(scrollBridge, true);
+		} else {
+			var _scrollBridge_setScrollEnabled2;
+			scrollBridge.scrollLockY = 0;
+			(_scrollBridge_setScrollEnabled2 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled2 === void 0 || _scrollBridge_setScrollEnabled2.call(scrollBridge, false);
 		}
-	}, [animationDriver, activePositions]));
+	});
+	var setAnimatedPositionDirect = useEvent(function(value) {
+		syncAnimatedPosition(value);
+		animatedNumber.setValue(value, { type: "direct" });
+	});
+	var getAnimatedPosition = useEvent(function() {
+		var value = animatedNumber.getValue();
+		syncAnimatedPosition(value);
+		return value;
+	});
 	function stopSpring() {
 		animatedNumber.stop();
 		if (scrollBridge.onFinishAnimate) {
@@ -29075,6 +29338,7 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 		}
 		var animationCompleteCallback = function() {
 			var _controller_onAnimationComplete;
+			syncAnimatedPosition(toValue);
 			if (opacityFallbackTimer.current) {
 				clearTimeout(opacityFallbackTimer.current);
 				opacityFallbackTimer.current = null;
@@ -29104,6 +29368,7 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 				type: "timing",
 				duration: 0
 			}, function() {
+				syncAnimatedPosition(screenSize);
 				setTimeout(function() {
 					setDisableAnimation(false);
 				}, 10);
@@ -29206,7 +29471,7 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 		var grant = function() {
 			setPanning(true);
 			stopSpring();
-			startY = at.current;
+			startY = getAnimatedPosition();
 		};
 		var isExternalDrag = false;
 		scrollBridge.startPanDrag = function() {
@@ -29218,8 +29483,7 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 				isExternalDrag = true;
 				grant();
 			}
-			var to = dy + startY;
-			animatedNumber.setValue(resisted(to, minY), { type: "direct" });
+			setAnimatedPositionDirect(resisted(dy + startY, minY));
 		};
 		scrollBridge.release = release;
 		scrollBridge.snapToPosition = function(positionIndex) {
@@ -29239,7 +29503,7 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 				var to = resisted(dy + startY, minY);
 				if (to <= minY) scrollBridge.setParentDragging(false);
 				else scrollBridge.setParentDragging(true);
-				animatedNumber.setValue(to, { type: "direct" });
+				setAnimatedPositionDirect(to);
 			},
 			onPanResponderEnd: finish,
 			onPanResponderTerminate: finish,
@@ -29289,16 +29553,11 @@ var SheetImplementationCustom = /* @__PURE__ */ react$1.default.forwardRef(funct
 		stopSpring,
 		scrollBridge,
 		setIsDragging,
-		getCurrentPosition: function() {
-			return at.current;
-		},
+		getCurrentPosition: getAnimatedPosition,
 		resisted,
 		disableDrag,
 		isShowingInnerSheet,
-		setAnimatedPosition: function(val) {
-			at.current = val;
-			animatedNumber.setValue(val, { type: "direct" });
-		},
+		setAnimatedPosition: setAnimatedPositionDirect,
 		dismissOnSnapToBottom,
 		snapPointsMode,
 		isKeyboardVisible,
@@ -29599,6 +29858,7 @@ var SheetScrollView = /* @__PURE__ */ react$1.default.forwardRef(function(param,
 		height: void 0,
 		maxHeight: screenSize || void 0
 	} : { flex: 1 };
+	var contentContainerStyle = hasFit ? void 0 : { minHeight: "100%" };
 	var keyboardFrozenOverride = hasFit && isKeyboardVisible && frozenFrameHeight > 0 ? {
 		height: frozenFrameHeight,
 		maxHeight: frozenFrameHeight
@@ -29607,20 +29867,29 @@ var SheetScrollView = /* @__PURE__ */ react$1.default.forwardRef(function(param,
 	var { ScrollView: RNGHScrollView } = getGestureHandlerState();
 	var useRNGHScrollView = isGestureHandlerEnabled() && RNGHScrollView && panGestureRef;
 	var currentScrollOffset = (0, react$1.useRef)(0);
+	var lastEmittedScrollOffset = (0, react$1.useRef)(0);
 	var lockedScrollY = (0, react$1.useRef)(0);
 	(0, react$1.useRef)(0);
 	var setScrollEnabled = function(next, lockTo) {
 		if (!next) {
-			var _scrollRef_current_scrollTo, _scrollRef_current;
-			var lockY = lockTo !== null && lockTo !== void 0 ? lockTo : currentScrollOffset.current;
+			var _ref;
+			var lockY = (_ref = lockTo !== null && lockTo !== void 0 ? lockTo : scrollBridge.scrollLockY) !== null && _ref !== void 0 ? _ref : currentScrollOffset.current;
+			if (scrollBridge.enabled === false && scrollBridge.scrollLockY === lockY) return;
+			scrollBridge.enabled = false;
 			lockedScrollY.current = lockY;
 			scrollBridge.scrollLockY = lockY;
-			(_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 || (_scrollRef_current_scrollTo = _scrollRef_current.scrollTo) == null || _scrollRef_current_scrollTo.call(_scrollRef_current, {
-				x: 0,
-				y: lockY,
-				animated: false
-			});
+			if (currentScrollOffset.current !== lockY) {
+				var _scrollRef_current_scrollTo, _scrollRef_current;
+				(_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 || (_scrollRef_current_scrollTo = _scrollRef_current.scrollTo) == null || _scrollRef_current_scrollTo.call(_scrollRef_current, {
+					x: 0,
+					y: lockY,
+					animated: false
+				});
+				currentScrollOffset.current = lockY;
+			}
 		} else {
+			if (scrollBridge.enabled === true && scrollBridge.scrollLockY === void 0) return;
+			scrollBridge.enabled = true;
 			lockedScrollY.current = currentScrollOffset.current;
 			scrollBridge.scrollLockY = void 0;
 		}
@@ -29632,7 +29901,31 @@ var SheetScrollView = /* @__PURE__ */ react$1.default.forwardRef(function(param,
 			y,
 			animated: false
 		});
-	};
+		currentScrollOffset.current = y;
+	};
+	var emitManualScroll = react$1.default.useCallback(function(node, y) {
+		currentScrollOffset.current = y;
+		scrollBridge.y = y;
+		if (y > 0) scrollBridge.scrollStartY = -1;
+		lastEmittedScrollOffset.current = y;
+		onScroll === null || onScroll === void 0 || onScroll({
+			nativeEvent: {
+				contentOffset: {
+					x: node.scrollLeft,
+					y
+				},
+				contentSize: {
+					height: node.scrollHeight,
+					width: node.scrollWidth
+				},
+				layoutMeasurement: {
+					height: node.offsetHeight,
+					width: node.offsetWidth
+				}
+			},
+			timeStamp: Date.now()
+		});
+	}, [onScroll, scrollBridge]);
 	var scrollFocusedInputClearOfKeyboard = react$1.default.useCallback(function() {}, [
 		hasFit,
 		isKeyboardVisible,
@@ -29667,7 +29960,8 @@ var SheetScrollView = /* @__PURE__ */ react$1.default.forwardRef(function(param,
 		scrollBridge,
 		hasScrollableContent,
 		scrollEnabled,
-		setScrollEnabled
+		setScrollEnabled,
+		onManualScroll: emitManualScroll
 	});
 	var contentWrapper = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(View, {
 		onLayout: function(e) {
@@ -29706,15 +30000,20 @@ var SheetScrollView = /* @__PURE__ */ react$1.default.forwardRef(function(param,
 						animated: false
 					});
 				}
+				currentScrollOffset.current = scrollBridge.scrollLockY;
 				scrollBridge.y = scrollBridge.scrollLockY;
-				onScroll === null || onScroll === void 0 || onScroll(_objectSpread2(_objectSpread2({}, e), {}, { nativeEvent: _objectSpread2(_objectSpread2({}, e.nativeEvent), {}, { contentOffset: _objectSpread2(_objectSpread2({}, e.nativeEvent.contentOffset), {}, { y: scrollBridge.scrollLockY }) }) }));
+				if (lastEmittedScrollOffset.current !== scrollBridge.scrollLockY) {
+					lastEmittedScrollOffset.current = scrollBridge.scrollLockY;
+					onScroll === null || onScroll === void 0 || onScroll(_objectSpread2(_objectSpread2({}, e), {}, { nativeEvent: _objectSpread2(_objectSpread2({}, e.nativeEvent), {}, { contentOffset: _objectSpread2(_objectSpread2({}, e.nativeEvent.contentOffset), {}, { y: scrollBridge.scrollLockY }) }) }));
+				}
 				return;
 			}
 			scrollBridge.y = y;
 			if (y > 0) scrollBridge.scrollStartY = -1;
+			lastEmittedScrollOffset.current = y;
 			onScroll === null || onScroll === void 0 || onScroll(e);
 		},
-		contentContainerStyle: { minHeight: "100%" },
+		contentContainerStyle,
 		bounces: false,
 		keyboardShouldPersistTaps: "always",
 		keyboardDismissMode: "none"
@@ -29734,9 +30033,10 @@ var SheetScrollView = /* @__PURE__ */ react$1.default.forwardRef(function(param,
 			currentScrollOffset.current = y;
 			scrollBridge.y = y;
 			if (y > 0) scrollBridge.scrollStartY = -1;
+			lastEmittedScrollOffset.current = y;
 			onScroll === null || onScroll === void 0 || onScroll(e);
 		},
-		contentContainerStyle: { minHeight: "100%" }
+		contentContainerStyle
 	}, gestureProps), props), keyboardFrozenOverride), {}, { children: contentWrapper }));
 });
 //#endregion
@@ -32276,13 +32576,19 @@ function getWindowSize() {
 	return Dimensions.get("window");
 }
 var cbs = /* @__PURE__ */ new Set();
-Dimensions.addEventListener("change", function(param) {
-	var { window } = param;
-	cbs.forEach(function(cb) {
-		return cb(window);
+var isListening = false;
+var ensureListening = function() {
+	if (isListening) return;
+	isListening = true;
+	Dimensions.addEventListener("change", function(param) {
+		var { window } = param;
+		cbs.forEach(function(cb) {
+			return cb(window);
+		});
 	});
-});
+};
 function subscribe(cb) {
+	ensureListening();
 	cbs.add(cb);
 	return function() {
 		return cbs.delete(cb);