@tamagui/web 1.74.14 → 1.74.16

package/dist/esm/hooks/useTheme.native.js

@@ -43,7 +43,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
   const themeProxied = useMemo(() => !themeManager || !state?.theme ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state, themeManager, props.deopt, props.debug]);
   return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} useTheme =>", state?.name), console.info("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
 };
-function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug) {
+function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys, debug) {
   if (!theme)
     return {};
   const config = getConfig();
@@ -76,21 +76,18 @@ function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug)
               else if (subkey === "get")
                 return (platform) => {
                   const outVal = getVariable(val);
-                  if (platform !== "web" && isIos && !deopt && config.settings.fastSchemeChange) {
-                    const isDark = name.startsWith("dark"), isLight = !isDark && name.startsWith("light");
-                    if (isDark || isLight) {
-                      const oppositeThemeName = name.replace(
-                        isDark ? "dark" : "light",
-                        isDark ? "light" : "dark"
-                      ), oppositeTheme = config.themes[oppositeThemeName], oppositeVal = getVariable(oppositeTheme?.[keyString]);
-                      if (oppositeVal)
-                        return {
-                          dynamic: {
-                            dark: isDark ? outVal : oppositeVal,
-                            light: isLight ? outVal : oppositeVal
-                          }
-                        };
-                    }
+                  if (platform !== "web" && isIos && !deopt && config.settings.fastSchemeChange && !someParentIsInversed(themeManager) && scheme) {
+                    const oppositeThemeName = name.replace(
+                      scheme === "dark" ? "dark" : "light",
+                      scheme === "dark" ? "light" : "dark"
+                    ), oppositeTheme = config.themes[oppositeThemeName], oppositeVal = getVariable(oppositeTheme?.[keyString]);
+                    if (oppositeVal)
+                      return {
+                        dynamic: {
+                          dark: scheme === "dark" ? outVal : oppositeVal,
+                          light: scheme === "light" ? outVal : oppositeVal
+                        }
+                      };
                   }
                   return track(keyString), outVal;
                 };
@@ -102,6 +99,17 @@ function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug)
     }
   });
 }
+function someParentIsInversed(manager) {
+  {
+    let cur = manager;
+    for (; cur; ) {
+      if (cur.state.inverse)
+        return !0;
+      cur = cur.parentManager;
+    }
+  }
+  return !1;
+}
 const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
   const { disable } = props, parentManager = useContext(ThemeManagerContext);
   if (!isRoot && !parentManager || disable)

package/dist/esm/hooks/useTheme.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useTheme.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
 }

package/dist/esm/setupReactNative.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/setupReactNative.ts"],
-  "mappings": "AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AACnD,MAAK;AAeH,WAAI,UAAU,WAAW,UAAU,WAC1B,UAAU,QAEf,UAAU,gBAAgB,UAAU,UAAU,SACzC,UAAU,OAGjB,UAAU,WACT,UAAU,gBAAgB,gBAAgB,UAAU,gBAAgB,UAE9D,UAAU,UAEf,UAAU,OAAO,gBACZ,UAAU,YAId,yBAAyB,IAAI,SAAS;AAC/C;AAEA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,IACL,eAAe;AAAA,IACf,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AAAA,EACA,MAAM;AAAA,IACJ,eAAe;AAAA,IACf,QAAQ;AAAA,EACV;AAAA,EACA,WAAW;AAAA,IACT,eAAe;AAAA,IACf,SAAS;AAAA,IACT,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,eAAe;AAAA,EACjB;AACF;AAKO,SAAS,iBAAiB,WAAgC;AAcjE;",
+  "mappings": "AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AACnD,MAAK;AAkBH,WAAI,UAAU,WAAW,UAAU,WAC1B,UAAU,QAEf,UAAU,gBAAgB,UAAU,UAAU,SACzC,UAAU,OAGjB,UAAU,WACT,UAAU,gBAAgB,gBAAgB,UAAU,gBAAgB,UAE9D,UAAU,UAEf,UAAU,OAAO,gBACZ,UAAU,YAId,yBAAyB,IAAI,SAAS;AAC/C;AAEA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,IACL,eAAe;AAAA,IACf,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AAAA,EACA,MAAM;AAAA,IACJ,eAAe;AAAA,IACf,QAAQ;AAAA,EACV;AAAA,EACA,WAAW;AAAA,IACT,eAAe;AAAA,IACf,SAAS;AAAA,IACT,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,eAAe;AAAA,EACjB;AACF;AAKO,SAAS,iBAAiB,WAAgC;AAcjE;",
   "names": []
 }

