@tamagui/web 3.0.0-beta.924.1 → 3.0.0

package/dist/cjs/hooks/useThemeState.cjs

@@ -36,8 +36,10 @@ __export(useThemeState_exports, {
 module.exports = __toCommonJS(useThemeState_exports);
 var import_constants = require("@tamagui/constants");
 var import_react = require("react");
+var import_helpers = require("@tamagui/helpers");
 var import_config = require("../config.cjs");
 var import_constants2 = require("../constants/constants.cjs");
+var import_themes = require("../helpers/themes.cjs");
 const ThemeStateContext = (0, import_react.createContext)("");
 const allListeners = /* @__PURE__ */ new Map();
 const listenersByParent = {};
@@ -45,7 +47,6 @@ const HasRenderedOnce = /* @__PURE__ */ new WeakMap();
 const HadTheme = /* @__PURE__ */ new WeakMap();
 const PendingUpdate = /* @__PURE__ */ new Map();
 const states = /* @__PURE__ */ new Map();
-const localStates = /* @__PURE__ */ new Map();
 let shouldForce = false;
 const forceUpdateThemes = () => {
 	cacheVersion++;
@@ -87,17 +88,11 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		theme: (0, import_config.getConfig)().themes.light
 	};
 	const id = (0, import_react.useId)();
-	const propsKey = getPropsKey(props);
+	const propsKey = `${props.name || ""}${props.forceClassName || ""}${props._themeUpdate?.key || ""}`;
 	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props);
 	const ref = (0, import_react.useRef)(null);
 	const r = ref.current ||= {
 		id,
-		parentId,
-		props,
-		propsKey,
-		isRoot,
-		keys,
-		schemeKeys,
 		optimizeForFirstRender,
 		renderVersion: 0
 	};
@@ -105,7 +100,6 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 	r.propsKey = propsKey;
 	r.isRoot = isRoot;
 	r.keys = keys;
-	r.schemeKeys = schemeKeys;
 	r.parentId = parentId;
 	r.renderVersion++;
 	const [, forceUpdate] = (0, import_react.useReducer)(incReducer, 0);
@@ -115,10 +109,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		const renderVersion = r.renderVersion;
 		if (r.lastSnap && !states.has(r.id)) {
 			states.set(r.id, r.lastSnap);
-			localStates.set(r.id, r.lastSnap);
+			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
+		if (r.unsubscribe && r.subscribedTo !== r.parentId) r.unsubscribe?.();
 		if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 			if (!r.unsubscribe) {
 				const pid = r.parentId;
@@ -137,18 +131,18 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 					PendingUpdate.set(sid, forced ? "force" : true);
 					cb(forced);
 				});
-				r.subscribedParentId = pid;
+				r.subscribedTo = pid;
 				r.unsubscribe = () => {
 					allListeners.delete(sid);
 					listenersByParent[pid]?.delete(sid);
-					localStates.delete(sid);
+					r.state = void 0;
 					states.delete(sid);
 					PendingUpdate.delete(sid);
 					r.unsubscribe = void 0;
-					r.subscribedParentId = void 0;
+					r.subscribedTo = void 0;
 				};
 			}
-		} else if (r.unsubscribe) cleanupThemeSubscription(r);
+		} else if (r.unsubscribe) r.unsubscribe?.();
 		return () => {
 			if (r.renderVersion === renderVersion) cleanupThemeState(r);
 		};
@@ -169,13 +163,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 	return state;
 };
 const shouldSubscribeToTheme = (r, cascadeOnChange) => Boolean(r.optimizeForFirstRender || r.isRoot || cascadeOnChange || hasThemeUpdatingProps(r.props) || r.keys.current?.size || r.props.needsUpdate?.());
