@tamagui/core 3.0.10 → 3.0.11

package/dist/native.cjs

@@ -7694,7 +7694,7 @@ function resolveStyles(...inputs) {
 function joinClassNames(...parts) {
 	return parts.filter(Boolean).join(" ").trim() || void 0;
 }
-var _excluded$22, _excluded2$4, View$1$1, commonStyle, styles$10, WebScrollView;
+var _excluded$22, _excluded2$5, View$1$1, commonStyle, styles$10, WebScrollView;
 var init_WebScrollView = __esmMin((() => {
 	init_View();
 	init_objectSpread2();
@@ -7745,7 +7745,7 @@ var init_WebScrollView = __esmMin((() => {
 		"snapToStart",
 		"bounces"
 	];
-	_excluded2$4 = ["dataSet"];
+	_excluded2$5 = ["dataSet"];
 	View$1$1 = View$2;
 	commonStyle = {
 		flexGrow: 1,
@@ -7783,7 +7783,7 @@ var init_WebScrollView = __esmMin((() => {
 	};
 	WebScrollView = react.forwardRef((props, forwardedRef) => {
 		const { children, contentContainerStyle, horizontal, onContentSizeChange, onScroll, refreshControl, stickyHeaderIndices, pagingEnabled, centerContent, scrollEnabled = true, scrollEventThrottle = 0, showsHorizontalScrollIndicator, showsVerticalScrollIndicator, style, keyboardShouldPersistTaps, keyboardDismissMode, contentOffset, contentInset, contentInsetAdjustmentBehavior, decelerationRate, directionalLockEnabled, disableIntervalMomentum, disableScrollViewPanResponder, endFillColor, fadingEdgeLength, indicatorStyle, invertStickyHeaders, maintainVisibleContentPosition, maximumZoomScale, minimumZoomScale, nestedScrollEnabled, onScrollToTop, overScrollMode, pinchGestureEnabled, removeClippedSubviews, scrollIndicatorInsets, scrollPerfTag, scrollToOverflowEnabled, snapToAlignment, snapToEnd, snapToInterval, snapToOffsets, snapToStart, bounces } = props, rest = _objectWithoutProperties(props, _excluded$22);
-		const { dataSet } = rest, domRest = _objectWithoutProperties(rest, _excluded2$4);
+		const { dataSet } = rest, domRest = _objectWithoutProperties(rest, _excluded2$5);
 		const dataAttrs = {};
 		if (dataSet) for (const key in dataSet) dataAttrs[`data-${key}`] = dataSet[key];
 		const scrollNodeRef = react.useRef(null);
@@ -14692,7 +14692,7 @@ var init_useTheme_native = __esmMin((() => {
 }));
 //#endregion
 //#region ../web/dist/esm/_withStableStyle.native.js
-var _excluded$8, _excluded2$3, EMPTY_EXPRESSIONS, EMPTY_THEME, FALLBACK_THEME_CACHE, _withStableStyle;
+var _excluded$8, _excluded2$4, EMPTY_EXPRESSIONS, EMPTY_THEME, FALLBACK_THEME_CACHE, _withStableStyle;
 var init__withStableStyle_native = __esmMin((() => {
 	init_config_native();
 	init_createVariable_native();
@@ -14702,14 +14702,14 @@ var init__withStableStyle_native = __esmMin((() => {
 	init_objectWithoutProperties();
 	init_objectSpread2();
 	_excluded$8 = ["ref"];
-	_excluded2$3 = ["_expressions"];
+	_excluded2$4 = ["_expressions"];
 	EMPTY_EXPRESSIONS = [];
 	EMPTY_THEME = {};
 	FALLBACK_THEME_CACHE = /* @__PURE__ */ new WeakMap();
 	_withStableStyle = function _withStableStyle2(Component, createStyle, hasThemeKeys, hasMediaKeys) {
 		return /* @__PURE__ */ react.default.memo(function WithStableStyle(props) {
 			var { ref } = props, propsWithoutRef = _objectWithoutProperties(props, _excluded$8);
-			var { _expressions = EMPTY_EXPRESSIONS } = propsWithoutRef, rest = _objectWithoutProperties(propsWithoutRef, _excluded2$3);
+			var { _expressions = EMPTY_EXPRESSIONS } = propsWithoutRef, rest = _objectWithoutProperties(propsWithoutRef, _excluded2$4);
 			var parentId = (0, react.useContext)(ThemeStateContext);
 			var theme = hasThemeKeys && parentId ? useTheme() : null;
 			var media = hasMediaKeys ? useMedia() : null;
@@ -14846,6 +14846,7 @@ function setNativeStyleEngine(next) {
 		scopeMappings.clear();
 		pendingHosts = [];
 		pendingStates = [];
+		resetNativeStyleDiscovery();
 	}
 	engine = next;
 	if (next) {
@@ -14919,16 +14920,80 @@ function createNativeStyleLinkState(mapping, scopeId, stateName, theme) {
 		theme
 	};
 }
+function hostKey(host) {
+	var _ref, _ref1;
+	var _record___internalInstanceHandle;
+	var record = host;
+	var instance = (_ref = (_record___internalInstanceHandle = record.__internalInstanceHandle) === null || _record___internalInstanceHandle === void 0 ? void 0 : _record___internalInstanceHandle.stateNode) !== null && _ref !== void 0 ? _ref : record.stateNode;
+	return (_ref1 = instance === null || instance === void 0 ? void 0 : instance.canonical) !== null && _ref1 !== void 0 ? _ref1 : host;
+}
+function resetNativeStyleDiscovery() {
+	fiberRoot = null;
+	needsDiscover = false;
+	linkedHostState = /* @__PURE__ */ new WeakMap();
+}
+function registerNativeStyle(style, state) {
+	stylesToState.set(style, state);
+}
+function nativeStyleMountMode() {
+	var current = fiberRoot === null || fiberRoot === void 0 ? void 0 : fiberRoot.current;
+	if (current && current.stateNode === fiberRoot) {
+		if (!needsDiscover) {
+			needsDiscover = true;
+			queueIdleFlush();
+		}
+		return "discover";
+	}
+	return "ref";
+}
+function captureNativeStyleRoot(node) {
+	var fiber = node === null || node === void 0 ? void 0 : node.__internalInstanceHandle;
+	if (!fiber) return;
+	var top = fiber;
+	for (var guard = 0; top.return && guard < 1e5; guard++) top = top.return;
+	var root = top.stateNode;
+	if (root && root.current === top) fiberRoot = root;
+}
+function discoverMountedHosts() {
+	var root = fiberRoot === null || fiberRoot === void 0 ? void 0 : fiberRoot.current;
+	if (!root || root.stateNode !== fiberRoot) return 0;
+	var stack = [root];
+	var found = 0;
+	for (var guard = 0; stack.length && guard < 1e5; guard++) {
+		var _fiber_memoizedProps, _fiber_stateNode;
+		var fiber = stack.pop();
+		if (fiber.sibling) stack.push(fiber.sibling);
+		if (fiber.child) stack.push(fiber.child);
+		var style = (_fiber_memoizedProps = fiber.memoizedProps) === null || _fiber_memoizedProps === void 0 ? void 0 : _fiber_memoizedProps.style;
+		if (!style) continue;
+		var state = stylesToState.get(style);
+		if (!state || !((_fiber_stateNode = fiber.stateNode) === null || _fiber_stateNode === void 0 ? void 0 : _fiber_stateNode.node)) continue;
+		found++;
+		linkNativeStyleHost(fiber, state);
+	}
+	return found;
+}
 function idleFlush() {
 	idleFlushQueued = false;
 	flushNativeStyleLinks();
 }
+function queueIdleFlush() {
+	if (idleFlushQueued) return;
+	idleFlushQueued = true;
+	requestIdleCallback(idleFlush);
+}
 function addScopeMapping(scopeId, compiled) {
 	var linked = scopeMappings.get(scopeId);
 	if (!linked) scopeMappings.set(scopeId, linked = /* @__PURE__ */ new Set());
 	linked.add(compiled);
 }
 function flushNativeStyleLinks() {
+	if (needsDiscover) {
+		needsDiscover = false;
+		var current = fiberRoot === null || fiberRoot === void 0 ? void 0 : fiberRoot.current;
+		if (!current || current.stateNode !== fiberRoot) fiberRoot = null;
+		else discoverMountedHosts();
+	}
 	if (!pendingHosts.length) return;
 	var hosts = pendingHosts;
 	var states = pendingStates;
@@ -14958,7 +15023,11 @@ function flushNativeStyleLinks() {
 	engine.linkTables(hosts, tableIds, scopeIndexes, scopes);
 }
 function linkNativeStyleHost(host, state) {
-	if (!engine) return;
+	if (!engine || host == null) return;
+	var key = hostKey(host);
+	var linked = linkedHostState.get(key);
+	if (linked && linked.mapping === state.mapping && linked.scopeId === state.scopeId) return;
+	linkedHostState.set(key, state);
 	var live = scopeStates.get(state.scopeId);
 	if (live && (live.name !== state.stateName || live.theme !== state.theme)) {
 		var compiled = getCompiledMapping(state.mapping);
@@ -14969,10 +15038,7 @@ function linkNativeStyleHost(host, state) {
 	}
 	pendingHosts.push(host);
 	pendingStates.push(state);
-	if (pendingHosts.length >= maxPendingHosts && !idleFlushQueued) {
-		idleFlushQueued = true;
-		requestIdleCallback(idleFlush);
-	}
+	if (pendingHosts.length >= maxPendingHosts) queueIdleFlush();
 }
 function setNativeStyleEngineFlushListener(cb) {
 	flushListener = cb;
@@ -15009,7 +15075,7 @@ function supersedeNativeViewStates(id) {
 	if (!pending) return;
 	(superseded || (superseded = /* @__PURE__ */ new Map())).set(id, pending.length);
 }
-var nativeTextInputColorProps, nativeOutlineProps, nativeIntrinsicSizeProps, engine, scopeStates, mappingKeys, compiledMappings, scopeMappings, nextTableId, pendingHosts, pendingStates, maxPendingHosts, idleFlushQueued, pending, flushListener, superseded;
+var nativeTextInputColorProps, nativeOutlineProps, nativeIntrinsicSizeProps, engine, scopeStates, mappingKeys, compiledMappings, scopeMappings, nextTableId, pendingHosts, pendingStates, maxPendingHosts, idleFlushQueued, stylesToState, linkedHostState, fiberRoot, needsDiscover, pending, flushListener, superseded;
 var init_nativeStyleEngine_native = __esmMin((() => {
 	init_createVariable_native();
 	init_objectSpread2();
@@ -15043,6 +15109,10 @@ var init_nativeStyleEngine_native = __esmMin((() => {
 	pendingStates = [];
 	maxPendingHosts = 4096;
 	idleFlushQueued = false;
+	stylesToState = /* @__PURE__ */ new WeakMap();
+	linkedHostState = /* @__PURE__ */ new WeakMap();
+	fiberRoot = null;
+	needsDiscover = false;
 	pending = null;
 	flushListener = null;
 	superseded = null;
@@ -15058,6 +15128,11 @@ var init_setupHooks_native = __esmMin((() => {
 }));
 //#endregion
 //#region ../web/dist/esm/_withNativeStyle.native.js
+function omitRef(props) {
+	if (!Object.prototype.hasOwnProperty.call(props, "ref")) return props;
+	var { ref: _ref } = props;
+	return _objectWithoutProperties(props, _excluded2$3);
+}
 function mayRenderText(children) {
 	if (children == null) return false;
 	if (Array.isArray(children) && children.length <= 3) return children.some(function(child) {
@@ -15065,7 +15140,7 @@ function mayRenderText(children) {
 	});
 	return typeof children === "object";
 }
-var _excluded$7, hostTextProps, _withNativeStyle;
+var _excluded$7, _excluded2$3, hostTextProps, _withNativeStyle;
 var init__withNativeStyle_native = __esmMin((() => {
 	init_index_native$12();
 	init_index_native$6();
@@ -15076,6 +15151,7 @@ var init__withNativeStyle_native = __esmMin((() => {
 	init_objectSpread2();
 	init_objectWithoutProperties();
 	_excluded$7 = ["_expressions"];
+	_excluded2$3 = ["ref"];
 	hostTextProps = {
 		accessible: isAndroid ? false : isIos ? true : void 0,
 		allowFontScaling: true,
@@ -15105,7 +15181,9 @@ var init__withNativeStyle_native = __esmMin((() => {
 				theme: null,
 				state: null,
 				ref: function ref(node) {
-					if (node) linkHost(node, entry.state);
+					if (!node) return;
+					captureRoot(node);
+					linkHost(node, entry.state);
 				}
 			};
 			return entry;
@@ -15116,6 +15194,9 @@ var init__withNativeStyle_native = __esmMin((() => {
 		var resolve = resolveNativeStyleMapping;
 		var linkState = createNativeStyleLinkState;
 		var linkHost = linkNativeStyleHost;
+		var registerStyle = registerNativeStyle;
+		var mountMode = nativeStyleMountMode;
+		var captureRoot = captureNativeStyleRoot;
 		var assignRef = setRef;
 		var render = function render2(props, key) {
 			var scopeId = (0, react.use)(ScopeContext);
@@ -15147,20 +15228,20 @@ var init__withNativeStyle_native = __esmMin((() => {
 				entry.stateName = name;
 				entry.theme = theme;
 				entry.state = linkState(themeStyleKeys, scopeId, name, theme);
+				registerStyle(entry.style, entry.state);
+				registerStyle(entry.hostTextStyle, entry.state);
 			}
 			var style = asHostText ? entry.hostTextStyle : entry.style;
 			var wrapped = resetsText || asHostText && mayRenderText(rest.children);
 			var state = entry.state;
-			var hostRef = ref == null ? entry.ref : function(node) {
+			var passedRef = mountMode() === "discover" ? ref !== null && ref !== void 0 ? ref : null : ref == null ? entry.ref : function(node) {
 				if (!node) return assignRef(ref, null);
+				captureRoot(node);
 				linkHost(node, state);
 				if (typeof ref === "function") return ref(node);
 				assignRef(ref, node);
 			};
-			var element = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Rendered, _objectSpread2(_objectSpread2(_objectSpread2({}, asHostText && hostTextProps), rest), {}, {
-				ref: hostRef,
-				style
-			}), wrapped ? void 0 : key);
+			var element = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Rendered, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, asHostText && hostTextProps), passedRef == null ? omitRef(rest) : rest), passedRef != null ? { ref: passedRef } : null), {}, { style }), wrapped ? void 0 : key);
 			if (!wrapped) return element;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TextAncestorProvider, {
 				value: !resetsText,
@@ -19681,8 +19762,8 @@ function createComponent(staticConfig) {
 		var childrenFromHooks = hooks.useChildren ? hooks.useChildren(elementType, children, viewProps, isPassthrough) : void 0;
 		if (isPassthrough) content = /* @__PURE__ */ react.default.createElement(BaseComponent, { style: { display: "contents" } }, propsIn.children);
 		else {
-			if (childrenFromHooks) content = childrenFromHooks;
 			var isRenderPropString = typeof renderProp === "string";
+			if (childrenFromHooks && (!renderProp || isRenderPropString)) content = childrenFromHooks;
 			if (renderProp && !isRenderPropString) {
 				var out = getCustomRender(renderProp, content || children, viewProps, componentState);
 				if (out) {

package/dist/test.native.cjs

@@ -3727,14 +3727,14 @@ If this is intended and you are using Tamagui without any themes, you can disabl
 //#endregion
 //#region ../web/dist/esm/_withStableStyle.native.js
 var _excluded$8 = ["ref"];
-var _excluded2$3 = ["_expressions"];
+var _excluded2$4 = ["_expressions"];
 var EMPTY_EXPRESSIONS = [];
 var EMPTY_THEME = {};
 var FALLBACK_THEME_CACHE = /* @__PURE__ */ new WeakMap();
 var _withStableStyle = function _withStableStyle2(Component, createStyle, hasThemeKeys, hasMediaKeys) {
 	return /* @__PURE__ */ react.default.memo(function WithStableStyle(props) {
 		var { ref } = props, propsWithoutRef = _objectWithoutProperties(props, _excluded$8);
-		var { _expressions = EMPTY_EXPRESSIONS } = propsWithoutRef, rest = _objectWithoutProperties(propsWithoutRef, _excluded2$3);
+		var { _expressions = EMPTY_EXPRESSIONS } = propsWithoutRef, rest = _objectWithoutProperties(propsWithoutRef, _excluded2$4);
 		var parentId = (0, react.useContext)(ThemeStateContext);
 		var theme = hasThemeKeys && parentId ? useTheme() : null;
 		var media = hasMediaKeys ? useMedia() : null;
@@ -3897,6 +3897,7 @@ function setNativeStyleEngine(next) {
 		scopeMappings.clear();
 		pendingHosts = [];
 		pendingStates = [];
+		resetNativeStyleDiscovery();
 	}
 	engine = next;
 	if (next) {
@@ -3974,16 +3975,84 @@ var pendingHosts = [];
 var pendingStates = [];
 var maxPendingHosts = 4096;
 var idleFlushQueued = false;
+var stylesToState = /* @__PURE__ */ new WeakMap();
+var linkedHostState = /* @__PURE__ */ new WeakMap();
+function hostKey(host) {
+	var _ref, _ref1;
+	var _record___internalInstanceHandle;
+	var record = host;
+	var instance = (_ref = (_record___internalInstanceHandle = record.__internalInstanceHandle) === null || _record___internalInstanceHandle === void 0 ? void 0 : _record___internalInstanceHandle.stateNode) !== null && _ref !== void 0 ? _ref : record.stateNode;
+	return (_ref1 = instance === null || instance === void 0 ? void 0 : instance.canonical) !== null && _ref1 !== void 0 ? _ref1 : host;
+}
+var fiberRoot = null;
+var needsDiscover = false;
+function resetNativeStyleDiscovery() {
+	fiberRoot = null;
+	needsDiscover = false;
+	linkedHostState = /* @__PURE__ */ new WeakMap();
+}
+function registerNativeStyle(style, state) {
+	stylesToState.set(style, state);
+}
+function nativeStyleMountMode() {
+	var current = fiberRoot === null || fiberRoot === void 0 ? void 0 : fiberRoot.current;
+	if (current && current.stateNode === fiberRoot) {
+		if (!needsDiscover) {
+			needsDiscover = true;
+			queueIdleFlush();
+		}
+		return "discover";
+	}
+	return "ref";
+}
+function captureNativeStyleRoot(node) {
+	var fiber = node === null || node === void 0 ? void 0 : node.__internalInstanceHandle;
+	if (!fiber) return;
+	var top = fiber;
+	for (var guard = 0; top.return && guard < 1e5; guard++) top = top.return;
+	var root = top.stateNode;
+	if (root && root.current === top) fiberRoot = root;
+}
+function discoverMountedHosts() {
+	var root = fiberRoot === null || fiberRoot === void 0 ? void 0 : fiberRoot.current;
+	if (!root || root.stateNode !== fiberRoot) return 0;
+	var stack = [root];
+	var found = 0;
+	for (var guard = 0; stack.length && guard < 1e5; guard++) {
+		var _fiber_memoizedProps, _fiber_stateNode;
+		var fiber = stack.pop();
+		if (fiber.sibling) stack.push(fiber.sibling);
+		if (fiber.child) stack.push(fiber.child);
+		var style = (_fiber_memoizedProps = fiber.memoizedProps) === null || _fiber_memoizedProps === void 0 ? void 0 : _fiber_memoizedProps.style;
+		if (!style) continue;
+		var state = stylesToState.get(style);
+		if (!state || !((_fiber_stateNode = fiber.stateNode) === null || _fiber_stateNode === void 0 ? void 0 : _fiber_stateNode.node)) continue;
+		found++;
+		linkNativeStyleHost(fiber, state);
+	}
+	return found;
+}
 function idleFlush() {
 	idleFlushQueued = false;
 	flushNativeStyleLinks();
 }
+function queueIdleFlush() {
+	if (idleFlushQueued) return;
+	idleFlushQueued = true;
+	requestIdleCallback(idleFlush);
+}
 function addScopeMapping(scopeId, compiled) {
 	var linked = scopeMappings.get(scopeId);
 	if (!linked) scopeMappings.set(scopeId, linked = /* @__PURE__ */ new Set());
 	linked.add(compiled);
 }
 function flushNativeStyleLinks() {
+	if (needsDiscover) {
+		needsDiscover = false;
+		var current = fiberRoot === null || fiberRoot === void 0 ? void 0 : fiberRoot.current;
+		if (!current || current.stateNode !== fiberRoot) fiberRoot = null;
+		else discoverMountedHosts();
+	}
 	if (!pendingHosts.length) return;
 	var hosts = pendingHosts;
 	var states = pendingStates;
@@ -4013,7 +4082,11 @@ function flushNativeStyleLinks() {
 	engine.linkTables(hosts, tableIds, scopeIndexes, scopes);
 }
 function linkNativeStyleHost(host, state) {
-	if (!engine) return;
+	if (!engine || host == null) return;
+	var key = hostKey(host);
+	var linked = linkedHostState.get(key);
+	if (linked && linked.mapping === state.mapping && linked.scopeId === state.scopeId) return;
+	linkedHostState.set(key, state);
 	var live = scopeStates.get(state.scopeId);
 	if (live && (live.name !== state.stateName || live.theme !== state.theme)) {
 		var compiled = getCompiledMapping(state.mapping);
@@ -4024,10 +4097,7 @@ function linkNativeStyleHost(host, state) {
 	}
 	pendingHosts.push(host);
 	pendingStates.push(state);
-	if (pendingHosts.length >= maxPendingHosts && !idleFlushQueued) {
-		idleFlushQueued = true;
-		requestIdleCallback(idleFlush);
-	}
+	if (pendingHosts.length >= maxPendingHosts) queueIdleFlush();
 }
 var pending = null;
 var flushListener = null;
@@ -4076,6 +4146,7 @@ function setupHooks(next) {
 //#endregion
 //#region ../web/dist/esm/_withNativeStyle.native.js
 var _excluded$7 = ["_expressions"];
+var _excluded2$3 = ["ref"];
 var hostTextProps = {
 	accessible: isAndroid ? false : isIos ? true : void 0,
 	allowFontScaling: true,
@@ -4105,7 +4176,9 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 			theme: null,
 			state: null,
 			ref: function ref(node) {
-				if (node) linkHost(node, entry.state);
+				if (!node) return;
+				captureRoot(node);
+				linkHost(node, entry.state);
 			}
 		};
 		return entry;
@@ -4116,6 +4189,9 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 	var resolve = resolveNativeStyleMapping;
 	var linkState = createNativeStyleLinkState;
 	var linkHost = linkNativeStyleHost;
+	var registerStyle = registerNativeStyle;
+	var mountMode = nativeStyleMountMode;
+	var captureRoot = captureNativeStyleRoot;
 	var assignRef = setRef;
 	var render = function render2(props, key) {
 		var scopeId = (0, react.use)(ScopeContext);
@@ -4147,20 +4223,20 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 			entry.stateName = name;
 			entry.theme = theme;
 			entry.state = linkState(themeStyleKeys, scopeId, name, theme);
+			registerStyle(entry.style, entry.state);
+			registerStyle(entry.hostTextStyle, entry.state);
 		}
 		var style = asHostText ? entry.hostTextStyle : entry.style;
 		var wrapped = resetsText || asHostText && mayRenderText(rest.children);
 		var state = entry.state;
-		var hostRef = ref == null ? entry.ref : function(node) {
+		var passedRef = mountMode() === "discover" ? ref !== null && ref !== void 0 ? ref : null : ref == null ? entry.ref : function(node) {
 			if (!node) return assignRef(ref, null);
+			captureRoot(node);
 			linkHost(node, state);
 			if (typeof ref === "function") return ref(node);
 			assignRef(ref, node);
 		};
-		var element = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Rendered, _objectSpread2(_objectSpread2(_objectSpread2({}, asHostText && hostTextProps), rest), {}, {
-			ref: hostRef,
-			style
-		}), wrapped ? void 0 : key);
+		var element = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Rendered, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, asHostText && hostTextProps), passedRef == null ? omitRef(rest) : rest), passedRef != null ? { ref: passedRef } : null), {}, { style }), wrapped ? void 0 : key);
 		if (!wrapped) return element;
 		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TextAncestorProvider, {
 			value: !resetsText,
@@ -4175,6 +4251,11 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 	};
 	return NativeStyleView;
 };
+function omitRef(props) {
+	if (!Object.prototype.hasOwnProperty.call(props, "ref")) return props;
+	var { ref: _ref } = props;
+	return _objectWithoutProperties(props, _excluded2$3);
+}
 function mayRenderText(children) {
 	if (children == null) return false;
 	if (Array.isArray(children) && children.length <= 3) return children.some(function(child) {
@@ -9336,8 +9417,8 @@ ${banner}
 		var childrenFromHooks = hooks.useChildren ? hooks.useChildren(elementType, children, viewProps, isPassthrough) : void 0;
 		if (isPassthrough) content = /* @__PURE__ */ react.default.createElement(BaseComponent, { style: { display: "contents" } }, propsIn.children);
 		else {
-			if (childrenFromHooks) content = childrenFromHooks;
 			var isRenderPropString = typeof renderProp === "string";
+			if (childrenFromHooks && (!renderProp || isRenderPropString)) content = childrenFromHooks;
 			if (renderProp && !isRenderPropString) {
 				var out = getCustomRender(renderProp, content || children, viewProps, componentState);
 				if (out) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -137,19 +137,19 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "3.0.10",
-    "@tamagui/constants": "3.0.10",
-    "@tamagui/helpers": "3.0.10",
-    "@tamagui/react-native-media-driver": "3.0.10",
-    "@tamagui/react-native-use-pressable": "3.0.10",
-    "@tamagui/use-element-layout": "3.0.10",
-    "@tamagui/use-event": "3.0.10",
-    "@tamagui/web": "3.0.10"
+    "@tamagui/compose-refs": "3.0.11",
+    "@tamagui/constants": "3.0.11",
+    "@tamagui/helpers": "3.0.11",
+    "@tamagui/react-native-media-driver": "3.0.11",
+    "@tamagui/react-native-use-pressable": "3.0.11",
+    "@tamagui/use-element-layout": "3.0.11",
+    "@tamagui/use-event": "3.0.11",
+    "@tamagui/web": "3.0.11"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.10",
-    "@tamagui/native-bundle": "3.0.10",
-    "@tamagui/react-native-web-lite": "3.0.10",
+    "@tamagui/build": "3.0.11",
+    "@tamagui/native-bundle": "3.0.11",
+    "@tamagui/react-native-web-lite": "3.0.11",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",
@@ -164,5 +164,5 @@
     "./dist/cjs": "./dist/esm/index.native.js",
     "./theme-update": "./dist/esm/theme-update.native.js"
   },
-  "releaseSourceCommit": "bd0af4e3ff768a30f8214da3d44eb0e4ceb21731"
+  "releaseSourceCommit": "2126db6e1f5389c724e21f06ce7d7e7d9f49f4aa"
 }