@tamagui/web 3.0.0-beta.1598.1 → 3.0.0-beta.1648.1

package/dist/cjs/helpers/proxyThemeToParents.cjs

@@ -24,6 +24,7 @@ __export(proxyThemeToParents_exports, {
 	proxyThemesToParents: () => proxyThemesToParents
 });
 module.exports = __toCommonJS(proxyThemeToParents_exports);
+var import_themes = require("./themes.cjs");
 const themesRaw = {};
 function proxyThemesToParents(dedupedThemes, declarationOrder) {
 	for (const { names, theme } of dedupedThemes) {
@@ -57,5 +58,5 @@ function proxyThemeToParents(themeName, theme) {
 		Object.assign(out, themesRaw[parent]);
 	}
 	Object.assign(out, theme);
-	return out;
+	return (0, import_themes.copyAuthoredThemeScheme)(out, theme);
 }

package/dist/cjs/helpers/proxyThemeToParents.native.cjs

@@ -26,6 +26,7 @@ __export(proxyThemeToParents_exports, {
 	proxyThemesToParents: () => proxyThemesToParents
 });
 module.exports = __toCommonJS(proxyThemeToParents_exports);
+var import_themes = require("./themes.native.js");
 var themesRaw = {};
 function proxyThemesToParents(dedupedThemes, declarationOrder) {
 	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
@@ -163,5 +164,5 @@ function proxyThemeToParents(themeName, theme) {
 		}
 	}
 	Object.assign(out, theme);
-	return out;
+	return (0, import_themes.copyAuthoredThemeScheme)(out, theme);
 }

package/dist/cjs/helpers/proxyThemeToParents.native.js

@@ -26,6 +26,7 @@ __export(proxyThemeToParents_exports, {
 	proxyThemesToParents: () => proxyThemesToParents
 });
 module.exports = __toCommonJS(proxyThemeToParents_exports);
+var import_themes = require("./themes.native.js");
 var themesRaw = {};
 function proxyThemesToParents(dedupedThemes, declarationOrder) {
 	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
@@ -163,7 +164,7 @@ function proxyThemeToParents(themeName, theme) {
 		}
 	}
 	Object.assign(out, theme);
-	return out;
+	return (0, import_themes.copyAuthoredThemeScheme)(out, theme);
 }
 
 //# sourceMappingURL=proxyThemeToParents.native.js.map

