@react-spectrum/s2 3.0.0-nightly-63d4359d6-250428 → 3.0.0-nightly-1dd65ffc5-250429

package/style/types.ts

@@ -14,7 +14,7 @@ import type * as CSS from 'csstype';
 
 export type CSSValue = string | number;
 export type CustomValue = string | number | boolean;
-export type Value = CustomValue | readonly CustomValue[];
+export type Value = CustomValue | readonly any[];
 export type PropertyValueDefinition<T> = T | {[condition: string]: PropertyValueDefinition<T>};
 export type PropertyValueMap<T extends CSSValue = CSSValue> = {
   [name in T]: PropertyValueDefinition<string>
@@ -25,13 +25,17 @@ export type CSSProperties = CSS.Properties & {
   [k: CustomProperty]: CSSValue
 };
 
-export type PropertyFunction<T> = (value: T, property: string) => PropertyValueDefinition<[CSSProperties, string]>;
+export interface Property<T> {
+  cssProperties: string[],
+  toCSSValue(value: T): PropertyValueDefinition<Value>,
+  toCSSProperties(customProperty: string | null, value: PropertyValueDefinition<Value>): PropertyValueDefinition<[CSSProperties]>
+}
 
 export type ShorthandProperty<T> = (value: T) => {[name: string]: Value};
 
 export interface Theme {
   properties: {
-    [name: string]: PropertyValueMap | PropertyFunction<any> | string[]
+    [name: string]: PropertyValueMap | Property<any> | string[]
   },
   conditions: {
     [name: string]: string
@@ -42,7 +46,7 @@ export interface Theme {
 }
 
 type PropertyValue<T> =
-  T extends PropertyFunction<infer P>
+  T extends Property<infer P>
     ? P
     : T extends PropertyValueMap<infer P>
       ? P