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: generate conditional collection (#3506)

Bogdan Chadkin5cd2899e8126
diff --git a/packages/react-sdk/src/component-generator.test.ts b/packages/react-sdk/src/component-generator.test.ts
index 4b5d047138..7b81a13fb1 100644
--- a/packages/react-sdk/src/component-generator.test.ts
+++ b/packages/react-sdk/src/component-generator.test.ts
@@ -992,3 +992,75 @@ data-ws-component="Body">
"
`);
});
+
+test("generate conditional collection", () => {
+ expect(
+ generateWebstudioComponent({
+ classesMap: new Map(),
+ scope: createScope(),
+ name: "Page",
+ rootInstanceId: "body",
+ parameters: [],
+ instances: toMap([
+ createInstance("body", "Body", [{ type: "id", value: "list" }]),
+ createInstance("list", collectionComponent, []),
+ ]),
+ dataSources: toMap<DataSource>([
+ {
+ id: "conditionId",
+ scopeInstanceId: "list",
+ name: "conditionName",
+ type: "variable",
+ value: { type: "boolean", value: false },
+ },
+ {
+ id: "collectionItemId",
+ scopeInstanceId: "list",
+ name: "collectionItemName",
+ type: "parameter",
+ },
+ ]),
+ props: toMap<Prop>([
+ {
+ id: "showPropId",
+ instanceId: "list",
+ name: showAttribute,
+ type: "expression",
+ value: "$ws$dataSource$conditionId",
+ },
+ {
+ id: "dataPropId",
+ instanceId: "list",
+ name: "data",
+ type: "json",
+ value: [],
+ },
+ {
+ id: "itemPropId",
+ instanceId: "list",
+ name: "item",
+ type: "parameter",
+ value: "collectionItemId",
+ },
+ ]),
+ indexesWithinAncestors: new Map(),
+ })
+ ).toMatchInlineSnapshot(`
+ "const Page = () => {
+ let [conditionName, set$conditionName] = useState<any>(false)
+ return <Body
+ data-ws-id="body"
+ data-ws-component="Body">
+ {(conditionName) &&
+ <>
+ {[]?.map((collectionItemName: any, index: number) =>
+ <Fragment key={index}>
+ </Fragment>
+ )}
+ </>
+ }
+ </Body>
+ }
+ "
+ `);
+});
diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.ts
index 0efffe661f..d0abcae385 100644
--- a/packages/react-sdk/src/component-generator.ts
+++ b/packages/react-sdk/src/component-generator.ts
@@ -153,6 +153,12 @@ export const generateJsxElement = ({
children: string;
classesMap?: Map<string, Array<string>>;
}) => {
+ // descendant component is used only for styling
+ // and should not be rendered
+ if (instance.component === descendantComponent) {
+ return "";
+ }
+
let generatedProps = "";
// id and component props are always defined for styles
@@ -220,12 +226,6 @@ export const generateJsxElement = ({
}
let generatedElement = "";
- // coditionally render instance when show prop is data source
- // {dataSourceVariable && <Instance>}
- if (conditionValue) {
- generatedElement += `{(${conditionValue}) &&\n`;
- }
-
if (instance.component === collectionComponent) {
// prevent generating invalid collection
if (
@@ -253,14 +253,26 @@ export const generateJsxElement = ({
}
}
- // descendant component is used only for styling
- // and should not be rendered
- if (instance.component === descendantComponent) {
- return "";
- }
-
+ // coditionally render instance when show prop is data source
+ // {dataSourceVariable && <Instance>}
if (conditionValue) {
- generatedElement += `}\n`;
+ let conditionalElement = "";
+ conditionalElement += `{(${conditionValue}) &&\n`;
+ // wrap collection with fragment when rendered inside condition
+ // {dataSourceVariable &&
+ // <>
+ // {[].map(...)}
+ // </>
+ // }
+ if (instance.component === collectionComponent) {
+ conditionalElement += "<>\n";
+ conditionalElement += generatedElement;
+ conditionalElement += "</>\n";
+ } else {
+ conditionalElement += generatedElement;
+ }
+ conditionalElement += `}\n`;
+ return conditionalElement;
}
return generatedElement;