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.

refactor: inline actions into props (#2813)

Bogdan Chadkina474d920690c
diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.ts
index 29b79b5027..8fe22db7cb 100644
--- a/apps/builder/app/shared/nano-states/props.ts
+++ b/apps/builder/app/shared/nano-states/props.ts
@@ -1,18 +1,13 @@
import { computed } from "nanostores";
-import {
- createScope,
- type Resource,
- type DataSource,
- type Instance,
- type Prop,
-} from "@webstudio-is/sdk";
+import type { Resource, DataSource, Instance, Prop } from "@webstudio-is/sdk";
import {
collectionComponent,
+ decodeDataSourceVariable,
encodeDataSourceVariable,
- generateDataSources,
normalizeProps,
portalComponent,
textContentAttribute,
+ validateExpression,
} from "@webstudio-is/react-sdk";
import { $instances } from "./instances";
import {
@@ -34,74 +29,106 @@ export const getIndexedInstanceId = (
index: number
) => `${instanceId}[${index}]`;
+/**
+ * (arg1) => {
+ * let $ws$dataSource$id = _getVariable('id')
+ * $ws$dataSource$id = $ws$dataSource$id + arg1
+ * _setVariable('id', $ws$dataSource$id)
+ * }
+ */
+const generateAction = (prop: Extract<Prop, { type: "action" }>) => {
+ const getters = new Set<DataSource["id"]>();
+ const setters = new Set<DataSource["id"]>();
+ // important to fallback to empty argumets to render empty function
+ let args: string[] = [];
+ let assignersCode = "";
+ for (const value of prop.value) {
+ args = value.args;
+ assignersCode += validateExpression(value.code, {
+ optional: true,
+ effectful: true,
+ transformIdentifier: (identifier, assignee) => {
+ if (args?.includes(identifier)) {
+ return identifier;
+ }
+ const depId = decodeDataSourceVariable(identifier);
+ if (depId) {
+ getters.add(depId);
+ if (assignee) {
+ setters.add(depId);
+ }
+ }
+ return identifier;
+ },
+ });
+ assignersCode += `\n`;
+ }
+ let gettersCode = "";
+ for (const dataSourceId of getters) {
+ const valueName = encodeDataSourceVariable(dataSourceId);
+ gettersCode += `let ${valueName} = _getVariable("${dataSourceId}")\n`;
+ }
+ let settersCode = "";
+ for (const dataSourceId of setters) {
+ const valueName = encodeDataSourceVariable(dataSourceId);
+ settersCode += `_setVariable("${dataSourceId}", ${valueName})\n`;
+ }
+ let generated = "";
+ generated += `return (${args.join(", ")}) => {\n`;
+ generated += gettersCode;
+ generated += assignersCode;
+ generated += settersCode;
+ generated += `}`;
+ return generated;
+};
+
+const getAction = (
+ prop: Extract<Prop, { type: "action" }>,
+ values: Map<string, unknown>
+) => {
+ const generatedAction = generateAction(prop);
+ try {
+ const executeFn = new Function(
+ "_getVariable",
+ "_setVariable",
+ generatedAction
+ );
+ const getVariable = (id: string) => {
+ return values.get(id);
+ };
+ const setVariable = (id: string, value: unknown) => {
+ const dataSourceVariables = new Map($dataSourceVariables.get());
+ dataSourceVariables.set(id, value);
+ $dataSourceVariables.set(dataSourceVariables);
+ };
+ return executeFn(getVariable, setVariable);
+ } catch (error) {
+ // eslint-disable-next-line no-console
+ console.error(error);
+ }
+};
+
// result of executing generated code
// includes variables, computed expressions and action callbacks
const $dataSourcesLogic = computed(
- [$dataSources, $dataSourceVariables, $resourceValues, $props],
- (dataSources, dataSourceVariables, resourceValues, props) => {
- const scope = createScope(["_getVariable", "_setVariable", "_output"]);
- const { body, output } = generateDataSources({
- scope,
- dataSources,
- props,
- });
- let generatedCode = "";
+ [$dataSources, $dataSourceVariables, $resourceValues],
+ (dataSources, dataSourceVariables, resourceValues) => {
+ const values = new Map<string, unknown>();
for (const [dataSourceId, dataSource] of dataSources) {
if (dataSource.type === "variable") {
- const initialValue = JSON.stringify(dataSource.value.value);
- // save variables to generate header and footer depending on environment
- const valueName = scope.getName(dataSourceId, dataSource.name);
- const setterName = scope.getName(
- `set$${dataSourceId}`,
- `set$${dataSource.name}`
+ values.set(
+ dataSourceId,
+ dataSourceVariables.get(dataSourceId) ?? dataSource.value.value
);
- generatedCode += `let ${valueName} = _getVariable("${dataSourceId}") ?? ${initialValue};\n`;
- generatedCode += `let ${setterName} = (value) => _setVariable("${dataSourceId}", value);\n`;
}
if (dataSource.type === "parameter") {
- const variableName = scope.getName(dataSourceId, dataSource.name);
- generatedCode += `let ${variableName} = _getVariable("${dataSourceId}");\n`;
+ values.set(dataSourceId, dataSourceVariables.get(dataSourceId));
}
if (dataSource.type === "resource") {
- const variableName = scope.getName(dataSourceId, dataSource.name);
- generatedCode += `let ${variableName} = _getResource("${dataSource.resourceId}");\n`;
+ values.set(dataSourceId, resourceValues.get(dataSource.resourceId));
}
}
- generatedCode += body;
- generatedCode += `let _output = new Map();\n`;
- for (const [dataSourceId, variableName] of output) {
- generatedCode += `_output.set('${dataSourceId}', ${variableName})\n`;
- }
- for (const [dataSourceId, dataSource] of dataSources) {
- const variableName = scope.getName(dataSourceId, dataSource.name);
- generatedCode += `_output.set('${dataSourceId}', ${variableName})\n`;
- }
- generatedCode += `return _output\n`;
-
- try {
- const executeFn = new Function(
- "_getVariable",
- "_getResource",
- "_setVariable",
- generatedCode
- );
- const getVariable = (id: string) => {
- return dataSourceVariables.get(id);
- };
- const getResource = (id: string) => {
- return resourceValues.get(id);
- };
- const setVariable = (id: string, value: unknown) => {
- const dataSourceVariables = new Map($dataSourceVariables.get());
- dataSourceVariables.set(id, value);
- $dataSourceVariables.set(dataSourceVariables);
- };
- return executeFn(getVariable, getResource, setVariable);
- } catch (error) {
- // eslint-disable-next-line no-console
- console.error(error);
- }
- return new Map();
+ return values;
}
);
@@ -111,11 +138,6 @@ const computeExpression = (
) => {
let code = "";
for (const [id, value] of variables) {
- // @todo pass dedicated map of variables without actions
- // skip actions
- if (typeof value === "function") {
- continue;
- }
const identifier = encodeDataSourceVariable(id);
code += `const ${identifier} = ${JSON.stringify(value)};\n`;
}
@@ -195,7 +217,7 @@ export const $propValuesByInstanceSelector = computed(
continue;
}
if (prop.type === "action") {
- const action = variableValues.get(prop.id);
+ const action = getAction(prop, variableValues);
if (typeof action === "function") {
propValues.set(prop.name, action);
}
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
index 94604b8f1b..ef7c3a3d2a 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx
@@ -77,21 +77,16 @@ type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [formState, set$formState] = useState<any>("initial");
let [formState_1, set$formState_1] = useState<any>("initial");
- let onStateChange = (state: any) => {
- formState = state;
- set$formState(formState);
- };
- let onStateChange_1 = (state: any) => {
- formState_1 = state;
- set$formState_1(formState_1);
- };
return (
<Body data-ws-id="a-4nDFkaWy4px1fn38XWJ" data-ws-component="Body">
<Form
data-ws-id="-1RvizaBcVpHsjvnYxn1c"
data-ws-component="Form"
state={formState_1}
- onStateChange={onStateChange_1}
+ onStateChange={(state: any) => {
+ formState_1 = state;
+ set$formState_1(formState_1);
+ }}
>
{(formState_1 === "initial" || formState_1 === "error") && (
<Box data-ws-id="qhnVrmYGlyrMZi3UzqSQA" data-ws-component="Box">
@@ -141,7 +136,10 @@ const Page = (_props: { params: Params }) => {
data-ws-id="isNSM3wXcnHFikwNPlEOL"
data-ws-component="Form"
state={formState}
- onStateChange={onStateChange}
+ onStateChange={(state: any) => {
+ formState = state;
+ set$formState(formState);
+ }}
method={"get"}
action={"/custom"}
>
diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
index f1589fc5ff..29a7825ffd 100644
--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx
@@ -83,10 +83,6 @@ export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [accordionValue, set$accordionValue] = useState<any>("0");
- let onValueChange = (value: any) => {
- accordionValue = value;
- set$accordionValue(accordionValue);
- };
return (
<Body data-ws-id="uKWGyE9JY3cPwY-xI9vk6" data-ws-component="Body">
<Accordion
@@ -94,7 +90,10 @@ const Page = (_props: { params: Params }) => {
data-ws-component="@webstudio-is/sdk-components-react-radix:Accordion"
collapsible={true}
value={accordionValue}
- onValueChange={onValueChange}
+ onValueChange={(value: any) => {
+ accordionValue = value;
+ set$accordionValue(accordionValue);
+ }}
>
<AccordionItem
data-ws-id="zJ927zk9txwUbYycKB7QA"
diff --git a/packages/react-sdk/src/component-generator.test.ts b/packages/react-sdk/src/component-generator.test.ts
index 01fb305473..f85d809ad3 100644
--- a/packages/react-sdk/src/component-generator.test.ts
+++ b/packages/react-sdk/src/component-generator.test.ts
@@ -253,17 +253,18 @@ test("generate jsx element with data sources and action", () => {
id: "3",
instanceId: "box",
type: "action",
- name: "onClick",
- value: [{ type: "execute", args: [], code: `variableName = 1` }],
- }),
- createPropPair({
- id: "4",
- instanceId: "box",
- type: "action",
name: "onChange",
value: [
- { type: "execute", args: ["value"], code: `variableName = value` },
- { type: "execute", args: ["value"], code: `variableName = value` },
+ {
+ type: "execute",
+ args: ["value"],
+ code: `$ws$dataSource$variableId = 1`,
+ },
+ {
+ type: "execute",
+ args: ["value"],
+ code: `$ws$dataSource$variableId = value`,
+ },
],
}),
]),
@@ -285,8 +286,11 @@ test("generate jsx element with data sources and action", () => {
data-ws-component="Box"
variable={variableName}
expression={variableName + 1}
- onClick={onClick}
- onChange={onChange} />
+ onChange={(value: any) => {
+ variableName = 1
+ variableName = value
+ set$variableName(variableName)
+ }} />
`)
);
});
@@ -631,10 +635,6 @@ test("generate page component with variables and actions", () => {
type Params = Record<string, string | undefined>
const Page = (_props: { params: Params }) => {
let [variableName, set$variableName] = useState<any>("initial")
- let onChange = (value: any) => {
- variableName = value
- set$variableName(variableName)
- }
return <Body
data-ws-id="body"
data-ws-component="Body">
@@ -643,7 +643,10 @@ test("generate page component with variables and actions", () => {
data-ws-component="Input"
data-ws-index="0"
value={variableName}
- onChange={onChange} />
+ onChange={(value: any) => {
+ variableName = value
+ set$variableName(variableName)
+ }} />
</Body>
}
`)
diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.ts
index d8b2d3c3f0..c4c241af83 100644
--- a/packages/react-sdk/src/component-generator.ts
+++ b/packages/react-sdk/src/component-generator.ts
@@ -6,6 +6,7 @@ import type {
DataSources,
Prop,
Page,
+ DataSource,
} from "@webstudio-is/sdk";
import { parseComponentName } from "@webstudio-is/sdk";
import {
@@ -15,9 +16,75 @@ import {
showAttribute,
} from "./props";
import { collectionComponent } from "./core-components";
-import { generateExpression, generateDataSources } from "./expression";
+import {
+ generateExpression,
+ validateExpression,
+ decodeDataSourceVariable,
+} from "./expression";
import type { IndexesWithinAncestors } from "./instance-utils";
+/**
+ * (arg1) => {
+ * myVar = myVar + arg1
+ * set$myVar(myVar)
+ * }
+ */
+const generateAction = ({
+ scope,
+ prop,
+ dataSources,
+}: {
+ scope: Scope;
+ prop: Extract<Prop, { type: "action" }>;
+ dataSources: DataSources;
+}) => {
+ const setters = new Set<DataSource>();
+ // important to fallback to empty argumets to render empty function
+ let args: string[] = [];
+ let assignersCode = "";
+ for (const value of prop.value) {
+ args = value.args;
+ assignersCode += validateExpression(value.code, {
+ optional: true,
+ effectful: true,
+ transformIdentifier: (identifier, assignee) => {
+ if (args?.includes(identifier)) {
+ return identifier;
+ }
+ const depId = decodeDataSourceVariable(identifier);
+ const dep = depId ? dataSources.get(depId) : undefined;
+ if (dep) {
+ if (assignee) {
+ setters.add(dep);
+ }
+ const valueName = scope.getName(dep.id, dep.name);
+ return valueName;
+ }
+ // eslint-disable-next-line no-console
+ console.error(`Unknown dependency "${identifier}"`);
+ return identifier;
+ },
+ });
+ assignersCode += `\n`;
+ }
+ let settersCode = "";
+ for (const dataSource of setters) {
+ const valueName = scope.getName(dataSource.id, dataSource.name);
+ const setterName = scope.getName(
+ `set$${dataSource.id}`,
+ `set$${dataSource.name}`
+ );
+ settersCode += `${setterName}(${valueName})\n`;
+ }
+ const argsList = args.map((arg) => `${arg}: any`).join(", ");
+ let generated = "";
+ generated += `(${argsList}) => {\n`;
+ generated += assignersCode;
+ generated += settersCode;
+ generated += `}`;
+ return generated;
+};
+
const generatePropValue = ({
scope,
prop,
@@ -57,7 +124,7 @@ const generatePropValue = ({
});
}
if (prop.type === "action") {
- return scope.getName(prop.id, prop.name);
+ return generateAction({ scope, prop, dataSources });
}
prop satisfies never;
};
@@ -269,12 +336,6 @@ export const generatePageComponent = ({
if (instance === undefined) {
return "";
}
- const { body: dataSourcesBody } = generateDataSources({
- typed: true,
- scope,
- dataSources,
- props,
- });
let generatedDataSources = "";
for (const dataSource of dataSources.values()) {
if (dataSource.type === "variable") {
@@ -306,8 +367,6 @@ export const generatePageComponent = ({
}
}
- generatedDataSources += dataSourcesBody;
-
const generatedJsx = generateJsxElement({
scope,
instance,
diff --git a/packages/react-sdk/src/expression.test.ts b/packages/react-sdk/src/expression.test.ts
index 3eeb8af9e7..04e0bb05e7 100644
--- a/packages/react-sdk/src/expression.test.ts
+++ b/packages/react-sdk/src/expression.test.ts
@@ -3,12 +3,7 @@ import {
decodeDataSourceVariable,
encodeDataSourceVariable,
validateExpression,
- generateDataSources,
} from "./expression";
-import { createScope } from "@webstudio-is/sdk";
-
-const toMap = <T extends { id: string }>(list: T[]) =>
- new Map(list.map((item) => [item.id, item]));
test("allow literals and array expressions", () => {
expect(
@@ -163,162 +158,3 @@ test("encode/decode variable names", () => {
);
expect(decodeDataSourceVariable("myVarName")).toEqual(undefined);
});
-
-test("generate variables with actions", () => {
- const generated = generateDataSources({
- scope: createScope(),
- dataSources: new Map([
- [
- "dataSource1",
- {
- id: "dataSource1",
- scopeInstanceId: "instance1",
- type: "variable",
- name: "myVar",
- value: { type: "string", value: "initial" },
- },
- ],
- [
- "dataSource2",
- {
- id: "dataSource2",
- scopeInstanceId: "instance1",
- type: "variable",
- name: "myVar",
- value: { type: "string", value: "initial" },
- },
- ],
- ]),
- props: new Map([
- [
- "prop1",
- {
- id: "prop1",
- instanceId: "instance1",
- type: "action",
- name: "onChange",
- value: [
- {
- type: "execute",
- args: ["value"],
- code: `$ws$dataSource$dataSource1 = value`,
- },
- {
- type: "execute",
- args: ["value"],
- code: `$ws$dataSource$dataSource1 = 'success'`,
- },
- ],
- },
- ],
- [
- "prop2",
- {
- id: "prop2",
- instanceId: "instance1",
- type: "action",
- name: "onSelect",
- value: [
- {
- type: "execute",
- args: [],
- code: `$ws$dataSource$dataSource2 = 'error'`,
- },
- ],
- },
- ],
- ]),
- });
- expect(generated.body).toMatchInlineSnapshot(`
- "let onChange = (value) => {
- myVar = value
- myVar = 'success'
- set$myVar(myVar)
- }
- let onSelect = () => {
- myVar_1 = 'error'
- set$myVar_1(myVar_1)
- }
- "
- `);
- expect(generated.variables).toEqual(
- new Map([
- [
- "dataSource1",
- {
- initialValue: "initial",
- setterName: "set$myVar",
- valueName: "myVar",
- },
- ],
- [
- "dataSource2",
- {
- initialValue: "initial",
- setterName: "set$myVar_1",
- valueName: "myVar_1",
- },
- ],
- ])
- );
- expect(generated.output).toEqual(
- new Map([
- ["dataSource1", "myVar"],
- ["dataSource2", "myVar_1"],
- ["prop1", "onChange"],
- ["prop2", "onSelect"],
- ])
- );
-});
-
-test("generate function for empty action", () => {
- const generated = generateDataSources({
- scope: createScope(),
- dataSources: new Map(),
- props: new Map([
- [
- "prop1",
- {
- id: "prop1",
- instanceId: "instance1",
- type: "action",
- name: "onChange",
- value: [],
- },
- ],
- ]),
- });
- expect(generated.body).toMatchInlineSnapshot(`
- "let onChange = () => {
- }
- "
- `);
- expect(generated.variables).toEqual(new Map());
- expect(generated.output).toEqual(new Map([["prop1", "onChange"]]));
-});
-
-test("prevent generating parameter variables", () => {
- const generated = generateDataSources({
- scope: createScope(),
- dataSources: toMap([
- {
- id: "dataSourceid",
- scopeInstanceId: "instanceId",
- type: "parameter",
- name: "myParameter",
- },
- ]),
- props: toMap([
- {
- id: "propId",
- instanceId: "instanceId",
- type: "expression",
- name: "value",
- value: "$ws$dataSource$dataSourceId",
- },
- ]),
- });
- expect(generated.body).toEqual("");
- expect(generated.variables).toEqual(new Map());
- expect(generated.output).toEqual(new Map());
-});
diff --git a/packages/react-sdk/src/expression.ts b/packages/react-sdk/src/expression.ts
index b50fb70013..1e6ec443a6 100644
--- a/packages/react-sdk/src/expression.ts
+++ b/packages/react-sdk/src/expression.ts
@@ -6,7 +6,7 @@ import type {
AssignmentExpression,
} from "@jsep-plugin/assignment";
import type { ObjectExpression, Property } from "@jsep-plugin/object";
-import type { DataSources, Props, Scope } from "@webstudio-is/sdk";
+import type { DataSources, Scope } from "@webstudio-is/sdk";
jsep.plugins.register(jsepAssignment);
jsep.plugins.register(jsepObject);
@@ -209,122 +209,3 @@ export const generateExpression = ({
},
});
};
-
-/*
-
-// header
-
-let formState_1 = _getVariable('#formState_1')
-let set$formState = value => _setVariable('#formStateId', value)
-
-// body
-
-let formInitial_1 = formState_1 === 'initial'
-
-let onStateChange_1 = (state) => {
- formState_1 = state;
-
- set$formState(formState_1)
-}
-
-// footer
-
-let _output = new Map();
-_output.set('#', formState_1)
-_output.set('#', formInitial_1)
-_output.set('#', onStateChange_1)
-return _output
-
-*/
-
-type DataSourceId = string;
-type DataSourceOrPropId = string;
-type VariableName = string;
-
-export const generateDataSources = ({
- scope,
- typed = false,
- dataSources,
- props,
-}: {
- scope: Scope;
- typed?: boolean;
- dataSources: DataSources;
- props: Props;
-}) => {
- const variables = new Map<
- DataSourceId,
- { valueName: VariableName; setterName: VariableName; initialValue: unknown }
- >();
- let body = "";
- const output = new Map<DataSourceOrPropId, VariableName>();
-
- for (const dataSource of dataSources.values()) {
- if (dataSource.type === "variable") {
- // save variables to generate header and footer depending on environment
- const valueName = scope.getName(dataSource.id, dataSource.name);
- const setterName = scope.getName(
- `set$${dataSource.id}`,
- `set$${dataSource.name}`
- );
- const initialValue = dataSource.value.value;
- output.set(dataSource.id, valueName);
- variables.set(dataSource.id, { valueName, setterName, initialValue });
- }
- }
-
- for (const prop of props.values()) {
- // generate actions assigning variables and invoking their setters
- if (prop.type === "action") {
- const name = scope.getName(prop.id, prop.name);
- output.set(prop.id, name);
- const setters = new Set<DataSourceId>();
- // important to fallback to empty argumets to render empty function
- let args: string[] = [];
- let newCode = "";
- for (const value of prop.value) {
- args = value.args;
- newCode += validateExpression(value.code, {
- optional: true,
- effectful: true,
- transformIdentifier: (identifier, assignee) => {
- if (args?.includes(identifier)) {
- return identifier;
- }
- const depId = decodeDataSourceVariable(identifier);
- const dep = depId ? dataSources.get(depId) : undefined;
- if (dep) {
- const name = scope.getName(dep.id, dep.name);
- if (assignee) {
- setters.add(dep.id);
- }
- return name;
- }
- // eslint-disable-next-line no-console
- console.error(`Unknown dependency "${identifier}"`);
- return identifier;
- },
- });
- newCode += `\n`;
- }
- if (typed) {
- args = args.map((arg) => `${arg}: any`);
- }
- body += `let ${name} = (${args.join(", ")}) => {\n`;
- body += newCode;
- for (const dataSourceId of setters.values()) {
- const variable = variables.get(dataSourceId);
- if (variable) {
- body += `${variable.setterName}(${variable.valueName})\n`;
- }
- }
- body += `}\n`;
- }
- }
-
- return {
- variables,
- body,
- output,
- };
-};
diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.ts
index 2fbae4485d..81de2c9fe7 100644
--- a/packages/react-sdk/src/index.ts
+++ b/packages/react-sdk/src/index.ts
@@ -21,7 +21,6 @@ export {
validateExpression,
encodeDataSourceVariable,
decodeDataSourceVariable,
- generateDataSources,
} from "./expression";
export { getIndexesWithinAncestors } from "./instance-utils";
export * from "./hook";
diff --git a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx
index bc757a4923..30a77ef39d 100644
--- a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx
@@ -15,10 +15,6 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [accordionValue, set$accordionValue] = useState<any>("0");
- let onValueChange = (value: any) => {
- accordionValue = value;
- set$accordionValue(accordionValue);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Accordion
@@ -26,7 +22,10 @@ const Page = (_props: { params: Params }) => {
data-ws-component="Accordion"
collapsible={true}
value={accordionValue}
- onValueChange={onValueChange}
+ onValueChange={(value: any) => {
+ accordionValue = value;
+ set$accordionValue(accordionValue);
+ }}
>
<AccordionItem
data-ws-id="6"
diff --git a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx
index 6b6f5137f6..08f63d13f6 100644
--- a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx
@@ -13,10 +13,6 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [checkboxChecked, set$checkboxChecked] = useState<any>(false);
- let onCheckedChange = (checked: any) => {
- checkboxChecked = checked;
- set$checkboxChecked(checkboxChecked);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Label
@@ -28,7 +24,10 @@ const Page = (_props: { params: Params }) => {
data-ws-id="3"
data-ws-component="Checkbox"
checked={checkboxChecked}
- onCheckedChange={onCheckedChange}
+ onCheckedChange={(checked: any) => {
+ checkboxChecked = checked;
+ set$checkboxChecked(checkboxChecked);
+ }}
className="c1pmpq0f c1yafs04 c11hichb c12e8ong c13c161l chzvexg c1s51a6q c17al2u0 c1ufcra4 c17gos5d cn4f13s c9mvxkx cu0p3ww c11i8aye ca1f4zs ck2qarh c1nxbatd caktpzb c1bm526f co0lfwl c1kn3u98 c2odgnt chlvjga c1jx7vpr c1oa7gr0 ce92j53 c1939zof c4lzij8"
>
<CheckboxIndicator
diff --git a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx
index 0c2b625838..63e565134e 100644
--- a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx
@@ -13,17 +13,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [collapsibleOpen, set$collapsibleOpen] = useState<any>(false);
- let onOpenChange = (open: any) => {
- collapsibleOpen = open;
- set$collapsibleOpen(collapsibleOpen);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Collapsible
data-ws-id="1"
data-ws-component="Collapsible"
open={collapsibleOpen}
- onOpenChange={onOpenChange}
+ onOpenChange={(open: any) => {
+ collapsibleOpen = open;
+ set$collapsibleOpen(collapsibleOpen);
+ }}
>
<CollapsibleTrigger
data-ws-id="5"
diff --git a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx
index 0c6d3acecb..18407c6566 100644
--- a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx
@@ -18,17 +18,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [dialogOpen, set$dialogOpen] = useState<any>(false);
- let onOpenChange = (open: any) => {
- dialogOpen = open;
- set$dialogOpen(dialogOpen);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Dialog
data-ws-id="1"
data-ws-component="Dialog"
open={dialogOpen}
- onOpenChange={onOpenChange}
+ onOpenChange={(open: any) => {
+ dialogOpen = open;
+ set$dialogOpen(dialogOpen);
+ }}
>
<DialogTrigger data-ws-id="5" data-ws-component="DialogTrigger">
<Button
diff --git a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx
index 7c060e5d25..0d42c15e7f 100644
--- a/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/navigation-menu.stories.tsx
@@ -20,17 +20,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [menuValue, set$menuValue] = useState<any>("");
- let onValueChange = (value: any) => {
- menuValue = value;
- set$menuValue(menuValue);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<NavigationMenu
data-ws-id="1"
data-ws-component="NavigationMenu"
value={menuValue}
- onValueChange={onValueChange}
+ onValueChange={(value: any) => {
+ menuValue = value;
+ set$menuValue(menuValue);
+ }}
className="crmoyyg cvxi4jc"
>
<NavigationMenuList
diff --git a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx
index 47da359992..5eb74d8b1f 100644
--- a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx
@@ -13,17 +13,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [popoverOpen, set$popoverOpen] = useState<any>(false);
- let onOpenChange = (open: any) => {
- popoverOpen = open;
- set$popoverOpen(popoverOpen);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Popover
data-ws-id="1"
data-ws-component="Popover"
open={popoverOpen}
- onOpenChange={onOpenChange}
+ onOpenChange={(open: any) => {
+ popoverOpen = open;
+ set$popoverOpen(popoverOpen);
+ }}
>
<PopoverTrigger data-ws-id="5" data-ws-component="PopoverTrigger">
<Button
diff --git a/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx
index 91f0dd9e09..08931e0629 100644
--- a/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/radio-group.stories.tsx
@@ -14,17 +14,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [radioGroupValue, set$radioGroupValue] = useState<any>("");
- let onValueChange = (value: any) => {
- radioGroupValue = value;
- set$radioGroupValue(radioGroupValue);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<RadioGroup
data-ws-id="1"
data-ws-component="RadioGroup"
value={radioGroupValue}
- onValueChange={onValueChange}
+ onValueChange={(value: any) => {
+ radioGroupValue = value;
+ set$radioGroupValue(radioGroupValue);
+ }}
className="c11xgi9i cfd715b c8prkzu c1edvzo4"
>
<Label
diff --git a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx
index b8c52e65b2..2286f5d902 100644
--- a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx
@@ -18,23 +18,21 @@ type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [selectValue, set$selectValue] = useState<any>("");
let [selectOpen, set$selectOpen] = useState<any>(false);
- let onValueChange = (value: any) => {
- selectValue = value;
- set$selectValue(selectValue);
- };
- let onOpenChange = (open: any) => {
- selectOpen = open;
- set$selectOpen(selectOpen);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Select
data-ws-id="1"
data-ws-component="Select"
value={selectValue}
- onValueChange={onValueChange}
+ onValueChange={(value: any) => {
+ selectValue = value;
+ set$selectValue(selectValue);
+ }}
open={selectOpen}
- onOpenChange={onOpenChange}
+ onOpenChange={(open: any) => {
+ selectOpen = open;
+ set$selectOpen(selectOpen);
+ }}
>
<SelectTrigger
data-ws-id="8"
diff --git a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx
index e2328a59eb..803ade98f0 100644
--- a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx
@@ -18,17 +18,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [sheetOpen, set$sheetOpen] = useState<any>(false);
- let onOpenChange = (open: any) => {
- sheetOpen = open;
- set$sheetOpen(sheetOpen);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Dialog
data-ws-id="1"
data-ws-component="Dialog"
open={sheetOpen}
- onOpenChange={onOpenChange}
+ onOpenChange={(open: any) => {
+ sheetOpen = open;
+ set$sheetOpen(sheetOpen);
+ }}
>
<DialogTrigger data-ws-id="5" data-ws-component="DialogTrigger">
<Button
diff --git a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx
index 1f9a87ab25..02b55afc4d 100644
--- a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx
@@ -5,17 +5,16 @@ import { Switch as Switch, SwitchThumb as SwitchThumb } from "../components";
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [switchChecked, set$switchChecked] = useState<any>(false);
- let onCheckedChange = (checked: any) => {
- switchChecked = checked;
- set$switchChecked(switchChecked);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Switch
data-ws-id="1"
data-ws-component="Switch"
checked={switchChecked}
- onCheckedChange={onCheckedChange}
+ onCheckedChange={(checked: any) => {
+ switchChecked = checked;
+ set$switchChecked(switchChecked);
+ }}
className="c1oai8p0 cnd1wdj cuh3w30 c11hichb c95zj28 clo3r8o c1o2cngd c1riwd65 ci2hmcl c1byz2lk c17al2u0 c1ufcra4 c17gos5d cn4f13s c1cofqbt c85ds3m c1e8k408 c1uosf6b chxhflr cc4jebi c4zy9sv c18xqxv1 cpr3ke2 c1wmnqxw c1b503n2 co0lfwl c1kn3u98 c2odgnt chlvjga c1jx7vpr c1oa7gr0 ce92j53 c1939zof c14mirta"
>
<SwitchThumb
diff --git a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx
index d54a6969b2..60b4eb53ff 100644
--- a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx
@@ -10,17 +10,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [tabsValue, set$tabsValue] = useState<any>("0");
- let onValueChange = (value: any) => {
- tabsValue = value;
- set$tabsValue(tabsValue);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Tabs
data-ws-id="1"
data-ws-component="Tabs"
value={tabsValue}
- onValueChange={onValueChange}
+ onValueChange={(value: any) => {
+ tabsValue = value;
+ set$tabsValue(tabsValue);
+ }}
>
<TabsList
data-ws-id="5"
diff --git a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx
index 0a57705040..72becc24a0 100644
--- a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx
+++ b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx
@@ -13,17 +13,16 @@ import {
type Params = Record<string, string | undefined>;
const Page = (_props: { params: Params }) => {
let [tooltipOpen, set$tooltipOpen] = useState<any>(false);
- let onOpenChange = (open: any) => {
- tooltipOpen = open;
- set$tooltipOpen(tooltipOpen);
- };
return (
<Box data-ws-id="root" data-ws-component="Box">
<Tooltip
data-ws-id="1"
data-ws-component="Tooltip"
open={tooltipOpen}
- onOpenChange={onOpenChange}
+ onOpenChange={(open: any) => {
+ tooltipOpen = open;
+ set$tooltipOpen(tooltipOpen);
+ }}
>
<TooltipTrigger data-ws-id="5" data-ws-component="TooltipTrigger">
<Button