tamagui 3.0.10 → 3.0.11

package/dist/native.cjs

@@ -15544,6 +15544,7 @@ function setNativeStyleEngine(next) {
 		scopeMappings.clear();
 		pendingHosts = [];
 		pendingStates = [];
+		resetNativeStyleDiscovery();
 	}
 	engine = next;
 	if (next) {
@@ -15606,12 +15607,58 @@ function removeNativeStyleScope(scopeId) {
 	});
 	engine === null || engine === void 0 || engine.removeScope(scopeId);
 }
+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 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;
@@ -15640,6 +15687,24 @@ function flushNativeStyleLinks() {
 	}
 	engine.linkTables(hosts, tableIds, scopeIndexes, scopes);
 }
+function linkNativeStyleHost(host, state) {
+	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);
+		syncTableState(compiled, live.name, live.theme);
+		addScopeMapping(state.scopeId, compiled);
+		engine.link(host, compiled.tableId, state.scopeId, true);
+		return;
+	}
+	pendingHosts.push(host);
+	pendingStates.push(state);
+	if (pendingHosts.length >= maxPendingHosts) queueIdleFlush();
+}
 function updateNativeStyleLink(ref, host) {
 	if (ref.nativeLink) {
 		ref.nativeLink.unlink();
@@ -15672,7 +15737,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, 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();
@@ -15704,6 +15769,12 @@ var init_nativeStyleEngine_native = __esmMin((() => {
 	nextTableId = 1;
 	pendingHosts = [];
 	pendingStates = [];
+	maxPendingHosts = 4096;
+	idleFlushQueued = false;
+	stylesToState = /* @__PURE__ */ new WeakMap();
+	linkedHostState = /* @__PURE__ */ new WeakMap();
+	fiberRoot = null;
+	needsDiscover = false;
 	pending = null;
 	flushListener = null;
 	superseded = null;
@@ -20208,8 +20279,8 @@ function createComponent(staticConfig) {
 		var childrenFromHooks = hooks.useChildren ? hooks.useChildren(elementType, children, viewProps, isPassthrough) : void 0;
 		if (isPassthrough) content = /* @__PURE__ */ react$1.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.cjs

@@ -15747,6 +15747,7 @@ function setNativeStyleEngine(next) {
 		scopeMappings.clear();
 		pendingHosts = [];
 		pendingStates = [];
+		resetNativeStyleDiscovery();
 	}
 	engine = next;
 	if (next) {
@@ -15809,12 +15810,58 @@ function removeNativeStyleScope(scopeId) {
 	});
 	engine === null || engine === void 0 || engine.removeScope(scopeId);
 }
+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 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;
@@ -15843,6 +15890,24 @@ function flushNativeStyleLinks() {
 	}
 	engine.linkTables(hosts, tableIds, scopeIndexes, scopes);
 }
+function linkNativeStyleHost(host, state) {
+	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);
+		syncTableState(compiled, live.name, live.theme);
+		addScopeMapping(state.scopeId, compiled);
+		engine.link(host, compiled.tableId, state.scopeId, true);
+		return;
+	}
+	pendingHosts.push(host);
+	pendingStates.push(state);
+	if (pendingHosts.length >= maxPendingHosts) queueIdleFlush();
+}
 function updateNativeStyleLink(ref, host) {
 	if (ref.nativeLink) {
 		ref.nativeLink.unlink();
@@ -15875,7 +15940,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, 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();
@@ -15907,6 +15972,12 @@ var init_nativeStyleEngine_native = __esmMin((() => {
 	nextTableId = 1;
 	pendingHosts = [];
 	pendingStates = [];
+	maxPendingHosts = 4096;
+	idleFlushQueued = false;
+	stylesToState = /* @__PURE__ */ new WeakMap();
+	linkedHostState = /* @__PURE__ */ new WeakMap();
+	fiberRoot = null;
+	needsDiscover = false;
 	pending = null;
 	flushListener = null;
 	superseded = null;
@@ -20435,8 +20506,8 @@ function createComponent(staticConfig) {
 		var childrenFromHooks = hooks.useChildren ? hooks.useChildren(elementType, children, viewProps, isPassthrough) : void 0;
 		if (isPassthrough) content = /* @__PURE__ */ react$1.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",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "license": "MIT",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
@@ -315,73 +315,73 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "3.0.10",
-    "@tamagui/adapt": "3.0.10",
-    "@tamagui/alert-dialog": "3.0.10",
-    "@tamagui/animate": "3.0.10",
-    "@tamagui/animate-presence": "3.0.10",
-    "@tamagui/avatar": "3.0.10",
-    "@tamagui/button": "3.0.10",
-    "@tamagui/card": "3.0.10",
-    "@tamagui/checkbox": "3.0.10",
-    "@tamagui/collapsible": "3.0.10",
-    "@tamagui/compose-refs": "3.0.10",
-    "@tamagui/constants": "3.0.10",
-    "@tamagui/context-menu": "3.0.10",
-    "@tamagui/core": "3.0.10",
-    "@tamagui/create-context": "3.0.10",
-    "@tamagui/create-menu": "3.0.10",
-    "@tamagui/dialog": "3.0.10",
-    "@tamagui/element": "3.0.10",
-    "@tamagui/fake-react-native": "3.0.10",
-    "@tamagui/field": "3.0.10",
-    "@tamagui/focusable": "3.0.10",
-    "@tamagui/font-size": "3.0.10",
-    "@tamagui/form": "3.0.10",
-    "@tamagui/get-font-sized": "3.0.10",
-    "@tamagui/get-token": "3.0.10",
-    "@tamagui/group": "3.0.10",
-    "@tamagui/helpers-tamagui": "3.0.10",
-    "@tamagui/image": "3.0.10",
-    "@tamagui/input": "3.0.10",
-    "@tamagui/label": "3.0.10",
-    "@tamagui/linear-gradient": "3.0.10",
-    "@tamagui/list-item": "3.0.10",
-    "@tamagui/menu": "3.0.10",
-    "@tamagui/polyfill-dev": "3.0.10",
-    "@tamagui/popover": "3.0.10",
-    "@tamagui/popper": "3.0.10",
-    "@tamagui/portal": "3.0.10",
-    "@tamagui/progress": "3.0.10",
-    "@tamagui/radio-group": "3.0.10",
-    "@tamagui/react-native-media-driver": "3.0.10",
-    "@tamagui/react-native-types": "3.0.10",
-    "@tamagui/scroll-view": "3.0.10",
-    "@tamagui/select": "3.0.10",
-    "@tamagui/separator": "3.0.10",
-    "@tamagui/shapes": "3.0.10",
-    "@tamagui/sheet": "3.0.10",
-    "@tamagui/slider": "3.0.10",
-    "@tamagui/spacer": "3.0.10",
-    "@tamagui/spinner": "3.0.10",
-    "@tamagui/stacks": "3.0.10",
-    "@tamagui/switch": "3.0.10",
-    "@tamagui/tabs": "3.0.10",
-    "@tamagui/text": "3.0.10",
-    "@tamagui/theme": "3.0.10",
-    "@tamagui/toast": "3.0.10",
-    "@tamagui/toggle-group": "3.0.10",
-    "@tamagui/tooltip": "3.0.10",
-    "@tamagui/ui": "3.0.10",
-    "@tamagui/use-controllable-state": "3.0.10",
-    "@tamagui/use-debounce": "3.0.10",
-    "@tamagui/use-force-update": "3.0.10",
-    "@tamagui/use-window-dimensions": "3.0.10",
-    "@tamagui/visually-hidden": "3.0.10",
-    "@tamagui/z-index-stack": "3.0.10"
+    "@tamagui/accordion": "3.0.11",
+    "@tamagui/adapt": "3.0.11",
+    "@tamagui/alert-dialog": "3.0.11",
+    "@tamagui/animate": "3.0.11",
+    "@tamagui/animate-presence": "3.0.11",
+    "@tamagui/avatar": "3.0.11",
+    "@tamagui/button": "3.0.11",
+    "@tamagui/card": "3.0.11",
+    "@tamagui/checkbox": "3.0.11",
+    "@tamagui/collapsible": "3.0.11",
+    "@tamagui/compose-refs": "3.0.11",
+    "@tamagui/constants": "3.0.11",
+    "@tamagui/context-menu": "3.0.11",
+    "@tamagui/core": "3.0.11",
+    "@tamagui/create-context": "3.0.11",
+    "@tamagui/create-menu": "3.0.11",
+    "@tamagui/dialog": "3.0.11",
+    "@tamagui/element": "3.0.11",
+    "@tamagui/fake-react-native": "3.0.11",
+    "@tamagui/field": "3.0.11",
+    "@tamagui/focusable": "3.0.11",
+    "@tamagui/font-size": "3.0.11",
+    "@tamagui/form": "3.0.11",
+    "@tamagui/get-font-sized": "3.0.11",
+    "@tamagui/get-token": "3.0.11",
+    "@tamagui/group": "3.0.11",
+    "@tamagui/helpers-tamagui": "3.0.11",
+    "@tamagui/image": "3.0.11",
+    "@tamagui/input": "3.0.11",
+    "@tamagui/label": "3.0.11",
+    "@tamagui/linear-gradient": "3.0.11",
+    "@tamagui/list-item": "3.0.11",
+    "@tamagui/menu": "3.0.11",
+    "@tamagui/polyfill-dev": "3.0.11",
+    "@tamagui/popover": "3.0.11",
+    "@tamagui/popper": "3.0.11",
+    "@tamagui/portal": "3.0.11",
+    "@tamagui/progress": "3.0.11",
+    "@tamagui/radio-group": "3.0.11",
+    "@tamagui/react-native-media-driver": "3.0.11",
+    "@tamagui/react-native-types": "3.0.11",
+    "@tamagui/scroll-view": "3.0.11",
+    "@tamagui/select": "3.0.11",
+    "@tamagui/separator": "3.0.11",
+    "@tamagui/shapes": "3.0.11",
+    "@tamagui/sheet": "3.0.11",
+    "@tamagui/slider": "3.0.11",
+    "@tamagui/spacer": "3.0.11",
+    "@tamagui/spinner": "3.0.11",
+    "@tamagui/stacks": "3.0.11",
+    "@tamagui/switch": "3.0.11",
+    "@tamagui/tabs": "3.0.11",
+    "@tamagui/text": "3.0.11",
+    "@tamagui/theme": "3.0.11",
+    "@tamagui/toast": "3.0.11",
+    "@tamagui/toggle-group": "3.0.11",
+    "@tamagui/tooltip": "3.0.11",
+    "@tamagui/ui": "3.0.11",
+    "@tamagui/use-controllable-state": "3.0.11",
+    "@tamagui/use-debounce": "3.0.11",
+    "@tamagui/use-force-update": "3.0.11",
+    "@tamagui/use-window-dimensions": "3.0.11",
+    "@tamagui/visually-hidden": "3.0.11",
+    "@tamagui/z-index-stack": "3.0.11"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.10",
+    "@tamagui/build": "3.0.11",
     "react": "19.2.3",
     "react-native": "0.87.1",
     "react-native-web": "~0.21.0"
@@ -400,5 +400,5 @@
   ],
   "module:jsx": "dist/jsx",
   "removeSideEffects": true,
-  "releaseSourceCommit": "bd0af4e3ff768a30f8214da3d44eb0e4ceb21731"
+  "releaseSourceCommit": "2126db6e1f5389c724e21f06ce7d7e7d9f49f4aa"
 }