package/dist/esm/setupReactNative.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/setupReactNative.ts"],
-  "mappings": "AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AACnD,MAAK;AAGH,WAAI,UAAU,WAAW,eAAe,UAAU,WAAW,eACpD,UAAU,YAEf,UAAU,qBACL,UAAU,QAEf,UAAU,WAAW,oBAChB,UAAU,OAGZ,UAAU;AAoBrB;AAEA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,IACL,eAAe;AAAA,IACf,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AAAA,EACA,MAAM;AAAA,IACJ,eAAe;AAAA,IACf,QAAQ;AAAA,EACV;AAAA,EACA,WAAW;AAAA,IACT,eAAe;AAAA,IACf,SAAS;AAAA,IACT,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,eAAe;AAAA,EACjB;AACF;AAKO,SAAS,iBAAiB,WAAgC;AAcjE;",
+  "mappings": "AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AACnD,MAAK;AAGH,WAAI,UAAU,WAAW,eAAe,UAAU,WAAW,eACpD,UAAU,YAEf,UAAU,qBACL,UAAU,QAEf,UAAU,WAAW,oBAChB,UAAU,OAMZ,UAAU;AAoBrB;AAEA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,IACL,eAAe;AAAA,IACf,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AAAA,EACA,MAAM;AAAA,IACJ,eAAe;AAAA,IACf,QAAQ;AAAA,EACV;AAAA,EACA,WAAW;AAAA,IACT,eAAe;AAAA,IACf,SAAS;AAAA,IACT,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,eAAe;AAAA,EACjB;AACF;AAKO,SAAS,iBAAiB,WAAgC;AAcjE;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.74.14",
+  "version": "1.74.16",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,19 +27,19 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.74.14",
-    "@tamagui/constants": "1.74.14",
-    "@tamagui/helpers": "1.74.14",
-    "@tamagui/normalize-css-color": "1.74.14",
-    "@tamagui/timer": "1.74.14",
-    "@tamagui/use-did-finish-ssr": "1.74.14",
-    "@tamagui/use-force-update": "1.74.14"
+    "@tamagui/compose-refs": "1.74.16",
+    "@tamagui/constants": "1.74.16",
+    "@tamagui/helpers": "1.74.16",
+    "@tamagui/normalize-css-color": "1.74.16",
+    "@tamagui/timer": "1.74.16",
+    "@tamagui/use-did-finish-ssr": "1.74.16",
+    "@tamagui/use-force-update": "1.74.16"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.74.14",
+    "@tamagui/build": "1.74.16",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/createComponent.tsx

@@ -951,6 +951,7 @@ export function createComponent<
 
     const runtimePressStyle = !disabled && noClassNames && pseudos?.pressStyle
     const runtimeFocusStyle = !disabled && noClassNames && pseudos?.focusStyle
+    const attachFocus = Boolean(runtimePressStyle || onFocus || onBlur)
     const attachPress = Boolean(
       groupName ||
         runtimePressStyle ||
@@ -970,7 +971,8 @@ export function createComponent<
     // check presence rather than value to prevent reparenting bugs
     // allows for onPress={x ? function : undefined} without re-ordering dom
     const shouldAttach = Boolean(
-      attachPress ||
+      attachFocus ||
+        attachPress ||
         isHoverable ||
         runtimePressStyle ||
         runtimeHoverStyle ||
@@ -1055,21 +1057,20 @@ export function createComponent<
                   onLongPress?.(e)
                 },
               }),
