Skip to content

fix: render nothing on website when collection is invalid #4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2025
Merged

fix: render nothing on website when collection is invalid #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml]._index.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/react-sdk/src/component-generator.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ test("generate collection component as map", () => {
).toEqual(
validateJSX(
clear(`
{data?.map((element: any, index: number) =>
{data?.map?.((element: any, index: number) =>
<Fragment key={index}>
<Label />
<Button
Expand Down Expand Up @@ -636,7 +636,7 @@ test("avoid generating collection parameter variable as state", () => {
const Page = () => {
let [data, set$data] = useVariableState<any>(["apple","orange","mango"])
return <Body>
{data?.map((element: any, index: number) =>
{data?.map?.((element: any, index: number) =>
<Fragment key={index}>
</Fragment>
)}
Expand Down Expand Up @@ -854,7 +854,7 @@ let [condition, set$condition] = useVariableState<any>(false)
return <Body>
{(condition) &&
<>
{[]?.map((collectionItem: any, index: number) =>
{[]?.map?.((collectionItem: any, index: number) =>
<Fragment key={index}>
</Fragment>
)}
Expand Down
5 changes: 3 additions & 2 deletions packages/react-sdk/src/component-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,9 @@ export const generateJsxElement = ({
return "";
}
const indexVariable = scope.getName(`${instance.id}-index`, "index");
// fix implicit any error
generatedElement += `{${collectionDataValue}?.map((${collectionItemValue}: any, ${indexVariable}: number) =>\n`;
// collection can be nullable or invalid type
// fix implicitly on published sites
generatedElement += `{${collectionDataValue}?.map?.((${collectionItemValue}: any, ${indexVariable}: number) =>\n`;
generatedElement += `<Fragment key={${indexVariable}}>\n`;
generatedElement += children;
generatedElement += `</Fragment>\n`;
Expand Down