package/dist/cjs/helpers/proxyThemeToParents.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxyThemeToParents.native.js","names":[],"sources":["cjs/helpers/proxyThemeToParents.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar proxyThemeToParents_exports = {};\n__export(proxyThemeToParents_exports, {\n  proxyThemeToParents: () => proxyThemeToParents,\n  proxyThemesToParents: () => proxyThemesToParents\n});\nmodule.exports = __toCommonJS(proxyThemeToParents_exports);\nvar themesRaw = {};\nfunction proxyThemesToParents(dedupedThemes, declarationOrder) {\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = dedupedThemes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var { names, theme } = _step.value;\n      var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n      try {\n        for (var _iterator1 = names[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n          var name = _step1.value;\n          themesRaw[name] = theme;\n        }\n      } catch (err) {\n        _didIteratorError1 = true;\n        _iteratorError1 = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n            _iterator1.return();\n          }\n        } finally {\n          if (_didIteratorError1) {\n            throw _iteratorError1;\n          }\n        }\n      }\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  var themes = {};\n  var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;\n  try {\n    for (var _iterator2 = dedupedThemes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {\n      var { names: names1, theme: theme1 } = _step2.value;\n      var _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;\n      try {\n        for (var _iterator3 = names1[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {\n          var themeName = _step3.value;\n          var proxiedTheme = proxyThemeToParents(themeName, theme1);\n          themes[themeName] = proxiedTheme;\n        }\n      } catch (err) {\n        _didIteratorError3 = true;\n        _iteratorError3 = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {\n            _iterator3.return();\n          }\n        } finally {\n          if (_didIteratorError3) {\n            throw _iteratorError3;\n          }\n        }\n      }\n    }\n  } catch (err) {\n    _didIteratorError2 = true;\n    _iteratorError2 = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion2 && _iterator2.return != null) {\n        _iterator2.return();\n      }\n    } finally {\n      if (_didIteratorError2) {\n        throw _iteratorError2;\n      }\n    }\n  }\n  if (declarationOrder) {\n    var ordered = {};\n    var _iteratorNormalCompletion4 = true, _didIteratorError4 = false, _iteratorError4 = void 0;\n    try {\n      for (var _iterator4 = declarationOrder[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {\n        var k = _step4.value;\n        if (k in themes) ordered[k] = themes[k];\n      }\n    } catch (err) {\n      _didIteratorError4 = true;\n      _iteratorError4 = err;\n    } finally {\n      try {\n        if (!_iteratorNormalCompletion4 && _iterator4.return != null) {\n          _iterator4.return();\n        }\n      } finally {\n        if (_didIteratorError4) {\n          throw _iteratorError4;\n        }\n      }\n    }\n    for (var k1 in themes) if (!(k1 in ordered)) ordered[k1] = themes[k1];\n    return ordered;\n  }\n  return themes;\n}\nfunction proxyThemeToParents(themeName, theme) {\n  var out = {};\n  var cur = [];\n  var parents = themeName.split(\"_\").slice(0, -1).map(function(part) {\n    cur.push(part);\n    return cur.join(\"_\");\n  });\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = parents[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var parent = _step.value;\n      Object.assign(out, themesRaw[parent]);\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  Object.assign(out, theme);\n  return out;\n}\n//# sourceMappingURL=proxyThemeToParents.js.map\n"],"mappings":"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"}
+{"version":3,"file":"proxyThemeToParents.native.js","names":[],"sources":["cjs/helpers/proxyThemeToParents.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar proxyThemeToParents_exports = {};\n__export(proxyThemeToParents_exports, {\n  proxyThemeToParents: () => proxyThemeToParents,\n  proxyThemesToParents: () => proxyThemesToParents\n});\nmodule.exports = __toCommonJS(proxyThemeToParents_exports);\nvar import_themes = require(\"./themes\");\nvar themesRaw = {};\nfunction proxyThemesToParents(dedupedThemes, declarationOrder) {\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = dedupedThemes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var { names, theme } = _step.value;\n      var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n      try {\n        for (var _iterator1 = names[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n          var name = _step1.value;\n          themesRaw[name] = theme;\n        }\n      } catch (err) {\n        _didIteratorError1 = true;\n        _iteratorError1 = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n            _iterator1.return();\n          }\n        } finally {\n          if (_didIteratorError1) {\n            throw _iteratorError1;\n          }\n        }\n      }\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  var themes = {};\n  var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;\n  try {\n    for (var _iterator2 = dedupedThemes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {\n      var { names: names1, theme: theme1 } = _step2.value;\n      var _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;\n      try {\n        for (var _iterator3 = names1[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {\n          var themeName = _step3.value;\n          var proxiedTheme = proxyThemeToParents(themeName, theme1);\n          themes[themeName] = proxiedTheme;\n        }\n      } catch (err) {\n        _didIteratorError3 = true;\n        _iteratorError3 = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {\n            _iterator3.return();\n          }\n        } finally {\n          if (_didIteratorError3) {\n            throw _iteratorError3;\n          }\n        }\n      }\n    }\n  } catch (err) {\n    _didIteratorError2 = true;\n    _iteratorError2 = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion2 && _iterator2.return != null) {\n        _iterator2.return();\n      }\n    } finally {\n      if (_didIteratorError2) {\n        throw _iteratorError2;\n      }\n    }\n  }\n  if (declarationOrder) {\n    var ordered = {};\n    var _iteratorNormalCompletion4 = true, _didIteratorError4 = false, _iteratorError4 = void 0;\n    try {\n      for (var _iterator4 = declarationOrder[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {\n        var k = _step4.value;\n        if (k in themes) ordered[k] = themes[k];\n      }\n    } catch (err) {\n      _didIteratorError4 = true;\n      _iteratorError4 = err;\n    } finally {\n      try {\n        if (!_iteratorNormalCompletion4 && _iterator4.return != null) {\n          _iterator4.return();\n        }\n      } finally {\n        if (_didIteratorError4) {\n          throw _iteratorError4;\n        }\n      }\n    }\n    for (var k1 in themes) if (!(k1 in ordered)) ordered[k1] = themes[k1];\n    return ordered;\n  }\n  return themes;\n}\nfunction proxyThemeToParents(themeName, theme) {\n  var out = {};\n  var cur = [];\n  var parents = themeName.split(\"_\").slice(0, -1).map(function(part) {\n    cur.push(part);\n    return cur.join(\"_\");\n  });\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = parents[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var parent = _step.value;\n      Object.assign(out, themesRaw[parent]);\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  Object.assign(out, theme);\n  return (0, import_themes.copyAuthoredThemeScheme)(out, theme);\n}\n//# sourceMappingURL=proxyThemeToParents.js.map\n"],"mappings":"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"}

package/dist/cjs/helpers/themes.cjs

@@ -19,23 +19,31 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var themes_exports = {};
-__export(themes_exports, { ensureThemeVariable: () => ensureThemeVariable });
+__export(themes_exports, {
+	copyAuthoredThemeScheme: () => copyAuthoredThemeScheme,
+	ensureThemeVariable: () => ensureThemeVariable,
+	getAuthoredThemeScheme: () => getAuthoredThemeScheme
+});
 module.exports = __toCommonJS(themes_exports);
 var import_createVariable = require("../createVariable.cjs");
+const schemeKey = /* @__PURE__ */ Symbol.for("tamagui.theme.scheme");
+function getAuthoredThemeScheme(theme) {
+	const scheme = theme[schemeKey];
+	return scheme === "light" || scheme === "dark" ? scheme : void 0;
+}
+function copyAuthoredThemeScheme(target, source) {
+	const scheme = getAuthoredThemeScheme(source);
+	if (scheme) Object.defineProperty(target, schemeKey, { value: scheme });
+	return target;
+}
 function ensureThemeVariable(theme, key) {
 	const val = theme[key];
-	const value = (0, import_createVariable.isVariable)(val) ? val.val : val;
-	if (!(0, import_createVariable.isVariable)(val)) {
-		theme[key] = (0, import_createVariable.createVariable)({
-			key,
-			name: key,
-			val: value
-		});
-	} else if (val.name !== key) {
+	const variable = (0, import_createVariable.isVariable)(val);
+	if (!variable || val.name !== key) {
 		theme[key] = (0, import_createVariable.createVariable)({
-			key: val.name,
+			key: variable ? val.name : key,
 			name: key,
-			val: value
+			val: variable ? val.val : val
 		});
 	}
 }

package/dist/cjs/helpers/themes.native.cjs

@@ -21,23 +21,31 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var themes_exports = {};
-__export(themes_exports, { ensureThemeVariable: () => ensureThemeVariable });
+__export(themes_exports, {
+	copyAuthoredThemeScheme: () => copyAuthoredThemeScheme,
+	ensureThemeVariable: () => ensureThemeVariable,
+	getAuthoredThemeScheme: () => getAuthoredThemeScheme
+});
 module.exports = __toCommonJS(themes_exports);
 var import_createVariable = require("../createVariable.native.js");
+var schemeKey = /* @__PURE__ */ Symbol.for("tamagui.theme.scheme");
+function getAuthoredThemeScheme(theme) {
+	var scheme = theme[schemeKey];
+	return scheme === "light" || scheme === "dark" ? scheme : void 0;
+}
+function copyAuthoredThemeScheme(target, source) {
+	var scheme = getAuthoredThemeScheme(source);
+	if (scheme) Object.defineProperty(target, schemeKey, { value: scheme });
+	return target;
+}
 function ensureThemeVariable(theme, key) {
 	var val = theme[key];
-	var value = (0, import_createVariable.isVariable)(val) ? val.val : val;
-	if (!(0, import_createVariable.isVariable)(val)) {
-		theme[key] = (0, import_createVariable.createVariable)({
-			key,
-			name: key,
-			val: value
-		});
-	} else if (val.name !== key) {
+	var variable = (0, import_createVariable.isVariable)(val);
+	if (!variable || val.name !== key) {
 		theme[key] = (0, import_createVariable.createVariable)({
-			key: val.name,
+			key: variable ? val.name : key,
 			name: key,
-			val: value
+			val: variable ? val.val : val
 		});
 	}
 }

package/dist/cjs/helpers/themes.native.js

@@ -21,23 +21,31 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var themes_exports = {};
-__export(themes_exports, { ensureThemeVariable: () => ensureThemeVariable });
+__export(themes_exports, {
+	copyAuthoredThemeScheme: () => copyAuthoredThemeScheme,
+	ensureThemeVariable: () => ensureThemeVariable,
+	getAuthoredThemeScheme: () => getAuthoredThemeScheme
+});
 module.exports = __toCommonJS(themes_exports);
 var import_createVariable = require("../createVariable.native.js");
+var schemeKey = /* @__PURE__ */ Symbol.for("tamagui.theme.scheme");
+function getAuthoredThemeScheme(theme) {
+	var scheme = theme[schemeKey];
+	return scheme === "light" || scheme === "dark" ? scheme : void 0;
+}
+function copyAuthoredThemeScheme(target, source) {
+	var scheme = getAuthoredThemeScheme(source);
+	if (scheme) Object.defineProperty(target, schemeKey, { value: scheme });
+	return target;
+}
 function ensureThemeVariable(theme, key) {
 	var val = theme[key];
-	var value = (0, import_createVariable.isVariable)(val) ? val.val : val;
-	if (!(0, import_createVariable.isVariable)(val)) {
-		theme[key] = (0, import_createVariable.createVariable)({
-			key,
-			name: key,
-			val: value
-		});
-	} else if (val.name !== key) {
+	var variable = (0, import_createVariable.isVariable)(val);
+	if (!variable || val.name !== key) {
 		theme[key] = (0, import_createVariable.createVariable)({
-			key: val.name,
+			key: variable ? val.name : key,
 			name: key,
-			val: value
+			val: variable ? val.val : val
 		});
 	}
 }

package/dist/cjs/helpers/themes.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"themes.native.js","names":[],"sources":["cjs/helpers/themes.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar themes_exports = {};\n__export(themes_exports, {\n  ensureThemeVariable: () => ensureThemeVariable\n});\nmodule.exports = __toCommonJS(themes_exports);\nvar import_createVariable = require(\"../createVariable\");\nfunction ensureThemeVariable(theme, key) {\n  var val = theme[key];\n  var value = (0, import_createVariable.isVariable)(val) ? val.val : val;\n  if (!(0, import_createVariable.isVariable)(val)) {\n    theme[key] = (0, import_createVariable.createVariable)({\n      key,\n      name: key,\n      val: value\n    });\n  } else if (val.name !== key) {\n    theme[key] = (0, import_createVariable.createVariable)({\n      key: val.name,\n      name: key,\n      val: value\n    });\n  }\n}\n//# sourceMappingURL=themes.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,iBAAiB,CAAC;AACtB,SAAS,gBAAgB,EACvB,2BAA2B,oBAC7B,CAAC;AACD,OAAO,UAAU,aAAa,cAAc;AAC5C,IAAI,wBAAwB,QAAQ,6BAAmB;AACvD,SAAS,oBAAoB,OAAO,KAAK;CACvC,IAAI,MAAM,MAAM;CAChB,IAAI,SAAS,GAAG,sBAAsB,WAAU,CAAE,GAAG,IAAI,IAAI,MAAM;CACnE,IAAI,EAAE,GAAG,sBAAsB,WAAU,CAAE,GAAG,GAAG;EAC/C,MAAM,QAAQ,GAAG,sBAAsB,eAAc,CAAE;GACrD;GACA,MAAM;GACN,KAAK;EACP,CAAC;CACH,OAAO,IAAI,IAAI,SAAS,KAAK;EAC3B,MAAM,QAAQ,GAAG,sBAAsB,eAAc,CAAE;GACrD,KAAK,IAAI;GACT,MAAM;GACN,KAAK;EACP,CAAC;CACH;AACF"}
+{"version":3,"file":"themes.native.js","names":[],"sources":["cjs/helpers/themes.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar themes_exports = {};\n__export(themes_exports, {\n  copyAuthoredThemeScheme: () => copyAuthoredThemeScheme,\n  ensureThemeVariable: () => ensureThemeVariable,\n  getAuthoredThemeScheme: () => getAuthoredThemeScheme\n});\nmodule.exports = __toCommonJS(themes_exports);\nvar import_createVariable = require(\"../createVariable\");\nvar schemeKey = /* @__PURE__ */ Symbol.for(\"tamagui.theme.scheme\");\nfunction getAuthoredThemeScheme(theme) {\n  var scheme = theme[schemeKey];\n  return scheme === \"light\" || scheme === \"dark\" ? scheme : void 0;\n}\nfunction copyAuthoredThemeScheme(target, source) {\n  var scheme = getAuthoredThemeScheme(source);\n  if (scheme) Object.defineProperty(target, schemeKey, {\n    value: scheme\n  });\n  return target;\n}\nfunction ensureThemeVariable(theme, key) {\n  var val = theme[key];\n  var variable = (0, import_createVariable.isVariable)(val);\n  if (!variable || val.name !== key) {\n    theme[key] = (0, import_createVariable.createVariable)({\n      key: variable ? val.name : key,\n      name: key,\n      val: variable ? val.val : val\n    });\n  }\n}\n//# sourceMappingURL=themes.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,iBAAiB,CAAC;AACtB,SAAS,gBAAgB;CACvB,+BAA+B;CAC/B,2BAA2B;CAC3B,8BAA8B;AAChC,CAAC;AACD,OAAO,UAAU,aAAa,cAAc;AAC5C,IAAI,wBAAwB,QAAQ,6BAAmB;AACvD,IAAI,YAA4B,uBAAO,IAAI,sBAAsB;AACjE,SAAS,uBAAuB,OAAO;CACrC,IAAI,SAAS,MAAM;CACnB,OAAO,WAAW,WAAW,WAAW,SAAS,SAAS,KAAK;AACjE;AACA,SAAS,wBAAwB,QAAQ,QAAQ;CAC/C,IAAI,SAAS,uBAAuB,MAAM;CAC1C,IAAI,QAAQ,OAAO,eAAe,QAAQ,WAAW,EACnD,OAAO,OACT,CAAC;CACD,OAAO;AACT;AACA,SAAS,oBAAoB,OAAO,KAAK;CACvC,IAAI,MAAM,MAAM;CAChB,IAAI,YAAY,GAAG,sBAAsB,WAAU,CAAE,GAAG;CACxD,IAAI,CAAC,YAAY,IAAI,SAAS,KAAK;EACjC,MAAM,QAAQ,GAAG,sBAAsB,eAAc,CAAE;GACrD,KAAK,WAAW,IAAI,OAAO;GAC3B,MAAM;GACN,KAAK,WAAW,IAAI,MAAM;EAC5B,CAAC;CACH;AACF"}

package/dist/cjs/hooks/useThemeState.cjs

@@ -39,6 +39,7 @@ 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 = {};
@@ -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);
@@ -118,7 +112,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedTo !== r.parentId) cleanupThemeSubscription(r);
+		if (r.unsubscribe && r.subscribedTo !== r.parentId) r.unsubscribe?.();
 		if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 			if (!r.unsubscribe) {
 				const pid = r.parentId;
@@ -148,7 +142,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 					r.subscribedTo = void 0;
 				};
 			}
-		} else if (r.unsubscribe) cleanupThemeSubscription(r);
+		} else if (r.unsubscribe) r.unsubscribe?.();
 		return () => {
 			if (r.renderVersion === renderVersion) cleanupThemeState(r);
 		};
