webstudio-is
diff --git a/‎fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
+1-1 b/‎fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx
+1-1
diff --git a/‎fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
+1-1 b/‎fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx
+1-1
diff --git a/‎fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml]._index.tsx
+1-1 b/‎fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml]._index.tsx
+1-1
diff --git a/‎packages/react-sdk/src/component-generator.test.tsx
+3-3 b/‎packages/react-sdk/src/component-generator.test.tsx
+3-3
diff --git a/‎packages/react-sdk/src/component-generator.ts
+3-2 b/‎packages/react-sdk/src/component-generator.ts
+3-2
@@ -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
@@ -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>
     )}
@@ -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>
 )}
 
@@ -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`;