Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Default form control values (#4045)

Oleg Isonena0407f3e1fe3
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.json
index 3cfa4768db..1af8393f6d 100644
--- a/packages/sdk-components-react-radix/package.json
+++ b/packages/sdk-components-react-radix/package.json
@@ -36,7 +36,7 @@
},
"scripts": {
"build": "rm -rf lib && esbuild src/components.ts src/metas.ts src/props.ts src/hooks.ts --outdir=lib --bundle --format=esm --packages=external",
- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts' -e asChild -e modal -e defaultOpen -e defaultChecked && prettier --write \"**/*.props.ts\"",
+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts !./src/*.test.{ts,tsx}' -e asChild -e modal -e defaultOpen -e defaultChecked && prettier --write \"**/*.props.ts\"",
"build:tailwind": "tsx scripts/generate-tailwind-theme.ts && prettier --write src/theme/__generated__",
"build:stories": "webstudio-sdk generate-stories && prettier --write \"src/__generated__/*.stories.tsx\"",
"dts": "tsc --project tsconfig.dts.json",
diff --git a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.props.ts b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.props.ts
index dfc6b34996..7ed2664948 100644
--- a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.props.ts
+++ b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.props.ts
@@ -2120,13 +2120,6 @@ export const propsNavigationMenuContent: Record<string, PropMeta> = {
description:
"Defines the text direction. Allowed values are ltr (Left-To-Right) or rtl (Right-To-Left)",
},
- disableOutsidePointerEvents: {
- description:
- "When `true`, hover/focus/click interactions will be disabled on elements outside\nthe `DismissableLayer`. Users will need to click twice on outside elements to\ninteract with them: once to close the `DismissableLayer`, and again to trigger the element.",
- required: false,
- control: "boolean",
- type: "boolean",
- },
draggable: {
required: false,
control: "boolean",
diff --git a/packages/sdk-components-react-radix/src/checkbox.tsx b/packages/sdk-components-react-radix/src/checkbox.tsx
index b40ff86c1f..739ca23a7d 100644
--- a/packages/sdk-components-react-radix/src/checkbox.tsx
+++ b/packages/sdk-components-react-radix/src/checkbox.tsx
@@ -10,9 +10,14 @@ export const Checkbox = forwardRef<
HTMLButtonElement,
// radix checked has complex named type which cannot be parsed
// cast to boolean
- Omit<ComponentPropsWithRef<typeof Root>, "checked"> & { checked: boolean }
->((props, ref) => {
- return <Root ref={ref} {...props} />;
+ Omit<ComponentPropsWithRef<typeof Root>, "checked" | "defaultChecked"> & {
+ checked: boolean;
+ defaultChecked?: boolean;
+ }
+>(({ checked, defaultChecked, ...props }, ref) => {
+ return (
+ <Root {...props} ref={ref} defaultChecked={checked ?? defaultChecked} />
+ );
});
export const CheckboxIndicator: ForwardRefExoticComponent<
diff --git a/packages/sdk-components-react-radix/src/checkbox.ws.ts b/packages/sdk-components-react-radix/src/checkbox.ws.ts
index f5b595c540..cce7311011 100644
--- a/packages/sdk-components-react-radix/src/checkbox.ws.ts
+++ b/packages/sdk-components-react-radix/src/checkbox.ws.ts
@@ -146,7 +146,7 @@ export const metaCheckboxIndicator: WsComponentMeta = {
export const propsMetaCheckbox: WsComponentPropsMeta = {
props: propsCheckbox,
- initialProps: ["id", "className", "checked", "name", "required"],
+ initialProps: ["id", "className", "name", "value", "required", "checked"],
};
export const propsMetaCheckboxIndicator: WsComponentPropsMeta = {
diff --git a/packages/sdk-components-react-radix/src/radio-group.tsx b/packages/sdk-components-react-radix/src/radio-group.tsx
index 6dd56ec214..ad91964246 100644
--- a/packages/sdk-components-react-radix/src/radio-group.tsx
+++ b/packages/sdk-components-react-radix/src/radio-group.tsx
@@ -2,12 +2,20 @@ import {
type ForwardRefExoticComponent,
type ComponentProps,
type RefAttributes,
+ type ElementRef,
+ forwardRef,
} from "react";
import { Root, Item, Indicator } from "@radix-ui/react-radio-group";
-export const RadioGroup: ForwardRefExoticComponent<
- ComponentProps<typeof Root> & RefAttributes<HTMLDivElement>
-> = Root;
+const defaultTag = "div";
+
+export const RadioGroup = forwardRef<
+ ElementRef<typeof defaultTag>,
+ ComponentProps<typeof Root> & RefAttributes<typeof defaultTag>
+ // Make sure children are not passed down to an input, because this will result in error.
+>(({ value, defaultValue, ...props }, ref) => (
+ <Root {...props} defaultValue={value ?? defaultValue} ref={ref} />
+));
export const RadioGroupItem: ForwardRefExoticComponent<
ComponentProps<typeof Item> & RefAttributes<HTMLButtonElement>
diff --git a/packages/sdk-components-react-radix/src/radio-group.ws.ts b/packages/sdk-components-react-radix/src/radio-group.ws.ts
index c3da65a994..7cd9904b70 100644
--- a/packages/sdk-components-react-radix/src/radio-group.ws.ts
+++ b/packages/sdk-components-react-radix/src/radio-group.ws.ts
@@ -165,7 +165,7 @@ export const metaRadioGroupIndicator: WsComponentMeta = {
export const propsMetaRadioGroup: WsComponentPropsMeta = {
props: propsRadioGroup,
- initialProps: ["id", "className", "value", "name", "required"],
+ initialProps: ["id", "className", "name", "value", "required"],
};
export const propsMetaRadioGroupItem: WsComponentPropsMeta = {
diff --git a/packages/sdk-components-react-radix/src/select.tsx b/packages/sdk-components-react-radix/src/select.tsx
index 1e29448def..ffed27c5f7 100644
--- a/packages/sdk-components-react-radix/src/select.tsx
+++ b/packages/sdk-components-react-radix/src/select.tsx
@@ -24,13 +24,11 @@ import {
ReactSdkContext,
} from "@webstudio-is/react-sdk/runtime";
-// wrap in forwardRef because Root is functional component without ref
-export const Select = forwardRef<
- HTMLDivElement,
- ComponentPropsWithoutRef<typeof Root>
->((props, _ref) => {
- return <Root {...props} />;
-});
+export const Select = forwardRef<HTMLDivElement, ComponentProps<typeof Root>>(
+ ({ value, defaultValue, ...props }) => {
+ return <Root {...props} defaultValue={value ?? defaultValue} />;
+ }
+);
export const SelectTrigger = forwardRef<
HTMLButtonElement,
diff --git a/packages/sdk-components-react-radix/src/select.ws.ts b/packages/sdk-components-react-radix/src/select.ws.ts
index c9af648153..7dbcecf663 100644
--- a/packages/sdk-components-react-radix/src/select.ws.ts
+++ b/packages/sdk-components-react-radix/src/select.ws.ts
@@ -308,7 +308,7 @@ export const metaSelectItemText: WsComponentMeta = {
export const propsMetaSelect: WsComponentPropsMeta = {
props: propsSelect,
- initialProps: ["value", "open", "name", "required"],
+ initialProps: ["name", "value", "open", "required"],
};
export const propsMetaSelectTrigger: WsComponentPropsMeta = {
diff --git a/packages/sdk-components-react-radix/src/switch.tsx b/packages/sdk-components-react-radix/src/switch.tsx
index 44e59b9a7a..716b4688ed 100644
--- a/packages/sdk-components-react-radix/src/switch.tsx
+++ b/packages/sdk-components-react-radix/src/switch.tsx
@@ -1,13 +1,19 @@
-import type {
- ForwardRefExoticComponent,
- ComponentProps,
- RefAttributes,
+import {
+ type ForwardRefExoticComponent,
+ type ComponentProps,
+ type RefAttributes,
+ forwardRef,
} from "react";
import { Root, Thumb } from "@radix-ui/react-switch";
-export const Switch: ForwardRefExoticComponent<
- ComponentProps<typeof Root> & RefAttributes<HTMLButtonElement>
-> = Root;
+export const Switch = forwardRef<
+ HTMLButtonElement,
+ ComponentProps<typeof Root>
+>(({ checked, defaultChecked, ...props }, ref) => {
+ return (
+ <Root {...props} ref={ref} defaultChecked={checked ?? defaultChecked} />
+ );
+});
export const SwitchThumb: ForwardRefExoticComponent<
ComponentProps<typeof Thumb> & RefAttributes<HTMLSpanElement>
diff --git a/packages/sdk-components-react-radix/src/switch.ws.ts b/packages/sdk-components-react-radix/src/switch.ws.ts
index 8eed96b620..9e73bbf2f1 100644
--- a/packages/sdk-components-react-radix/src/switch.ws.ts
+++ b/packages/sdk-components-react-radix/src/switch.ws.ts
@@ -138,7 +138,7 @@ export const metaSwitchThumb: WsComponentMeta = {
export const propsMetaSwitch: WsComponentPropsMeta = {
props: propsSwitch,
- initialProps: ["id", "className", "checked", "name", "required"],
+ initialProps: ["id", "className", "name", "value", "checked", "required"],
};
export const propsMetaSwitchThumb: WsComponentPropsMeta = {
diff --git a/packages/sdk-components-react-remix/src/__generated__/remix-form.props.ts b/packages/sdk-components-react-remix/src/__generated__/remix-form.props.ts
index 203c365838..fb805f1e55 100644
--- a/packages/sdk-components-react-remix/src/__generated__/remix-form.props.ts
+++ b/packages/sdk-components-react-remix/src/__generated__/remix-form.props.ts
@@ -442,6 +442,7 @@ export const props: Record<string, PropMeta> = {
},
datatype: { required: false, control: "text", type: "string" },
defaultChecked: { required: false, control: "boolean", type: "boolean" },
+ defaultValue: { required: false, control: "text", type: "string" },
dir: {
required: false,
control: "text",
diff --git a/packages/sdk-components-react-remix/src/__generated__/webhook-form.props.ts b/packages/sdk-components-react-remix/src/__generated__/webhook-form.props.ts
index 9951b3b93a..4997f1c460 100644
--- a/packages/sdk-components-react-remix/src/__generated__/webhook-form.props.ts
+++ b/packages/sdk-components-react-remix/src/__generated__/webhook-form.props.ts
@@ -442,6 +442,7 @@ export const props: Record<string, PropMeta> = {
},
datatype: { required: false, control: "text", type: "string" },
defaultChecked: { required: false, control: "boolean", type: "boolean" },
+ defaultValue: { required: false, control: "text", type: "string" },
dir: {
required: false,
control: "text",
diff --git a/packages/sdk-components-react-remix/src/remix-form.tsx b/packages/sdk-components-react-remix/src/remix-form.tsx
index 14fe669034..0328240c6b 100644
--- a/packages/sdk-components-react-remix/src/remix-form.tsx
+++ b/packages/sdk-components-react-remix/src/remix-form.tsx
@@ -11,11 +11,12 @@ export const defaultTag = "form";
export const RemixForm = forwardRef<
ElementRef<typeof defaultTag>,
- ComponentProps<typeof defaultTag> &
+ Omit<ComponentProps<typeof defaultTag>, "action"> &
Pick<FormProps, "encType"> & {
// Remix's default behavior includes method values in both uppercase and lowercase,
// resulting in our UI displaying a list that encompasses both variants.
method?: Lowercase<NonNullable<FormProps["method"]>>;
+ action?: string;
}
>(({ action, ...props }, ref) => {
const { renderer } = useContext(ReactSdkContext);
diff --git a/packages/sdk-components-react-remix/src/webhook-form.tsx b/packages/sdk-components-react-remix/src/webhook-form.tsx
index 89dd4b95c4..0198d2c04d 100644
--- a/packages/sdk-components-react-remix/src/webhook-form.tsx
+++ b/packages/sdk-components-react-remix/src/webhook-form.tsx
@@ -78,11 +78,12 @@ const isJSDom = () => {
export const WebhookForm = forwardRef<
ElementRef<typeof defaultTag>,
- ComponentProps<typeof defaultTag> & {
+ Omit<ComponentProps<typeof defaultTag>, "action"> & {
/** Use this property to reveal the Success and Error states on the canvas so they can be styled. The Initial state is displayed when the page first opens. The Success and Error states are displayed depending on whether the Form submits successfully or unsuccessfully. */
state?: State;
encType?: FormProps["encType"];
onStateChange?: (state: State) => void;
+ action?: string;
}
>(
(
diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.json
index f6ddb7b572..f175ffd520 100644
--- a/packages/sdk-components-react/package.json
+++ b/packages/sdk-components-react/package.json
@@ -36,7 +36,7 @@
},
"scripts": {
"build": "rm -rf lib && esbuild src/components.ts src/metas.ts src/props.ts --outdir=lib --bundle --format=esm --packages=external",
- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts' && prettier --write \"**/*.props.ts\"",
+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.test.{ts,tsx} !./src/*.ws.ts' && prettier --write \"**/*.props.ts\"",
"dts": "tsc --project tsconfig.dts.json",
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
"typecheck": "tsc"
diff --git a/packages/sdk-components-react/src/checkbox.tsx b/packages/sdk-components-react/src/checkbox.tsx
index ef74195c1c..96190d24d4 100644
--- a/packages/sdk-components-react/src/checkbox.tsx
+++ b/packages/sdk-components-react/src/checkbox.tsx
@@ -6,8 +6,15 @@ export const Checkbox = forwardRef<
ElementRef<typeof defaultTag>,
Omit<ComponentProps<typeof defaultTag>, "type" | "value"> & { value?: string }
// Make sure children are not passed down to an input, because this will result in error.
->(({ children: _children, ...props }, ref) => {
- return <input {...props} type="checkbox" ref={ref} />;
+>(({ children: _children, checked, defaultChecked, ...props }, ref) => {
+ return (
+ <input
+ {...props}
+ defaultChecked={checked ?? defaultChecked}
+ type="checkbox"
+ ref={ref}
+ />
+ );
});
Checkbox.displayName = "Checkbox";
diff --git a/packages/sdk-components-react/src/checkbox.ws.ts b/packages/sdk-components-react/src/checkbox.ws.ts
index bf2abb37ff..2c380c2fb6 100644
--- a/packages/sdk-components-react/src/checkbox.ws.ts
+++ b/packages/sdk-components-react/src/checkbox.ws.ts
@@ -59,13 +59,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: [
- "id",
- "className",
- "name",
- "value",
- "required",
- "checked",
- "defaultChecked",
- ],
+ initialProps: ["id", "className", "name", "value", "required", "checked"],
};
diff --git a/packages/sdk-components-react/src/input.tsx b/packages/sdk-components-react/src/input.tsx
index fe3e6d2481..bef9759dd7 100644
--- a/packages/sdk-components-react/src/input.tsx
+++ b/packages/sdk-components-react/src/input.tsx
@@ -23,8 +23,18 @@ export const Input = forwardRef<
| "week";
}
// Make sure children are not passed down to an input, because this will result in error.
->(({ children: _children, type = "text", ...props }, ref) => (
- <input {...props} type={type} ref={ref} />
-));
+>(
+ (
+ { children: _children, type = "text", value, defaultValue, ...props },
+ ref
+ ) => (
+ <input
+ {...props}
+ defaultValue={value ?? defaultValue}
+ type={type}
+ ref={ref}
+ />
+ )
+);
Input.displayName = "Input";
diff --git a/packages/sdk-components-react/src/input.ws.ts b/packages/sdk-components-react/src/input.ws.ts
index 32f12bf0f9..e9327dd30c 100644
--- a/packages/sdk-components-react/src/input.ws.ts
+++ b/packages/sdk-components-react/src/input.ws.ts
@@ -50,6 +50,7 @@ export const propsMeta: WsComponentPropsMeta = {
"id",
"className",
"name",
+ "value",
"type",
"placeholder",
"required",
diff --git a/packages/sdk-components-react/src/radio-button.tsx b/packages/sdk-components-react/src/radio-button.tsx
index d1a514895d..83fd379ca1 100644
--- a/packages/sdk-components-react/src/radio-button.tsx
+++ b/packages/sdk-components-react/src/radio-button.tsx
@@ -6,8 +6,13 @@ export const RadioButton = forwardRef<
ElementRef<typeof defaultTag>,
Omit<ComponentProps<typeof defaultTag>, "type" | "value"> & { value?: string }
// Make sure children are not passed down to an input, because this will result in error.
->(({ children: _children, ...props }, ref) => (
- <input {...props} type="radio" ref={ref} />
+>(({ children: _children, checked, defaultChecked, ...props }, ref) => (
+ <input
+ {...props}
+ defaultChecked={checked ?? defaultChecked}
+ type="radio"
+ ref={ref}
+ />
));
RadioButton.displayName = "RadioButton";
diff --git a/packages/sdk-components-react/src/radio-button.ws.ts b/packages/sdk-components-react/src/radio-button.ws.ts
index 4d051d515d..d243c8dd4c 100644
--- a/packages/sdk-components-react/src/radio-button.ws.ts
+++ b/packages/sdk-components-react/src/radio-button.ws.ts
@@ -61,13 +61,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: [
- "id",
- "className",
- "name",
- "value",
- "required",
- "checked",
- "defaultChecked",
- ],
+ initialProps: ["id", "className", "name", "value", "required", "checked"],
};
diff --git a/packages/sdk-components-react/src/select.tsx b/packages/sdk-components-react/src/select.tsx
index f758e3e700..1770fef00e 100644
--- a/packages/sdk-components-react/src/select.tsx
+++ b/packages/sdk-components-react/src/select.tsx
@@ -10,7 +10,9 @@ export const defaultTag = "select";
export const Select = forwardRef<
ElementRef<typeof defaultTag>,
ComponentProps<typeof defaultTag>
->((props, ref) => <select {...props} ref={ref} />);
+>(({ value, defaultValue, ...props }, ref) => (
+ <select {...props} defaultValue={value ?? defaultValue} ref={ref} />
+));
Select.displayName = "Select";
diff --git a/packages/sdk-components-react/src/select.ws.ts b/packages/sdk-components-react/src/select.ws.ts
index 0704093be9..fbeab22be0 100644
--- a/packages/sdk-components-react/src/select.ws.ts
+++ b/packages/sdk-components-react/src/select.ws.ts
@@ -93,8 +93,8 @@ export const propsMeta: WsComponentPropsMeta = {
"id",
"className",
"name",
+ "value",
"multiple",
- "defaultValue",
"required",
"autoFocus",
],
diff --git a/packages/sdk-components-react/src/textarea.tsx b/packages/sdk-components-react/src/textarea.tsx
index 48890027f0..596601b2f2 100644
--- a/packages/sdk-components-react/src/textarea.tsx
+++ b/packages/sdk-components-react/src/textarea.tsx
@@ -6,8 +6,8 @@ export const Textarea = forwardRef<
ElementRef<typeof defaultTag>,
ComponentProps<typeof defaultTag>
// Make sure children are not passed down to an textarea, because this will result in error.
->(({ children: _children, ...props }, ref) => (
- <textarea {...props} ref={ref} />
+>(({ children: _children, value, defaultValue, ...props }, ref) => (
+ <textarea {...props} defaultValue={value ?? defaultValue} ref={ref} />
));
Textarea.displayName = "Textarea";
diff --git a/packages/sdk-components-react/src/textarea.ws.ts b/packages/sdk-components-react/src/textarea.ws.ts
index 5dddcd3f0f..a164bdc278 100644
--- a/packages/sdk-components-react/src/textarea.ws.ts
+++ b/packages/sdk-components-react/src/textarea.ws.ts
@@ -52,6 +52,7 @@ export const propsMeta: WsComponentPropsMeta = {
"id",
"className",
"name",
+ "value",
"placeholder",
"required",
"autoFocus",