@tamagui/core 1.0.1-beta.225 → 1.0.1-beta.227

package/types/helpers/getSplitStyles.d.ts

@@ -2,10 +2,8 @@ import type { ViewStyle } from '@tamagui/types-react-native';
 import type { DebugProp, MediaQueryKey, PseudoStyles, SplitStyleState, StackProps, StaticConfigParsed, TamaguiInternalConfig, ThemeParsed } from '../types';
 import { FontLanguageProps, LanguageContextType } from '../views/FontLanguage.types';
 import { RulesToInsert } from './insertStyleRule';
-export declare type SplitStyles = ReturnType<typeof getSplitStyles>;
-export declare type ClassNamesObject = Record<string, string>;
-export declare type SplitStyleResult = ReturnType<typeof getSplitStyles>;
-declare type SplitStylesAndProps = {
+import { FlatTransforms } from './mergeTransform';
+declare type GetStyleResult = {
     pseudos: PseudoStyles;
     medias: Record<MediaQueryKey, ViewStyle>;
     style: ViewStyle;
@@ -15,12 +13,30 @@ declare type SplitStylesAndProps = {
     fontFamily: string | undefined;
     mediaKeys: string[];
 };
+declare type GetStyleState = {
+    style: ViewStyle;
+    usedKeys: Record<string, number>;
+    classNames: ClassNamesObject;
+    flatTransforms: FlatTransforms;
+    staticConfig: StaticConfigParsed;
+    theme: ThemeParsed;
+    props: Record<string, any>;
+    viewProps: Record<string, any>;
+    state: SplitStyleState;
+    conf: TamaguiInternalConfig;
+    languageContext?: FontLanguageProps;
+    avoidDefaultProps?: boolean;
+    avoidMergeTransform?: boolean;
+};
+export declare type SplitStyles = ReturnType<typeof getSplitStyles>;
+export declare type ClassNamesObject = Record<string, string>;
+export declare type SplitStyleResult = ReturnType<typeof getSplitStyles>;
 declare type StyleSplitter = (props: {
     [key: string]: any;
-}, staticConfig: StaticConfigParsed, theme: ThemeParsed, state: SplitStyleState, parentSplitStyles?: SplitStylesAndProps | null, languageContext?: LanguageContextType, elementType?: string, debug?: DebugProp) => SplitStylesAndProps;
+}, staticConfig: StaticConfigParsed, theme: ThemeParsed, state: SplitStyleState, parentSplitStyles?: GetStyleResult | null, languageContext?: LanguageContextType, elementType?: string, debug?: DebugProp) => GetStyleResult;
 export declare const PROP_SPLIT = "-";
 export declare const getSplitStyles: StyleSplitter;
-export declare const getSubStyle: (subKey: string, styleIn: Object, staticConfig: StaticConfigParsed, theme: ThemeParsed, props: any, state: SplitStyleState, conf: TamaguiInternalConfig, languageContext?: FontLanguageProps, avoidDefaultProps?: boolean, avoidMergeTransform?: boolean) => ViewStyle;
+export declare const getSubStyle: (styleState: GetStyleState, subKey: string, styleIn: Object, avoidDefaultProps?: boolean, avoidMergeTransform?: boolean) => ViewStyle;
 export declare const insertSplitStyles: StyleSplitter;
 export declare const useSplitStyles: StyleSplitter;
 export {};

package/types/hooks/useTheme.d.ts

