@tamagui/web 3.0.0-beta.807.1 → 3.0.0-beta.881.1

package/dist/cjs/hooks/useThemeState.cjs

@@ -37,7 +37,6 @@ module.exports = __toCommonJS(useThemeState_exports);
 var import_constants = require("@tamagui/constants");
 var import_react = require("react");
 var import_config = require("../config.cjs");
-var import_formatDiagnostic = require("../helpers/formatDiagnostic.cjs");
 var import_constants2 = require("../constants/constants.cjs");
 const ThemeStateContext = (0, import_react.createContext)("");
 const allListeners = /* @__PURE__ */ new Map();
@@ -91,7 +90,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 	const propsKey = getPropsKey(props);
 	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props);
 	const ref = (0, import_react.useRef)(null);
-	if (!ref.current) ref.current = {
+	const r = ref.current ||= {
 		id,
 		parentId,
 		props,
@@ -102,21 +101,17 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		optimizeForFirstRender,
 		renderVersion: 0
 	};
-	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++;
-	if (process.env.NODE_ENV === "development" && globalThis.time) globalThis.time`theme-prep-uses`;
+	r.props = props;
+	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);
-	const state = getSnapshotImpl(ref.current);
-	ref.current.lastSnap = state;
+	const state = getSnapshotImpl(r);
+	r.lastSnap = state;
 	(0, import_react.useEffect)(() => {
-		const r = ref.current;
 		const renderVersion = r.renderVersion;
 		if (r.lastSnap && !states.has(r.id)) {
 			states.set(r.id, r.lastSnap);
@@ -136,8 +131,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 						forceUpdate();
 					}
 				};
-				listenersByParent[pid] = listenersByParent[pid] || /* @__PURE__ */ new Set();
-				listenersByParent[pid].add(sid);
+				(listenersByParent[pid] ||= /* @__PURE__ */ new Set()).add(sid);
 				allListeners.set(sid, () => {
 					const forced = shouldForce;
 					PendingUpdate.set(sid, forced ? "force" : true);
@@ -169,13 +163,12 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			HadTheme.set(keys, false);
 			return;
 		}
-		if (process.env.NODE_ENV === "development" && props.debug === "verbose") console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name);
 		scheduleUpdate(id);
 		HadTheme.set(keys, true);
 	}, [keys, propsKey]);
 	return state;
 };
-const shouldSubscribeToTheme = (r, cascadeOnChange) => r.optimizeForFirstRender || r.isRoot || cascadeOnChange || hasThemeUpdatingProps(r.props) || !!r.keys.current?.size || !!r.props.needsUpdate?.();
+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?.();
 }
@@ -197,12 +190,8 @@ const getSnapshotImpl = (r) => {
 		if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
 	}
 	const isSchemeOnlyChange = !optimizeForFirstRender && false;
