@tamagui/core 1.0.1-beta.206 → 1.0.1-beta.208

package/src/types.tsx

@@ -257,7 +257,7 @@ export type Tokens = TamaguiConfig['tokens']
 export type Shorthands = TamaguiConfig['shorthands']
 export type Media = TamaguiConfig['media']
 export type Themes = TamaguiConfig['themes']
-export type ThemeName = GetAltThemeNames<keyof Themes>
+export type ThemeName = Exclude<GetAltThemeNames<keyof Themes>, number>
 export type ThemeTokens = `$${ThemeKeys}`
 export type AnimationKeys = TamaguiConfig['animations'] extends AnimationDriver<infer Config>
   ? keyof Config
@@ -294,8 +294,6 @@ export type CreateTamaguiProps = {
     }
   }
 
-  defaultTheme?: string
-
   /**
    * *Advanced use case* For all CSS extracted views, this has no effect.
    *

package/src/views/TamaguiProvider.tsx

@@ -6,6 +6,7 @@ import { TextAncestorContext } from '../contexts/TextAncestorContext'
 import { useMediaListeners } from '../hooks/useMedia'
 import type { TamaguiProviderProps } from '../types'
 import { ThemeProvider } from './ThemeProvider'
+import { getConfig } from '..'
 
 export function TamaguiProvider({
   children,
@@ -14,8 +15,9 @@ export function TamaguiProvider({
   ...themePropsProvider
 }: TamaguiProviderProps) {
   if (isRSC) {
+    const { themes } = getConfig()
     return (
-      <span style={{ display: 'contents' }} className={`t_${config.defaultTheme || 'light'}`}>
+      <span style={{ display: 'contents' }} className={`t_${Object.keys(themes)[0] || 'light'}`}>
         {children}
       </span>
     )
@@ -39,14 +41,16 @@ export function TamaguiProvider({
     }, [config, disableInjectCSS])
   }
 
+  const { themes } = getConfig()
+
   return (
     <ButtonInsideButtonContext.Provider value={false}>
       <TextAncestorContext.Provider value={false}>
         <ThemeProvider
-          defaultTheme={config.defaultTheme || 'light'}
           themeClassNameOnRoot={config.themeClassNameOnRoot}
           disableRootThemeClass={config.disableRootThemeClass}
           {...themePropsProvider}
+          defaultTheme={themePropsProvider.defaultTheme ?? Object.keys(themes)[0]}
         >
           {children}
         </ThemeProvider>

package/types/helpers/themeable.d.ts

@@ -1,12 +1,9 @@
 import { ThemeName } from '../types';
-export declare type ThemeableProps = {
-    theme?: ThemeName | string | null;
+export interface ThemeableProps {
+    theme?: ThemeName | null;
     themeInverse?: boolean;
-};
+}
 export declare function themeable<Component extends (props: any) => any>(component: Component, opts?: {
     componentName?: string;
-}): Component extends (props: infer P) => infer R ? (props: Omit<P, "theme" | "themeInverse"> & {
-    theme?: ThemeName | null | undefined;
-    themeInverse?: boolean | undefined;
-}) => R : unknown;
+}): Component extends (props: infer P) => infer R ? (props: Omit<P, "theme" | "themeInverse"> & ThemeableProps) => R : unknown;
 //# sourceMappingURL=themeable.d.ts.map

package/types/hooks/useTheme.d.ts

@@ -11,10 +11,10 @@ export interface ThemeProps {
 }
 export declare const useTheme: (themeName?: string | null, componentName?: string, props?: ThemeProps, forceUpdate?: any) => ThemeParsed;
 export declare const getThemeManager: (theme: any) => ThemeManager | undefined;
-export declare const useThemeName: (opts?: {
+export declare function useThemeName(opts?: {
     parent?: true;
-}) => string;
-export declare const useDefaultThemeName: () => ThemeName | undefined;
+}): ThemeName;
+export declare const useDefaultThemeName: () => string | undefined;
 export declare const activeThemeManagers: Set<ThemeManager>;
 export declare const useChangeThemeEffect: (name?: string | null, componentName?: string, props?: ThemeProps, forceUpdateProp?: any, uuid?: Object) => {
     themes: Record<string, ThemeParsed>;

package/types/types.d.ts

@@ -147,7 +147,7 @@ export declare type Tokens = TamaguiConfig['tokens'];
 export declare type Shorthands = TamaguiConfig['shorthands'];
 export declare type Media = TamaguiConfig['media'];
 export declare type Themes = TamaguiConfig['themes'];
-export declare type ThemeName = GetAltThemeNames<keyof Themes>;
+export declare type ThemeName = Exclude<GetAltThemeNames<keyof Themes>, number>;
 export declare type ThemeTokens = `$${ThemeKeys}`;
 export declare type AnimationKeys = TamaguiConfig['animations'] extends AnimationDriver<infer Config> ? keyof Config : string;
 export declare type FontLanguages = ArrayIntersection<TamaguiConfig['fontLanguages']>;
@@ -172,7 +172,6 @@ export declare type CreateTamaguiProps = {
             [key: string]: string | number | Variable;
         };
     };
-    defaultTheme?: string;
     /**
      * *Advanced use case* For all CSS extracted views, this has no effect.
      *