@@ -169,11 +163,8 @@ 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 {
 		r.state = void 0;
 		states.delete(r.id);
@@ -183,15 +174,15 @@ function cleanupThemeState(r) {
 	themeProviderParents.delete(r.id);
 }
 const getSnapshotImpl = (r) => {
-	const { id, parentId, props, propsKey, isRoot, keys, schemeKeys, optimizeForFirstRender } = r;
+	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._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 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;
@@ -247,7 +238,7 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
 		if (shouldRerender) return [true, { ...parentState || lastState || next }];
 		return [false, next];
 	}
-	const scheme = (0, import_helpers.getThemeScheme)(resolvedName);
+	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);
@@ -316,5 +307,4 @@ function resolveThemeName(parentName, name, themes2, forceUpdate = false) {
 	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

@@ -41,6 +41,7 @@ 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 = {};
@@ -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
 	});
@@ -138,7 +134,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedTo !== 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;
@@ -171,7 +170,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 					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,12 +197,8 @@ 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 {
 		r.state = void 0;
 		states.delete(r.id);
@@ -211,15 +209,15 @@ 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 { 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._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 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;
@@ -278,7 +276,7 @@ var getNextState = function(lastState, props, propsKey) {
 		if (shouldRerender) return [true, { ...parentState || lastState || next }];
 		return [false, next];
 	}
-	var scheme = (0, import_helpers.getThemeScheme)(resolvedName);
+	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);
@@ -368,10 +366,6 @@ function resolveThemeName(parentName, name, themes2) {
 	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;
 };

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

@@ -41,6 +41,7 @@ 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 = {};
@@ -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
 	});
@@ -138,7 +134,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedTo !== 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;
@@ -171,7 +170,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 					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,12 +197,8 @@ 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 {
 		r.state = void 0;
 		states.delete(r.id);
@@ -211,15 +209,15 @@ 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 { 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._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 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;
@@ -278,7 +276,7 @@ var getNextState = function(lastState, props, propsKey) {
 		if (shouldRerender) return [true, { ...parentState || lastState || next }];
 		return [false, next];
 	}
-	var scheme = (0, import_helpers.getThemeScheme)(resolvedName);
+	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);
@@ -368,10 +366,6 @@ function resolveThemeName(parentName, name, themes2) {
 	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;
 };