-	let allKeysSchemeOptimized = false;
-	if (!optimizeForFirstRender) {
-		const keysSize = keys.current?.size ?? 0;
-		allKeysSchemeOptimized = (schemeKeys?.current?.size ?? 0) === keysSize && keysSize > 0;
-	}
-	const canSkipForSchemeChange = !!isSchemeOnlyChange && allKeysSchemeOptimized;
+	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 [rerender, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	let next = nextRaw;
@@ -219,22 +208,6 @@ const getSnapshotImpl = (r) => {
 		local = { ...next };
 		localStates.set(id, local);
 	}
-	if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
-		console.groupCollapsed(` ${id} getSnapshot ${rerender}`, local.name, ">", next.name);
-		console.info({
-			props,
-			propsKey,
-			isRoot,
-			parentId,
-			local,
-			next,
-			needsUpdate,
-			isSchemeOnlyChange,
-			allKeysSchemeOptimized,
-			canSkipForSchemeChange
-		});
-		console.groupEnd();
-	}
 	if (next !== local) {
 		Object.assign(local, next);
 		local.id = id;
@@ -245,27 +218,12 @@ const getSnapshotImpl = (r) => {
 	return local;
 };
 const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId, needsUpdate, pendingUpdate) => {
-	const { debug } = props;
 	const parentState = states.get(parentId);
 	if (props.passThrough) return [false, lastState || parentState || { name: "" }];
-	if (!themes) themes = (0, import_config.getConfig)().themes;
-	const name = !propsKey && (!lastState || !lastState?.isNew) ? null : getNewThemeName(parentState?.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
-	const isSameAsParent = parentState && (!name || name === parentState.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));
-	if (process.env.NODE_ENV === "development" && debug === "verbose") {
-		const message = ` \xB7 useTheme(${id}) getNextState => ${name} needsUpdate ${needsUpdate} shouldRerender ${shouldRerender}`;
-		console.groupCollapsed(message);
-		console.trace({
-			name,
-			lastState,
-			parentState,
-			props,
-			propsKey,
-			id,
-			isSameAsParent
-		});
-		console.groupEnd();
-	}
 	if (isSameAsParent) {
 		if (!shouldRerender && lastState && lastState.name === parentState.name) return [false, lastState];
 		return [shouldRerender, {
@@ -284,7 +242,7 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
 	}
 	const scheme = getScheme(name);
 	const parentInverses = parentState?.inverses ?? 0;
-	const isInverse = parentState && scheme !== parentState.scheme;
+	const isInverse = Boolean(parentState && scheme !== parentState.scheme);
 	const inverses = parentInverses + (isInverse ? 1 : 0);
 	const nextState = {
 		id,
@@ -299,19 +257,7 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
 	};
 	if (isRoot) rootThemeState = nextState;
 	if (pendingUpdate !== "force" && lastState && lastState.name === name) return [false, nextState];
-	const shouldAvoidRerender = pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name;
-	if (process.env.NODE_ENV === "development" && debug === "verbose") {
-		console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name} shouldAvoidRerender: ${shouldAvoidRerender}`);
-		console.info({
-			lastState,
-			needsUpdate,
-			nextState,
-			pendingUpdate
-		});
-		console.groupEnd();
-	}
-	if (shouldAvoidRerender) return [false, nextState];
-	return [true, nextState];
+	return [!(pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name), nextState];
 };
 function scheduleUpdate(id) {
 	const queue = [id];
@@ -337,12 +283,8 @@ function getScheme(name) {
 	return validSchemes[name.split("_")[0]];
 }
 function getNewThemeName(parentName = "", props, forceUpdate = false) {
-	const { name, reset } = props;
-	if (name && reset) throw new Error((0, import_formatDiagnostic.formatDiagnostic)("❌004", "Theme", "props name and reset are mutually exclusive", "Pass either name or reset, not both", "name,reset", {
-		name,
-		reset
-	}));
-	const cacheKey = `${parentName}|${name || ""}|${reset ? 1 : 0}|${forceUpdate ? 1 : 0}`;
+	const { name } = props;
+	const cacheKey = `${parentName}|${name || ""}|${forceUpdate ? 1 : 0}`;
 	if (themeNameCacheVer !== cacheVersion) {
 		themeNameCache.clear();
 		themeNameCacheVer = cacheVersion;
@@ -350,20 +292,13 @@ function getNewThemeName(parentName = "", props, forceUpdate = false) {
 		const cached = themeNameCache.get(cacheKey);
 		if (cached !== void 0) return cached;
 	}
-	const result = resolveThemeName(parentName, name ?? void 0, reset, (0, import_config.getConfig)().themes, forceUpdate);
+	const result = resolveThemeName(parentName, name ?? void 0, (0, import_config.getConfig)().themes, forceUpdate);
 	if (themeNameCache.size >= 1e4) themeNameCache.clear();
 	themeNameCache.set(cacheKey, result);
 	return result;
 }
 const getThemeNameCacheSize = () => themeNameCache.size;
-function resolveThemeName(parentName, name, reset, themes2, forceUpdate = false) {
-	if (reset) {
-		if (parentName === "light" || parentName === "dark") return parentName === "light" ? "dark" : "light";
-		const lastPartIndex = parentName.lastIndexOf("_");
-		const resetName = lastPartIndex <= 0 ? parentName : parentName.slice(lastPartIndex);
-		const scheme = parentName.slice(0, lastPartIndex);
-		return themes2[resetName] ? resetName : scheme;
-	}
+function resolveThemeName(parentName, name, themes2, forceUpdate = false) {
 	const parentParts = parentName ? parentName.split("_") : [];
 	let found = null;
 	if (name) {
@@ -381,5 +316,5 @@ function resolveThemeName(parentName, name, reset, themes2, forceUpdate = false)
 	if (!forceUpdate && found === parentName && !validSchemes[found]) return null;
 	return found;
 }
-const getPropsKey = ({ name, reset, forceClassName, _themeUpdate }) => `${name || ""}${reset || ""}${forceClassName || ""}${_themeUpdate?.key || ""}`;
-const hasThemeUpdatingProps = (props) => "name" in props || "reset" in props || "forceClassName" in props || "_themeUpdate" in props;
+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

@@ -39,7 +39,6 @@ module.exports = __toCommonJS(useThemeState_exports);
 var import_constants = require("@tamagui/constants");
 var import_react = require("react");
 var import_config = require("../config.native.js");
-var import_formatDiagnostic = require("../helpers/formatDiagnostic.native.js");
 var import_constants2 = require("../constants/constants.native.js");
 var ThemeStateContext = (0, import_react.createContext)("");
 var allListeners = /* @__PURE__ */ new Map();
@@ -97,6 +96,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 _ref;
 	var { disable } = props;
 	var parentId = (0, import_react.useContext)(ThemeStateContext);
 	if (!parentId && !isRoot) throw new Error(process.env.NODE_ENV === "development" ? `${import_constants2.MISSING_THEME_MESSAGE}
@@ -110,8 +110,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 	var id = (0, import_react.useId)();
 	var propsKey = getPropsKey(props);
 	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props);
-	var ref = (0, import_react.useRef)(null);
-	if (!ref.current) ref.current = {
+	var r = (_ref = (0, import_react.useRef)(null)).current || (_ref.current = {
 		id,
 		parentId,
 		props,
@@ -121,22 +120,18 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		schemeKeys,
 		optimizeForFirstRender,
 		renderVersion: 0
-	};
-	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++;
-	if (process.env.NODE_ENV === "development" && globalThis.time) globalThis.time`theme-prep-uses`;
+	});
+	r.props = props;
+	r.propsKey = propsKey;
+	r.isRoot = isRoot;
+	r.keys = keys;
+	r.schemeKeys = schemeKeys;
+	r.parentId = parentId;
+	r.renderVersion++;
 	var [, forceUpdate] = (0, import_react.useReducer)(incReducer, 0);
-	var state = getSnapshotImpl(ref.current);
-	ref.current.lastSnap = state;
+	var state = getSnapshotImpl(r);
+	r.lastSnap = state;
 	(0, import_react.useEffect)(function() {
-		var r = ref.current;
 		var renderVersion = r.renderVersion;
 		if (r.lastSnap && !states.has(r.id)) {
 			states.set(r.id, r.lastSnap);
@@ -146,6 +141,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
 		if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 			if (!r.unsubscribe) {
+				var _listenersByParent, _pid;
 				var pid = r.parentId;
 				var sid = r.id;
 				var cb = function(forced) {
@@ -157,8 +153,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 						forceUpdate();
 					}
 				};
-				listenersByParent[pid] = listenersByParent[pid] || /* @__PURE__ */ new Set();
-				listenersByParent[pid].add(sid);
+				((_listenersByParent = listenersByParent)[_pid = pid] || (_listenersByParent[_pid] = /* @__PURE__ */ new Set())).add(sid);
 				allListeners.set(sid, function() {
 					var forced = shouldForce;
 					PendingUpdate.set(sid, forced ? "force" : true);
@@ -191,10 +186,6 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			HadTheme.set(keys, false);
 			return;
 		}
-		if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
-			var _states_get;
-			console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, (_states_get = states.get(id)) === null || _states_get === void 0 ? void 0 : _states_get.name);
-		}
 		scheduleUpdate(id);
 		HadTheme.set(keys, true);
 	}, [keys, propsKey]);
@@ -202,7 +193,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 };
 var shouldSubscribeToTheme = function(r, cascadeOnChange) {
 	var _r_keys_current, _r_props_needsUpdate, _r_props;
-	return 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));
+	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;
@@ -219,7 +210,7 @@ function cleanupThemeState(r) {
 	themeProviderParents.delete(r.id);
 }
 var getSnapshotImpl = function(r) {
-	var _keys_current, _props_needsUpdate;
+	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 parentState = states.get(parentId);
@@ -227,16 +218,9 @@ var getSnapshotImpl = function(r) {
 		if (parentState && local._parentName === parentState.name && 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 = false;
-	if (!optimizeForFirstRender) {
-		var _keys_current1, _schemeKeys_current;
-		var _keys_current_size;
-		var keysSize = (_keys_current_size = (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) !== null && _keys_current_size !== void 0 ? _keys_current_size : 0;
-		var _schemeKeys_current_size;
-		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 : 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_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
+	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 [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)) {
@@ -253,22 +237,6 @@ var getSnapshotImpl = function(r) {
 		local = { ...next };
 		localStates.set(id, local);
 	}
-	if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
-		console.groupCollapsed(` ${id} getSnapshot ${rerender}`, local.name, ">", next.name);
-		console.info({
-			props,
-			propsKey,
-			isRoot,
-			parentId,
-			local,
-			next,
-			needsUpdate,
-			isSchemeOnlyChange,
-			allKeysSchemeOptimized,
-			canSkipForSchemeChange
-		});
-		console.groupEnd();
-	}
 	if (next !== local) {
 		Object.assign(local, next);
 		local.id = id;
@@ -280,17 +248,12 @@ 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 { debug } = props;
 	var parentState = states.get(parentId);
 	if (props.passThrough) return [false, lastState || parentState || { name: "" }];
-	if (!themes) themes = (0, import_config.getConfig)().themes;
-	var name = !propsKey && (!lastState || !(lastState === null || lastState === void 0 ? void 0 : lastState.isNew)) ? null : getNewThemeName(parentState === null || parentState === void 0 ? void 0 : parentState.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
-	var isSameAsParent = parentState && (!name || name === parentState.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)));
-	if (process.env.NODE_ENV === "development" && debug === "verbose") {
-		var message = ` \xB7 useTheme(${id}) getNextState => ${name} needsUpdate ${needsUpdate} shouldRerender ${shouldRerender}`;
-		console.info(message);
-	}
 	if (isSameAsParent) {
 		if (!shouldRerender && lastState && lastState.name === parentState.name) return [false, lastState];
 		return [shouldRerender, {
@@ -311,7 +274,7 @@ var getNextState = function(lastState, props, propsKey) {
 	var scheme = getScheme(name);
 	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 = parentState && scheme !== parentState.scheme;
+	var isInverse = Boolean(parentState && scheme !== parentState.scheme);
 	var inverses = parentInverses + (isInverse ? 1 : 0);
 	var nextState = {
 		id,
@@ -326,19 +289,7 @@ var getNextState = function(lastState, props, propsKey) {
 	};
 	if (isRoot) rootThemeState = nextState;
 	if (pendingUpdate !== "force" && lastState && lastState.name === name) return [false, nextState];
-	var shouldAvoidRerender = pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name;
-	if (process.env.NODE_ENV === "development" && debug === "verbose") {
-		console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name} shouldAvoidRerender: ${shouldAvoidRerender}`);
-		console.info({
-			lastState,
-			needsUpdate,
-			nextState,
-			pendingUpdate
-		});
-		console.groupEnd();
-	}
-	if (shouldAvoidRerender) return [false, nextState];
-	return [true, nextState];
+	return [!(pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name), nextState];
 };
 function scheduleUpdate(id) {
 	var queue = [id];
@@ -368,8 +319,8 @@ function scheduleUpdate(id) {
 		}
 	}
 	visited.forEach(function(childId2) {
-		var cb = allListeners.get(childId2);
-		cb === null || cb === void 0 || cb();
+		var _allListeners_get;
+		(_allListeners_get = allListeners.get(childId2)) === null || _allListeners_get === void 0 || _allListeners_get();
 	});
 }
 var validSchemes = {
@@ -381,12 +332,8 @@ function getScheme(name) {
 }
 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, reset } = props;
-	if (name && reset) throw new Error((0, import_formatDiagnostic.formatDiagnostic)("❌004", "Theme", "props name and reset are mutually exclusive", "Pass either name or reset, not both", "name,reset", {
-		name,
-		reset
-	}));
-	var cacheKey = `${parentName}|${name || ""}|${reset ? 1 : 0}|${forceUpdate ? 1 : 0}`;
+	var { name } = props;
+	var cacheKey = `${parentName}|${name || ""}|${forceUpdate ? 1 : 0}`;
 	if (themeNameCacheVer !== cacheVersion) {
 		themeNameCache.clear();
 		themeNameCacheVer = cacheVersion;
@@ -394,7 +341,7 @@ function getNewThemeName() {
 		var cached = themeNameCache.get(cacheKey);
 		if (cached !== void 0) return cached;
 	}
-	var result = resolveThemeName(parentName, name !== null && name !== void 0 ? name : void 0, reset, (0, import_config.getConfig)().themes, forceUpdate);
+	var result = resolveThemeName(parentName, name !== null && name !== void 0 ? name : void 0, (0, import_config.getConfig)().themes, forceUpdate);
 	if (themeNameCache.size >= 1e4) themeNameCache.clear();
 	themeNameCache.set(cacheKey, result);
 	return result;
@@ -402,15 +349,8 @@ function getNewThemeName() {
 var getThemeNameCacheSize = function() {
 	return themeNameCache.size;
 };
-function resolveThemeName(parentName, name, reset, themes2) {
-	var forceUpdate = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
-	if (reset) {
-		if (parentName === "light" || parentName === "dark") return parentName === "light" ? "dark" : "light";
-		var lastPartIndex = parentName.lastIndexOf("_");
-		var resetName = lastPartIndex <= 0 ? parentName : parentName.slice(lastPartIndex);
-		var scheme = parentName.slice(0, lastPartIndex);
-		return themes2[resetName] ? resetName : scheme;
-	}
+function resolveThemeName(parentName, name, themes2) {
+	var forceUpdate = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
 	var parentParts = parentName ? parentName.split("_") : [];
 	var found = null;
 	if (name) {
@@ -429,9 +369,9 @@ function resolveThemeName(parentName, name, reset, themes2) {
 	return found;
 }
 var getPropsKey = function(param) {
-	var { name, reset, forceClassName, _themeUpdate } = param;
-	return `${name || ""}${reset || ""}${forceClassName || ""}${(_themeUpdate === null || _themeUpdate === void 0 ? void 0 : _themeUpdate.key) || ""}`;
+	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 || "reset" in props || "forceClassName" in props || "_themeUpdate" in props;
+	return "name" in props || "forceClassName" in props || "_themeUpdate" in props;
 };