-            ...(process.env.TAMAGUI_TARGET === 'web' &&
-              runtimeFocusStyle && {
-                onFocus: (e) => {
-                  setStateShallow({
-                    focus: true,
-                  })
-                  onFocus?.(e)
-                },
-                onBlur: (e) => {
-                  setStateShallow({
-                    focus: false,
-                  })
-                  onBlur?.(e)
-                },
-              }),
+            ...(attachFocus && {
+              onFocus: (e) => {
+                setStateShallow({
+                  focus: true,
+                })
+                onFocus?.(e)
+              },
+              onBlur: (e) => {
+                setStateShallow({
+                  focus: false,
+                })
+                onBlur?.(e)
+              },
+            }),
           }
         : null
 

package/src/helpers/ThemeManager.tsx

@@ -2,7 +2,7 @@ import { isWeb } from '@tamagui/constants'
 
 import { getThemes } from '../config'
 import { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from '../constants/constants'
-import { ThemeParsed, ThemeProps } from '../types'
+import { ColorScheme, ThemeParsed, ThemeProps } from '../types'
 
 type ThemeListener = (
   name: string | null,
@@ -20,11 +20,12 @@ export type SetActiveThemeProps = {
 
 export type ThemeManagerState = {
   name: string
+  parentName?: string
   theme?: ThemeParsed | null
+  isComponent?: boolean
   className?: string
-  parentName?: string
-  componentName?: string
   inverse?: boolean
+  scheme?: ColorScheme
 }
 
 const emptyState: ThemeManagerState = { name: '' }
@@ -37,22 +38,20 @@ let uid = 0
 
 export class ThemeManager {
   id = uid++
-  isComponent = false
   themeListeners = new Set<ThemeListener>()
   parentManager: ThemeManager | null = null
   state: ThemeManagerState = emptyState
-  scheme: 'light' | 'dark' | null = null
 
   constructor(
     public props: ThemeProps = {},
-    parentManagerIn?: ThemeManager | 'root' | null | undefined
+    parentManager?: ThemeManager | 'root' | null | undefined
   ) {
-    if (parentManagerIn === 'root') {
+    if (parentManager === 'root') {
       this.updateStateFromProps(props, false)
       return
     }
 
-    if (!parentManagerIn) {
+    if (!parentManager) {
       if (process.env.NODE_ENV !== 'production') {
         throw new Error(
           `No parent manager given, this is likely due to duplicated Tamagui dependencies. Check your lockfile for mis-matched versions. It could also be from an error somewhere else in your stack causing Tamagui to recieve undefined context, you can try putting some ErrorBoundary components around other areas of your app, or a Suspense boundary.`
@@ -61,13 +60,14 @@ export class ThemeManager {
       throw `❌ 0`
     }
 
-    this.parentManager = parentManagerIn
+    // this is used in updateStateFromProps so must be set
+    this.parentManager = parentManager
 
     if (this.updateStateFromProps(props, false)) {
       return
     }
 
-    return parentManagerIn || this
+    return parentManager
   }
 
   updateStateFromProps(
@@ -81,6 +81,7 @@ export class ThemeManager {
       return true
     }
     const nextState = this.getStateIfChanged(props)
+
     if (nextState) {
       this.updateState(nextState, shouldNotify)
       return nextState
@@ -89,11 +90,7 @@ export class ThemeManager {
 
   updateState(nextState: ThemeManagerState, shouldNotify = true) {
     this.state = nextState
-    const names = this.state.name.split('_')
-    const lastName = names[names.length - 1][0]
-    this.isComponent = lastName[0] === lastName[0].toUpperCase()
     this._allKeys = null
-    this.scheme = names[0] === 'light' ? 'light' : names[0] === 'dark' ? 'dark' : null
     if (process.env.NODE_ENV === 'development') {
       this['_numChangeEventsSent'] ??= 0
       this['_numChangeEventsSent']++
@@ -166,86 +163,61 @@ export class ThemeManager {
   }
 }
 
-function getNextThemeClassName(name: string) {
-  const next = `t_sub_theme ${THEME_CLASSNAME_PREFIX}${name}`
-  return next.replace('light_', '').replace('dark_', '')
-}
-
 function getState(
   props: ThemeProps,
-  parentManager?: ThemeManager | null
+  manager?: ThemeManager | null
 ): ThemeManagerState | null {
-  const validManagerAndAllComponentThemes = getNonComponentParentManager(parentManager)
-  parentManager = validManagerAndAllComponentThemes[0]
-  const allComponentThemes = validManagerAndAllComponentThemes[1]
-  const themes = getThemes()
-  const isDirectParentAComponentTheme = allComponentThemes.length > 0
-
   if (props.name && props.reset) {
-    throw new Error('Cannot reset + set new name')
+    throw new Error(
+      process.env.NODE_ENV === 'production'
+        ? `❌004`
+        : 'Cannot reset and set a new name at the same time.'
+    )
   }
 
-  if (!props.name && !props.inverse && !props.reset && !props.componentName) {
+  if (!getHasThemeUpdatingProps(props)) {
     return null
   }
 
-  if (props.reset && !isDirectParentAComponentTheme && !parentManager?.parentManager) {
-    if (process.env.NODE_ENV === 'development') {
-      console.warn('Cannot reset no grandparent exists')
+  const themes = getThemes()
+  const [allManagers, componentManagers] = getManagers(manager)
+
+  const isDirectParentAComponentTheme = !!manager?.state.isComponent
+  const startIndex =
+    allManagers.findIndex((x) => !x?.state.isComponent) +
+    (props.reset && !isDirectParentAComponentTheme ? 1 : 0)
+
+  let baseManager = allManagers[startIndex]
+  let parentManager = allManagers[startIndex + 1]
+
+  if (!baseManager && props.reset) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.warn('Cannot reset, no parent theme exists')
     }
     return null
   }
 
   let result: ThemeManagerState | null = null
 
-  const nextName = props.reset
-    ? isDirectParentAComponentTheme
-      ? parentManager?.state?.name || ''
-      : parentManager?.parentManager?.state?.name || ''
-    : props.name || ''
-  const { componentName } = props
-  const parentName = props.reset
-    ? isDirectParentAComponentTheme
-      ? // here because parentManager already skipped componentTheme so we have to only go up once
-        parentManager?.parentManager?.state.name || ''
-      : parentManager?.parentManager?.parentManager?.state.name || ''
-    : isDirectParentAComponentTheme
-    ? allComponentThemes[0] || ''
-    : parentManager?.state.name || ''
+  const baseName = baseManager?.state.name || ''
+  const nextName = props.reset ? baseName : props.name || ''
 
+  const allComponentThemes = componentManagers.map((x) => x?.state.name || '')
   if (props.reset && isDirectParentAComponentTheme) {
-    // skip nearest component theme
     allComponentThemes.shift()
   }
 
   // components look for most specific, fallback upwards
-  const base = parentName.split(THEME_NAME_SEPARATOR)
-  const lastSegment = base[base.length - 1]
-  const isParentComponentTheme =
-    parentName && lastSegment[0].toUpperCase() === lastSegment[0]
-  if (isParentComponentTheme) {
-    base.pop() // always remove componentName they can't nest
-  }
-  const parentBaseTheme = isParentComponentTheme
-    ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)
-    : parentName
+  const base = baseName.split(THEME_NAME_SEPARATOR)
   const max = base.length
   const min =
-    componentName && !nextName
+    props.componentName && !nextName
       ? max // component name only don't search upwards
       : 0
 
   if (process.env.NODE_ENV === 'development' && typeof props.debug === 'string') {
     console.groupCollapsed('ThemeManager.getState()')
-    console.info({
-      props,
-      parentName,
-      parentBaseTheme,
-      base,
-      min,
-      max,
-      isParentComponentTheme,
-    })
+    console.info({ props, baseName, base, min, max })
   }
 
   for (let i = max; i >= min; i--) {
@@ -256,7 +228,7 @@ function getState(
     }
     let potentials: string[] = []
 
-    if (prefix && prefix !== parentBaseTheme) {
+    if (prefix && prefix !== baseName) {
       potentials.push(prefix)
     }
     if (nextName) {
@@ -269,41 +241,63 @@ function getState(
       }
     }
 
-    if (componentName) {
+    if (props.componentName) {
       let componentPotentials: string[] = []
       // components only look for component themes
       if (nextName) {
         const beforeSeparator = prefix.slice(0, prefix.indexOf(THEME_NAME_SEPARATOR))
-        componentPotentials.push(`${beforeSeparator}_${nextName}_${componentName}`)
+        componentPotentials.push(`${beforeSeparator}_${nextName}_${props.componentName}`)
       }
-      componentPotentials.push(`${prefix}_${componentName}`)
+      componentPotentials.push(`${prefix}_${props.componentName}`)
       if (nextName) {
         // do this one and one level up
         const prefixLessOne = base.slice(0, i - 1).join(THEME_NAME_SEPARATOR)
         if (prefixLessOne) {
-          const lessSpecific = `${prefixLessOne}_${nextName}_${componentName}`
+          const lessSpecific = `${prefixLessOne}_${nextName}_${props.componentName}`
           componentPotentials.unshift(lessSpecific)
         }
-        const moreSpecific = `${prefix}_${nextName}_${componentName}`
+        const moreSpecific = `${prefix}_${nextName}_${props.componentName}`
         componentPotentials.unshift(moreSpecific)
       }
       potentials = [...componentPotentials, ...potentials, ...allComponentThemes]
     }
+
     const found = potentials.find((t) => t in themes)
 
     if (process.env.NODE_ENV === 'development' && typeof props.debug === 'string') {
-      console.info(' - ', { found, potentials, parentManager })
+      console.info(' - ', { found, potentials, baseManager })
     }
 
     if (found) {
+      const names = found.split('_')
+      const [firstName, ...restNames] = names
+      const lastName = names[names.length - 1]
+      const isComponent = lastName[0] === lastName[0].toUpperCase()
+      const scheme =
+        firstName === 'light' ? 'light' : firstName === 'dark' ? 'dark' : undefined
+      const pre = THEME_CLASSNAME_PREFIX
+      const className = !isWeb
+        ? ''
+        : `${pre}sub_theme ${pre}${
+            !scheme || !restNames.length ? firstName : restNames.join('_')
+          }`
+
+      // because its a new theme the baseManager is now the parent
+      const parentState = baseManager?.state
+      const parentScheme = parentState?.scheme
+      const parentName = parentState?.name
+      const inverse = parentScheme && scheme !== parentScheme
+
       result = {
         name: found,
-        theme: themes[found],
-        className: isWeb ? getNextThemeClassName(found) : '',
         parentName,
-        componentName,
-        inverse: props.inverse,
+        theme: themes[found],
+        className,
+        inverse,
+        isComponent,
+        scheme,
       }
+
       break
     }
   }
@@ -313,9 +307,7 @@ function getState(
     typeof props.debug === 'string' &&
     typeof window !== 'undefined'
   ) {
-    console.warn('ThemeManager.getState():', {
-      result,
-    })
+    console.warn('ThemeManager.getState():', { result })
     console.trace()
     console.groupEnd()
   }
@@ -329,19 +321,21 @@ const inverseThemeName = (themeName: string) => {
     : themeName.replace(/^dark/, 'light')
 }
 
-export function getNonComponentParentManager(themeManager?: ThemeManager | null) {
-  // components never inherit from components
-  // example <Switch><Switch.Thumb /></Switch>
-  // the Switch theme shouldn't be considered parent of Thumb
-  let res = themeManager
-  let componentThemeNames: string[] = []
-  while (res) {
-    if (res?.isComponent) {
-      componentThemeNames.push(res?.state?.name!)
-      res = res.parentManager
-    } else {
-      break
+type MaybeThemeManager = ThemeManager | undefined
+
+// components never inherit from components
+// example <Switch><Switch.Thumb /></Switch>
+// the Switch theme shouldn't be considered parent of Thumb
+export function getManagers(themeManager?: ThemeManager | null) {
+  const comp: MaybeThemeManager[] = []
+  const all: MaybeThemeManager[] = []
+  let cur = themeManager
+  while (cur) {
+    all.push(cur)
+    if (cur.state.isComponent) {
+      comp.push(cur)
     }
+    cur = cur.parentManager
   }
-  return [res || null, componentThemeNames] as const
+  return [all, comp] as const
 }

package/src/hooks/useTheme.tsx

@@ -133,7 +133,7 @@ export const useThemeWithState = (
 }
 
 export function getThemeProxied(
-  { theme, name }: ThemeManagerState,
+  { theme, name, scheme }: ThemeManagerState,
   deopt = false,
   themeManager?: ThemeManager,
   keys?: string[],
@@ -198,22 +198,21 @@ export function getThemeProxied(
                       platform !== 'web' &&
                       isIos &&
                       !deopt &&
-                      config.settings.fastSchemeChange
+                      config.settings.fastSchemeChange &&
+                      !someParentIsInversed(themeManager)
                     ) {
-                      const isDark = name.startsWith('dark')
-                      const isLight = !isDark && name.startsWith('light')
-                      if (isDark || isLight) {
+                      if (scheme) {
                         const oppositeThemeName = name.replace(
-                          isDark ? 'dark' : 'light',
-                          isDark ? 'light' : 'dark'
+                          scheme === 'dark' ? 'dark' : 'light',
+                          scheme === 'dark' ? 'light' : 'dark'
                         )
                         const oppositeTheme = config.themes[oppositeThemeName]
                         const oppositeVal = getVariable(oppositeTheme?.[keyString])
                         if (oppositeVal) {
                           const dynamicVal = {
                             dynamic: {
-                              dark: isDark ? outVal : oppositeVal,
-                              light: isLight ? outVal : oppositeVal,
+                              dark: scheme === 'dark' ? outVal : oppositeVal,
+                              light: scheme === 'light' ? outVal : oppositeVal,
                             },
                           }
                           return dynamicVal
@@ -240,6 +239,18 @@ export function getThemeProxied(
   }) as UseThemeResult
 }
 
+// to tell if we are inversing the scheme anywhere in the tree, if so we need to de-opt
+function someParentIsInversed(manager?: ThemeManager) {
+  if (process.env.TAMAGUI_TARGET === 'native') {
+    let cur: ThemeManager | null | undefined = manager
+    while (cur) {
+      if (cur.state.inverse) return true
+      cur = cur.parentManager
+    }
+  }
+  return false
+}
+
 export const activeThemeManagers = new Set<ThemeManager>()
 
 export const useChangeThemeEffect = (

package/src/setupReactNative.ts

@@ -15,6 +15,9 @@ export function getReactNativeConfig(Component: any) {
     if (Component.propTypes?.textBreakStrategy) {
       return RNConfigs.Text
     }
+
+    // can optimize plain View or Text to not be react native specific
+
     // can assume everything else is react native on native
     return RNConfigs.default
   } else {

package/src/types.tsx

@@ -29,6 +29,8 @@ import type { ThemeProviderProps } from './views/ThemeProvider'
 
 export type { MediaStyleObject, StyleObject } from '@tamagui/helpers'
 
+export type ColorScheme = 'light' | 'dark'
+
 export type IsMediaType = boolean | 'platform' | 'theme' | 'group'
 
 export type SpaceDirection = 'vertical' | 'horizontal' | 'both'
@@ -2010,6 +2012,8 @@ export type TamaguiComponentEvents = {
   onMouseEnter?: ((e: any) => void) | undefined
   onMouseLeave?: ((e: any) => void) | undefined
   onPressOut: ((e: any) => void) | undefined
+  onFocus?: ((e: any) => void) | undefined
+  onBlur?: ((e: any) => void) | undefined
 }
 
 export type ModifyTamaguiComponentStyleProps<

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAaN,MAAM,OAAO,CAAA;AAsBd,OAAO,EAEL,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAMV,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,UAAU,GAAG,SAAS,GAAG,EAAE,EACtD,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,4DAwsC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,0DAqCjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAaN,MAAM,OAAO,CAAA;AAsBd,OAAO,EAEL,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAGhB,cAAc,EAEd,SAAS,EAMV,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA6D3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,UAAU,GAAG,SAAS,GAAG,EAAE,EACtD,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,4DAysC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAiBD,eAAO,MAAM,MAAM,0DAqCjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}