@tamagui/web 3.0.0-beta.924.1 → 3.0.0

package/src/styled.tsx

@@ -19,6 +19,7 @@ import type {
   StaticConfig,
   StaticConfigPublic,
   StylableComponent,
+  StyleOnlyVariants,
   StyledContext,
   StyledDynamicFn,
   StyledDynamicProp,
@@ -26,6 +27,7 @@ import type {
   TamaguiComponent,
   ThemeValueGet,
   VariantDefinitions,
+  VariantStyleProps,
 } from './types'
 
 type AreVariantsUndefined<Variants> =
@@ -50,6 +52,9 @@ type GetVariantAcceptedValues<V> = V extends object
 type GetVariantAcceptedValue<Key> = Key extends 'true' | 'false' ? boolean : Key
 
 type NoInferLocal<T> = [T][T extends any ? 0 : never]
+// Omit keeps only the keys every member of a union shares, so a parent typed
+// as a union of components would lose each member's own props, `name` included
+type DistributiveOmit<T, K extends PropertyKey> = T extends unknown ? Omit<T, K> : never
 type IsAny<T> = 0 extends 1 & T ? true : false
 
 type GetStyledOptionsAcceptedProps<
@@ -58,7 +63,13 @@ type GetStyledOptionsAcceptedProps<
   Variants extends VariantDefinitions<ParentComponent, StyledConfig>,
   Context,
   ContextPropKeys extends string,
-> = Partial<InferStyledProps<ParentComponent, StyledConfig>> &
+> = DistributiveOmit<
+  Partial<InferStyledProps<ParentComponent, StyledConfig>>,
+  | keyof GetStyledContextVariantProps<ParentComponent, Context, ContextPropKeys>
+  | (AreVariantsUndefined<Variants> extends true
+      ? never
+      : keyof GetVariantAcceptedValues<Variants>)
+> &
   (AreVariantsUndefined<Variants> extends true
     ? {}
     : Partial<GetVariantAcceptedValues<Variants>>) &
@@ -78,7 +89,15 @@ export type StyledOptions<
   ContextPropKeys
 > & {
   displayName?: string
-  variants?: Variants | undefined
+  variants?:
+    | (Variants &
+        NoInferLocal<
+          StyleOnlyVariants<
+            Variants,
+            keyof VariantStyleProps<ParentComponent, StyledConfig>
+          >
+        >)
+    | undefined
   defaultVariants?: NoInferLocal<GetVariantAcceptedValues<NonNullable<Variants>>>
   context?: Context
   contextProps?: readonly Extract<
@@ -116,7 +135,19 @@ type GetStyledContextVariantProps<
   ParentComponent extends StylableComponent,
   Context,
   Keys extends string,
-> = Omit<GetStyledContextProps<Context, Keys>, keyof GetProps<ParentComponent>>
+  ContextProps = GetStyledContextProps<Context, Keys>,
+  ParentProps = GetProps<ParentComponent>,
+> = {
+  // compatible style context keeps its inherited token and conditional grammar.
+  // a declared incompatible context value owns its name when css gains that key.
+  [Key in keyof ContextProps as Key extends keyof ParentProps
+    ? Key extends keyof GetBaseStyles<ParentComponent, {}>
+      ? ContextProps[Key] extends ParentProps[Key]
+        ? never
+        : Key
+      : never
+    : Key]: ContextProps[Key]
+}
 
 type StyledMergedVariants<
   ParentComponent extends StylableComponent,