@@ -1,7 +1,6 @@
 import { ThemeManager } from '../helpers/ThemeManager';
 import { ThemeParsed, ThemeProps } from '../types';
 export declare type ChangedThemeResponse = {
-    themes: Record<string, ThemeParsed>;
     themeManager: ThemeManager | null;
     name: string;
     isNewTheme?: boolean;

package/types/types.d.ts

@@ -1,6 +1,6 @@
 import type { Image, PressableProps, TextProps as ReactTextProps, Text, TextInput, TextStyle, View, ViewProps, ViewStyle } from '@tamagui/types-react-native';
 import type { Properties } from 'csstype';
-import type { Component, ForwardRefExoticComponent, FunctionComponent, HTMLAttributes, ReactNode, RefAttributes, RefObject } from 'react';
+import type { ComponentType, ForwardRefExoticComponent, FunctionComponent, HTMLAttributes, ReactNode, RefAttributes, RefObject } from 'react';
 import type { Variable } from './createVariable';
 import type { ResolveVariableTypes } from './helpers/createPropMapper';
 import type { TamaguiReactElement } from './static';
@@ -323,7 +323,7 @@ declare type FontWeightKeys = 'fontWeight';
 declare type FontLetterSpacingKeys = 'letterSpacing';
 declare type LineHeightKeys = 'lineHeight';
 declare type ZIndexKeys = 'zIndex';
-export declare type ThemeValueGet<K extends string | number | symbol> = K extends 'theme' ? ThemeTokens : K extends SizeKeys ? SizeTokens : K extends FontKeys ? FontTokens : K extends FontSizeKeys ? FontSizeTokens : K extends SpaceKeys ? K extends 'shadowOffset' ? {
+export declare type ThemeValueGet<K extends string | number | symbol> = K extends 'theme' ? ThemeTokens : K extends SizeKeys ? SizeTokens : K extends FontKeys ? FontTokens : K extends FontSizeKeys ? FontSizeTokens : K extends `${`border${string | ''}Radius`}` ? RadiusTokens : K extends SpaceKeys ? K extends 'shadowOffset' ? {
     width: SpaceTokens;
     height: SpaceTokens;
 } : SpaceTokens : K extends ColorKeys ? ColorTokens : K extends ZIndexKeys ? ZIndexTokens : K extends LineHeightKeys ? FontLineHeightTokens : K extends FontWeightKeys ? FontWeightTokens : K extends FontLetterSpacingKeys ? FontLetterSpacingTokens : never;
@@ -482,10 +482,6 @@ export declare type StaticConfig = StaticConfigPublic & {
      * Memoize the component
      */
     memo?: boolean;
-    /**
-     * Used internally to handle extractable HoC separate
-     */
-    isHOC?: boolean;
     /**
      * Used insternally to attach default props to names
      */
@@ -506,10 +502,10 @@ export declare type StaticConfig = StaticConfigPublic & {
  *   variants
  * --------------------------------------------
  */
-export declare type StylableComponent = TamaguiComponent | Component | ForwardRefExoticComponent<any> | ReactComponentWithRef<any, any> | (new (props: any) => any) | typeof View | typeof Text | typeof TextInput | typeof Image;
+export declare type StylableComponent = TamaguiComponent | ComponentType<any> | ForwardRefExoticComponent<any> | ReactComponentWithRef<any, any> | (new (props: any) => any) | typeof View | typeof Text | typeof TextInput | typeof Image;
 export declare type GetStyledVariants<A extends TamaguiComponent> = A extends TamaguiComponent<any, any, any, infer Variants> ? Variants : never;
 export declare type GetBaseProps<A extends StylableComponent> = A extends TamaguiComponent<any, any, infer BaseProps> ? BaseProps : never;
-export declare type GetProps<A extends StylableComponent> = A extends TamaguiComponent<infer Props> ? Props : A extends TamaguiReactElement<infer Props> ? Props : A extends Component<infer Props> ? GetGenericComponentTamaguiProps<Props> : A extends new (props: infer Props) => any ? GetGenericComponentTamaguiProps<Props> : {};
+export declare type GetProps<A extends StylableComponent> = A extends TamaguiComponent<infer Props> ? Props : A extends TamaguiReactElement<infer Props> ? Props : A extends ComponentType<infer Props> ? GetGenericComponentTamaguiProps<Props> : A extends new (props: infer Props) => any ? GetGenericComponentTamaguiProps<Props> : {};
 declare type GetGenericComponentTamaguiProps<P> = P & Omit<'textAlign' extends keyof P ? TextProps : StackProps, keyof P>;
 export declare type SpreadKeys = '...fontSize' | '...fontStyle' | '...fontTransform' | '...lineHeight' | '...letterSpacing' | '...size' | '...space' | '...color' | '...zIndex' | '...theme' | '...radius';
 export declare type VariantDefinitions<Parent extends StylableComponent = TamaguiComponent, MyProps extends Object = GetProps<Parent>, Val = any> = VariantDefinitionFromProps<MyProps, Val>;