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

package/dist/esm/internal-runtime.mjs

@@ -7,7 +7,7 @@ import { styleToCSS as styleToCSS$1 } from "./helpers/styleToCSS.mjs";
 import { getThemeCSSRules as getThemeCSSRules$1 } from "./helpers/getThemeCSSRules.mjs";
 import { normalizeValueWithProperty as normalizeValueWithProperty$1 } from "./helpers/normalizeValueWithProperty.mjs";
 import { proxyThemeToParents as proxyThemeToParents$1 } from "./helpers/proxyThemeToParents.mjs";
-import { ensureThemeVariable as ensureThemeVariable$1 } from "./helpers/themes.mjs";
+import { copyAuthoredThemeScheme as copyAuthoredThemeScheme$1, ensureThemeVariable as ensureThemeVariable$1 } from "./helpers/themes.mjs";
 import { transformsToString as transformsToString$1 } from "./helpers/transformsToString.mjs";
 import { parseFont as parseFont$1, registerFontVariables as registerFontVariables$1 } from "./insertFont.mjs";
 import { createTamagui as createTamagui$1 } from "./createTamagui.mjs";
@@ -27,6 +27,7 @@ const getThemeCSSRules = getThemeCSSRules$1;
 const normalizeValueWithProperty = normalizeValueWithProperty$1;
 const proxyThemeToParents = proxyThemeToParents$1;
 const ensureThemeVariable = ensureThemeVariable$1;
+const copyAuthoredThemeScheme = copyAuthoredThemeScheme$1;
 const transformsToString = transformsToString$1;
 const styleToCSS = styleToCSS$1;
 const useThemeWithState = useThemeWithState$1;
@@ -79,5 +80,5 @@ function createFrontendHTML(frontend) {
 	return out;
 }
 
-export { TamaguiProvider, createFrontendHTML, createFrontendStyled, createFrontendViews, createTamagui, createVariables, ensureThemeVariable, fixStyles, getThemeCSSRules, mergeFrontendCondition, normalizeValueWithProperty, parseFont, plainValueToPayload, proxyThemeToParents, registerFontVariables, regularStyleFrontend, setupHooks, styleToCSS, transformsToString, useThemeWithState };
+export { TamaguiProvider, copyAuthoredThemeScheme, createFrontendHTML, createFrontendStyled, createFrontendViews, createTamagui, createVariables, ensureThemeVariable, fixStyles, getThemeCSSRules, mergeFrontendCondition, normalizeValueWithProperty, parseFont, plainValueToPayload, proxyThemeToParents, registerFontVariables, regularStyleFrontend, setupHooks, styleToCSS, transformsToString, useThemeWithState };
 //# sourceMappingURL=internal-runtime.mjs.map