-function cleanupThemeSubscription(r) {
-	r.unsubscribe?.();
-}
 function cleanupThemeState(r) {
-	if (r.unsubscribe) cleanupThemeSubscription(r);
+	if (r.unsubscribe) r.unsubscribe();
 	else {
-		localStates.delete(r.id);
+		r.state = void 0;
 		states.delete(r.id);
 		PendingUpdate.delete(r.id);
 	}
@@ -183,16 +174,16 @@ function cleanupThemeState(r) {
 	themeProviderParents.delete(r.id);
 }
 const getSnapshotImpl = (r) => {
-	const { id, parentId, props, propsKey, isRoot, keys, schemeKeys, optimizeForFirstRender } = r;
-	let local = localStates.get(id);
+	const { id, parentId, props, propsKey, isRoot, keys, optimizeForFirstRender } = r;
+	const schemeKeys = void 0;
+	let local = r.state;
 	const parentState = states.get(parentId);
 	if (local && !PendingUpdate.has(id)) {
-		if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
+		if (parentState && local._parentName === parentState.name && local._parentSchemeAuthored === parentState.schemeAuthored && local._propsKey === propsKey) return local;
 	}
 	const isSchemeOnlyChange = !optimizeForFirstRender && false;
-	const allKeysSchemeOptimized = !optimizeForFirstRender && Boolean(keys.current?.size && schemeKeys?.current?.size === keys.current.size);
-	const canSkipForSchemeChange = Boolean(isSchemeOnlyChange && allKeysSchemeOptimized);
-	const needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : keys?.current?.size ? true : props.needsUpdate?.();
+	const canSkipForSchemeChange = Boolean(isSchemeOnlyChange && keys.current?.size && schemeKeys?.current?.size === keys.current.size);
+	const needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.forceClassName || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : keys?.current?.size ? true : props.needsUpdate?.();
 	const [rerender, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	let next = nextRaw;
 	if (props._themeUpdate && nextRaw?.theme) {
@@ -206,32 +197,39 @@ const getSnapshotImpl = (r) => {
 	PendingUpdate.delete(id);
 	if (!local || rerender) {
 		local = { ...next };
-		localStates.set(id, local);
+		r.state = local;
 	}
 	if (next !== local) {
 		Object.assign(local, next);
 		local.id = id;
 	}
 	local._parentName = parentState?.name;
+	local._parentSchemeAuthored = parentState?.schemeAuthored;
 	local._propsKey = propsKey;
 	states.set(id, next);
 	return local;
 };
 const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId, needsUpdate, pendingUpdate) => {
 	const parentState = states.get(parentId);
-	if (props.passThrough) return [false, lastState || parentState || { name: "" }];
+	if (props.passThrough) return [false, parentState || lastState || { name: "" }];
 	themes ||= (0, import_config.getConfig)().themes;
 	const name = !propsKey && (!lastState || !lastState.isNew) ? null : getNewThemeName(parentState?.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
-	const isSameAsParent = Boolean(parentState && (!name || name === parentState.name));
-	const shouldRerender = Boolean(pendingUpdate === "force" || needsUpdate && (pendingUpdate || lastState?.name !== parentState?.name));
+	const authoredName = props.name;
+	const parentSchemeAuthored = !!parentState?.schemeAuthored;
+	const schemeAuthored = isRoot ? !!props.forceClassName : parentSchemeAuthored || !!(authoredName && (0, import_helpers.getThemeScheme)(authoredName) && authoredName in themes);
+	const intentChanged = schemeAuthored !== parentSchemeAuthored;
+	const resolvedName = name || parentState?.name;
+	const sameAsLast = lastState && lastState.name === resolvedName && !!lastState.schemeAuthored === schemeAuthored;
+	const isSameAsParent = Boolean(parentState && resolvedName === parentState.name && !intentChanged);
+	const shouldRerender = Boolean(pendingUpdate === "force" || needsUpdate && (pendingUpdate || lastState?.name !== parentState?.name || !!lastState?.schemeAuthored !== schemeAuthored));
 	if (isSameAsParent) {
-		if (!shouldRerender && lastState && lastState.name === parentState.name) return [false, lastState];
+		if (!shouldRerender && sameAsLast) return [false, lastState];
 		return [shouldRerender, {
 			...parentState,
 			isNew: false
 		}];
 	}
-	if (!name) {
+	if (!resolvedName) {
 		const next = lastState ?? parentState ?? rootThemeState ?? {
 			id,
 			name: "light",
@@ -240,24 +238,24 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
 		if (shouldRerender) return [true, { ...parentState || lastState || next }];
 		return [false, next];
 	}
-	const scheme = getScheme(name);
+	const scheme = (0, import_themes.getAuthoredThemeScheme)(themes[resolvedName]) || (0, import_helpers.getThemeScheme)(resolvedName);
 	const parentInverses = parentState?.inverses ?? 0;
 	const isInverse = Boolean(parentState && scheme !== parentState.scheme);
 	const inverses = parentInverses + (isInverse ? 1 : 0);
 	const nextState = {
 		id,
-		name,
-		theme: themes[name],
+		name: resolvedName,
+		theme: themes[resolvedName],
 		scheme,
 		parentId,
 		parentName: parentState?.name,
 		inverses,
 		isInverse,
+		schemeAuthored,
 		isNew: true
 	};
 	if (isRoot) rootThemeState = nextState;
-	if (pendingUpdate !== "force" && lastState && lastState.name === name) return [false, nextState];
-	return [!(pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name), nextState];
+	return [pendingUpdate === "force" || !sameAsLast, nextState];
 };
 function scheduleUpdate(id) {
 	const queue = [id];
@@ -275,13 +273,6 @@ function scheduleUpdate(id) {
 		allListeners.get(childId)?.();
 	});
 }
-const validSchemes = {
-	light: "light",
-	dark: "dark"
-};
-function getScheme(name) {
-	return validSchemes[name.split("_")[0]];
-}
 function getNewThemeName(parentName = "", props, forceUpdate = false) {
 	const { name } = props;
 	const cacheKey = `${parentName}|${name || ""}|${forceUpdate ? 1 : 0}`;
@@ -302,7 +293,7 @@ function resolveThemeName(parentName, name, themes2, forceUpdate = false) {
 	const parentParts = parentName ? parentName.split("_") : [];
 	let found = null;
 	if (name) {
-		const nameHasScheme = getScheme(name);
+		const nameHasScheme = (0, import_helpers.getThemeScheme)(name);
 		if (nameHasScheme && name in themes2) found = name;
 		if (!found && !nameHasScheme) for (let i = parentParts.length; i >= 0; i--) {
 			const base = parentParts.slice(0, i).join("_");
@@ -313,8 +304,7 @@ function resolveThemeName(parentName, name, themes2, forceUpdate = false) {
 			}
 		}
 	}
-	if (!forceUpdate && found === parentName && !validSchemes[found]) return null;
+	if (!forceUpdate && found === parentName && found !== "light" && found !== "dark") return null;
 	return found;
 }
-const getPropsKey = ({ name, forceClassName, _themeUpdate }) => `${name || ""}${forceClassName || ""}${_themeUpdate?.key || ""}`;
 const hasThemeUpdatingProps = (props) => "name" in props || "forceClassName" in props || "_themeUpdate" in props;

package/dist/cjs/hooks/useThemeState.native.cjs

@@ -38,8 +38,10 @@ __export(useThemeState_exports, {
 module.exports = __toCommonJS(useThemeState_exports);
 var import_constants = require("@tamagui/constants");
 var import_react = require("react");
+var import_helpers = require("@tamagui/helpers");
 var import_config = require("../config.native.js");
 var import_constants2 = require("../constants/constants.native.js");
+var import_themes = require("../helpers/themes.native.js");
 var ThemeStateContext = (0, import_react.createContext)("");
 var allListeners = /* @__PURE__ */ new Map();
 var listenersByParent = {};
@@ -47,7 +49,6 @@ var HasRenderedOnce = /* @__PURE__ */ new WeakMap();
 var HadTheme = /* @__PURE__ */ new WeakMap();
 var PendingUpdate = /* @__PURE__ */ new Map();
 var states = /* @__PURE__ */ new Map();
-var localStates = /* @__PURE__ */ new Map();
 var shouldForce = false;
 var forceUpdateThemes = function() {
 	cacheVersion++;
@@ -96,6 +97,7 @@ var incReducer = function(c) {
 var 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, cascadeOnChange = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false, optimizeForFirstRender = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false;
+	var _props__themeUpdate;
 	var _ref;
 	var { disable } = props;
 	var parentId = (0, import_react.useContext)(ThemeStateContext);
@@ -108,16 +110,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		theme: (0, import_config.getConfig)().themes.light
 	};
 	var id = (0, import_react.useId)();
-	var propsKey = getPropsKey(props);
+	var propsKey = `${props.name || ""}${props.forceClassName || ""}${((_props__themeUpdate = props._themeUpdate) === null || _props__themeUpdate === void 0 ? void 0 : _props__themeUpdate.key) || ""}`;
 	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props);
 	var r = (_ref = (0, import_react.useRef)(null)).current || (_ref.current = {
 		id,
-		parentId,
-		props,
-		propsKey,
-		isRoot,
-		keys,
-		schemeKeys,
 		optimizeForFirstRender,
 		renderVersion: 0
 	});
@@ -135,10 +131,13 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		var renderVersion = r.renderVersion;
 		if (r.lastSnap && !states.has(r.id)) {
 			states.set(r.id, r.lastSnap);
-			localStates.set(r.id, r.lastSnap);
+			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
+		if (r.unsubscribe && r.subscribedTo !== r.parentId) {
+			var _r_unsubscribe;
+			(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
+		}
 		if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 			if (!r.unsubscribe) {
 				var _listenersByParent, _pid;
@@ -159,19 +158,22 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 					PendingUpdate.set(sid, forced ? "force" : true);
 					cb(forced);
 				});
-				r.subscribedParentId = pid;
+				r.subscribedTo = 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);
+					r.state = void 0;
 					states.delete(sid);
 					PendingUpdate.delete(sid);
 					r.unsubscribe = void 0;
-					r.subscribedParentId = void 0;
+					r.subscribedTo = void 0;
 				};
 			}
-		} else if (r.unsubscribe) cleanupThemeSubscription(r);
+		} else if (r.unsubscribe) {
+			var _r_unsubscribe1;
+			(_r_unsubscribe1 = r.unsubscribe) === null || _r_unsubscribe1 === void 0 || _r_unsubscribe1.call(r);
+		}
 		return function() {
 			if (r.renderVersion === renderVersion) cleanupThemeState(r);
 		};
@@ -195,14 +197,10 @@ var shouldSubscribeToTheme = function(r, cascadeOnChange) {
 	var _r_keys_current, _r_props_needsUpdate, _r_props;
 	return Boolean(r.optimizeForFirstRender || 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)));
 };
-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);
+	if (r.unsubscribe) r.unsubscribe();
 	else {
-		localStates.delete(r.id);
+		r.state = void 0;
 		states.delete(r.id);
 		PendingUpdate.delete(r.id);
 	}
@@ -211,16 +209,16 @@ function cleanupThemeState(r) {
 }
 var getSnapshotImpl = function(r) {
 	var _keys_current, _schemeKeys_current, _keys_current1, _props_needsUpdate;
-	var { id, parentId, props, propsKey, isRoot, keys, schemeKeys, optimizeForFirstRender } = r;
-	var local = localStates.get(id);
+	var { id, parentId, props, propsKey, isRoot, keys, optimizeForFirstRender } = r;
+	var schemeKeys = r.schemeKeys;
+	var local = r.state;
 	var parentState = states.get(parentId);
 	if (local && !PendingUpdate.has(id)) {
-		if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
+		if (parentState && local._parentName === parentState.name && local._parentSchemeAuthored === parentState.schemeAuthored && local._propsKey === propsKey) return local;
 	}
 	var isSchemeOnlyChange = !optimizeForFirstRender && import_constants.supportsDynamicColorIOS && (0, import_config.getSetting)("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
-	var allKeysSchemeOptimized = !optimizeForFirstRender && Boolean(((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
-	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && allKeysSchemeOptimized);
-	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : 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 canSkipForSchemeChange = Boolean(isSchemeOnlyChange && ((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
+	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.forceClassName || 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, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	var next = nextRaw;
 	if (props._themeUpdate && (nextRaw === null || nextRaw === void 0 ? void 0 : nextRaw.theme)) {
@@ -235,13 +233,14 @@ var getSnapshotImpl = function(r) {
 	PendingUpdate.delete(id);
 	if (!local || rerender) {
 		local = { ...next };
-		localStates.set(id, local);
+		r.state = local;
 	}
 	if (next !== local) {
 		Object.assign(local, next);
 		local.id = id;
 	}
 	local._parentName = parentState === null || parentState === void 0 ? void 0 : parentState.name;
+	local._parentSchemeAuthored = parentState === null || parentState === void 0 ? void 0 : parentState.schemeAuthored;
 	local._propsKey = propsKey;
 	states.set(id, next);
 	return local;
@@ -249,19 +248,25 @@ var getSnapshotImpl = function(r) {
 var 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 parentState = states.get(parentId);
-	if (props.passThrough) return [false, lastState || parentState || { name: "" }];
+	if (props.passThrough) return [false, parentState || lastState || { name: "" }];
 	themes || (themes = (0, import_config.getConfig)().themes);
 	var name = !propsKey && (!lastState || !lastState.isNew) ? null : getNewThemeName(parentState === null || parentState === void 0 ? void 0 : parentState.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
-	var isSameAsParent = Boolean(parentState && (!name || name === parentState.name));
-	var shouldRerender = Boolean(pendingUpdate === "force" || needsUpdate && (pendingUpdate || (lastState === null || lastState === void 0 ? void 0 : lastState.name) !== (parentState === null || parentState === void 0 ? void 0 : parentState.name)));
+	var authoredName = props.name;
+	var parentSchemeAuthored = !!(parentState === null || parentState === void 0 ? void 0 : parentState.schemeAuthored);
+	var schemeAuthored = isRoot ? !!props.forceClassName : parentSchemeAuthored || !!(authoredName && (0, import_helpers.getThemeScheme)(authoredName) && authoredName in themes);
+	var intentChanged = schemeAuthored !== parentSchemeAuthored;
+	var resolvedName = name || (parentState === null || parentState === void 0 ? void 0 : parentState.name);
+	var sameAsLast = lastState && lastState.name === resolvedName && !!lastState.schemeAuthored === schemeAuthored;
+	var isSameAsParent = Boolean(parentState && resolvedName === parentState.name && !intentChanged);
+	var shouldRerender = Boolean(pendingUpdate === "force" || needsUpdate && (pendingUpdate || (lastState === null || lastState === void 0 ? void 0 : lastState.name) !== (parentState === null || parentState === void 0 ? void 0 : parentState.name) || !!(lastState === null || lastState === void 0 ? void 0 : lastState.schemeAuthored) !== schemeAuthored));
 	if (isSameAsParent) {
-		if (!shouldRerender && lastState && lastState.name === parentState.name) return [false, lastState];
+		if (!shouldRerender && sameAsLast) return [false, lastState];
 		return [shouldRerender, {
 			...parentState,
 			isNew: false
 		}];
 	}
-	if (!name) {
+	if (!resolvedName) {
 		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,
@@ -271,25 +276,25 @@ var getNextState = function(lastState, props, propsKey) {
 		if (shouldRerender) return [true, { ...parentState || lastState || next }];
 		return [false, next];
 	}
-	var scheme = getScheme(name);
+	var scheme = (0, import_themes.getAuthoredThemeScheme)(themes[resolvedName]) || (0, import_helpers.getThemeScheme)(resolvedName);
 	var _parentState_inverses;
 	var parentInverses = (_parentState_inverses = parentState === null || parentState === void 0 ? void 0 : parentState.inverses) !== null && _parentState_inverses !== void 0 ? _parentState_inverses : 0;
 	var isInverse = Boolean(parentState && scheme !== parentState.scheme);
 	var inverses = parentInverses + (isInverse ? 1 : 0);
 	var nextState = {
 		id,
-		name,
-		theme: themes[name],
+		name: resolvedName,
+		theme: themes[resolvedName],
 		scheme,
 		parentId,
 		parentName: parentState === null || parentState === void 0 ? void 0 : parentState.name,
 		inverses,
 		isInverse,
+		schemeAuthored,
 		isNew: true
 	};
 	if (isRoot) rootThemeState = nextState;
-	if (pendingUpdate !== "force" && lastState && lastState.name === name) return [false, nextState];
-	return [!(pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name), nextState];
+	return [pendingUpdate === "force" || !sameAsLast, nextState];
 };
 function scheduleUpdate(id) {
 	var queue = [id];
@@ -323,13 +328,6 @@ function scheduleUpdate(id) {
 		(_allListeners_get = allListeners.get(childId2)) === null || _allListeners_get === void 0 || _allListeners_get();
 	});
 }
-var validSchemes = {
-	light: "light",
-	dark: "dark"
-};
-function getScheme(name) {
-	return validSchemes[name.split("_")[0]];
-}
 function getNewThemeName() {
 	var parentName = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", props = arguments.length > 1 ? arguments[1] : void 0, forceUpdate = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
 	var { name } = props;
@@ -354,7 +352,7 @@ function resolveThemeName(parentName, name, themes2) {
 	var parentParts = parentName ? parentName.split("_") : [];
 	var found = null;
 	if (name) {
-		var nameHasScheme = getScheme(name);
+		var nameHasScheme = (0, import_helpers.getThemeScheme)(name);
 		if (nameHasScheme && name in themes2) found = name;
 		if (!found && !nameHasScheme) for (var i = parentParts.length; i >= 0; i--) {
 			var base = parentParts.slice(0, i).join("_");
@@ -365,13 +363,9 @@ function resolveThemeName(parentName, name, themes2) {
 			}
 		}
 	}
-	if (!forceUpdate && found === parentName && !validSchemes[found]) return null;
+	if (!forceUpdate && found === parentName && found !== "light" && found !== "dark") return null;
 	return found;
 }
-var getPropsKey = function(param) {
-	var { name, forceClassName, _themeUpdate } = param;
-	return `${name || ""}${forceClassName || ""}${(_themeUpdate === null || _themeUpdate === void 0 ? void 0 : _themeUpdate.key) || ""}`;
-};
 var hasThemeUpdatingProps = function(props) {
 	return "name" in props || "forceClassName" in props || "_themeUpdate" in props;
 };