@plasmicapp/react-web 0.2.399 → 0.2.400

package/dist/all.d.ts

@@ -11373,6 +11373,125 @@ interface CodeComponentElement<P> {
 }
 type PlasmicElement = ImageElement | TextElement | ContainerElement | ButtonElement | TextInputElement | CodeComponentElement<{}> | DefaultComponentElement<{}>;
 
+type GenericContext<Props, Data, Extra = unknown> = [Props, Data, Extra];
+/**
+ * Config option that takes the context (e.g., props) of the component instance
+ * or function to dynamically set its value.
+ */
+type ContextDependentConfig<Ctx extends any[], R> = (...args: Ctx) => R;
+type MaybeContextDependentConfig<Ctx extends any[], V> = V | ContextDependentConfig<Ctx, V>;
+interface CanvasComponentProps<Data = any> {
+    /**
+     * This prop is only provided within the canvas of Plasmic Studio.
+     * Allows the component to set data to be consumed by the props' controls.
+     */
+    setControlContextData?: (data: Data) => void;
+}
+type ControlExtras = {
+    path: (string | number)[];
+    item?: any;
+};
+type InferDataType<P> = P extends CanvasComponentProps<infer Data> ? Data : any;
+interface CommonTypeBase<Ctx extends any[]> {
+    description?: string;
+    helpText?: string;
+    required?: boolean;
+    /**
+     * If the user has chosen to use a dynamic expression for this prop, provide
+     * a hint as to the expected values that the expression should evaluate to.
+     * This hint will be displayed alongside the code editor.  You may use
+     * markdown in the text here.
+     */
+    exprHint?: string;
+    /**
+     * Function for whether this prop should be hidden in the right panel,
+     * given the current props for this component
+     */
+    hidden?: ContextDependentConfig<Ctx, boolean>;
+    /**
+     * If true, does not allow the user to use a dynamic expression for this prop
+     */
+    disableDynamicValue?: boolean;
+}
+
+type ChoiceValue = string | number | boolean;
+type ChoiceObject<T = ChoiceValue> = {
+    label: string;
+    value: T;
+};
+type ChoiceOptions<T extends ChoiceValue = ChoiceValue> = T[] | ChoiceObject<T>[];
+interface ChoiceCore<Ctx extends any[], T extends ChoiceValue> {
+    type: "choice";
+    options: MaybeContextDependentConfig<Ctx, ChoiceOptions<T>>;
+    multiSelect?: MaybeContextDependentConfig<Ctx, boolean>;
+    allowSearch?: boolean;
+    filterOption?: boolean;
+    onSearch?: MaybeContextDependentConfig<Ctx, ((v: string) => void) | undefined>;
+}
+
+interface ObjectTypeBaseCore<Ctx extends any[], Fields> {
+    type: "object";
+    fields?: Record<string, Fields>;
+    nameFunc?: (item: any, ...args: Ctx) => string | undefined;
+}
+interface ArrayTypeBaseCore<Ctx extends any[], Fields> {
+    type: "array";
+    itemType?: ObjectTypeBaseCore<Ctx, Fields>;
+    /**
+     * Optional function that determines whether the user can delete a given item.
+     */
+    unstable__canDelete?: (item: any, ...args: Ctx) => boolean;
+    /**
+     * Specify how to let Plasmic know how to update its own internal representation of the data when the value has
+     * changed, or when issuing a minimalValue or shownValue that is different.
+     *
+     * Important to specify this if you are expecting any nested expression values in this data type!
+     */
+    unstable__keyFunc?: (item: any) => any;
+    /**
+     * Specify what would be the tentative new value that is set if the user makes any changes.
+     *
+     * Useful for field mappings.
+     *
+     * For instance, consider a Table where we have a `fields` prop:
+     *
+     * - Initially, the value is undefined. But if the user makes any changes, we would want to save an array of at
+     *   least three items (corresponding to, say, three columns inferred from a schema).
+     *
+     * - Let's say there are 5 columns in the value. The data schema changes, removing a column and adding two new
+     *   ones. Now we would want a different minimal value, containing 6 items.
+     */
+    unstable__minimalValue?: ContextDependentConfig<Ctx, any>;
+}
+
+interface RichExprEditorCore<Ctx extends any[]> {
+    type: "exprEditor";
+    data?: Record<string, any> | ContextDependentConfig<Ctx, Record<string, any>>;
+    isolateEnv?: boolean;
+}
+interface DataSourceCore {
+    type: "dataSource";
+    dataSource: "airtable" | "cms";
+}
+type DataPickerValueType = string | number | (string | number)[];
+interface RichDataPickerCore<Ctx extends any[]> {
+    type: "dataSelector";
+    data?: Record<string, any> | ContextDependentConfig<Ctx, Record<string, any>>;
+    alwaysShowValuePathAsLabel?: boolean;
+    isolateEnv?: boolean;
+}
+type GraphQLValue = {
+    query: string;
+    variables?: Record<string, any>;
+};
+interface GraphQLCore<Ctx extends any[]> {
+    type: "code";
+    lang: "graphql";
+    endpoint: string | ContextDependentConfig<Ctx, string>;
+    method?: string | ContextDependentConfig<Ctx, string>;
+    headers?: object | ContextDependentConfig<Ctx, object>;
+}
+
 type Nullish<T> = T | null | undefined;
 
 interface ActionProps<P> {
@@ -11402,11 +11521,11 @@ type Action<P> = {
     type: "button-action";
     label: string;
     onClick: (props: ActionProps<P>) => void;
-    hidden?: ContextDependentConfig$1<P, boolean>;
+    hidden?: ComponentContextConfig<P, boolean>;
 } | {
     type: "custom-action";
     control: React.ComponentType<ActionProps<P>>;
-    hidden?: ContextDependentConfig$1<P, boolean>;
+    hidden?: ComponentContextConfig<P, boolean>;
 };
 type DistributedKeyOf$1<T> = T extends any ? keyof T : never;
 interface ComponentTemplate<P> extends Omit<CodeComponentElement<P>, "type" | "name"> {
@@ -11423,12 +11542,12 @@ type StateSpec<P> = {
     /**
      * If true, will hide the state on studio.
      */
-    hidden?: ContextDependentConfig$1<P, boolean>;
+    hidden?: ComponentContextConfig<P, boolean>;
     /**
      * If true, will hide the state in a collapsed section; good for states that
      * should not usually be used.
      */
-    advanced?: ContextDependentConfig$1<P, boolean>;
+    advanced?: ComponentContextConfig<P, boolean>;
 } & ({
     type: "readonly";
     variableType: "text";
@@ -11618,7 +11737,7 @@ interface CodeComponentMeta<P> {
      * on the left of the Studio.  This makes it easy to identify an element when
      * looking at the tree.
      */
-    treeLabel?: ContextDependentConfig$1<P, string>;
+    treeLabel?: ComponentContextConfig<P, string>;
     /**
      * The value of the CSS display property used by this component.
      * Plasmic passes in a class name prop to components to let users style them,
@@ -11666,134 +11785,37 @@ declare global {
     }
 }
 
-interface CanvasComponentProps<Data = any> {
-    /**
-     * This prop is only provided within the canvas of Plasmic Studio.
-     * Allows the component to set data to be consumed by the props' controls.
-     */
-    setControlContextData?: (data: Data) => void;
-}
-type ControlExtras = {
-    path: (string | number)[];
-    item?: any;
-};
-type InferDataType<P> = P extends CanvasComponentProps<infer Data> ? Data : any;
-/**
- * Context that we pass back to control functions.
- */
-type ControlContext$1<P> = [
-    /**
-     * props
-     */
-    P,
-    /**
-     * `contextData` can be `null` if the prop controls are rendering before
-     * the component instance itself (it will re-render once the component
-     * calls `setControlContextData`)
-     */
-    InferDataType<P> | null,
-    /**
-     * Extra information for the control to use
-     */
-    ControlExtras
-];
-/**
- * Config option that takes the context (e.g., props) of the component instance
- * to dynamically set its value.
- */
-type ContextDependentConfig$1<P, R> = (...args: ControlContext$1<P>) => R;
-interface PropTypeBase<P> {
-    displayName?: string;
-    description?: string;
-    helpText?: string;
-    required?: boolean;
-    /**
-     * If the user has chosen to use a dynamic expression for this prop, provide
-     * a hint as to the expected values that the expression should evaluate to.
-     * This hint will be displayed alongside the code editor.  You may use
-     * markdown in the text here.
-     */
-    exprHint?: string;
-    /**
-     * Function for whether this prop should be hidden in the right panel,
-     * given the current props for this component
-     */
-    hidden?: ContextDependentConfig$1<P, boolean>;
-    readOnly?: boolean | ContextDependentConfig$1<P, boolean>;
-    /**
-     * If true, will hide the prop in a collapsed section; good for props that
-     * should not usually be used.
-     */
-    advanced?: boolean;
-    /**
-     * If true, does not allow the user to use a dynamic expression for this prop
-     */
-    disableDynamicValue?: boolean;
-    /**
-     * If set to true, the component will be remounted when the prop value is updated.
-     * (This behavior only applies to canvas)
-     */
-    forceRemount?: boolean;
-    /**
-     * If true, the prop can't be overriden in different variants.
-     */
-    invariantable?: boolean;
+interface RichBooleanCore {
+    type: "boolean";
 }
-interface Defaultable<P, T> {
-    /**
-     * Default value to set for this prop when the component is instantiated
-     */
-    defaultValue?: T;
-    /**
-     * If no prop is given, the component uses a default; specify what
-     * that default is so the Plasmic user can see it in the studio UI
-     */
-    defaultValueHint?: T | ContextDependentConfig$1<P, T | undefined>;
-    /**
-     * Use a dynamic value expression as the default instead
-     */
-    defaultExpr?: string;
-    defaultExprHint?: string;
-    /**
-     * This function validates whether the prop value is valid.
-     * If the value is invalid, it returns an error message. Otherwise, it returns true.
-     */
-    validator?: (value: T, ...args: ControlContext$1<P>) => (string | true) | Promise<string | true>;
+interface NumberTypeBaseCore<Ctx extends any[]> {
+    type: "number";
+    min?: number | ContextDependentConfig<Ctx, number>;
+    max?: number | ContextDependentConfig<Ctx, number>;
 }
-interface Controllable {
-    /**
-     * If true, this is a prop that should only be used inside Plasmic
-     * Studio for rendering artboards; will not be actually used in
-     * generated code.
-     */
-    editOnly?: boolean;
-    /**
-     * If specified, the value used for this prop will instead be
-     * mapped to the uncontrolledProp when generating code. This is
-     * useful if, for example, in the artboard, you want to use `value`
-     * prop to control the component, but in generated code, you want to
-     * map it to `defaultValue`.
-     */
-    uncontrolledProp?: string;
+interface PlainNumberCore<Ctx extends any[]> extends NumberTypeBaseCore<Ctx> {
+    control?: "default";
 }
-interface PropTypeBaseDefault<P, T> extends PropTypeBase<P>, Defaultable<P, T>, Controllable {
+interface SliderNumberCore<Ctx extends any[]> extends NumberTypeBaseCore<Ctx> {
+    control: "slider";
+    step?: number | ContextDependentConfig<Ctx, number>;
 }
-interface PlainStringType$1<P> extends PropTypeBaseDefault<P, string> {
+interface PlainStringCore {
     type: "string";
     control?: "default" | "large";
     isLocalizable?: boolean;
 }
-interface CodeStringType<P> extends PropTypeBaseDefault<P, string> {
+interface CodeStringCore {
     type: "code";
     lang: "css" | "html" | "javascript" | "json";
 }
-interface RichTextType<P> extends PropTypeBaseDefault<P, string> {
+interface RichTextCore {
     type: "richText";
 }
-interface HrefType<P> extends PropTypeBaseDefault<P, string> {
+interface HrefCore {
     type: "href";
 }
-interface ColorType<P> extends PropTypeBaseDefault<P, string> {
+interface ColorCore {
     type: "color";
     /**
      * If specified, and the user picks a color token in the Studio, then
@@ -11810,13 +11832,13 @@ interface ColorType<P> extends PropTypeBaseDefault<P, string> {
      */
     disableTokens?: boolean;
 }
-interface DateStringType<P> extends PropTypeBaseDefault<P, string> {
+interface DateStringCore {
     type: "dateString";
 }
-interface DateRangeStringsType<P> extends PropTypeBaseDefault<P, [string, string]> {
+interface DateRangeStringsCore {
     type: "dateRangeStrings";
 }
-interface ClassType<P> extends PropTypeBase<P> {
+interface ClassCore {
     type: "class";
     /**
      * Additional css selectors that can change how this style should look.
@@ -11855,7 +11877,7 @@ interface ClassType<P> extends PropTypeBase<P> {
      */
     defaultStyles?: CSSProperties;
 }
-interface ThemeResetClassType<P> extends PropTypeBase<P> {
+interface ThemeResetClassCore {
     type: "themeResetClass";
     /**
      * Normally, theme reset class will only target Plasmic-generated tags
@@ -11865,143 +11887,134 @@ interface ThemeResetClassType<P> extends PropTypeBase<P> {
      */
     targetAllTags?: boolean;
 }
-interface CardPickerType<P> extends PropTypeBaseDefault<P, string> {
+interface CardPickerCore<Ctx extends any[]> {
     type: "cardPicker";
-    modalTitle?: React.ReactNode | ContextDependentConfig$1<P, React.ReactNode>;
+    modalTitle?: React.ReactNode | ContextDependentConfig<Ctx, React.ReactNode>;
     options: {
         value: string;
         label?: string;
         imgUrl: string;
         footer?: React.ReactNode;
-    }[] | ContextDependentConfig$1<P, {
+    }[] | ContextDependentConfig<Ctx, {
         value: string;
         label?: string;
         imgUrl: string;
         footer?: React.ReactNode;
     }[]>;
-    showInput?: boolean | ContextDependentConfig$1<P, boolean>;
-    onSearch?: ContextDependentConfig$1<P, ((value: string) => void) | undefined>;
-}
-type RichStringType<P> = PlainStringType$1<P> | CodeStringType<P> | RichTextType<P> | ColorType<P> | ClassType<P> | ThemeResetClassType<P> | CardPickerType<P> | HrefType<P>;
-type StringType$1<P> = "string" | "href" | RichStringType<P>;
-interface RichBooleanType<P> extends PropTypeBaseDefault<P, boolean> {
-    type: "boolean";
+    showInput?: boolean | ContextDependentConfig<Ctx, boolean>;
+    onSearch?: ContextDependentConfig<Ctx, ((value: string) => void) | undefined>;
 }
-type BooleanType$1<P> = "boolean" | RichBooleanType<P>;
-type GraphQLValue$1 = {
-    query: string;
-    variables?: Record<string, any>;
-};
-interface GraphQLType$1<P> extends PropTypeBaseDefault<P, GraphQLValue$1> {
-    type: "code";
-    lang: "graphql";
-    endpoint: string | ContextDependentConfig$1<P, string>;
-    method?: string | ContextDependentConfig$1<P, string>;
-    headers?: object | ContextDependentConfig$1<P, object>;
-}
-interface NumberTypeBase<P> extends PropTypeBaseDefault<P, number> {
-    type: "number";
-    min?: number | ContextDependentConfig$1<P, number>;
-    max?: number | ContextDependentConfig$1<P, number>;
-}
-interface PlainNumberType$1<P> extends NumberTypeBase<P> {
-    control?: "default";
-}
-interface SliderNumberType<P> extends NumberTypeBase<P> {
-    control: "slider";
-    step?: number | ContextDependentConfig$1<P, number>;
-}
-type RichNumberType<P> = PlainNumberType$1<P> | SliderNumberType<P>;
-type NumberType$1<P> = "number" | RichNumberType<P>;
-interface ObjectType$1<P> extends PropTypeBaseDefault<P, Record<string, any>> {
-    type: "object";
-    fields?: Record<string, PropType$1<P>>;
-    nameFunc?: (item: any, ...args: ControlContext$1<P>) => string | undefined;
+
+type ComponentControlContext<P> = GenericContext<P, // Full component props
+// Full component props
+InferDataType<P> | null, // Canvas data
+ControlExtras>;
+type ComponentContextConfig<Props, R> = ContextDependentConfig<ComponentControlContext<Props>, R>;
+interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
+    displayName?: string;
+    readOnly?: boolean | ContextDependentConfig<Ctx, boolean>;
+    /**
+     * If true, will hide the prop in a collapsed section; good for props that
+     * should not usually be used.
+     */
+    advanced?: boolean;
+    /**
+     * If set to true, the component will be remounted when the prop value is updated.
+     * (This behavior only applies to canvas)
+     */
+    forceRemount?: boolean;
+    /**
+     * If true, the prop can't be overriden in different variants.
+     */
+    invariantable?: boolean;
 }
-interface ArrayType$1<P> extends PropTypeBaseDefault<P, any[]> {
-    type: "array";
-    itemType?: ObjectType$1<P>;
+interface Defaultable<Ctx extends any[], T> {
     /**
-     * Optional function that determines whether the user can delete a given item.
+     * Default value to set for this prop when the component is instantiated
      */
-    unstable__canDelete?: (item: any, ...args: ControlContext$1<P>) => boolean;
+    defaultValue?: T;
     /**
-     * Specify how to let Plasmic know how to update its own internal representation of the data when the value has
-     * changed, or when issuing a minimalValue or shownValue that is different.
-     *
-     * Important to specify this if you are expecting any nested expression values in this data type!
+     * If no prop is given, the component uses a default; specify what
+     * that default is so the Plasmic user can see it in the studio UI
      */
-    unstable__keyFunc?: (item: any) => any;
+    defaultValueHint?: T | ContextDependentConfig<Ctx, T | undefined>;
     /**
-     * Specify what would be the tentative new value that is set if the user makes any changes.
-     *
-     * Useful for field mappings.
-     *
-     * For instance, consider a Table where we have a `fields` prop:
-     *
-     * - Initially, the value is undefined. But if the user makes any changes, we would want to save an array of at
-     *   least three items (corresponding to, say, three columns inferred from a schema).
-     *
-     * - Let's say there are 5 columns in the value. The data schema changes, removing a column and adding two new
-     *   ones. Now we would want a different minimal value, containing 6 items.
+     * Use a dynamic value expression as the default instead
+     */
+    defaultExpr?: string;
+    defaultExprHint?: string;
+    /**
+     * This function validates whether the prop value is valid.
+     * If the value is invalid, it returns an error message. Otherwise, it returns true.
+     */
+    validator?: (value: T, ...args: Ctx) => (string | true) | Promise<string | true>;
+}
+interface Controllable {
+    /**
+     * If true, this is a prop that should only be used inside Plasmic
+     * Studio for rendering artboards; will not be actually used in
+     * generated code.
      */
-    unstable__minimalValue?: ContextDependentConfig$1<P, any>;
+    editOnly?: boolean;
+    /**
+     * If specified, the value used for this prop will instead be
+     * mapped to the uncontrolledProp when generating code. This is
+     * useful if, for example, in the artboard, you want to use `value`
+     * prop to control the component, but in generated code, you want to
+     * map it to `defaultValue`.
+     */
+    uncontrolledProp?: string;
 }
+type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & Defaultable<ComponentControlContext<P>, T> & Controllable;
+type PlainStringType$1<P> = PropTypeBaseDefault<P, string> & PlainStringCore;
+type CodeStringType<P> = PropTypeBaseDefault<P, string> & CodeStringCore;
+type RichTextType<P> = PropTypeBaseDefault<P, string> & RichTextCore;
+type HrefType<P> = PropTypeBaseDefault<P, string> & HrefCore;
+type ColorType<P> = PropTypeBaseDefault<P, string> & ColorCore;
+type DateStringType$1<P> = PropTypeBaseDefault<P, string> & DateStringCore;
+type DateRangeStringsType$1<P> = PropTypeBaseDefault<P, [string, string]> & DateRangeStringsCore;
+type ClassType<P> = PropTypeBase<ComponentControlContext<P>> & ClassCore;
+type ThemeResetClassType<P> = PropTypeBase<ComponentControlContext<P>> & ThemeResetClassCore;
+type CardPickerType<P> = PropTypeBaseDefault<P, string> & CardPickerCore<ComponentControlContext<P>>;
+type RichStringType<P> = PlainStringType$1<P> | CodeStringType<P> | RichTextType<P> | ColorType<P> | ClassType<P> | ThemeResetClassType<P> | CardPickerType<P> | HrefType<P>;
+type StringType$1<P> = "string" | "href" | RichStringType<P>;
+type RichBooleanType<P> = PropTypeBaseDefault<P, boolean> & RichBooleanCore;
+type BooleanType$1<P> = "boolean" | RichBooleanType<P>;
+type GraphQLType$1<P> = PropTypeBaseDefault<P, GraphQLValue> & GraphQLCore<ComponentControlContext<P>>;
+type NumberTypeBase<P> = PropTypeBaseDefault<P, number> & NumberTypeBaseCore<ComponentControlContext<P>>;
+type PlainNumberType$1<P> = NumberTypeBase<P> & PlainNumberCore<ComponentControlContext<P>>;
+type SliderNumberType<P> = NumberTypeBase<P> & SliderNumberCore<ComponentControlContext<P>>;
+type RichNumberType<P> = PlainNumberType$1<P> | SliderNumberType<P>;
+type NumberType$1<P> = "number" | RichNumberType<P>;
+type ObjectType$1<P> = PropTypeBaseDefault<P, Record<string, any>> & ObjectTypeBaseCore<ComponentControlContext<P>, PropType$1<P>>;
+type ArrayType$1<P> = PropTypeBaseDefault<P, any[]> & ArrayTypeBaseCore<ComponentControlContext<P>, PropType$1<P>>;
 type JSONLikeType<P> = "object" | ObjectType$1<P> | ArrayType$1<P>;
-interface DataSourceType<P> extends PropTypeBase<P> {
-    type: "dataSource";
-    dataSource: "airtable" | "cms";
+type DataSourceType<P> = PropTypeBase<ComponentControlContext<P>> & DataSourceCore;
+type RichDataPickerType<P> = PropTypeBaseDefault<P, DataPickerValueType> & RichDataPickerCore<ComponentControlContext<P>>;
+type DataPickerType<P> = "dataPicker" | RichDataPickerType<P>;
+type RichExprEditorType<P> = PropTypeBaseDefault<P, DataPickerValueType> & RichExprEditorCore<ComponentControlContext<P>>;
+type ExprEditorType<P> = "exprEditor" | RichExprEditorType<P>;
+type ComponentChoiceType<P, Opt extends ChoiceValue = ChoiceValue, Val = Opt | Opt[]> = PropTypeBaseDefault<P, Val> & ChoiceCore<ComponentControlContext<P>, Opt>;
+interface SingleChoiceType$1<P, Opt extends ChoiceValue = ChoiceValue> extends ComponentChoiceType<P, Opt, Opt> {
+    multiSelect?: false;
 }
-type DataPickerValueType = string | number | (string | number)[];
-interface RichDataPickerType<P> extends PropTypeBaseDefault<P, DataPickerValueType> {
-    type: "dataSelector";
-    data?: Record<string, any> | ContextDependentConfig$1<P, Record<string, any>>;
-    alwaysShowValuePathAsLabel?: boolean;
-    isolateEnv?: boolean;
+interface MultiChoiceType$1<P, Opt extends ChoiceValue = ChoiceValue> extends ComponentChoiceType<P, Opt, Opt[]> {
+    multiSelect: true;
 }
-type DataPickerType<P> = "dataPicker" | RichDataPickerType<P>;
-interface RichExprEditorType<P> extends PropTypeBaseDefault<P, DataPickerValueType> {
-    type: "exprEditor";
-    data?: Record<string, any> | ContextDependentConfig$1<P, Record<string, any>>;
-    isolateEnv?: boolean;
+interface CustomChoiceType$1<P> extends ComponentChoiceType<P, ChoiceValue, ChoiceValue | ChoiceValue[]> {
+    multiSelect: ComponentContextConfig<P, boolean>;
 }
-type ExprEditorType<P> = "exprEditor" | RichExprEditorType<P>;
+type ChoiceType$1<P> = SingleChoiceType$1<P> | MultiChoiceType$1<P> | CustomChoiceType$1<P>;
 interface FormValidationRulesType<P> extends PropTypeBaseDefault<P, any> {
     type: "formValidationRules";
 }
-interface EventHandlerType<P> extends PropTypeBase<P> {
+interface EventHandlerType<P> extends PropTypeBase<ComponentControlContext<P>> {
     type: "eventHandler";
     argTypes: {
         name: string;
         type: ArgType<any>;
     }[];
 }
-type ChoiceValue = string | number | boolean;
-type ChoiceObject = {
-    label: string;
-    value: ChoiceValue;
-};
-type ChoiceOptions = ChoiceValue[] | ChoiceObject[];
-interface ChoiceTypeBase$1<P, T> extends PropTypeBaseDefault<P, T> {
-    type: "choice";
-    options: ChoiceOptions | ContextDependentConfig$1<P, string[] | {
-        label: string;
-        value: string | number | boolean;
-    }[]>;
-    allowSearch?: boolean;
-    filterOption?: boolean;
-    onSearch?: ContextDependentConfig$1<P, ((value: string) => void) | undefined>;
-}
-interface SingleChoiceType$1<P> extends ChoiceTypeBase$1<P, string | number | boolean> {
-    multiSelect?: false;
-}
-interface MultiChoiceType$1<P> extends ChoiceTypeBase$1<P, (string | number | boolean)[]> {
-    multiSelect: true;
-}
-interface CustomChoiceType$1<P> extends ChoiceTypeBase$1<P, string | number | boolean | (string | number | boolean)[]> {
-    multiSelect: ContextDependentConfig$1<P, boolean>;
-}
-type ChoiceType$1<P> = SingleChoiceType$1<P> | MultiChoiceType$1<P> | CustomChoiceType$1<P>;
 interface RichSlotType<P> {
     type: "slot";
     description?: string;
@@ -12032,7 +12045,7 @@ interface RichSlotType<P> {
      * Function for whether this slot should be hidden from the left tree,
      * given the current props for this component
      */
-    hidden?: ContextDependentConfig$1<P, boolean>;
+    hidden?: ComponentContextConfig<P, boolean>;
     /**
      * If slot is a render prop (accepts a function that takes in some
      * arguments and returns some JSX), then specify the names of the
@@ -12053,11 +12066,11 @@ interface RichSlotType<P> {
      * Furthermore, the component further shows the props of whatever is in the slot on
      *  the parent component for the user's convenience. Handy for various “wrapper" components, form fields, and so on.
      */
-    mergeWithParent?: boolean | ContextDependentConfig$1<P, boolean>;
+    mergeWithParent?: boolean | ComponentContextConfig<P, boolean>;
     /**
      * A function that returns true to hide the merged props conditionally.
      */
-    hiddenMergedProps?: ContextDependentConfig$1<P, boolean>;
+    hiddenMergedProps?: ComponentContextConfig<P, boolean>;
 }
 type SlotType<P> = "slot" | RichSlotType<P>;
 interface RichImageUrlType<P> extends PropTypeBaseDefault<P, string> {
@@ -12135,9 +12148,9 @@ interface RichCustomType<P> extends PropTypeBaseDefault<P, any> {
 }
 type CustomType<P> = RichCustomType<P> | CustomControl<P>;
 type PrimitiveType<P = any> = Extract<StringType$1<P> | BooleanType$1<P> | NumberType$1<P> | JSONLikeType<P>, string>;
-type PropType$1<P> = StringType$1<P> | BooleanType$1<P> | GraphQLType$1<P> | NumberType$1<P> | JSONLikeType<P> | DataSourceType<P> | DataPickerType<P> | ExprEditorType<P> | FormValidationRulesType<P> | EventHandlerType<P> | ChoiceType$1<P> | CustomType<P> | ImageUrlType<P> | SlotType<P> | DateStringType<P> | DateRangeStringsType<P>;
+type PropType$1<P> = StringType$1<P> | BooleanType$1<P> | GraphQLType$1<P> | NumberType$1<P> | JSONLikeType<P> | DataSourceType<P> | DataPickerType<P> | ExprEditorType<P> | FormValidationRulesType<P> | EventHandlerType<P> | ChoiceType$1<P> | CustomType<P> | ImageUrlType<P> | SlotType<P> | DateStringType$1<P> | DateRangeStringsType$1<P>;
 type ArgType<P> = Exclude<PropType$1<P>, SlotType<P> | EventHandlerType<P>>;
-type StringCompatType<P> = DateStringType<P> | StringType$1<P> | ChoiceType$1<P> | JSONLikeType<P> | ImageUrlType<P> | CustomType<P> | DataPickerType<P>;
+type StringCompatType<P> = DateStringType$1<P> | StringType$1<P> | ChoiceType$1<P> | JSONLikeType<P> | ImageUrlType<P> | CustomType<P> | DataPickerType<P>;
 type BoolCompatType<P> = BooleanType$1<P> | CustomType<P> | DataPickerType<P>;
 type NumberCompatType<P> = NumberType$1<P> | CustomType<P> | DataPickerType<P>;
 type RestrictPropType$1<T, P> = T extends string ? StringCompatType<P> : T extends boolean ? BoolCompatType<P> : T extends number ? NumberCompatType<P> : PropType$1<P>;
@@ -12181,76 +12194,32 @@ declare global {
     }
 }
 
-/**
- * Context that we pass back to control functions.
- */
-type ControlContext<P> = [
-    /**
-     * props
-     */
-    Partial<P>,
-    /**
-     * context data
-     */
-    any
-];
-/**
- * Config option that takes the context (e.g., props) of the function call
- * to dynamically set its value.
- */
-type ContextDependentConfig<P, R> = (...args: ControlContext<P>) => R;
+type FunctionControlContext<P> = GenericContext<Partial<P>, // Partial function props
+any>;
+type FunctionContextConfig<Args extends any[], R> = ContextDependentConfig<FunctionControlContext<Args>, R>;
 interface BaseParam {
     name: string;
     description?: string;
     isOptional?: boolean;
     isRestParameter?: boolean;
 }
-interface ChoiceTypeBase<P, T> extends BaseParam {
-    type: "choice";
-    options: T[] | {
-        label: string;
-        value: T;
-    }[] | ContextDependentConfig<P, T[] | {
-        label: string;
-        value: T;
-    }[]>;
-    allowSearch?: boolean;
-    filterOption?: boolean;
-    onSearch?: ContextDependentConfig<P, ((value: string) => void) | undefined>;
-}
-interface SingleChoiceType<P, T> extends ChoiceTypeBase<P, T> {
-    multiSelect?: false;
-}
-interface MultiChoiceType<P, T> extends ChoiceTypeBase<P, T[]> {
-    multiSelect: true;
-}
-interface CustomChoiceType<P, T> extends ChoiceTypeBase<P, T | T[]> {
-    multiSelect: ContextDependentConfig<P, boolean>;
+interface FunctionMeta<Args extends any[] = any> extends CommonTypeBase<FunctionControlContext<Args>> {
+    name: string;
+    rest?: boolean;
 }
-type ChoiceType<P, T> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
 interface PlainStringType<T extends Nullish<string> = string> extends BaseParam {
     type: "string" | `'${T}'`;
 }
-type StringType<P, T extends Nullish<string> = string> = "string" | PlainStringType<T> | ChoiceType<P, T> | AnyType;
+type StringType<P, T extends string = string> = "string" | PlainStringType<T> | ChoiceType<P, T> | DateStringType | DateRangeStringsType | AnyType;
 interface PlainNumberType<T extends Nullish<number> = number> extends BaseParam {
     type: "number" | `${number extends T ? number : T}`;
 }
-type NumberType<P, T extends Nullish<number> = number> = PlainNumberType<T> | ChoiceType<P, T> | AnyType;
+type NumberType<P, T extends number = number> = PlainNumberType<T> | (BaseParam & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
 interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends BaseParam {
     type: "boolean" | `${boolean extends T ? boolean : T}`;
 }
-type BooleanType<P, T extends Nullish<boolean> = boolean> = PlainBooleanType<T> | ChoiceType<P, T> | AnyType;
-type GraphQLValue = {
-    query: string;
-    variables?: Record<string, any>;
-};
-interface GraphQLType<P> extends BaseParam {
-    type: "code";
-    lang: "graphql";
-    endpoint: string | ContextDependentConfig<P, string>;
-    method?: string | ContextDependentConfig<P, string>;
-    headers?: object | ContextDependentConfig<P, object>;
-}
+type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (BaseParam & RichBooleanCore) | ChoiceType<P, T> | AnyType;
+type GraphQLType<P> = BaseParam & GraphQLCore<FunctionControlContext<P>>;
 interface PlainNullType extends BaseParam {
     type: "null";
 }
@@ -12259,14 +12228,8 @@ interface PlainUndefinedType extends BaseParam {
     type: "undefined";
 }
 type UndefinedType = PlainUndefinedType | AnyType;
-interface PlainArrayType extends BaseParam {
-    type: "array";
-}
-type ArrayType = PlainArrayType | AnyType;
-interface PlainObjectType extends BaseParam {
-    type: "object";
-}
-type ObjectType = PlainObjectType | AnyType;
+type ObjectType<P> = BaseParam & ObjectTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
+type ArrayType<P> = BaseParam & ArrayTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
 interface PlainAnyType extends BaseParam {
     type: "any";
 }
@@ -12276,9 +12239,25 @@ interface PlainVoidType extends BaseParam {
 }
 type VoidType = PlainVoidType | AnyType;
 type IsAny<T> = 0 extends 1 & T ? true : false;
-type CommonType<P, T> = T extends GraphQLValue ? GraphQLType<P> : T extends null ? NullType : T extends undefined ? UndefinedType : T extends Array<any> ? ArrayType : T extends object ? ObjectType : AnyType;
+type CommonType<P, T> = T extends GraphQLValue ? GraphQLType<P> : T extends null ? NullType : T extends undefined ? UndefinedType : T extends Array<any> ? ArrayType<P> : T extends object ? ObjectType<P> : AnyType;
 type AnyTyping<P, T> = T extends string ? StringType<P, T> : T extends number ? NumberType<P, T> : T extends boolean ? BooleanType<P, T> : CommonType<P, T>;
-type RestrictedType<P, T> = IsAny<T> extends true ? AnyTyping<P, T> : [T] extends [Nullish<string>] ? StringType<P, T> : [T] extends [Nullish<number>] ? NumberType<P, T> : [T] extends [Nullish<boolean>] ? BooleanType<P, T> : CommonType<P, T>;
+type ToTuple<T> = T extends any[] ? T : never;
+type FunctionChoiceType<Args, Opt extends ChoiceValue = ChoiceValue> = FunctionMeta<ToTuple<Args>> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
+interface SingleChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+    multiSelect?: false;
+}
+interface MultiChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+    multiSelect: true;
+}
+interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+    multiSelect: FunctionContextConfig<ToTuple<P>, boolean>;
+}
+type ChoiceType<P, T extends ChoiceValue = ChoiceValue> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
+type DateStringType = BaseParam & DateStringCore;
+type DateRangeStringsType = BaseParam & DateRangeStringsCore;
+type RestrictedType<P, T> = IsAny<T> extends true ? AnyTyping<P, T> : [
+    T
+] extends [string] ? StringType<P, T> : [T] extends [number] ? NumberType<P, T> : [T] extends [boolean] ? BooleanType<P, T> : T extends string | null | undefined ? Exclude<T, null | undefined> extends string ? StringType<P, T extends string ? T : string> : CommonType<P, T> : T extends number | null | undefined ? Exclude<T, null | undefined> extends number ? NumberType<P, T extends number ? T : number> : CommonType<P, T> : T extends boolean | null | undefined ? Exclude<T, null | undefined> extends boolean ? BooleanType<P, T extends boolean ? T : boolean> : CommonType<P, T> : CommonType<P, T>;
 type ParamType<P, T> = RestrictedType<P, T>;
 type RequiredParam<P, T> = ParamType<P, T> & {
     isOptional?: false;
@@ -12306,6 +12285,7 @@ type HandleParams<P extends any[]> = [
     ...HandleOptionalParams<P, Required<OptionalParams<P>>>
 ];
 type HandleReturnType<P, T> = VoidType | ParamType<P, T>;
+
 interface CustomFunctionMeta<F extends (...args: any[]) => any> {
     /**
      * The javascript name of the function. Notice it must be unique across all

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/react-web",
-  "version": "0.2.399",
+  "version": "0.2.400",
   "description": "plasmic library for rendering in the presentational style",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -96,9 +96,9 @@
   },
   "dependencies": {
     "@plasmicapp/auth-react": "0.0.23",
-    "@plasmicapp/data-sources": "0.1.188",
+    "@plasmicapp/data-sources": "0.1.189",
     "@plasmicapp/data-sources-context": "0.1.22",
-    "@plasmicapp/host": "1.0.224",
+    "@plasmicapp/host": "1.0.225",
     "@plasmicapp/loader-splits": "1.0.64",
     "@plasmicapp/nextjs-app-router": "1.0.17",
     "@plasmicapp/prepass": "1.0.20",
@@ -155,5 +155,5 @@
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
-  "gitHead": "569173f3355b4b4902be9faf33d55e6cda552701"
+  "gitHead": "d37fc3f8207cda80c220fc0130fa821c0aed7abe"
 }