package/dist/esm/internal-runtime.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"internal-runtime.js","names":["createVariablesImpl","parseFontImpl","registerFontVariablesImpl","fixStylesImpl","getThemeCSSRulesImpl","normalizeValueWithPropertyImpl","proxyThemeToParentsImpl","ensureThemeVariableImpl","transformsToStringImpl","styleToCSSImpl","useThemeWithStateImpl","createTamaguiImpl","setupHooksImpl","TamaguiProviderImpl","createFrontendStyledImpl"],"sources":["esm/internal-runtime.js"],"sourcesContent":["import { stylePropsUnitless } from \"@tamagui/helpers\";\nimport { createComponent } from \"./createComponent\";\nimport { createVariables as createVariablesImpl } from \"./createVariables\";\nimport { html } from \"./dom/html\";\nimport { fixStyles as fixStylesImpl } from \"./helpers/expandStyles\";\nimport { styleToCSS as styleToCSSImpl } from \"./helpers/styleToCSS\";\nimport { getThemeCSSRules as getThemeCSSRulesImpl } from \"./helpers/getThemeCSSRules\";\nimport { normalizeValueWithProperty as normalizeValueWithPropertyImpl } from \"./helpers/normalizeValueWithProperty\";\nimport { proxyThemeToParents as proxyThemeToParentsImpl } from \"./helpers/proxyThemeToParents\";\nimport { ensureThemeVariable as ensureThemeVariableImpl } from \"./helpers/themes\";\nimport { transformsToString as transformsToStringImpl } from \"./helpers/transformsToString\";\nimport {\n  parseFont as parseFontImpl,\n  registerFontVariables as registerFontVariablesImpl\n} from \"./insertFont\";\nimport { createTamagui as createTamaguiImpl } from \"./createTamagui\";\nimport { setupHooks as setupHooksImpl } from \"./setupHooks\";\nimport { createFrontendStyled as createFrontendStyledImpl } from \"./styled\";\nimport { useThemeWithState as useThemeWithStateImpl } from \"./hooks/useTheme\";\nimport { TamaguiProvider as TamaguiProviderImpl } from \"./views/TamaguiProvider\";\nimport { textStaticConfig } from \"./views/Text\";\nimport { viewStaticConfig } from \"./views/View\";\nimport { mergeFrontendCondition, regularStyleFrontend } from \"./helpers/styleFrontend\";\nconst createVariables = createVariablesImpl;\nconst parseFont = parseFontImpl;\nconst registerFontVariables = registerFontVariablesImpl;\nconst fixStyles = fixStylesImpl;\nconst getThemeCSSRules = getThemeCSSRulesImpl;\nconst normalizeValueWithProperty = normalizeValueWithPropertyImpl;\nconst proxyThemeToParents = proxyThemeToParentsImpl;\nconst ensureThemeVariable = ensureThemeVariableImpl;\nconst transformsToString = transformsToStringImpl;\nconst styleToCSS = styleToCSSImpl;\nconst useThemeWithState = useThemeWithStateImpl;\nconst plainValueToPayload = (value, property) => {\n  if (typeof value === \"string\") return value;\n  if (typeof value !== \"number\" || !Number.isFinite(value)) return null;\n  if (property === \"rotate\" || property === \"rotateX\" || property === \"rotateY\" || property === \"rotateZ\") {\n    return value === 0 ? \"0\" : `${value}deg`;\n  }\n  if (property === \"x\" || property === \"y\" || property === \"perspective\" || property === \"translateX\" || property === \"translateY\") {\n    return value === 0 ? \"0\" : `${value}px`;\n  }\n  return stylePropsUnitless[property] ? String(value) : `${value}px`;\n};\nconst createTamagui = createTamaguiImpl;\nconst setupHooks = setupHooksImpl;\nconst TamaguiProvider = TamaguiProviderImpl;\nfunction createFrontendStyled(frontend) {\n  return createFrontendStyledImpl(frontend);\n}\nfunction createFrontendViews(frontend) {\n  return {\n    View: createComponent({\n      ...viewStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"View\"\n    }),\n    Text: createComponent({\n      ...textStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"Text\"\n    })\n  };\n}\nfunction createFrontendHTML(frontend) {\n  const out = {};\n  for (const tag in html) {\n    const source = html[tag];\n    if (!source.staticConfig) {\n      out[tag] = source;\n      continue;\n    }\n    const rebuilt = createComponent({\n      ...source.staticConfig,\n      styleFrontend: frontend,\n      displayName: tag\n    });\n    out[tag] = source.rebindDOMTag ? source.rebindDOMTag(rebuilt) : rebuilt;\n  }\n  return out;\n}\nexport {\n  TamaguiProvider,\n  createFrontendHTML,\n  createFrontendStyled,\n  createFrontendViews,\n  createTamagui,\n  createVariables,\n  ensureThemeVariable,\n  fixStyles,\n  getThemeCSSRules,\n  mergeFrontendCondition,\n  normalizeValueWithProperty,\n  parseFont,\n  plainValueToPayload,\n  proxyThemeToParents,\n  registerFontVariables,\n  regularStyleFrontend,\n  setupHooks,\n  styleToCSS,\n  transformsToString,\n  useThemeWithState\n};\n//# sourceMappingURL=internal-runtime.js.map\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAuBA,MAAM,kBAAkBA;AACxB,MAAM,YAAYC;AAClB,MAAM,wBAAwBC;AAC9B,MAAM,YAAYC;AAClB,MAAM,mBAAmBC;AACzB,MAAM,6BAA6BC;AACnC,MAAM,sBAAsBC;AAC5B,MAAM,sBAAsBC;AAC5B,MAAM,qBAAqBC;AAC3B,MAAM,aAAaC;AACnB,MAAM,oBAAoBC;AAC1B,MAAM,uBAAuB,OAAO,aAAa;CAC/C,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,OAAO,UAAU,YAAY,CAAC,OAAO,SAAS,KAAK,GAAG,OAAO;CACjE,IAAI,aAAa,YAAY,aAAa,aAAa,aAAa,aAAa,aAAa,WAAW;EACvG,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,IAAI,aAAa,OAAO,aAAa,OAAO,aAAa,iBAAiB,aAAa,gBAAgB,aAAa,cAAc;EAChI,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,OAAO,mBAAmB,YAAY,OAAO,KAAK,IAAI,GAAG,MAAM;AACjE;AACA,MAAM,gBAAgBC;AACtB,MAAM,aAAaC;AACnB,MAAM,kBAAkBC;AACxB,SAAS,qBAAqB,UAAU;CACtC,OAAOC,uBAAyB,QAAQ;AAC1C;AACA,SAAS,oBAAoB,UAAU;CACrC,OAAO;EACL,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;EACD,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;CACH;AACF;AACA,SAAS,mBAAmB,UAAU;CACpC,MAAM,MAAM,CAAC;CACb,KAAK,MAAM,OAAO,MAAM;EACtB,MAAM,SAAS,KAAK;EACpB,IAAI,CAAC,OAAO,cAAc;GACxB,IAAI,OAAO;GACX;EACF;EACA,MAAM,UAAU,gBAAgB;GAC9B,GAAG,OAAO;GACV,eAAe;GACf,aAAa;EACf,CAAC;EACD,IAAI,OAAO,OAAO,eAAe,OAAO,aAAa,OAAO,IAAI;CAClE;CACA,OAAO;AACT"}
+{"version":3,"file":"internal-runtime.js","names":["createVariablesImpl","parseFontImpl","registerFontVariablesImpl","fixStylesImpl","getThemeCSSRulesImpl","normalizeValueWithPropertyImpl","proxyThemeToParentsImpl","ensureThemeVariableImpl","copyAuthoredThemeSchemeImpl","transformsToStringImpl","styleToCSSImpl","useThemeWithStateImpl","createTamaguiImpl","setupHooksImpl","TamaguiProviderImpl","createFrontendStyledImpl"],"sources":["esm/internal-runtime.js"],"sourcesContent":["import { stylePropsUnitless } from \"@tamagui/helpers\";\nimport { createComponent } from \"./createComponent\";\nimport { createVariables as createVariablesImpl } from \"./createVariables\";\nimport { html } from \"./dom/html\";\nimport { fixStyles as fixStylesImpl } from \"./helpers/expandStyles\";\nimport { styleToCSS as styleToCSSImpl } from \"./helpers/styleToCSS\";\nimport { getThemeCSSRules as getThemeCSSRulesImpl } from \"./helpers/getThemeCSSRules\";\nimport { normalizeValueWithProperty as normalizeValueWithPropertyImpl } from \"./helpers/normalizeValueWithProperty\";\nimport { proxyThemeToParents as proxyThemeToParentsImpl } from \"./helpers/proxyThemeToParents\";\nimport {\n  copyAuthoredThemeScheme as copyAuthoredThemeSchemeImpl,\n  ensureThemeVariable as ensureThemeVariableImpl\n} from \"./helpers/themes\";\nimport { transformsToString as transformsToStringImpl } from \"./helpers/transformsToString\";\nimport {\n  parseFont as parseFontImpl,\n  registerFontVariables as registerFontVariablesImpl\n} from \"./insertFont\";\nimport { createTamagui as createTamaguiImpl } from \"./createTamagui\";\nimport { setupHooks as setupHooksImpl } from \"./setupHooks\";\nimport { createFrontendStyled as createFrontendStyledImpl } from \"./styled\";\nimport { useThemeWithState as useThemeWithStateImpl } from \"./hooks/useTheme\";\nimport { TamaguiProvider as TamaguiProviderImpl } from \"./views/TamaguiProvider\";\nimport { textStaticConfig } from \"./views/Text\";\nimport { viewStaticConfig } from \"./views/View\";\nimport { mergeFrontendCondition, regularStyleFrontend } from \"./helpers/styleFrontend\";\nconst createVariables = createVariablesImpl;\nconst parseFont = parseFontImpl;\nconst registerFontVariables = registerFontVariablesImpl;\nconst fixStyles = fixStylesImpl;\nconst getThemeCSSRules = getThemeCSSRulesImpl;\nconst normalizeValueWithProperty = normalizeValueWithPropertyImpl;\nconst proxyThemeToParents = proxyThemeToParentsImpl;\nconst ensureThemeVariable = ensureThemeVariableImpl;\nconst copyAuthoredThemeScheme = copyAuthoredThemeSchemeImpl;\nconst transformsToString = transformsToStringImpl;\nconst styleToCSS = styleToCSSImpl;\nconst useThemeWithState = useThemeWithStateImpl;\nconst plainValueToPayload = (value, property) => {\n  if (typeof value === \"string\") return value;\n  if (typeof value !== \"number\" || !Number.isFinite(value)) return null;\n  if (property === \"rotate\" || property === \"rotateX\" || property === \"rotateY\" || property === \"rotateZ\") {\n    return value === 0 ? \"0\" : `${value}deg`;\n  }\n  if (property === \"x\" || property === \"y\" || property === \"perspective\" || property === \"translateX\" || property === \"translateY\") {\n    return value === 0 ? \"0\" : `${value}px`;\n  }\n  return stylePropsUnitless[property] ? String(value) : `${value}px`;\n};\nconst createTamagui = createTamaguiImpl;\nconst setupHooks = setupHooksImpl;\nconst TamaguiProvider = TamaguiProviderImpl;\nfunction createFrontendStyled(frontend) {\n  return createFrontendStyledImpl(frontend);\n}\nfunction createFrontendViews(frontend) {\n  return {\n    View: createComponent({\n      ...viewStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"View\"\n    }),\n    Text: createComponent({\n      ...textStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"Text\"\n    })\n  };\n}\nfunction createFrontendHTML(frontend) {\n  const out = {};\n  for (const tag in html) {\n    const source = html[tag];\n    if (!source.staticConfig) {\n      out[tag] = source;\n      continue;\n    }\n    const rebuilt = createComponent({\n      ...source.staticConfig,\n      styleFrontend: frontend,\n      displayName: tag\n    });\n    out[tag] = source.rebindDOMTag ? source.rebindDOMTag(rebuilt) : rebuilt;\n  }\n  return out;\n}\nexport {\n  TamaguiProvider,\n  copyAuthoredThemeScheme,\n  createFrontendHTML,\n  createFrontendStyled,\n  createFrontendViews,\n  createTamagui,\n  createVariables,\n  ensureThemeVariable,\n  fixStyles,\n  getThemeCSSRules,\n  mergeFrontendCondition,\n  normalizeValueWithProperty,\n  parseFont,\n  plainValueToPayload,\n  proxyThemeToParents,\n  registerFontVariables,\n  regularStyleFrontend,\n  setupHooks,\n  styleToCSS,\n  transformsToString,\n  useThemeWithState\n};\n//# sourceMappingURL=internal-runtime.js.map\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AA0BA,MAAM,kBAAkBA;AACxB,MAAM,YAAYC;AAClB,MAAM,wBAAwBC;AAC9B,MAAM,YAAYC;AAClB,MAAM,mBAAmBC;AACzB,MAAM,6BAA6BC;AACnC,MAAM,sBAAsBC;AAC5B,MAAM,sBAAsBC;AAC5B,MAAM,0BAA0BC;AAChC,MAAM,qBAAqBC;AAC3B,MAAM,aAAaC;AACnB,MAAM,oBAAoBC;AAC1B,MAAM,uBAAuB,OAAO,aAAa;CAC/C,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,OAAO,UAAU,YAAY,CAAC,OAAO,SAAS,KAAK,GAAG,OAAO;CACjE,IAAI,aAAa,YAAY,aAAa,aAAa,aAAa,aAAa,aAAa,WAAW;EACvG,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,IAAI,aAAa,OAAO,aAAa,OAAO,aAAa,iBAAiB,aAAa,gBAAgB,aAAa,cAAc;EAChI,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,OAAO,mBAAmB,YAAY,OAAO,KAAK,IAAI,GAAG,MAAM;AACjE;AACA,MAAM,gBAAgBC;AACtB,MAAM,aAAaC;AACnB,MAAM,kBAAkBC;AACxB,SAAS,qBAAqB,UAAU;CACtC,OAAOC,uBAAyB,QAAQ;AAC1C;AACA,SAAS,oBAAoB,UAAU;CACrC,OAAO;EACL,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;EACD,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;CACH;AACF;AACA,SAAS,mBAAmB,UAAU;CACpC,MAAM,MAAM,CAAC;CACb,KAAK,MAAM,OAAO,MAAM;EACtB,MAAM,SAAS,KAAK;EACpB,IAAI,CAAC,OAAO,cAAc;GACxB,IAAI,OAAO;GACX;EACF;EACA,MAAM,UAAU,gBAAgB;GAC9B,GAAG,OAAO;GACV,eAAe;GACf,aAAa;EACf,CAAC;EACD,IAAI,OAAO,OAAO,eAAe,OAAO,aAAa,OAAO,IAAI;CAClE;CACA,OAAO;AACT"}

package/dist/esm/internal-runtime.native.js

@@ -7,7 +7,7 @@ import { styleToCSS as styleToCSS$1 } from "./helpers/styleToCSS.native.js";
 import { getThemeCSSRules as getThemeCSSRules$1 } from "./helpers/getThemeCSSRules.native.js";
 import { normalizeValueWithProperty as normalizeValueWithProperty$1 } from "./helpers/normalizeValueWithProperty.native.js";
 import { proxyThemeToParents as proxyThemeToParents$1 } from "./helpers/proxyThemeToParents.native.js";
-import { ensureThemeVariable as ensureThemeVariable$1 } from "./helpers/themes.native.js";
+import { copyAuthoredThemeScheme as copyAuthoredThemeScheme$1, ensureThemeVariable as ensureThemeVariable$1 } from "./helpers/themes.native.js";
 import { transformsToString as transformsToString$1 } from "./helpers/transformsToString.native.js";
 import { parseFont as parseFont$1, registerFontVariables as registerFontVariables$1 } from "./insertFont.native.js";
 import { createTamagui as createTamagui$1 } from "./createTamagui.native.js";
@@ -27,6 +27,7 @@ var getThemeCSSRules = getThemeCSSRules$1;
 var normalizeValueWithProperty = normalizeValueWithProperty$1;
 var proxyThemeToParents = proxyThemeToParents$1;
 var ensureThemeVariable = ensureThemeVariable$1;
+var copyAuthoredThemeScheme = copyAuthoredThemeScheme$1;
 var transformsToString = transformsToString$1;
 var styleToCSS = styleToCSS$1;
 var useThemeWithState = useThemeWithState$1;
@@ -79,5 +80,5 @@ function createFrontendHTML(frontend) {
 	return out;
 }
 
-export { TamaguiProvider, createFrontendHTML, createFrontendStyled, createFrontendViews, createTamagui, createVariables, ensureThemeVariable, fixStyles, getThemeCSSRules, mergeFrontendCondition, normalizeValueWithProperty, parseFont, plainValueToPayload, proxyThemeToParents, registerFontVariables, regularStyleFrontend, setupHooks, styleToCSS, transformsToString, useThemeWithState };
+export { TamaguiProvider, copyAuthoredThemeScheme, createFrontendHTML, createFrontendStyled, createFrontendViews, createTamagui, createVariables, ensureThemeVariable, fixStyles, getThemeCSSRules, mergeFrontendCondition, normalizeValueWithProperty, parseFont, plainValueToPayload, proxyThemeToParents, registerFontVariables, regularStyleFrontend, setupHooks, styleToCSS, transformsToString, useThemeWithState };
 //# sourceMappingURL=internal-runtime.native.js.map

package/dist/esm/internal-runtime.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal-runtime.native.js","names":["createVariablesImpl","parseFontImpl","registerFontVariablesImpl","fixStylesImpl","getThemeCSSRulesImpl","normalizeValueWithPropertyImpl","proxyThemeToParentsImpl","ensureThemeVariableImpl","transformsToStringImpl","styleToCSSImpl","useThemeWithStateImpl","createTamaguiImpl","setupHooksImpl","TamaguiProviderImpl","createFrontendStyledImpl"],"sources":["esm/internal-runtime.native.js"],"sourcesContent":["import { stylePropsUnitless } from \"@tamagui/helpers\";\nimport { createComponent } from \"./createComponent\";\nimport { createVariables as createVariablesImpl } from \"./createVariables\";\nimport { html } from \"./dom/html\";\nimport { fixStyles as fixStylesImpl } from \"./helpers/expandStyles\";\nimport { styleToCSS as styleToCSSImpl } from \"./helpers/styleToCSS\";\nimport { getThemeCSSRules as getThemeCSSRulesImpl } from \"./helpers/getThemeCSSRules\";\nimport { normalizeValueWithProperty as normalizeValueWithPropertyImpl } from \"./helpers/normalizeValueWithProperty\";\nimport { proxyThemeToParents as proxyThemeToParentsImpl } from \"./helpers/proxyThemeToParents\";\nimport { ensureThemeVariable as ensureThemeVariableImpl } from \"./helpers/themes\";\nimport { transformsToString as transformsToStringImpl } from \"./helpers/transformsToString\";\nimport { parseFont as parseFontImpl, registerFontVariables as registerFontVariablesImpl } from \"./insertFont\";\nimport { createTamagui as createTamaguiImpl } from \"./createTamagui\";\nimport { setupHooks as setupHooksImpl } from \"./setupHooks\";\nimport { createFrontendStyled as createFrontendStyledImpl } from \"./styled\";\nimport { useThemeWithState as useThemeWithStateImpl } from \"./hooks/useTheme\";\nimport { TamaguiProvider as TamaguiProviderImpl } from \"./views/TamaguiProvider\";\nimport { textStaticConfig } from \"./views/Text\";\nimport { viewStaticConfig } from \"./views/View\";\nimport { mergeFrontendCondition, regularStyleFrontend } from \"./helpers/styleFrontend\";\nvar createVariables = createVariablesImpl;\nvar parseFont = parseFontImpl;\nvar registerFontVariables = registerFontVariablesImpl;\nvar fixStyles = fixStylesImpl;\nvar getThemeCSSRules = getThemeCSSRulesImpl;\nvar normalizeValueWithProperty = normalizeValueWithPropertyImpl;\nvar proxyThemeToParents = proxyThemeToParentsImpl;\nvar ensureThemeVariable = ensureThemeVariableImpl;\nvar transformsToString = transformsToStringImpl;\nvar styleToCSS = styleToCSSImpl;\nvar useThemeWithState = useThemeWithStateImpl;\nvar plainValueToPayload = function(value, property) {\n  if (typeof value === \"string\") return value;\n  if (typeof value !== \"number\" || !Number.isFinite(value)) return null;\n  if (property === \"rotate\" || property === \"rotateX\" || property === \"rotateY\" || property === \"rotateZ\") {\n    return value === 0 ? \"0\" : `${value}deg`;\n  }\n  if (property === \"x\" || property === \"y\" || property === \"perspective\" || property === \"translateX\" || property === \"translateY\") {\n    return value === 0 ? \"0\" : `${value}px`;\n  }\n  return stylePropsUnitless[property] ? String(value) : `${value}px`;\n};\nvar createTamagui = createTamaguiImpl;\nvar setupHooks = setupHooksImpl;\nvar TamaguiProvider = TamaguiProviderImpl;\nfunction createFrontendStyled(frontend) {\n  return createFrontendStyledImpl(frontend);\n}\nfunction createFrontendViews(frontend) {\n  return {\n    View: createComponent({\n      ...viewStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"View\"\n    }),\n    Text: createComponent({\n      ...textStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"Text\"\n    })\n  };\n}\nfunction createFrontendHTML(frontend) {\n  var out = {};\n  for (var tag in html) {\n    var source = html[tag];\n    if (!source.staticConfig) {\n      out[tag] = source;\n      continue;\n    }\n    var rebuilt = createComponent({\n      ...source.staticConfig,\n      styleFrontend: frontend,\n      displayName: tag\n    });\n    out[tag] = source.rebindDOMTag ? source.rebindDOMTag(rebuilt) : rebuilt;\n  }\n  return out;\n}\nexport {\n  TamaguiProvider,\n  createFrontendHTML,\n  createFrontendStyled,\n  createFrontendViews,\n  createTamagui,\n  createVariables,\n  ensureThemeVariable,\n  fixStyles,\n  getThemeCSSRules,\n  mergeFrontendCondition,\n  normalizeValueWithProperty,\n  parseFont,\n  plainValueToPayload,\n  proxyThemeToParents,\n  registerFontVariables,\n  regularStyleFrontend,\n  setupHooks,\n  styleToCSS,\n  transformsToString,\n  useThemeWithState\n};\n//# sourceMappingURL=internal-runtime.js.map\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAoBA,IAAI,kBAAkBA;AACtB,IAAI,YAAYC;AAChB,IAAI,wBAAwBC;AAC5B,IAAI,YAAYC;AAChB,IAAI,mBAAmBC;AACvB,IAAI,6BAA6BC;AACjC,IAAI,sBAAsBC;AAC1B,IAAI,sBAAsBC;AAC1B,IAAI,qBAAqBC;AACzB,IAAI,aAAaC;AACjB,IAAI,oBAAoBC;AACxB,IAAI,sBAAsB,SAAS,OAAO,UAAU;CAClD,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,OAAO,UAAU,YAAY,CAAC,OAAO,SAAS,KAAK,GAAG,OAAO;CACjE,IAAI,aAAa,YAAY,aAAa,aAAa,aAAa,aAAa,aAAa,WAAW;EACvG,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,IAAI,aAAa,OAAO,aAAa,OAAO,aAAa,iBAAiB,aAAa,gBAAgB,aAAa,cAAc;EAChI,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,OAAO,mBAAmB,YAAY,OAAO,KAAK,IAAI,GAAG,MAAM;AACjE;AACA,IAAI,gBAAgBC;AACpB,IAAI,aAAaC;AACjB,IAAI,kBAAkBC;AACtB,SAAS,qBAAqB,UAAU;CACtC,OAAOC,uBAAyB,QAAQ;AAC1C;AACA,SAAS,oBAAoB,UAAU;CACrC,OAAO;EACL,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;EACD,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;CACH;AACF;AACA,SAAS,mBAAmB,UAAU;CACpC,IAAI,MAAM,CAAC;CACX,KAAK,IAAI,OAAO,MAAM;EACpB,IAAI,SAAS,KAAK;EAClB,IAAI,CAAC,OAAO,cAAc;GACxB,IAAI,OAAO;GACX;EACF;EACA,IAAI,UAAU,gBAAgB;GAC5B,GAAG,OAAO;GACV,eAAe;GACf,aAAa;EACf,CAAC;EACD,IAAI,OAAO,OAAO,eAAe,OAAO,aAAa,OAAO,IAAI;CAClE;CACA,OAAO;AACT"}
+{"version":3,"file":"internal-runtime.native.js","names":["createVariablesImpl","parseFontImpl","registerFontVariablesImpl","fixStylesImpl","getThemeCSSRulesImpl","normalizeValueWithPropertyImpl","proxyThemeToParentsImpl","ensureThemeVariableImpl","copyAuthoredThemeSchemeImpl","transformsToStringImpl","styleToCSSImpl","useThemeWithStateImpl","createTamaguiImpl","setupHooksImpl","TamaguiProviderImpl","createFrontendStyledImpl"],"sources":["esm/internal-runtime.native.js"],"sourcesContent":["import { stylePropsUnitless } from \"@tamagui/helpers\";\nimport { createComponent } from \"./createComponent\";\nimport { createVariables as createVariablesImpl } from \"./createVariables\";\nimport { html } from \"./dom/html\";\nimport { fixStyles as fixStylesImpl } from \"./helpers/expandStyles\";\nimport { styleToCSS as styleToCSSImpl } from \"./helpers/styleToCSS\";\nimport { getThemeCSSRules as getThemeCSSRulesImpl } from \"./helpers/getThemeCSSRules\";\nimport { normalizeValueWithProperty as normalizeValueWithPropertyImpl } from \"./helpers/normalizeValueWithProperty\";\nimport { proxyThemeToParents as proxyThemeToParentsImpl } from \"./helpers/proxyThemeToParents\";\nimport { copyAuthoredThemeScheme as copyAuthoredThemeSchemeImpl, ensureThemeVariable as ensureThemeVariableImpl } from \"./helpers/themes\";\nimport { transformsToString as transformsToStringImpl } from \"./helpers/transformsToString\";\nimport { parseFont as parseFontImpl, registerFontVariables as registerFontVariablesImpl } from \"./insertFont\";\nimport { createTamagui as createTamaguiImpl } from \"./createTamagui\";\nimport { setupHooks as setupHooksImpl } from \"./setupHooks\";\nimport { createFrontendStyled as createFrontendStyledImpl } from \"./styled\";\nimport { useThemeWithState as useThemeWithStateImpl } from \"./hooks/useTheme\";\nimport { TamaguiProvider as TamaguiProviderImpl } from \"./views/TamaguiProvider\";\nimport { textStaticConfig } from \"./views/Text\";\nimport { viewStaticConfig } from \"./views/View\";\nimport { mergeFrontendCondition, regularStyleFrontend } from \"./helpers/styleFrontend\";\nvar createVariables = createVariablesImpl;\nvar parseFont = parseFontImpl;\nvar registerFontVariables = registerFontVariablesImpl;\nvar fixStyles = fixStylesImpl;\nvar getThemeCSSRules = getThemeCSSRulesImpl;\nvar normalizeValueWithProperty = normalizeValueWithPropertyImpl;\nvar proxyThemeToParents = proxyThemeToParentsImpl;\nvar ensureThemeVariable = ensureThemeVariableImpl;\nvar copyAuthoredThemeScheme = copyAuthoredThemeSchemeImpl;\nvar transformsToString = transformsToStringImpl;\nvar styleToCSS = styleToCSSImpl;\nvar useThemeWithState = useThemeWithStateImpl;\nvar plainValueToPayload = function(value, property) {\n  if (typeof value === \"string\") return value;\n  if (typeof value !== \"number\" || !Number.isFinite(value)) return null;\n  if (property === \"rotate\" || property === \"rotateX\" || property === \"rotateY\" || property === \"rotateZ\") {\n    return value === 0 ? \"0\" : `${value}deg`;\n  }\n  if (property === \"x\" || property === \"y\" || property === \"perspective\" || property === \"translateX\" || property === \"translateY\") {\n    return value === 0 ? \"0\" : `${value}px`;\n  }\n  return stylePropsUnitless[property] ? String(value) : `${value}px`;\n};\nvar createTamagui = createTamaguiImpl;\nvar setupHooks = setupHooksImpl;\nvar TamaguiProvider = TamaguiProviderImpl;\nfunction createFrontendStyled(frontend) {\n  return createFrontendStyledImpl(frontend);\n}\nfunction createFrontendViews(frontend) {\n  return {\n    View: createComponent({\n      ...viewStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"View\"\n    }),\n    Text: createComponent({\n      ...textStaticConfig,\n      styleFrontend: frontend,\n      displayName: \"Text\"\n    })\n  };\n}\nfunction createFrontendHTML(frontend) {\n  var out = {};\n  for (var tag in html) {\n    var source = html[tag];\n    if (!source.staticConfig) {\n      out[tag] = source;\n      continue;\n    }\n    var rebuilt = createComponent({\n      ...source.staticConfig,\n      styleFrontend: frontend,\n      displayName: tag\n    });\n    out[tag] = source.rebindDOMTag ? source.rebindDOMTag(rebuilt) : rebuilt;\n  }\n  return out;\n}\nexport {\n  TamaguiProvider,\n  copyAuthoredThemeScheme,\n  createFrontendHTML,\n  createFrontendStyled,\n  createFrontendViews,\n  createTamagui,\n  createVariables,\n  ensureThemeVariable,\n  fixStyles,\n  getThemeCSSRules,\n  mergeFrontendCondition,\n  normalizeValueWithProperty,\n  parseFont,\n  plainValueToPayload,\n  proxyThemeToParents,\n  registerFontVariables,\n  regularStyleFrontend,\n  setupHooks,\n  styleToCSS,\n  transformsToString,\n  useThemeWithState\n};\n//# sourceMappingURL=internal-runtime.js.map\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAoBA,IAAI,kBAAkBA;AACtB,IAAI,YAAYC;AAChB,IAAI,wBAAwBC;AAC5B,IAAI,YAAYC;AAChB,IAAI,mBAAmBC;AACvB,IAAI,6BAA6BC;AACjC,IAAI,sBAAsBC;AAC1B,IAAI,sBAAsBC;AAC1B,IAAI,0BAA0BC;AAC9B,IAAI,qBAAqBC;AACzB,IAAI,aAAaC;AACjB,IAAI,oBAAoBC;AACxB,IAAI,sBAAsB,SAAS,OAAO,UAAU;CAClD,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,OAAO,UAAU,YAAY,CAAC,OAAO,SAAS,KAAK,GAAG,OAAO;CACjE,IAAI,aAAa,YAAY,aAAa,aAAa,aAAa,aAAa,aAAa,WAAW;EACvG,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,IAAI,aAAa,OAAO,aAAa,OAAO,aAAa,iBAAiB,aAAa,gBAAgB,aAAa,cAAc;EAChI,OAAO,UAAU,IAAI,MAAM,GAAG,MAAM;CACtC;CACA,OAAO,mBAAmB,YAAY,OAAO,KAAK,IAAI,GAAG,MAAM;AACjE;AACA,IAAI,gBAAgBC;AACpB,IAAI,aAAaC;AACjB,IAAI,kBAAkBC;AACtB,SAAS,qBAAqB,UAAU;CACtC,OAAOC,uBAAyB,QAAQ;AAC1C;AACA,SAAS,oBAAoB,UAAU;CACrC,OAAO;EACL,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;EACD,MAAM,gBAAgB;GACpB,GAAG;GACH,eAAe;GACf,aAAa;EACf,CAAC;CACH;AACF;AACA,SAAS,mBAAmB,UAAU;CACpC,IAAI,MAAM,CAAC;CACX,KAAK,IAAI,OAAO,MAAM;EACpB,IAAI,SAAS,KAAK;EAClB,IAAI,CAAC,OAAO,cAAc;GACxB,IAAI,OAAO;GACX;EACF;EACA,IAAI,UAAU,gBAAgB;GAC5B,GAAG,OAAO;GACV,eAAe;GACf,aAAa;EACf,CAAC;EACD,IAAI,OAAO,OAAO,eAAe,OAAO,aAAa,OAAO,IAAI;CAClE;CACA,OAAO;AACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "3.0.0-beta.1598.1",
+  "version": "3.0.0-beta.1648.1",
   "license": "MIT",
   "author": {
     "name": "Nate Wienert"
@@ -100,23 +100,23 @@
     "test:web": "vitest --typecheck --run"
   },
   "dependencies": {
-    "@tamagui/animation-helpers": "3.0.0-beta.1598.1",
-    "@tamagui/compose-refs": "3.0.0-beta.1598.1",
-    "@tamagui/constants": "3.0.0-beta.1598.1",
-    "@tamagui/dom": "3.0.0-beta.1598.1",
-    "@tamagui/helpers": "3.0.0-beta.1598.1",
-    "@tamagui/is-equal-shallow": "3.0.0-beta.1598.1",
-    "@tamagui/native": "3.0.0-beta.1598.1",
-    "@tamagui/normalize-css-color": "3.0.0-beta.1598.1",
-    "@tamagui/react-native-types": "3.0.0-beta.1598.1",
-    "@tamagui/style-grammar": "3.0.0-beta.1598.1",
-    "@tamagui/types": "3.0.0-beta.1598.1",
-    "@tamagui/use-did-finish-ssr": "3.0.0-beta.1598.1",
-    "@tamagui/use-event": "3.0.0-beta.1598.1",
-    "@tamagui/use-force-update": "3.0.0-beta.1598.1"
+    "@tamagui/animation-helpers": "3.0.0-beta.1648.1",
+    "@tamagui/compose-refs": "3.0.0-beta.1648.1",
+    "@tamagui/constants": "3.0.0-beta.1648.1",
+    "@tamagui/dom": "3.0.0-beta.1648.1",
+    "@tamagui/helpers": "3.0.0-beta.1648.1",
+    "@tamagui/is-equal-shallow": "3.0.0-beta.1648.1",
+    "@tamagui/native": "3.0.0-beta.1648.1",
+    "@tamagui/normalize-css-color": "3.0.0-beta.1648.1",
+    "@tamagui/react-native-types": "3.0.0-beta.1648.1",
+    "@tamagui/style-grammar": "3.0.0-beta.1648.1",
+    "@tamagui/types": "3.0.0-beta.1648.1",
+    "@tamagui/use-did-finish-ssr": "3.0.0-beta.1648.1",
+    "@tamagui/use-event": "3.0.0-beta.1648.1",
+    "@tamagui/use-force-update": "3.0.0-beta.1648.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1598.1",
+    "@tamagui/build": "3.0.0-beta.1648.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",
@@ -129,5 +129,5 @@
     "react": ">=19",
     "react-dom": "*"
   },
-  "releaseSourceCommit": "cb51d68712077103855934d1cd4055921caa9b35"
+  "releaseSourceCommit": "302078aa9222bfff888df41f1679e1179a20b18a"
 }

package/src/createTamagui.ts

@@ -14,7 +14,11 @@ import {
 } from './helpers/createDesignSystem'
 import { scanAllSheets } from './helpers/insertStyleRule'
 import { proxyThemesToParents } from './helpers/proxyThemeToParents'
-import { ensureThemeVariable } from './helpers/themes'
+import {
+  copyAuthoredThemeScheme,
+  ensureThemeVariable,
+  getAuthoredThemeScheme,
+} from './helpers/themes'
 import { mergeConfigVariablesIntoTheme } from './helpers/configVariables'
 import { configureMedia } from './hooks/useMedia'
 import { parseFont, registerFontVariables } from './insertFont'
@@ -232,10 +236,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
 
     const themesIn = configIn.themes as ThemesLikeObject
     const dedupedThemes =
-      foundThemes ??
-      getThemesDeduped(themesIn, tokens.color, configIn.variables, {
-        tokensParsed,
-      })
+      foundThemes ?? getThemesDeduped(themesIn, tokensParsed, configIn.variables)
     const themes = proxyThemesToParents(dedupedThemes, Object.keys(themesIn))
 
     return {
@@ -330,11 +331,8 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
 // dedupes the themes if given them via JS config
 function getThemesDeduped(
   themes: ThemesLikeObject,
-  colorTokens?: Record<string, any>,
-  variables?: CreateTamaguiProps['variables'],
-  variablesCtx?: {
-    tokensParsed: TokensParsed
-  }
+  tokensParsed: TokensParsed,
+  variables?: CreateTamaguiProps['variables']
 ): DedupedThemes {
   const dedupedThemes: DedupedThemes = []
   const existing = new Map<string, DedupedTheme>()
@@ -351,11 +349,12 @@ function getThemesDeduped(
     const rawTheme = themes[themeName]
 
     // dont force referential equality but may need something more consistent than JSON.stringify
-    const key = JSON.stringify(rawTheme)
+    const scheme = getAuthoredThemeScheme(rawTheme)
+    const key = JSON.stringify(rawTheme) + scheme
 
     // if existing, avoid
-    if (existing.has(key)) {
-      const e = existing.get(key)!
+    const e = existing.get(key)
+    if (e) {
       e.names.push(themeName)
       continue
     }
@@ -363,7 +362,7 @@ function getThemesDeduped(
     // ensure each theme object unique for dedupe
     // is ThemeParsed because we call ensureThemeVariable
     // color tokens are spread first as fallbacks, theme values take precedence
-    const theme = { ...colorTokens, ...rawTheme } as any as ThemeParsed
+    const theme = { ...tokensParsed.color, ...rawTheme } as any as ThemeParsed
 
     // parse into variables
     for (const key in theme) {
@@ -371,16 +370,13 @@ function getThemesDeduped(
       ensureThemeVariable(theme, key)
     }
 
+    copyAuthoredThemeScheme(theme, rawTheme)
+
     // custom variables merge into base themes only; sub-themes inherit them
     // via proxyThemesToParents (native) and the CSS cascade (web), so a
     // a ThemeUpdate patch survives sub-theme switches below it
-    if (variables && variablesCtx && !themeName.includes('_')) {
-      mergeConfigVariablesIntoTheme(
-        theme as any,
-        themeName,
-        variables,
-        variablesCtx.tokensParsed
-      )
+    if (variables && !themeName.includes('_')) {
+      mergeConfigVariablesIntoTheme(theme as any, themeName, variables, tokensParsed)
     }
 
     // set deduped

package/src/helpers/getSplitStyles.tsx

@@ -534,7 +534,6 @@ function contributeProp(
   const shouldCheckSkipProps = !noSkip
   const asChildExceptStyleLike = Boolean(flags & passAsChildStyleFlag)
   const isTextOrInput = isText || isInput
-  const hocParentVariants = isHOC ? parentVariants : undefined
   let keyInit = keyOg
   let valInit = valOg
 
@@ -1008,11 +1007,10 @@ function contributeProp(
   const shouldPassProp =
     (!isStyleProp && isHOC) ||
     // is in parent variants
-    (hocParentVariants && keyInit in hocParentVariants) ||
+    (parentVariants && keyInit in parentVariants) ||
     inlineProps?.has(keyInit)
 
-  const parentVariant = parentVariants?.[keyInit]
-  const isHOCShouldPassThrough = Boolean(isHOC && (parentVariant || keyInit in skipProps))
+  const isHOCShouldPassThrough = isHOC && keyInit in skipProps
 
   const shouldPassThrough = shouldPassProp || isHOCShouldPassThrough
 
@@ -1342,8 +1340,10 @@ export const getSplitStyles: StyleSplitter = (
   let frontendContainer: boolean | string | undefined
   let frontendContainerType: string | undefined
   const processedProps = props
-  const parentVariants = parentStaticConfig
-    ? getStyleStaticConfig(parentStaticConfig as StaticConfig, conf).variants
+  // only variant names determine HOC forwarding; their style values resolve
+  // in the renderer, so this needs no normalized style snapshot.
+  const parentVariants = isHOC
+    ? staticConfig.Component?.staticConfig?.variants
     : undefined
   const defaultProps = asChild ? styleStaticConfig.defaultProps : undefined
   const asChildExceptStyleLike =
@@ -1382,7 +1382,7 @@ export const getSplitStyles: StyleSplitter = (
     styledContextKeys,
     stylePassFlags,
     debug,
-    parentStaticConfig,
+    process.env.NODE_ENV === 'development' ? parentStaticConfig : undefined,
     defaultProps,
     driverAnimations,
     driverOutputStyle,
@@ -3480,7 +3480,12 @@ function emitValue(
   }
   if (typeof raw === 'string' && property === 'background') {
     const parts = splitComponents(raw)
-    if (parts.length === 1 && !startsValueFunction(parts[0])) {
+    if (
+      parts.length === 1 &&
+      (!startsValueFunction(parts[0]) ||
+        (process.env.TAMAGUI_TARGET === 'native' &&
+          classifyBorderComponents(parts[0]).color))
+    ) {
       emitResolved(state, 'backgroundColor', parts[0], cursor, originalValue, contextOnly)
       return
     }

package/src/helpers/proxyThemeToParents.ts

@@ -1,4 +1,5 @@
 import type { DedupedThemes, ThemeParsed } from '../types'
+import { copyAuthoredThemeScheme } from './themes'
 
 const themesRaw: Record<string, ThemeParsed> = {}
 
@@ -58,5 +59,5 @@ export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
     Object.assign(out, themesRaw[parent])
   }
   Object.assign(out, theme)
-  return out
+  return copyAuthoredThemeScheme(out, theme)
 }

package/src/helpers/themes.ts

@@ -1,22 +1,28 @@
 import { createVariable, isVariable } from '../createVariable'
 
+const schemeKey = /* @__PURE__ */ Symbol.for('tamagui.theme.scheme')
+
+export function getAuthoredThemeScheme(theme: any): 'light' | 'dark' | undefined {
+  const scheme = theme[schemeKey]
+  return scheme === 'light' || scheme === 'dark' ? scheme : undefined
+}
+
+export function copyAuthoredThemeScheme<T>(target: T, source: any): T {
+  const scheme = getAuthoredThemeScheme(source)
+  if (scheme) Object.defineProperty(target, schemeKey, { value: scheme })
+  return target
+}
+
 // mutates, freeze after
 // shared by createTamagui so extracted here
 export function ensureThemeVariable(theme: any, key: string) {
   const val = theme[key]
-  const value = isVariable(val) ? val.val : val
-  if (!isVariable(val)) {
-    theme[key] = createVariable({
-      key,
-      name: key,
-      val: value,
-    })
-  } else if (val.name !== key) {
-    // rename to theme name
+  const variable = isVariable(val)
+  if (!variable || val.name !== key) {
     theme[key] = createVariable({
-      key: val.name,
+      key: variable ? val.name : key,
       name: key,
-      val: value,
+      val: variable ? val.val : val,
     })
   }
 }

package/src/hooks/useThemeState.ts

@@ -18,6 +18,7 @@ import type {
   UseThemeWithStateProps,
 } from '../types'
 import type { ThemeUpdateState } from '../helpers/themeUpdateState'
+import { getAuthoredThemeScheme } from '../helpers/themes'
 
 type ID = string
 
@@ -110,7 +111,7 @@ export const useThemeState = (
   }
 
   const id = useId()
-  const propsKey = getPropsKey(props)
+  const propsKey = `${props.name || ''}${props.forceClassName || ''}${props._themeUpdate?.key || ''}`
 
   if (cascadeOnChange) {
     registerThemeProviderChain(id, parentId, props)
@@ -119,20 +120,14 @@ export const useThemeState = (
   const ref = useRef<ThemeStateRef>(null as any)
   const r = (ref.current ||= {
     id,
-    parentId,
-    props,
-    propsKey,
-    isRoot,
-    keys,
-    schemeKeys,
     optimizeForFirstRender,
     renderVersion: 0,
-  })
+  } as ThemeStateRef)
   r.props = props
   r.propsKey = propsKey
   r.isRoot = isRoot
   r.keys = keys
-  r.schemeKeys = schemeKeys
+  if (process.env.TAMAGUI_TARGET === 'native') r.schemeKeys = schemeKeys
   r.parentId = parentId
   r.renderVersion++
 
@@ -153,7 +148,7 @@ export const useThemeState = (
     }
 
     if (r.unsubscribe && r.subscribedTo !== r.parentId) {
-      cleanupThemeSubscription(r)
+      r.unsubscribe?.()
     }
 
     if (shouldSubscribeToTheme(r, cascadeOnChange)) {
@@ -189,7 +184,7 @@ export const useThemeState = (
         }
       }
     } else if (r.unsubscribe) {
-      cleanupThemeSubscription(r)
+      r.unsubscribe?.()
     }
 
     return () => {
@@ -250,13 +245,9 @@ const shouldSubscribeToTheme = (r: ThemeStateRef, cascadeOnChange: boolean): boo
     r.props.needsUpdate?.()
   )
 
-function cleanupThemeSubscription(r: ThemeStateRef) {
-  r.unsubscribe?.()
-}
-
 function cleanupThemeState(r: ThemeStateRef) {
   if (r.unsubscribe) {
-    cleanupThemeSubscription(r)
+    r.unsubscribe()
   } else {
     r.state = undefined
     states.delete(r.id)
@@ -267,16 +258,8 @@ function cleanupThemeState(r: ThemeStateRef) {
 }
 
 const getSnapshotImpl = (r: SnapshotRef): ThemeState => {
-  const {
-    id,
-    parentId,
-    props,
-    propsKey,
-    isRoot,
-    keys,
-    schemeKeys,
-    optimizeForFirstRender,
-  } = r
+  const { id, parentId, props, propsKey, isRoot, keys, optimizeForFirstRender } = r
+  const schemeKeys = process.env.TAMAGUI_TARGET === 'native' ? r.schemeKeys : undefined
   // useId values repeat across server renders; each hook owns its snapshot.
   let local = r.state
   const parentState = states.get(parentId)
@@ -302,11 +285,11 @@ const getSnapshotImpl = (r: SnapshotRef): ThemeState => {
     local.scheme !== parentState.scheme &&
     getThemeBaseName(local.name) === getThemeBaseName(parentState.name)
 
-  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
+  )
 
   // forceClassName renders its resolved name as classes, so a nameless one that
   // mirrors its parent still has to re-render when the parent's scheme flips
@@ -445,7 +428,7 @@ const getNextState = (
   }
 
   // a same-name pin still introduces its own scope.
-  const scheme = getScheme(resolvedName)
+  const scheme = getAuthoredThemeScheme(themes[resolvedName]) || getScheme(resolvedName)
   const parentInverses = parentState?.inverses ?? 0
   const isInverse = Boolean(parentState && scheme !== parentState.scheme)
   const inverses = parentInverses + (isInverse ? 1 : 0)
@@ -556,8 +539,5 @@ export function resolveThemeName(
   return found
 }
 
-const getPropsKey = ({ name, forceClassName, _themeUpdate }: UseThemeWithStateProps) =>
-  `${name || ''}${forceClassName || ''}${_themeUpdate?.key || ''}`
-
 export const hasThemeUpdatingProps = (props: UseThemeWithStateProps) =>
   'name' in props || 'forceClassName' in props || '_themeUpdate' in props

package/src/internal-runtime.ts

@@ -19,7 +19,10 @@ import { getThemeCSSRules as getThemeCSSRulesImpl } from './helpers/getThemeCSSR
 import { normalizeValueWithProperty as normalizeValueWithPropertyImpl } from './helpers/normalizeValueWithProperty'
 import { proxyThemeToParents as proxyThemeToParentsImpl } from './helpers/proxyThemeToParents'
 import type { FrontendComponent, StyleFrontend } from './helpers/styleFrontend'
-import { ensureThemeVariable as ensureThemeVariableImpl } from './helpers/themes'
+import {
+  copyAuthoredThemeScheme as copyAuthoredThemeSchemeImpl,
+  ensureThemeVariable as ensureThemeVariableImpl,
+} from './helpers/themes'
 import { transformsToString as transformsToStringImpl } from './helpers/transformsToString'
 import {
   parseFont as parseFontImpl,
@@ -59,6 +62,8 @@ export const proxyThemeToParents: (themeName: string, theme: any) => any =
   proxyThemeToParentsImpl
 export const ensureThemeVariable: (theme: any, key: string) => void =
   ensureThemeVariableImpl
+export const copyAuthoredThemeScheme: <T>(target: T, source: any) => T =
+  copyAuthoredThemeSchemeImpl
 export const transformsToString: (transforms: object[]) => string = transformsToStringImpl
 export const styleToCSS: (style: Record<string, any>) => void = styleToCSSImpl
 export const useThemeWithState: (

package/src/types.tsx

@@ -1999,20 +1999,6 @@ export type GetTokenFontKeysFor<
 > = keyof TamaguiConfig['fonts']['body'][A]
 
 export type FontTokens = GetTokenString<keyof TamaguiConfig['fonts']>
-/** generic css families, valid as a single-token fontFamily without a config font */
-export type GenericFontFamily =
-  | 'serif'
-  | 'sans-serif'
-  | 'monospace'
-  | 'cursive'
-  | 'fantasy'
-  | 'system-ui'
-  | 'ui-serif'
-  | 'ui-sans-serif'
-  | 'ui-monospace'
-  | 'ui-rounded'
-  | 'math'
-  | 'inherit'
 export type FontFamilyTokens = FontTokens
 export type FontSize =
   | GetTokenString<GetTokenFontKeysFor<'size'>>
@@ -2115,7 +2101,7 @@ export type ThemeValueGet<K extends string | number | symbol> = K extends 'theme
   : K extends SizeKeys
     ? SizeTokens
     : K extends FontKeys
-      ? FontTokens | GenericFontFamily
+      ? FontTokens
       : K extends FontSizeKeys
         ? FontSizeTokens | FontStyleValueFallback
         : K extends `${`border${string | ''}Radius`}`

package/types/createTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,kBAAkB,EAMlB,kBAAkB,EAClB,qBAAqB,EAKtB,MAAM,SAAS,CAAA;AAwDhB,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,yBAIjE;AAwBD,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA+M1B"}
+{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EACV,kBAAkB,EAMlB,kBAAkB,EAClB,qBAAqB,EAKtB,MAAM,SAAS,CAAA;AAwDhB,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,yBAIjE;AAwBD,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA4M1B"}

package/types/helpers/getSplitStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAGb,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,qBAAqB,EAErB,WAAW,EAGZ,MAAM,UAAU,CAAA;AAkBjB,OAAO,EAAE,oBAAoB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAqB/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAe3D,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAK3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,MAAM,MAAM,aAAa,GAAG,CAC1B,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,EAC5C,iBAAiB,CAAC,EAAE,iBAAiB,KAClC,IAAI,GAAG,cAAc,CAAA;AA6U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AA+rBD,eAAO,MAAM,cAAc,EAAE,aAuuB5B,CAAA;AAoYD,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AA63CT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAgCnF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,oBAAoB,GAAG,IAAI,EACjC,QAAQ,SAAI,EACZ,WAAW,UAAQ,WA4OpB;AA6HD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,QAyBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAGb,eAAe,EACf,YAAY,EAGZ,qBAAqB,EACrB,qBAAqB,EAErB,WAAW,EAGZ,MAAM,UAAU,CAAA;AAkBjB,OAAO,EAAE,oBAAoB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKlF,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAqB/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAe3D,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACvF,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAK3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,MAAM,MAAM,aAAa,GAAG,CAC1B,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,YAAY,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAEtC,WAAW,CAAC,EAAE,MAAM,EACpB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,KAAK,CAAC,EAAE,SAAS,EAEjB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,EAC5C,iBAAiB,CAAC,EAAE,iBAAiB,KAClC,IAAI,GAAG,cAAc,CAAA;AA6U1B,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAEhF;AA6rBD,eAAO,MAAM,cAAc,EAAE,aAyuB5B,CAAA;AAoYD,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,gBAAgB,CAAC,EAAE,OAAO,EAC1B,aAAa,CAAC,EAAE,GAAG,KAChB,IAAI,CAAA;AAk4CT,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAgCnF,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,oBAAoB,GAAG,IAAI,EACjC,QAAQ,SAAI,EACZ,WAAW,UAAQ,WA4OpB;AA6HD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,QAyBlB;AAID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAgBtF;AAMD,cAAc,mBAAmB,CAAA"}

package/types/helpers/proxyThemeToParents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxyThemeToParents.d.ts","sourceRoot":"","sources":["../../src/helpers/proxyThemeToParents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAM1D,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAC1B,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA+B7B;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,MAmBxE"}
+{"version":3,"file":"proxyThemeToParents.d.ts","sourceRoot":"","sources":["../../src/helpers/proxyThemeToParents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAO1D,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAC1B,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA+B7B;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,MAmBxE"}

package/types/helpers/themes.d.ts

@@ -1,2 +1,4 @@
+export declare function getAuthoredThemeScheme(theme: any): 'light' | 'dark' | undefined;
+export declare function copyAuthoredThemeScheme<T>(target: T, source: any): T;
 export declare function ensureThemeVariable(theme: any, key: string): void;
 //# sourceMappingURL=themes.d.ts.map

package/types/helpers/themes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themes.d.ts","sourceRoot":"","sources":["../../src/helpers/themes.ts"],"names":[],"mappings":"AAIA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,QAiB1D"}
+{"version":3,"file":"themes.d.ts","sourceRoot":"","sources":["../../src/helpers/themes.ts"],"names":[],"mappings":"AAIA,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAG/E;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,CAIpE;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,QAU1D"}

package/types/hooks/useThemeState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useThemeState.d.ts","sourceRoot":"","sources":["../../src/hooks/useThemeState.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,OAAO,CAAA;AAId,OAAO,KAAK,EAGV,UAAU,EACV,sBAAsB,EACvB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,KAAK,EAAE,GAAG,MAAM,CAAA;AAEhB,eAAO,MAAM,iBAAiB,iCAAwB,CAAA;AAWtD,eAAO,MAAM,iBAAiB,YAK7B,CAAA;AAED,eAAO,MAAM,aAAa,OAAQ,EAAE,2BAAmB,CAAA;AAKvD,eAAO,MAAM,mBAAmB,OAAQ,EAAE,iCAA8B,CAAA;AACxE,eAAO,MAAM,sBAAsB,OAAQ,EAAE,uBAAiC,CAAA;AAE9E,eAAO,MAAM,0BAA0B;IACrC,MAAM;IACN,OAAO;CACP,CAAA;AAsBF,eAAO,MAAM,iBAAiB,yBAAuB,CAAA;AAMrD,eAAO,MAAM,aAAa,UACjB,sBAAsB,qCAEvB,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAC7B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,kEAGhD,UAsIF,CAAA;AAiRD,wBAAgB,eAAe,CAC7B,UAAU,oBAAK,EACf,KAAK,EAAE,sBAAsB,EAC7B,WAAW,UAAQ,GAClB,MAAM,GAAG,IAAI,CAuBf;AAED,eAAO,MAAM,qBAAqB,cAA4B,CAAA;AAE9D,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,WAAW,UAAQ,GAClB,MAAM,GAAG,IAAI,CA0Bf;AAKD,eAAO,MAAM,qBAAqB,UAAW,sBAAsB,YACM,CAAA"}
+{"version":3,"file":"useThemeState.d.ts","sourceRoot":"","sources":["../../src/hooks/useThemeState.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,OAAO,CAAA;AAId,OAAO,KAAK,EAGV,UAAU,EACV,sBAAsB,EACvB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAGnE,KAAK,EAAE,GAAG,MAAM,CAAA;AAEhB,eAAO,MAAM,iBAAiB,iCAAwB,CAAA;AAWtD,eAAO,MAAM,iBAAiB,YAK7B,CAAA;AAED,eAAO,MAAM,aAAa,OAAQ,EAAE,2BAAmB,CAAA;AAKvD,eAAO,MAAM,mBAAmB,OAAQ,EAAE,iCAA8B,CAAA;AACxE,eAAO,MAAM,sBAAsB,OAAQ,EAAE,uBAAiC,CAAA;AAE9E,eAAO,MAAM,0BAA0B;IACrC,MAAM;IACN,OAAO;CACP,CAAA;AAsBF,eAAO,MAAM,iBAAiB,yBAAuB,CAAA;AAMrD,eAAO,MAAM,aAAa,UACjB,sBAAsB,qCAEvB,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAC7B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,kEAGhD,UAgIF,CAAA;AAqQD,wBAAgB,eAAe,CAC7B,UAAU,oBAAK,EACf,KAAK,EAAE,sBAAsB,EAC7B,WAAW,UAAQ,GAClB,MAAM,GAAG,IAAI,CAuBf;AAED,eAAO,MAAM,qBAAqB,cAA4B,CAAA;AAE9D,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,WAAW,UAAQ,GAClB,MAAM,GAAG,IAAI,CA0Bf;AAED,eAAO,MAAM,qBAAqB,UAAW,sBAAsB,YACM,CAAA"}

package/types/internal-runtime.d.ts

@@ -27,6 +27,7 @@ export declare const getThemeCSSRules: (props: {
 export declare const normalizeValueWithProperty: (value: any, property?: string) => any;
 export declare const proxyThemeToParents: (themeName: string, theme: any) => any;
 export declare const ensureThemeVariable: (theme: any, key: string) => void;
+export declare const copyAuthoredThemeScheme: <T>(target: T, source: any) => T;
 export declare const transformsToString: (transforms: object[]) => string;
 export declare const styleToCSS: (style: Record<string, any>) => void;
 export declare const useThemeWithState: (props: any, isRoot?: boolean, forThemeView?: boolean) => [any, any];

package/types/internal-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-runtime.d.ts","sourceRoot":"","sources":["../src/internal-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"internal-runtime.d.ts","sourceRoot":"","sources":["../src/internal-runtime.ts"],"names":[],"mappings":"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"}

package/types/types.d.ts

@@ -1173,8 +1173,6 @@ export type Fonts = DefaultFont extends string ? TamaguiConfig['fonts'][DefaultF
 export type Font = ParseFont<Fonts>;
 export type GetTokenFontKeysFor<A extends 'size' | 'weight' | 'letterSpacing' | 'family' | 'lineHeight' | 'transform' | 'style' | 'color'> = keyof TamaguiConfig['fonts']['body'][A];
 export type FontTokens = GetTokenString<keyof TamaguiConfig['fonts']>;
-/** generic css families, valid as a single-token fontFamily without a config font */
-export type GenericFontFamily = 'serif' | 'sans-serif' | 'monospace' | 'cursive' | 'fantasy' | 'system-ui' | 'ui-serif' | 'ui-sans-serif' | 'ui-monospace' | 'ui-rounded' | 'math' | 'inherit';
 export type FontFamilyTokens = FontTokens;
 export type FontSize = GetTokenString<GetTokenFontKeysFor<'size'>> | number | RemString | true;
 export type FontSizeTokens = FontSize;
@@ -1207,7 +1205,7 @@ export type LineHeightKeys = 'lineHeight';
 export type ZIndexKeys = 'zIndex';
 export type OpacityKeys = 'opacity';
 type FontStyleValueFallback = GetThemeValueFallbackFor<AllowedValueSettingSize, never, never, never, WebStyleValueUniversal | `${number}%`>;
-export type ThemeValueGet<K extends string | number | symbol> = K extends 'theme' ? ThemeTokens : K extends SizeKeys ? SizeTokens : K extends FontKeys ? FontTokens | GenericFontFamily : K extends FontSizeKeys ? FontSizeTokens | FontStyleValueFallback : K extends `${`border${string | ''}Radius`}` ? RadiusTokens : K extends SpaceKeys ? K extends 'shadowOffset' ? {
+export type ThemeValueGet<K extends string | number | symbol> = K extends 'theme' ? ThemeTokens : K extends SizeKeys ? SizeTokens : K extends FontKeys ? FontTokens : K extends FontSizeKeys ? FontSizeTokens | FontStyleValueFallback : K extends `${`border${string | ''}Radius`}` ? RadiusTokens : K extends SpaceKeys ? K extends 'shadowOffset' ? {
     width: SpaceTokens;
     height: SpaceTokens;
 } : SpaceTokens : K extends ColorKeys ? ColorTokens | ThemeValueFallbackColor : K extends ZIndexKeys ? ZIndexTokens : K extends LineHeightKeys ? FontLineHeightTokens | FontStyleValueFallback : K extends FontWeightKeys ? FontWeightTokens : K extends FontLetterSpacingKeys ? FontLetterSpacingTokens : K extends OpacityKeys ? ThemeValueFallback : never;