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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: drop data-ws-* attributes (#3806)
Bogdan Chadkin8a746f6594d6
diff --git a/fixtures/ssg/.gitignore b/fixtures/ssg/.gitignoredeleted file mode 100644index 1521c8b765..0000000000--- a/fixtures/ssg/.gitignore+++ /dev/null@@ -1 +0,0 @@-distdiff --git a/fixtures/ssg/app/__generated__/[another-page]._index.tsx b/fixtures/ssg/app/__generated__/[another-page]._index.tsxindex dc400d12f4..276b7ad8e5 100644--- a/fixtures/ssg/app/__generated__/[another-page]._index.tsx+++ b/fixtures/ssg/app/__generated__/[another-page]._index.tsx@@ -20,18 +20,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="n_VBMr7klpx25buS0NV7R"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="wthNByqb3RPmheb-56VYI"- data-ws-component="Heading"- className="w-heading"- >- {"Another page"}- </Heading>+ <Body className="w-body">+ <Heading className="w-heading">{"Another page"}</Heading></Body>);};diff --git a/fixtures/ssg/app/__generated__/_index.tsx b/fixtures/ssg/app/__generated__/_index.tsxindex fccb8f013f..c10ae2e1fa 100644--- a/fixtures/ssg/app/__generated__/_index.tsx+++ b/fixtures/ssg/app/__generated__/_index.tsx@@ -27,36 +27,15 @@ export const CustomCode = () => {const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="MMimeobf_zi4ZkRGXapju"- data-ws-component="Body"- className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l"- >- <Heading- data-ws-id="MYDt0guk1-vzc7yzqyN6A"- data-ws-component="Heading"- className="w-heading"- >- {"Simple Project to test CLI"}- </Heading>- <Text- data-ws-id="BMJfjOzunWs8XkQgvvx1e"- data-ws-component="Text"- className="w-text cn3rfux"- >+ <Body className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l">+ <Heading className="w-heading">{"Simple Project to test CLI"}</Heading>+ <Text className="w-text cn3rfux">{"Please don't change directly in the fixture"}</Text>- <Link- data-ws-id="pjkZo5EiBqaeUXBcyHf_O"- data-ws-component="Link"- href={"/another-page"}- className="w-link"- >+ <Link href={"/another-page"} className="w-link">{"Test another page link"}</Link><Image- data-ws-id="uHB3Fjb7-NELG-bnH7bXB"- data-ws-component="Image"src={"/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg"}width={14}height={16}diff --git a/fixtures/ssg/package.json b/fixtures/ssg/package.jsonindex b9f8f6a7d0..f4681947bb 100644--- a/fixtures/ssg/package.json+++ b/fixtures/ssg/package.json@@ -4,12 +4,13 @@"description": "","scripts": {"build": "vite build",+ "postbuild": "prettier --write .","dev": "vite dev","typecheck": "tsc","cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio","fixtures:link": "pnpm cli link --link \"https://main.development.webstudio.is/builder/d845c167-ea07-4875-b08d-83e97c09dcce?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93\"","fixtures:sync": "pnpm cli sync && pnpm prettier --write ./.webstudio/",- "fixtures:build": "rm -rf pages && pnpm cli build --template ssg --template internal --preview && pnpm prettier --write ."+ "fixtures:build": "rm -rf pages && pnpm cli build --template ssg --template internal --preview && prettier --write ."},"engines": {"node": ">=20.0.0"diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsxindex d8c98243d2..b456d56818 100644--- a/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.tsx@@ -18,18 +18,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="n_VBMr7klpx25buS0NV7R"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="wthNByqb3RPmheb-56VYI"- data-ws-component="Heading"- className="w-heading"- >- {"Another page"}- </Heading>+ <Body className="w-body">+ <Heading className="w-heading">{"Another page"}</Heading></Body>);};diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsxindex 38fa1a51e4..a6c2d25781 100644--- a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.tsx@@ -29,36 +29,15 @@ export const CustomCode = () => {const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="MMimeobf_zi4ZkRGXapju"- data-ws-component="Body"- className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l"- >- <Heading- data-ws-id="MYDt0guk1-vzc7yzqyN6A"- data-ws-component="Heading"- className="w-heading"- >- {"Simple Project to test CLI"}- </Heading>- <Text- data-ws-id="BMJfjOzunWs8XkQgvvx1e"- data-ws-component="Text"- className="w-text cn3rfux"- >+ <Body className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l">+ <Heading className="w-heading">{"Simple Project to test CLI"}</Heading>+ <Text className="w-text cn3rfux">{"Please don't change directly in the fixture"}</Text>- <Link- data-ws-id="pjkZo5EiBqaeUXBcyHf_O"- data-ws-component="Link"- href={"/another-page"}- className="w-link"- >+ <Link href={"/another-page"} className="w-link">{"Test another page link"}</Link><Image- data-ws-id="uHB3Fjb7-NELG-bnH7bXB"- data-ws-component="Image"src={"/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg"}width={14}height={16}diff --git a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsxindex b6af7a2126..02244847f8 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[script-test]._index.tsx@@ -34,37 +34,18 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="LW98_-srDnnagkR10lsk4"- data-ws-component="Body"- className="w-body cjrgi00"- >- <Heading- data-ws-id="SHXddDLFWST_sy44UfGQO"- data-ws-component="Heading"- className="w-heading"- >- {"Script Test"}- </Heading>- <Link- data-ws-id="8MXByradrqVRiGSyHI0aH"- data-ws-component="Link"- href={"/"}- className="w-link"- >+ <Body className="w-body cjrgi00">+ <Heading className="w-heading">{"Script Test"}</Heading>+ <Link href={"/"} className="w-link">{"Go Home"}</Link><HtmlEmbed- data-ws-id="fx0TfnvHfudZ99agcyokN"- data-ws-component="HtmlEmbed"code={"<br>\n<script>console.log('SCRIPT TEST SSR')</script>\n<script>console.log('SCRIPT TEST SSR 2')</script>\nSCRIPTS ARE HERE 2<br>"}className="w-html-embed"/><HtmlEmbed- data-ws-id="evFyHvPu9rGzKojoj723b"- data-ws-component="HtmlEmbed"code={"<script>console.log('SCRIPTS TEST Client')</script>\n<script>console.log('SCRIPTS TEST 2 Client')</script>\nSCRIPTS ARE HERE <br>"}diff --git a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsxindex 3d2aa3d7d3..3667dc7e70 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml]._index.tsx@@ -30,38 +30,18 @@ const Body = (props: any) => props.children;const Page = ({ system: system }: { system: any }) => {let sitemapxml = useResource("sitemapxml_1");return (- <Body- data-ws-id="rve0BYRbzAkSCr3Lq-wzi"- data-ws-component="Body"- className="w-body"- >+ <Body className="w-body"><XmlNode- data-ws-id="cgaMXxOMMAh4H-u-MB3_0"- data-ws-component="XmlNode"tag={"urlset"}xmlns={"http://www.sitemaps.org/schemas/sitemap/0.9"}>{sitemapxml?.data?.map((url: any, index: number) => (<Fragment key={index}>- <XmlNode- data-ws-id="SKzEKWw1VtVVFvUcIWuUp"- data-ws-component="XmlNode"- tag={"url"}- >- <XmlNode- data-ws-id="9NJGnzZG3iPZs78XPTHhH"- data-ws-component="XmlNode"- tag={"loc"}- >+ <XmlNode tag={"url"}>+ <XmlNode tag={"loc"}>{`${system?.origin ?? "${ORIGIN}"}${url?.path}`}</XmlNode>- <XmlNode- data-ws-id="IjNaHLHI4gWStV8GvhijX"- data-ws-component="XmlNode"- tag={"lastmod"}- >- {url?.lastModified}- </XmlNode>+ <XmlNode tag={"lastmod"}>{url?.lastModified}</XmlNode></XmlNode></Fragment>))}diff --git a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsxindex 710c6a8877..f0b2ef8718 100644--- a/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/[world]._index.tsx@@ -28,18 +28,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="jDb2FuSK2-azIZxkH5XNv"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="D7kQxgXxrjei-MS_KzUa2"- data-ws-component="Heading"- className="w-heading"- >- {"Привет Мир"}- </Heading>+ <Body className="w-body">+ <Heading className="w-heading">{"Привет Мир"}</Heading></Body>);};diff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsxindex b9eca9d816..dbd9bfae0f 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx@@ -89,26 +89,12 @@ export const CustomCode = () => {const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="ibXgMoi9_ipHx1gVrvii0"- data-ws-component="Body"- className="w-body cjrgi00"- >- <Heading- data-ws-id="7pwqBSgrfuuOfk1JblWcL"- data-ws-component="Heading"- className="w-heading ce7mxws cd0g70b c1ku1ozg c1kbs9xq c1m6kmmg crjoqt7 c1n5sjmn c1hqh3e6 cwdggon c4o64du"- >+ <Body className="w-body cjrgi00">+ <Heading className="w-heading ce7mxws cd0g70b c1ku1ozg c1kbs9xq c1m6kmmg crjoqt7 c1n5sjmn c1hqh3e6 cwdggon c4o64du">{"DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES"}</Heading>- <Box- data-ws-id="GMg3Wi9tJBFMtKcwbIK6z"- data-ws-component="Box"- className="w-box cxb89wn c12qr5j7 c111rqf8 cp8i2p0 cwfevk3"- >+ <Box className="w-box cxb89wn c12qr5j7 c111rqf8 cp8i2p0 cwfevk3"><Image- data-ws-id="Mfd_mI-VJtT4r7gICAvXi"- data-ws-component="Image"src={"/custom-folder/_937084ed-a798-49fe-8664-df93a2af605e_1JqSy_0Wy9fY5mXNZSLJ0.jpeg"}@@ -116,22 +102,10 @@ const Page = ({}: { system: any }) => {height={1024}className="w-image ccgiojm cv4f3rn cer5re4 c9lz7ss"/>- <Box- data-ws-id="COafOppxs73Ne4O0Geik0"- data-ws-component="Box"- className="w-box ccgiojm cv4f3rn cer5re4 c9lz7ss"- />+ <Box className="w-box ccgiojm cv4f3rn cer5re4 c9lz7ss" /></Box>- <Heading- data-ws-id="jWb8SRMYG_XPWqCYvGZjo"- data-ws-component="Heading"- className="w-heading"- >- {"Below Image"}- </Heading>+ <Heading className="w-heading">{"Below Image"}</Heading><HtmlEmbed- data-ws-id="PI0W8MDhnG1glS5zDm8HQ"- data-ws-component="HtmlEmbed"code={"<script>console.log('PAGE MAIN Client')</script>\n<script>console.log('PAGE MAIN 2 Client')</script>\nSCRIPTS ARE HERE <br>"}@@ -139,44 +113,27 @@ const Page = ({}: { system: any }) => {className="w-html-embed"/><HtmlEmbed- data-ws-id="ffuOk2adQRwdmAPbN0C02"- data-ws-component="HtmlEmbed"code={"<script>console.log('PAGE MAIN SSR')</script>\n<script>console.log('PAGE MAIN 2 SSR')</script>\nSCRIPTS ARE HERE <br>"}className="w-html-embed"/>- <Link- data-ws-id="QzTSoZnbGD6luZ5xcv893"- data-ws-component="Link"- href={"/script-test"}- className="w-link"- >+ <Link href={"/script-test"} className="w-link">{"Goto Scr"}</Link><Vimeo- data-ws-id="ZkDuD4HlHP3pDdp0SXJuh"- data-ws-component="Vimeo"url={"https://player.vimeo.com/video/831343124"}showPreview={true}className="w-vimeo c17osjft c5kxibo c8mrdqb"><VimeoPreviewImage- data-ws-id="wxd8Wul8dl2yPRFFedNn6"- data-ws-component="VimeoPreviewImage"alt={"Vimeo video preview image"}sizes={"100vw"}src={"/custom-folder/home_wsKvRSqvkajPPBeycZ-C8.svg"}className="w-preview-image c13adha2 c19kjzjn c8mrdqb chv0hit c1vw7ut7 c64vnj4 cow7xo6 cddunt6 cqjhyu2"/>- <VimeoSpinner- data-ws-id="o8sAMUoaOraWYZClEfRgl"- data-ws-component="VimeoSpinner"- className="w-spinner c13adha2 c1ifzo79 c1ljqvnn c10zke2u cplzsl2 c1ardg8l ces5mo3"- >+ <VimeoSpinner className="w-spinner c13adha2 c1ifzo79 c1ljqvnn c10zke2u cplzsl2 c1ardg8l ces5mo3"><HtmlEmbed- data-ws-id="BeQ7sgDlUizFvf4aHqOsh"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" id="e2CRglijn891" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 128 128" fill="currentColor" width="100%" height="100%" style="display: block;"><style>@keyframes e2CRglijn892_tr__tr{0%{transform:translate(64px,64px) rotate(90deg);animation-timing-function:cubic-bezier(.42,0,.58,1)}50%{transform:translate(64px,64px) rotate(810deg);animation-timing-function:cubic-bezier(.42,0,.58,1)}to{transform:translate(64px,64px) rotate(1530deg)}}@keyframes e2CRglijn892_s_p{0%,to{stroke:#39fbbb}25%{stroke:#4a4efa}50%{stroke:#e63cfe}75%{stroke:#ffae3c}}@keyframes e2CRglijn892_s_do{0%{stroke-dashoffset:251.89}2.5%,52.5%{stroke-dashoffset:263.88;animation-timing-function:cubic-bezier(.42,0,.58,1)}25%,75%{stroke-dashoffset:131.945}to{stroke-dashoffset:251.885909}}#e2CRglijn892_tr{animation:e2CRglijn892_tr__tr 3000ms linear infinite normal forwards}#e2CRglijn892{animation-name:e2CRglijn892_s_p,e2CRglijn892_s_do;animation-duration:3000ms;animation-fill-mode:forwards;animation-timing-function:linear;animation-direction:normal;animation-iteration-count:infinite}</style><g id="e2CRglijn892_tr" transform="translate(64,64) rotate(90)"><circle id="e2CRglijn892" r="42" fill="none" stroke="#39fbbb" stroke-dasharray="263.89" stroke-dashoffset="251.89" stroke-linecap="round" stroke-width="16" transform="scale(-1,1) translate(0,0)"/></g></svg>'}@@ -185,20 +142,11 @@ const Page = ({}: { system: any }) => {/></VimeoSpinner><VimeoPlayButton- data-ws-id="9hBBPGSf7hB30ZkSHKjNd"- data-ws-component="VimeoPlayButton"aria-label={"Play button"}className="w-play-button c13adha2 c1t88ri8 ca7kf99 c1ifzo79 c1ljqvnn c1bld9op ctly9e6 cxb89wn cwcnvqs cvchf4 c1y7dyx c1bnrgjg c1joowif c120xed6 c2eug5n cvwgylz c1f0qcby c1syyj1x cil01r8 c11087u4 coba2o7 c82nx6d">- <Box- data-ws-id="D__QElBIIQtamhJN3a4FI"- data-ws-component="Box"- aria-hidden={"true"}- className="w-box c1cccshn c1eyznz"- >+ <Box aria-hidden={"true"} className="w-box c1cccshn c1eyznz"><HtmlEmbed- data-ws-id="iEc6hab-WardXZc5P9wJu"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.766 5.765c0-.725 0-1.088.178-1.288a.93.93 0 0 1 .648-.294c.294-.015.65.186 1.359.588l9.234 5.235c.586.332.88.498.982.708.09.183.09.389 0 .572-.102.21-.396.376-.982.708l-9.234 5.235c-.71.402-1.065.603-1.359.588a.93.93 0 0 1-.648-.294c-.178-.2-.178-.563-.178-1.288V5.765Z"/></svg>'}diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsxindex d8c98243d2..b456d56818 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[another-page]._index.tsx@@ -18,18 +18,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="n_VBMr7klpx25buS0NV7R"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="wthNByqb3RPmheb-56VYI"- data-ws-component="Heading"- className="w-heading"- >- {"Another page"}- </Heading>+ <Body className="w-body">+ <Heading className="w-heading">{"Another page"}</Heading></Body>);};diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsxindex 38fa1a51e4..a6c2d25781 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx@@ -29,36 +29,15 @@ export const CustomCode = () => {const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="MMimeobf_zi4ZkRGXapju"- data-ws-component="Body"- className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l"- >- <Heading- data-ws-id="MYDt0guk1-vzc7yzqyN6A"- data-ws-component="Heading"- className="w-heading"- >- {"Simple Project to test CLI"}- </Heading>- <Text- data-ws-id="BMJfjOzunWs8XkQgvvx1e"- data-ws-component="Text"- className="w-text cn3rfux"- >+ <Body className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l">+ <Heading className="w-heading">{"Simple Project to test CLI"}</Heading>+ <Text className="w-text cn3rfux">{"Please don't change directly in the fixture"}</Text>- <Link- data-ws-id="pjkZo5EiBqaeUXBcyHf_O"- data-ws-component="Link"- href={"/another-page"}- className="w-link"- >+ <Link href={"/another-page"} className="w-link">{"Test another page link"}</Link><Image- data-ws-id="uHB3Fjb7-NELG-bnH7bXB"- data-ws-component="Image"src={"/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg"}width={14}height={16}diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsxindex d8c98243d2..b456d56818 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/[another-page]._index.tsx@@ -18,18 +18,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="n_VBMr7klpx25buS0NV7R"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="wthNByqb3RPmheb-56VYI"- data-ws-component="Heading"- className="w-heading"- >- {"Another page"}- </Heading>+ <Body className="w-body">+ <Heading className="w-heading">{"Another page"}</Heading></Body>);};diff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsxindex 38fa1a51e4..a6c2d25781 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx@@ -29,36 +29,15 @@ export const CustomCode = () => {const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="MMimeobf_zi4ZkRGXapju"- data-ws-component="Body"- className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l"- >- <Heading- data-ws-id="MYDt0guk1-vzc7yzqyN6A"- data-ws-component="Heading"- className="w-heading"- >- {"Simple Project to test CLI"}- </Heading>- <Text- data-ws-id="BMJfjOzunWs8XkQgvvx1e"- data-ws-component="Text"- className="w-text cn3rfux"- >+ <Body className="w-body c1jaw2zx cbipm55 ctniqj4 ctgx88l">+ <Heading className="w-heading">{"Simple Project to test CLI"}</Heading>+ <Text className="w-text cn3rfux">{"Please don't change directly in the fixture"}</Text>- <Link- data-ws-id="pjkZo5EiBqaeUXBcyHf_O"- data-ws-component="Link"- href={"/another-page"}- className="w-link"- >+ <Link href={"/another-page"} className="w-link">{"Test another page link"}</Link><Image- data-ws-id="uHB3Fjb7-NELG-bnH7bXB"- data-ws-component="Image"src={"/assets/iconly_svg_converted-converted_zMaMiAAutUl8XrITgz7d1.svg"}width={14}height={16}diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsxindex 585a515cc2..071a9b6541 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx@@ -28,14 +28,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="EDEfpMPRqDejthtwkH7ws"- data-ws-component="Body"- className="w-body"- >+ <Body className="w-body"><Image- data-ws-id="AdXSAYCx4QDo5QN6nLoGs"- data-ws-component="Image"src={"/assets/small-avif-kitty_FnabJsioMWpBtXZSGf4DR.webp"}className="w-image c1czoo99"/>diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex 541c01958b..779eece0d2 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -39,14 +39,8 @@ const Page = ({}: { system: any }) => {let [formState, set$formState] = useState<any>("initial");let [formState_1, set$formState_1] = useState<any>("initial");return (- <Body- data-ws-id="a-4nDFkaWy4px1fn38XWJ"- data-ws-component="Body"- className="w-body"- >+ <Body className="w-body"><Form- data-ws-id="-1RvizaBcVpHsjvnYxn1c"- data-ws-component="Form"state={formState}onStateChange={(state: any) => {formState = state;@@ -55,76 +49,25 @@ const Page = ({}: { system: any }) => {className="w-webhook-form">{(formState === "initial" || formState === "error") && (- <Box- data-ws-id="qhnVrmYGlyrMZi3UzqSQA"- data-ws-component="Box"- className="w-box"- >- <Heading- data-ws-id="YdHHf4u3jrdbRIWpB_VfH"- data-ws-component="Heading"- tag={"h3"}- className="w-heading"- >+ <Box className="w-box">+ <Heading tag={"h3"} className="w-heading">{"Default form"}</Heading>- <Label- data-ws-id="A0RNI1WVwOGGDbwYnoZia"- data-ws-component="Label"- className="w-input-label"- >- {"Name"}- </Label>- <Input- data-ws-id="e035xi9fcwYtrn9La49Eh"- data-ws-component="Input"- name={"name"}- className="w-text-input"- />- <Label- data-ws-id="LImtuVzw5R9yQsG4faiGV"- data-ws-component="Label"- className="w-input-label"- >- {"Email"}- </Label>- <Input- data-ws-id="dcHjdeW_HXPkyQlx3ZiL7"- data-ws-component="Input"- name={"email"}- className="w-text-input"- />- <Button- data-ws-id="ZAtG6JgK4sbTnOAZlp2rU"- data-ws-component="Button"- className="w-button"- >- {"Submit"}- </Button>+ <Label className="w-input-label">{"Name"}</Label>+ <Input name={"name"} className="w-text-input" />+ <Label className="w-input-label">{"Email"}</Label>+ <Input name={"email"} className="w-text-input" />+ <Button className="w-button">{"Submit"}</Button></Box>)}{formState === "success" && (- <Box- data-ws-id="966cjxuqP_T99N27-mqWE"- data-ws-component="Box"- className="w-box"- >- {"Thank you for getting in touch!"}- </Box>+ <Box className="w-box">{"Thank you for getting in touch!"}</Box>)}{formState === "error" && (- <Box- data-ws-id="SYG5hhOz31xFJUN_v9zq6"- data-ws-component="Box"- className="w-box"- >- {"Sorry, something went wrong."}- </Box>+ <Box className="w-box">{"Sorry, something went wrong."}</Box>)}</Form><Form- data-ws-id="isNSM3wXcnHFikwNPlEOL"- data-ws-component="Form"state={formState_1}onStateChange={(state: any) => {formState_1 = state;@@ -134,71 +77,22 @@ const Page = ({}: { system: any }) => {className="w-webhook-form">{(formState_1 === "initial" || formState_1 === "error") && (- <Box- data-ws-id="a5YPRc19IJyhTrjjasA_R"- data-ws-component="Box"- className="w-box"- >- <Heading- data-ws-id="y4pceTmziuBRIDgUBQNLD"- data-ws-component="Heading"- tag={"h3"}- className="w-heading"- >+ <Box className="w-box">+ <Heading tag={"h3"} className="w-heading">{"Form with custom action and method"}</Heading>- <Label- data-ws-id="_gLjS0enBOV8KW9Ykz_es"- data-ws-component="Label"- className="w-input-label"- >- {"Name"}- </Label>- <Input- data-ws-id="ydR5B_9uMS4PXFS76TmBh"- data-ws-component="Input"- name={"name"}- className="w-text-input"- />- <Label- data-ws-id="8RU1FyL2QRyqhNUKELGrb"- data-ws-component="Label"- className="w-input-label"- >- {"Email"}- </Label>- <Input- data-ws-id="TsqGP49hjgEW41ReCwrpZ"- data-ws-component="Input"- name={"email"}- className="w-text-input"- />- <Button- data-ws-id="5GWjwVdapuGdn443GIKDW"- data-ws-component="Button"- className="w-button"- >- {"Submit"}- </Button>+ <Label className="w-input-label">{"Name"}</Label>+ <Input name={"name"} className="w-text-input" />+ <Label className="w-input-label">{"Email"}</Label>+ <Input name={"email"} className="w-text-input" />+ <Button className="w-button">{"Submit"}</Button></Box>)}{formState_1 === "success" && (- <Box- data-ws-id="Gw-ta0R4FNFAGBTVRWKep"- data-ws-component="Box"- className="w-box"- >- {"Thank you for getting in touch!"}- </Box>+ <Box className="w-box">{"Thank you for getting in touch!"}</Box>)}{formState_1 === "error" && (- <Box- data-ws-id="ewk_WKpu4syHLPABMmvUz"- data-ws-component="Box"- className="w-box"- >- {"Sorry, something went wrong."}- </Box>+ <Box className="w-box">{"Sorry, something went wrong."}</Box>)}</Form></Body>diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsxindex 0f04d001a6..43e7b89229 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx@@ -28,17 +28,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="O-ljaGZQ0iRNTlEshMkgE"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="qmxnOlSxUGpuhuonVArWJ"- data-ws-component="Heading"- id={"my-heading"}- className="w-heading"- >+ <Body className="w-body">+ <Heading id={"my-heading"} className="w-heading">{"Heading you can edit"}</Heading></Body>diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsxindex d3233f3bf1..55b16d0684 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[nested].[nested-page]._index.tsx@@ -28,18 +28,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="L0ZXd5F9xk9Rsl9ORzIkJ"- data-ws-component="Body"- className="w-body"- >- <Heading- data-ws-id="VFPjLwt6Caq4l9PPJSiyI"- data-ws-component="Heading"- className="w-heading"- >- {"Nested page"}- </Heading>+ <Body className="w-body">+ <Heading className="w-heading">{"Nested page"}</Heading></Body>);};diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex 2ee9608afc..6e3ddda812 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -40,14 +40,8 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {let [accordionValue, set$accordionValue] = useState<any>("0");return (- <Body- data-ws-id="uKWGyE9JY3cPwY-xI9vk6"- data-ws-component="Body"- className="w-body"- >+ <Body className="w-body"><Accordion- data-ws-id="AM9fD6dv2Ftc3Xjcsd7Uc"- data-ws-component="@webstudio-is/sdk-components-react-radix:Accordion"collapsible={true}value={accordionValue}onValueChange={(value: any) => {@@ -56,37 +50,12 @@ const Page = ({}: { system: any }) => {}}className="w-accordion">- <AccordionItem- data-ws-id="zJ927zk9txwUbYycKB7QA"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"- data-ws-index="0"- className="w-item c2onvcp"- >- <AccordionHeader- data-ws-id="sMxg7xT1hwYt05hbOvoPL"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"- className="w-item-header c13v7j50"- >- <AccordionTrigger- data-ws-id="qQSA4NoyKC88O68mBiQe2"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"- className="w-item-trigger c13v7j50 c1qxdkbn chhejm9 c13bviim cpjvam0 c1tw5o2 cqw88jp c44srea c14kxsax cg783j6 c1ad236a c1s4llbc"- >- <Text- data-ws-id="q-DVI4YTNrQ1LizmEyJHI"- data-ws-component="Text"- className="w-text"- >- {"Is it accessible?"}- </Text>- <Box- data-ws-id="RSk81lLj2IGXgchTuXF7V"- data-ws-component="Box"- className="w-box c14hansb c6d2sb5 cwwiftc c16vb2zi c1hl6g8z c1xm49r0 c1vri55v"- >+ <AccordionItem data-ws-index="0" className="w-item c2onvcp">+ <AccordionHeader className="w-item-header c13v7j50">+ <AccordionTrigger className="w-item-trigger c13v7j50 c1qxdkbn chhejm9 c13bviim cpjvam0 c1tw5o2 cqw88jp c44srea c14kxsax cg783j6 c1ad236a c1s4llbc">+ <Text className="w-text">{"Is it accessible?"}</Text>+ <Box className="w-box c14hansb c6d2sb5 cwwiftc c16vb2zi c1hl6g8z c1xm49r0 c1vri55v"><HtmlEmbed- data-ws-id="d0sd_G-kHirxgjq6s6Uq1"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -95,45 +64,16 @@ const Page = ({}: { system: any }) => {</Box></AccordionTrigger></AccordionHeader>- <AccordionContent- data-ws-id="IUftdfjK-ilSzfOTdIx1u"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"- className="w-item-content c1mxwmum c1j0j9ep c1gl2i2 c44srea"- >+ <AccordionContent className="w-item-content c1mxwmum c1j0j9ep c1gl2i2 c44srea">{"Yes. It adheres to the WAI-ARIA design pattern."}</AccordionContent></AccordionItem>- <AccordionItem- data-ws-id="C838wkvIcA1BQu30Xu2G8"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"- data-ws-index="1"- className="w-item c2onvcp"- >- <AccordionHeader- data-ws-id="fYUOB_brm6s0Ky68lzMfU"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"- className="w-item-header c13v7j50"- >- <AccordionTrigger- data-ws-id="dfd4gonev_AX6BpuCsxjb"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"- className="w-item-trigger c13v7j50 c1qxdkbn chhejm9 c13bviim cpjvam0 c1tw5o2 cqw88jp c44srea c14kxsax cg783j6 c1ad236a c1s4llbc"- >- <Text- data-ws-id="lZ7sI6Kw_0VZkURriKscB"- data-ws-component="Text"- className="w-text"- >- {"Is it styled?"}- </Text>- <Box- data-ws-id="wRw75kuvFzl5NWD8IGJoI"- data-ws-component="Box"- className="w-box c14hansb c6d2sb5 cwwiftc c16vb2zi c1hl6g8z c1xm49r0 c1vri55v"- >+ <AccordionItem data-ws-index="1" className="w-item c2onvcp">+ <AccordionHeader className="w-item-header c13v7j50">+ <AccordionTrigger className="w-item-trigger c13v7j50 c1qxdkbn chhejm9 c13bviim cpjvam0 c1tw5o2 cqw88jp c44srea c14kxsax cg783j6 c1ad236a c1s4llbc">+ <Text className="w-text">{"Is it styled?"}</Text>+ <Box className="w-box c14hansb c6d2sb5 cwwiftc c16vb2zi c1hl6g8z c1xm49r0 c1vri55v"><HtmlEmbed- data-ws-id="StPslEr81nfBISqBE2R-Y"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -142,47 +82,18 @@ const Page = ({}: { system: any }) => {</Box></AccordionTrigger></AccordionHeader>- <AccordionContent- data-ws-id="wNRVuu0L5E8TVufKdswp1"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"- className="w-item-content c1mxwmum c1j0j9ep c1gl2i2 c44srea"- >+ <AccordionContent className="w-item-content c1mxwmum c1j0j9ep c1gl2i2 c44srea">{"Yes. It comes with default styles that matches the other components' aesthetic."}</AccordionContent></AccordionItem>- <AccordionItem- data-ws-id="65djoTmSBGemZ2L5izQ5M"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionItem"- data-ws-index="2"- className="w-item c2onvcp"- >- <AccordionHeader- data-ws-id="UJYfe6kH7HqhH0YYeJwe7"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionHeader"- className="w-item-header c13v7j50"- >- <AccordionTrigger- data-ws-id="600nGddaNxGGdsuGgpxJR"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionTrigger"- className="w-item-trigger c13v7j50 c1qxdkbn chhejm9 c13bviim cpjvam0 c1tw5o2 cqw88jp c44srea c14kxsax cg783j6 c1ad236a c1s4llbc"- >- <Text- data-ws-id="1iNKIMG91n83PzJnEdxq9"- data-ws-component="Text"- className="w-text"- >- {"Is it animated?"}- </Text>- <Box- data-ws-id="Ta70VqUb_fGJXBT_zsnxQ"- data-ws-component="Box"- className="w-box c14hansb c6d2sb5 cwwiftc c16vb2zi c1hl6g8z c1xm49r0 c1vri55v"- >+ <AccordionItem data-ws-index="2" className="w-item c2onvcp">+ <AccordionHeader className="w-item-header c13v7j50">+ <AccordionTrigger className="w-item-trigger c13v7j50 c1qxdkbn chhejm9 c13bviim cpjvam0 c1tw5o2 cqw88jp c44srea c14kxsax cg783j6 c1ad236a c1s4llbc">+ <Text className="w-text">{"Is it animated?"}</Text>+ <Box className="w-box c14hansb c6d2sb5 cwwiftc c16vb2zi c1hl6g8z c1xm49r0 c1vri55v"><HtmlEmbed- data-ws-id="sO80m5u4f87jVGG91t6u8"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -191,11 +102,7 @@ const Page = ({}: { system: any }) => {</Box></AccordionTrigger></AccordionHeader>- <AccordionContent- data-ws-id="mOVPnIrlt6IwVAzI_i2Fc"- data-ws-component="@webstudio-is/sdk-components-react-radix:AccordionContent"- className="w-item-content c1mxwmum c1j0j9ep c1gl2i2 c44srea"- >+ <AccordionContent className="w-item-content c1mxwmum c1j0j9ep c1gl2i2 c44srea">{"Yes. It's animated by default, but you can disable it if you prefer."}diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsxindex b448afd9a3..21d68ad292 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx@@ -32,24 +32,11 @@ export const pageBackgroundImageAssets: ImageAsset[] = [];const Page = ({}: { system: any }) => {let list = useResource("list_1");return (- <Body- data-ws-id="AWY2qZfpbykoiWELeJhse"- data-ws-component="Body"- className="w-body"- >+ <Body className="w-body">{list?.data?.map((collectionItem: any, index: number) => (<Fragment key={index}>- <Box- data-ws-id="-F-b3eIEZ8WKW_F-Aw8nN"- data-ws-component="Box"- className="w-box"- >- <HtmlEmbed- data-ws-id="05oK4Ks0ocFv3w8MJOcNR"- data-ws-component="HtmlEmbed"- code={collectionItem?.name}- className="w-html-embed"- />+ <Box className="w-box">+ <HtmlEmbed code={collectionItem?.name} className="w-html-embed" /></Box></Fragment>))}diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex 515a373dc6..6806c6d98b 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -61,98 +61,40 @@ export const CustomCode = () => {const Page = ({}: { system: any }) => {return (- <Body- data-ws-id="On9cvWCxr5rdZtY9O1Bv0"- data-ws-component="Body"- className="w-body cielobv"- >- <Heading- data-ws-id="nVMWvMsaLCcb0o1wuNQgg"- data-ws-component="Heading"- className="w-heading ceva767"- >+ <Body className="w-body cielobv">+ <Heading className="w-heading ceva767">{"DO NOT TOUCH THIS PROJECT, IT'S USED FOR FIXTURES"}</Heading>- <Box- data-ws-id="f0kF-WmL7DQg7MSyRvqY1"- data-ws-component="Box"- className="w-box c13v7j50 cqkqnmd cv6wa71"- >- <Box- data-ws-id="5XDbqPrZDeCwq4YJ3CHsc"- data-ws-component="Box"- className="w-box c1t3ybra c1qxdkbn c1ogzcge cv3kvac"- >- <Heading- data-ws-id="oLXYe1UQiVMhVnZGvJSMr"- data-ws-component="Heading"- className="w-heading"- >- {"Heading"}- </Heading>- <Paragraph- data-ws-id="p34JHWcU6UNrd9FVnY80Q"- data-ws-component="Paragraph"- className="w-paragraph"- >+ <Box className="w-box c13v7j50 cqkqnmd cv6wa71">+ <Box className="w-box c1t3ybra c1qxdkbn c1ogzcge cv3kvac">+ <Heading className="w-heading">{"Heading"}</Heading>+ <Paragraph className="w-paragraph">{"a little kitten painted in black and white gouache with a thick brush"}</Paragraph>- <Link- data-ws-id="l9AI_pShC-BH4ibxK6kNT"- data-ws-component="Link"- href={"https://github.com/"}- className="w-link"- >+ <Link href={"https://github.com/"} className="w-link">{"Click here to adore more kittens"}</Link>- <Text- data-ws-id="D8wLZzLWQfxH9uaKsn-0L"- data-ws-component="Text"- tag={"span"}- className="w-text"- >+ <Text tag={"span"} className="w-text">{" or "}</Text><Link- data-ws-id="8AXawjUE3fJoOH_1qOAoq"- data-ws-component="Link"href={"/assets/small-avif-kitty_FnabJsioMWpBtXZSGf4DR.webp"}className="w-link">{"go download this little kitten"}</Link>- <Box- data-ws-id="82HYqzxZeahPxSDFNWem5"- data-ws-component="Box"- className="w-box"- />- <Link- data-ws-id="9I4GRU1sev48hREkQcKQ-"- data-ws-component="Link"- href={"/_route_with_symbols_"}- className="w-link ch2exr5"- >+ <Box className="w-box" />+ <Link href={"/_route_with_symbols_"} className="w-link ch2exr5">{"Symbols in path"}</Link>- <Link- data-ws-id="81ejLVXyFEV1SxiJrWhyw"- data-ws-component="Link"- href={"/heading-with-id#my-heading"}- className="w-link ch2exr5"- >+ <Link href={"/heading-with-id#my-heading"} className="w-link ch2exr5">{"Link to instance"}</Link></Box>- <Box- data-ws-id="qPnkiFGDj8dITWb1kmpGl"- data-ws-component="Box"- className="w-box c1t3ybra c1qxdkbn c1ogzcge cv3kvac"- >+ <Box className="w-box c1t3ybra c1qxdkbn c1ogzcge cv3kvac"><Image- data-ws-id="pX1ovPI7NdC0HRjkw6Kpw"- data-ws-component="Image"src={"/assets/_937084ed-a798-49fe-8664-df93a2af605e_uiBk3o6UWdqolyakMvQJ9.jpeg"}diff --git a/packages/react-sdk/src/component-generator.test.tsx b/packages/react-sdk/src/component-generator.test.tsxindex 70dfb231d0..7d77831d03 100644--- a/packages/react-sdk/src/component-generator.test.tsx+++ b/packages/react-sdk/src/component-generator.test.tsx@@ -36,9 +36,7 @@ test("generate jsx element with children and without them", () => {})).toEqual(clear(`- <Body- data-ws-id="body"- data-ws-component="Body">+ <Body>{"Children"}</Body>`)@@ -54,9 +52,7 @@ test("generate jsx element with children and without them", () => {})).toEqual(clear(`- <Image- data-ws-id="image"- data-ws-component="Image" />+ <Image />`));});@@ -74,9 +70,7 @@ test("generate jsx element with namespaces components", () => {})).toEqual(clear(`- <Body- data-ws-id="body"- data-ws-component="@webstudio-is/library:Body" />+ <Body />`));expect(@@ -90,9 +84,7 @@ test("generate jsx element with namespaces components", () => {})).toEqual(clear(`- <Image- data-ws-id="image"- data-ws-component="@webstudio-is/library:Image" />+ <Image />`));});@@ -110,8 +102,6 @@ test("generate jsx element with literal props", () => {).toEqual(clear(`<Body- data-ws-id="body"- data-ws-component="Body"string={"string"}number={0} />`)@@ -134,8 +124,6 @@ test("generate jsx element with literal props", () => {).toEqual(clear(`<Image- data-ws-id="image"- data-ws-component="Image"boolean={true}stringArray={["value1","value2"]} />`)@@ -160,9 +148,7 @@ test("ignore asset and page props", () => {})).toEqual(clear(`- <Box- data-ws-id="box"- data-ws-component="Box" />+ <Box />`));});@@ -196,8 +182,6 @@ test("generate jsx element with data sources and action", () => {).toEqual(clear(`<Box- data-ws-id="box"- data-ws-component="Box"variable={variableName}expression={variableName + 1}onChange={(value: any) => {@@ -220,9 +204,7 @@ test("generate jsx element with condition based on show prop", () => {})).toEqual(clear(`- <Box- data-ws-id="box"- data-ws-component="Box" />+ <Box />`));expect(@@ -259,9 +241,7 @@ test("generate jsx element with condition based on show prop", () => {).toEqual(clear(`{(conditionName) &&- <Box- data-ws-id="box"- data-ws-component="Box" />+ <Box />}`));@@ -280,8 +260,6 @@ test("generate jsx element with index prop", () => {).toEqual(clear(`<Box- data-ws-id="box"- data-ws-component="Box"data-ws-index="5" />`));@@ -379,15 +357,9 @@ test("generate jsx children with nested instances", () => {).toEqual(clear(`<Form- data-ws-id="form"- data-ws-component="Form"prop={"value"}>- <Input- data-ws-id="0"- data-ws-component="Input" />- <Button- data-ws-id="1"- data-ws-component="Button" />+ <Input />+ <Button /></Form>`));@@ -414,12 +386,8 @@ test("deduplicate base and namespaced components with same short name", () => {})).toEqual(clear(`- <Button- data-ws-id="button1"- data-ws-component="Button" />- <Button_1- data-ws-id="button2"- data-ws-component="@webstudio-is/sdk-component-react-radix:Button" />+ <Button />+ <Button_1 />`));});@@ -464,12 +432,8 @@ test("generate collection component as map", () => {clear(`{data?.map((element: any, index: number) =><Fragment key={index}>- <Label- data-ws-id="0"- data-ws-component="Label" />+ <Label /><Button- data-ws-id="1"- data-ws-component="Button"aria-label={element} /></Fragment>)}@@ -509,12 +473,8 @@ test("generate component with variables and actions", () => {clear(`const Page = () => {let [variableName, set$variableName] = useState<any>("initial")- return <Body- data-ws-id="body"- data-ws-component="Body">+ return <Body><Input- data-ws-id="0"- data-ws-component="Input"value={variableName}onChange={(value: any) => {variableName = value@@ -542,8 +502,6 @@ test("add classes and merge classes", () => {clear(`const Page = () => {return <Body- data-ws-id="body"- data-ws-component="Body"className="cls1 cls2 \\"cls3\\"" />}`)@@ -588,9 +546,7 @@ test("avoid generating collection parameter variable as state", () => {clear(`const Page = () => {let [data, set$data] = useState<any>(["apple","orange","mango"])- return <Body- data-ws-id="body"- data-ws-component="Body">+ return <Body>{data?.map((element: any, index: number) =><Fragment key={index}></Fragment>@@ -637,8 +593,6 @@ test("generate system variable when present", () => {clear(`const Page = ({ system: system_1, }: { system: any; }) => {return <Body- data-ws-id="body"- data-ws-component="Body"data-slug={system_1?.params?.slug} />}`)@@ -686,8 +640,6 @@ test("generate resources loading", () => {let [data, set$data] = useState<any>("data")let data_1 = useResource("data_2")return <Body- data-ws-id="body"- data-ws-component="Body"data-data={data}data-resource={data_1} />}@@ -752,8 +704,6 @@ test("avoid generating unused variables", () => {"const Page = ({ }: { system: any; }) => {let [UsedVariableName, set$UsedVariableName] = useState<any>("initial")return <Body-data-ws-id="body"-data-ws-component="Body"data-data={UsedVariableName} />}"@@ -778,9 +728,7 @@ test("avoid generating descendant component", () => {})).toMatchInlineSnapshot(`"const Page = () => {-return <Body-data-ws-id="body"-data-ws-component="Body">+return <Body></Body>}"@@ -825,9 +773,7 @@ test("generate conditional collection", () => {).toMatchInlineSnapshot(`"const Page = () => {let [conditionName, set$conditionName] = useState<any>(false)- return <Body- data-ws-id="body"- data-ws-component="Body">+ return <Body>{(conditionName) &&<>{[]?.map((collectionItemName: any, index: number) =>@@ -867,16 +813,10 @@ test("generate resource prop", () => {})).toMatchInlineSnapshot(`"const Page = () => {- return <Body- data-ws-id="body"- data-ws-component="Body">+ return <Body><Form- data-ws-id="form1"- data-ws-component="Form"action={"action"} /><Form- data-ws-id="form2"- data-ws-component="Form"action={"action_1"} /></Body>}diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex 5bb99b1ef0..4a10bf4248 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -13,12 +13,7 @@ import {decodeDataSourceVariable,transpileExpression,} from "@webstudio-is/sdk";-import {- componentAttribute,- idAttribute,- indexAttribute,- showAttribute,-} from "./props";+import { indexAttribute, showAttribute } from "./props";import { collectionComponent, descendantComponent } from "./core-components";import type { IndexesWithinAncestors } from "./instance-utils";@@ -164,11 +159,6 @@ export const generateJsxElement = ({let generatedProps = "";- // id and component props are always defined for styles- generatedProps += `\n${idAttribute}=${JSON.stringify(instance.id)}`;- generatedProps += `\n${componentAttribute}=${JSON.stringify(- instance.component- )}`;const index = indexesWithinAncestors.get(instance.id);if (index !== undefined) {generatedProps += `\n${indexAttribute}="${index}"`;diff --git a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsxindex 8f8dbcfcb9..bdb955af35 100644--- a/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/accordion.stories.tsx@@ -13,41 +13,14 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Accordion- data-ws-id="1"- data-ws-component="Accordion"- collapsible={true}- defaultValue={"0"}- className="w-accordion"- >- <AccordionItem- data-ws-id="4"- data-ws-component="AccordionItem"- data-ws-index="0"- className="w-item w-item-1"- >- <AccordionHeader- data-ws-id="6"- data-ws-component="AccordionHeader"- className="w-item-header w-item-header-1"- >- <AccordionTrigger- data-ws-id="8"- data-ws-component="AccordionTrigger"- className="w-item-trigger w-item-trigger-1"- >- <Text data-ws-id="10" data-ws-component="Text" className="w-text">- {"Is it accessible?"}- </Text>- <Box- data-ws-id="11"- data-ws-component="Box"- className="w-box w-icon-container"- >+ <Box className="w-box">+ <Accordion collapsible={true} defaultValue={"0"} className="w-accordion">+ <AccordionItem data-ws-index="0" className="w-item w-item-1">+ <AccordionHeader className="w-item-header w-item-header-1">+ <AccordionTrigger className="w-item-trigger w-item-trigger-1">+ <Text className="w-text">{"Is it accessible?"}</Text>+ <Box className="w-box w-icon-container"><HtmlEmbed- data-ws-id="13"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -56,41 +29,16 @@ const Component = () => {</Box></AccordionTrigger></AccordionHeader>- <AccordionContent- data-ws-id="15"- data-ws-component="AccordionContent"- className="w-item-content w-item-content-1"- >+ <AccordionContent className="w-item-content w-item-content-1">{"Yes. It adheres to the WAI-ARIA design pattern."}</AccordionContent></AccordionItem>- <AccordionItem- data-ws-id="17"- data-ws-component="AccordionItem"- data-ws-index="1"- className="w-item w-item-2"- >- <AccordionHeader- data-ws-id="19"- data-ws-component="AccordionHeader"- className="w-item-header w-item-header-2"- >- <AccordionTrigger- data-ws-id="21"- data-ws-component="AccordionTrigger"- className="w-item-trigger w-item-trigger-2"- >- <Text data-ws-id="23" data-ws-component="Text" className="w-text">- {"Is it styled?"}- </Text>- <Box- data-ws-id="24"- data-ws-component="Box"- className="w-box w-icon-container-1"- >+ <AccordionItem data-ws-index="1" className="w-item w-item-2">+ <AccordionHeader className="w-item-header w-item-header-2">+ <AccordionTrigger className="w-item-trigger w-item-trigger-2">+ <Text className="w-text">{"Is it styled?"}</Text>+ <Box className="w-box w-icon-container-1"><HtmlEmbed- data-ws-id="26"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -99,43 +47,18 @@ const Component = () => {</Box></AccordionTrigger></AccordionHeader>- <AccordionContent- data-ws-id="28"- data-ws-component="AccordionContent"- className="w-item-content w-item-content-2"- >+ <AccordionContent className="w-item-content w-item-content-2">{"Yes. It comes with default styles that matches the other components' aesthetic."}</AccordionContent></AccordionItem>- <AccordionItem- data-ws-id="30"- data-ws-component="AccordionItem"- data-ws-index="2"- className="w-item w-item-3"- >- <AccordionHeader- data-ws-id="32"- data-ws-component="AccordionHeader"- className="w-item-header w-item-header-3"- >- <AccordionTrigger- data-ws-id="34"- data-ws-component="AccordionTrigger"- className="w-item-trigger w-item-trigger-3"- >- <Text data-ws-id="36" data-ws-component="Text" className="w-text">- {"Is it animated?"}- </Text>- <Box- data-ws-id="37"- data-ws-component="Box"- className="w-box w-icon-container-2"- >+ <AccordionItem data-ws-index="2" className="w-item w-item-3">+ <AccordionHeader className="w-item-header w-item-header-3">+ <AccordionTrigger className="w-item-trigger w-item-trigger-3">+ <Text className="w-text">{"Is it animated?"}</Text>+ <Box className="w-box w-icon-container-2"><HtmlEmbed- data-ws-id="39"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -144,11 +67,7 @@ const Component = () => {</Box></AccordionTrigger></AccordionHeader>- <AccordionContent- data-ws-id="41"- data-ws-component="AccordionContent"- className="w-item-content w-item-content-3"- >+ <AccordionContent className="w-item-content w-item-content-3">{"Yes. It's animated by default, but you can disable it if you prefer."}diff --git a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsxindex 9ac9c641c1..ff3f7a692c 100644--- a/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/checkbox.stories.tsx@@ -13,15 +13,9 @@ import {const Component = () => {let [checkboxChecked, set$checkboxChecked] = useState<any>(false);return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Label- data-ws-id="1"- data-ws-component="Label"- className="w-label w-checkbox-field"- >+ <Box className="w-box">+ <Label className="w-label w-checkbox-field"><Checkbox- data-ws-id="3"- data-ws-component="Checkbox"checked={checkboxChecked}onCheckedChange={(checked: any) => {checkboxChecked = checked;@@ -29,14 +23,8 @@ const Component = () => {}}className="w-checkbox w-checkbox-1">- <CheckboxIndicator- data-ws-id="8"- data-ws-component="CheckboxIndicator"- className="w-checkbox-indicator w-checkbox-indicator-1"- >+ <CheckboxIndicator className="w-checkbox-indicator w-checkbox-indicator-1"><HtmlEmbed- data-ws-id="10"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M11.957 5.043a1 1 0 0 1 0 1.414l-4.5 4.5a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L6.75 8.836l3.793-3.793a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/></svg>'}@@ -44,12 +32,7 @@ const Component = () => {/></CheckboxIndicator></Checkbox>- <Text- data-ws-id="12"- data-ws-component="Text"- tag={"span"}- className="w-text"- >+ <Text tag={"span"} className="w-text">{"Checkbox"}</Text></Label>diff --git a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsxindex c50f648a61..f9dffbbdb1 100644--- a/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/collapsible.stories.tsx@@ -11,32 +11,15 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Collapsible- data-ws-id="1"- data-ws-component="Collapsible"- className="w-collapsible"- >- <CollapsibleTrigger- data-ws-id="2"- data-ws-component="CollapsibleTrigger"- >- <Button- data-ws-id="3"- data-ws-component="Button"- className="w-button w-button-1"- >+ <Box className="w-box">+ <Collapsible className="w-collapsible">+ <CollapsibleTrigger>+ <Button className="w-button w-button-1">{"Click to toggle content"}</Button></CollapsibleTrigger>- <CollapsibleContent- data-ws-id="5"- data-ws-component="CollapsibleContent"- className="w-collapsible-content"- >- <Text data-ws-id="6" data-ws-component="Text" className="w-text">- {"Collapsible Content"}- </Text>+ <CollapsibleContent className="w-collapsible-content">+ <Text className="w-text">{"Collapsible Content"}</Text></CollapsibleContent></Collapsible></Box>diff --git a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsxindex cd1c44ef2f..3e763487bb 100644--- a/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/dialog.stories.tsx@@ -16,58 +16,24 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Dialog data-ws-id="1" data-ws-component="Dialog">- <DialogTrigger data-ws-id="2" data-ws-component="DialogTrigger">- <Button- data-ws-id="3"- data-ws-component="Button"- className="w-button w-button-1"- >- {"Button"}- </Button>+ <Box className="w-box">+ <Dialog>+ <DialogTrigger>+ <Button className="w-button w-button-1">{"Button"}</Button></DialogTrigger>- <DialogOverlay- data-ws-id="5"- data-ws-component="DialogOverlay"- className="w-dialog-overlay w-dialog-overlay-1"- >- <DialogContent- data-ws-id="7"- data-ws-component="DialogContent"- className="w-dialog-content w-dialog-content-1"- >- <Box- data-ws-id="9"- data-ws-component="Box"- className="w-box w-dialog-header"- >- <DialogTitle- data-ws-id="11"- data-ws-component="DialogTitle"- className="w-dialog-title w-dialog-title-1"- >+ <DialogOverlay className="w-dialog-overlay w-dialog-overlay-1">+ <DialogContent className="w-dialog-content w-dialog-content-1">+ <Box className="w-box w-dialog-header">+ <DialogTitle className="w-dialog-title w-dialog-title-1">{"Dialog Title you can edit"}</DialogTitle>- <DialogDescription- data-ws-id="13"- data-ws-component="DialogDescription"- className="w-dialog-description w-dialog-description-1"- >+ <DialogDescription className="w-dialog-description w-dialog-description-1">{"Dialog description text you can edit"}</DialogDescription></Box>- <Text data-ws-id="15" data-ws-component="Text" className="w-text">- {"The text you can edit"}- </Text>- <DialogClose- data-ws-id="16"- data-ws-component="DialogClose"- className="w-close-button w-close-button-1"- >+ <Text className="w-text">{"The text you can edit"}</Text>+ <DialogClose className="w-close-button w-close-button-1"><HtmlEmbed- data-ws-id="18"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M13.566 2.434a.8.8 0 0 1 0 1.132L9.13 8l4.435 4.434a.8.8 0 0 1-1.132 1.132L8 9.13l-4.434 4.435a.8.8 0 0 1-1.132-1.132L6.87 8 2.434 3.566a.8.8 0 0 1 1.132-1.132L8 6.87l4.434-4.435a.8.8 0 0 1 1.132 0Z" clip-rule="evenodd"/></svg>'}diff --git a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsxindex d35a2c333c..715872f89a 100644--- a/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/label.stories.tsx@@ -3,14 +3,8 @@ import { Label as Label } from "../components";const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Label- data-ws-id="1"- data-ws-component="Label"- className="w-label w-label-1"- >- {"Form Label"}- </Label>+ <Box className="w-box">+ <Label className="w-label w-label-1">{"Form Label"}</Label></Box>);};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.tsxindex c5704ae8c3..7a13a9d65e 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@@ -18,48 +18,15 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <NavigationMenu- data-ws-id="1"- data-ws-component="NavigationMenu"- className="w-navigation-menu w-navigation-menu-1"- >- <NavigationMenuList- data-ws-id="3"- data-ws-component="NavigationMenuList"- className="w-menu-list w-menu-list-1"- >- <NavigationMenuItem- data-ws-id="5"- data-ws-component="NavigationMenuItem"- data-ws-index="0"- className="w-menu-item"- >- <NavigationMenuTrigger- data-ws-id="6"- data-ws-component="NavigationMenuTrigger"- className="w-menu-trigger"- >- <Button- data-ws-id="7"- data-ws-component="Button"- className="w-button w-button-1"- >- <Text- data-ws-id="9"- data-ws-component="Text"- className="w-text"- >- {"About"}- </Text>- <Box- data-ws-id="10"- data-ws-component="Box"- className="w-box w-icon-container"- >+ <Box className="w-box">+ <NavigationMenu className="w-navigation-menu w-navigation-menu-1">+ <NavigationMenuList className="w-menu-list w-menu-list-1">+ <NavigationMenuItem data-ws-index="0" className="w-menu-item">+ <NavigationMenuTrigger className="w-menu-trigger">+ <Button className="w-button w-button-1">+ <Text className="w-text">{"About"}</Text>+ <Box className="w-box w-icon-container"><HtmlEmbed- data-ws-id="12"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -69,109 +36,47 @@ const Component = () => {</Button></NavigationMenuTrigger><NavigationMenuContent- data-ws-id="14"- data-ws-component="NavigationMenuContent"data-ws-index="0"className="w-menu-content w-menu-content-1">- <Box- data-ws-id="16"- data-ws-component="Box"- className="w-box w-content"- >- <Box- data-ws-id="18"- data-ws-component="Box"- className="w-box w-box-1"- >- {""}- </Box>- <Box- data-ws-id="20"- data-ws-component="Box"- className="w-box w-flex-column"- >- <NavigationMenuLink- data-ws-id="22"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <Box className="w-box w-content">+ <Box className="w-box w-box-1">{""}</Box>+ <Box className="w-box w-flex-column">+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="23"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/sheet"}className="w-link w-link-1">- <Text- data-ws-id="26"- data-ws-component="Text"- className="w-text w-text-1"- >- {"Sheet"}- </Text>- <Paragraph- data-ws-id="28"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-1"- >+ <Text className="w-text w-text-1">{"Sheet"}</Text>+ <Paragraph className="w-paragraph w-paragraph-1">{"Extends the Dialog component to display content that complements the main content of the screen."}</Paragraph></Link></NavigationMenuLink>- <NavigationMenuLink- data-ws-id="30"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="31"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/navigation-menu"}className="w-link w-link-2">- <Text- data-ws-id="34"- data-ws-component="Text"- className="w-text w-text-2"- >+ <Text className="w-text w-text-2">{"Navigation Menu"}</Text>- <Paragraph- data-ws-id="36"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-2"- >+ <Paragraph className="w-paragraph w-paragraph-2">{"A collection of links for navigating websites."}</Paragraph></Link></NavigationMenuLink>- <NavigationMenuLink- data-ws-id="38"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="39"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/tabs"}className="w-link w-link-3">- <Text- data-ws-id="42"- data-ws-component="Text"- className="w-text w-text-3"- >- {"Tabs"}- </Text>- <Paragraph- data-ws-id="44"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-3"- >+ <Text className="w-text w-text-3">{"Tabs"}</Text>+ <Paragraph className="w-paragraph w-paragraph-3">{"A set of layered sections of content—known as tab panels—that are displayed one at a time."}@@ -182,37 +87,12 @@ const Component = () => {</Box></NavigationMenuContent></NavigationMenuItem>- <NavigationMenuItem- data-ws-id="46"- data-ws-component="NavigationMenuItem"- data-ws-index="1"- className="w-menu-item"- >- <NavigationMenuTrigger- data-ws-id="47"- data-ws-component="NavigationMenuTrigger"- className="w-menu-trigger"- >- <Button- data-ws-id="48"- data-ws-component="Button"- className="w-button w-button-2"- >- <Text- data-ws-id="50"- data-ws-component="Text"- className="w-text"- >- {"Components"}- </Text>- <Box- data-ws-id="51"- data-ws-component="Box"- className="w-box w-icon-container-1"- >+ <NavigationMenuItem data-ws-index="1" className="w-menu-item">+ <NavigationMenuTrigger className="w-menu-trigger">+ <Button className="w-button w-button-2">+ <Text className="w-text">{"Components"}</Text>+ <Box className="w-box w-icon-container-1"><HtmlEmbed- data-ws-id="53"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M4.04 6.284a.65.65 0 0 1 .92.001L8 9.335l3.04-3.05a.65.65 0 1 1 .921.918l-3.5 3.512a.65.65 0 0 1-.921 0L4.039 7.203a.65.65 0 0 1 .001-.92Z"/></svg>'}@@ -222,102 +102,44 @@ const Component = () => {</Button></NavigationMenuTrigger><NavigationMenuContent- data-ws-id="55"- data-ws-component="NavigationMenuContent"data-ws-index="1"className="w-menu-content w-menu-content-2">- <Box- data-ws-id="57"- data-ws-component="Box"- className="w-box w-content-1"- >- <Box- data-ws-id="59"- data-ws-component="Box"- className="w-box w-flex-column-1"- >- <NavigationMenuLink- data-ws-id="61"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <Box className="w-box w-content-1">+ <Box className="w-box w-flex-column-1">+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="62"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/accordion"}className="w-link w-link-4">- <Text- data-ws-id="65"- data-ws-component="Text"- className="w-text w-text-4"- >- {"Accordion"}- </Text>- <Paragraph- data-ws-id="67"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-4"- >+ <Text className="w-text w-text-4">{"Accordion"}</Text>+ <Paragraph className="w-paragraph w-paragraph-4">{"A vertically stacked set of interactive headings that each reveal a section of content."}</Paragraph></Link></NavigationMenuLink>- <NavigationMenuLink- data-ws-id="69"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="70"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/dialog"}className="w-link w-link-5">- <Text- data-ws-id="73"- data-ws-component="Text"- className="w-text w-text-5"- >- {"Dialog"}- </Text>- <Paragraph- data-ws-id="75"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-5"- >+ <Text className="w-text w-text-5">{"Dialog"}</Text>+ <Paragraph className="w-paragraph w-paragraph-5">{"A window overlaid on either the primary window or another dialog window, rendering the content underneath inert."}</Paragraph></Link></NavigationMenuLink>- <NavigationMenuLink- data-ws-id="77"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="78"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/collapsible"}className="w-link w-link-6">- <Text- data-ws-id="81"- data-ws-component="Text"- className="w-text w-text-6"- >- {"Collapsible"}- </Text>- <Paragraph- data-ws-id="83"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-6"- >+ <Text className="w-text w-text-6">{"Collapsible"}</Text>+ <Paragraph className="w-paragraph w-paragraph-6">{"An interactive component which expands/collapses a panel."}@@ -325,92 +147,40 @@ const Component = () => {</Link></NavigationMenuLink></Box>- <Box- data-ws-id="85"- data-ws-component="Box"- className="w-box w-flex-column-2"- >- <NavigationMenuLink- data-ws-id="87"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <Box className="w-box w-flex-column-2">+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="88"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/popover"}className="w-link w-link-7">- <Text- data-ws-id="91"- data-ws-component="Text"- className="w-text w-text-7"- >- {"Popover"}- </Text>- <Paragraph- data-ws-id="93"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-7"- >+ <Text className="w-text w-text-7">{"Popover"}</Text>+ <Paragraph className="w-paragraph w-paragraph-7">{"Displays rich content in a portal, triggered by a button."}</Paragraph></Link></NavigationMenuLink>- <NavigationMenuLink- data-ws-id="95"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="96"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/tooltip"}className="w-link w-link-8">- <Text- data-ws-id="99"- data-ws-component="Text"- className="w-text w-text-8"- >- {"Tooltip"}- </Text>- <Paragraph- data-ws-id="101"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-8"- >+ <Text className="w-text w-text-8">{"Tooltip"}</Text>+ <Paragraph className="w-paragraph w-paragraph-8">{"A popup that displays information related to an element when the element receives keyboard focus or the mouse hovers over it."}</Paragraph></Link></NavigationMenuLink>- <NavigationMenuLink- data-ws-id="103"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >+ <NavigationMenuLink className="w-accessible-link-wrapper"><Link- data-ws-id="104"- data-ws-component="Link"href={"https://ui.shadcn.com/docs/components/button"}className="w-link w-link-9">- <Text- data-ws-id="107"- data-ws-component="Text"- className="w-text w-text-9"- >- {"Button"}- </Text>- <Paragraph- data-ws-id="109"- data-ws-component="Paragraph"- className="w-paragraph w-paragraph-9"- >+ <Text className="w-text w-text-9">{"Button"}</Text>+ <Paragraph className="w-paragraph w-paragraph-9">{"Displays a button or a component that looks like a button."}@@ -421,37 +191,14 @@ const Component = () => {</Box></NavigationMenuContent></NavigationMenuItem>- <NavigationMenuItem- data-ws-id="111"- data-ws-component="NavigationMenuItem"- data-ws-index="2"- className="w-menu-item"- >- <NavigationMenuLink- data-ws-id="112"- data-ws-component="NavigationMenuLink"- className="w-accessible-link-wrapper"- >- <Link- data-ws-id="113"- data-ws-component="Link"- className="w-link w-link-10"- >- {"Standalone"}- </Link>+ <NavigationMenuItem data-ws-index="2" className="w-menu-item">+ <NavigationMenuLink className="w-accessible-link-wrapper">+ <Link className="w-link w-link-10">{"Standalone"}</Link></NavigationMenuLink></NavigationMenuItem></NavigationMenuList>- <Box- data-ws-id="115"- data-ws-component="Box"- className="w-box w-viewport-container"- >- <NavigationMenuViewport- data-ws-id="117"- data-ws-component="NavigationMenuViewport"- className="w-menu-viewport w-menu-viewport-1"- />+ <Box className="w-box w-viewport-container">+ <NavigationMenuViewport className="w-menu-viewport w-menu-viewport-1" /></Box></NavigationMenu></Box>diff --git a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsxindex 2753c44350..8cf9106395 100644--- a/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/popover.stories.tsx@@ -11,25 +11,13 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Popover data-ws-id="1" data-ws-component="Popover">- <PopoverTrigger data-ws-id="2" data-ws-component="PopoverTrigger">- <Button- data-ws-id="3"- data-ws-component="Button"- className="w-button w-button-1"- >- {"Button"}- </Button>+ <Box className="w-box">+ <Popover>+ <PopoverTrigger>+ <Button className="w-button w-button-1">{"Button"}</Button></PopoverTrigger>- <PopoverContent- data-ws-id="5"- data-ws-component="PopoverContent"- className="w-popover-content w-popover-content-1"- >- <Text data-ws-id="7" data-ws-component="Text" className="w-text">- {"The text you can edit"}- </Text>+ <PopoverContent className="w-popover-content w-popover-content-1">+ <Text className="w-text">{"The text you can edit"}</Text></PopoverContent></Popover></Box>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.tsxindex 40fa556e02..b7c7476466 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,10 +14,8 @@ import {const Component = () => {let [radioGroupValue, set$radioGroupValue] = useState<any>("");return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">+ <Box className="w-box"><RadioGroup- data-ws-id="1"- data-ws-component="RadioGroup"value={radioGroupValue}onValueChange={(value: any) => {radioGroupValue = value;@@ -25,25 +23,13 @@ const Component = () => {}}className="w-radio-group w-radio-group-1">- <Label- data-ws-id="6"- data-ws-component="Label"- className="w-label w-label-1"- >+ <Label className="w-label w-label-1"><RadioGroupItem- data-ws-id="8"- data-ws-component="RadioGroupItem"value={"default"}className="w-radio-group-item w-radio-group-item-1">- <RadioGroupIndicator- data-ws-id="11"- data-ws-component="RadioGroupIndicator"- className="w-radio-group-indicator"- >+ <RadioGroupIndicator className="w-radio-group-indicator"><HtmlEmbed- data-ws-id="12"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M8 5.35a2.65 2.65 0 1 0 0 5.3 2.65 2.65 0 0 0 0-5.3Z"/></svg>'}@@ -51,29 +37,15 @@ const Component = () => {/></RadioGroupIndicator></RadioGroupItem>- <Text data-ws-id="14" data-ws-component="Text" className="w-text">- {"Default"}- </Text>+ <Text className="w-text">{"Default"}</Text></Label>- <Label- data-ws-id="15"- data-ws-component="Label"- className="w-label w-label-2"- >+ <Label className="w-label w-label-2"><RadioGroupItem- data-ws-id="17"- data-ws-component="RadioGroupItem"value={"comfortable"}className="w-radio-group-item w-radio-group-item-2">- <RadioGroupIndicator- data-ws-id="20"- data-ws-component="RadioGroupIndicator"- className="w-radio-group-indicator"- >+ <RadioGroupIndicator className="w-radio-group-indicator"><HtmlEmbed- data-ws-id="21"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M8 5.35a2.65 2.65 0 1 0 0 5.3 2.65 2.65 0 0 0 0-5.3Z"/></svg>'}@@ -81,29 +53,15 @@ const Component = () => {/></RadioGroupIndicator></RadioGroupItem>- <Text data-ws-id="23" data-ws-component="Text" className="w-text">- {"Comfortable"}- </Text>+ <Text className="w-text">{"Comfortable"}</Text></Label>- <Label- data-ws-id="24"- data-ws-component="Label"- className="w-label w-label-3"- >+ <Label className="w-label w-label-3"><RadioGroupItem- data-ws-id="26"- data-ws-component="RadioGroupItem"value={"compact"}className="w-radio-group-item w-radio-group-item-3">- <RadioGroupIndicator- data-ws-id="29"- data-ws-component="RadioGroupIndicator"- className="w-radio-group-indicator"- >+ <RadioGroupIndicator className="w-radio-group-indicator"><HtmlEmbed- data-ws-id="30"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M8 5.35a2.65 2.65 0 1 0 0 5.3 2.65 2.65 0 0 0 0-5.3Z"/></svg>'}@@ -111,9 +69,7 @@ const Component = () => {/></RadioGroupIndicator></RadioGroupItem>- <Text data-ws-id="32" data-ws-component="Text" className="w-text">- {"Compact"}- </Text>+ <Text className="w-text">{"Compact"}</Text></Label></RadioGroup></Box>diff --git a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsxindex 0b20eca1b4..4de45aee3f 100644--- a/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/select.stories.tsx@@ -17,119 +17,60 @@ import {const Component = () => {let [selectValue, set$selectValue] = useState<any>("");return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">+ <Box className="w-box"><Select- data-ws-id="1"- data-ws-component="Select"value={selectValue}onValueChange={(value: any) => {selectValue = value;set$selectValue(selectValue);}}>- <SelectTrigger- data-ws-id="5"- data-ws-component="SelectTrigger"- className="w-select-trigger w-select-trigger-1"- >- <SelectValue- data-ws-id="7"- data-ws-component="SelectValue"- placeholder={"Theme"}- className="w-value"- />+ <SelectTrigger className="w-select-trigger w-select-trigger-1">+ <SelectValue placeholder={"Theme"} className="w-value" /></SelectTrigger>- <SelectContent- data-ws-id="9"- data-ws-component="SelectContent"- className="w-select-content w-select-content-1"- >- <SelectViewport- data-ws-id="11"- data-ws-component="SelectViewport"- className="w-select-viewport w-select-viewport-1"- >+ <SelectContent className="w-select-content w-select-content-1">+ <SelectViewport className="w-select-viewport w-select-viewport-1"><SelectItem- data-ws-id="13"- data-ws-component="SelectItem"value={"light"}className="w-select-item w-select-item-1">- <SelectItemIndicator- data-ws-id="16"- data-ws-component="SelectItemIndicator"- className="w-indicator w-indicator-1"- >+ <SelectItemIndicator className="w-indicator w-indicator-1"><HtmlEmbed- data-ws-id="18"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M11.957 5.043a1 1 0 0 1 0 1.414l-4.5 4.5a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L6.75 8.836l3.793-3.793a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/></svg>'}className="w-html-embed"/></SelectItemIndicator>- <SelectItemText- data-ws-id="20"- data-ws-component="SelectItemText"- className="w-item-text"- >- {"Light"}- </SelectItemText>+ <SelectItemText className="w-item-text">{"Light"}</SelectItemText></SelectItem><SelectItem- data-ws-id="21"- data-ws-component="SelectItem"value={"dark"}className="w-select-item w-select-item-2">- <SelectItemIndicator- data-ws-id="24"- data-ws-component="SelectItemIndicator"- className="w-indicator w-indicator-2"- >+ <SelectItemIndicator className="w-indicator w-indicator-2"><HtmlEmbed- data-ws-id="26"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M11.957 5.043a1 1 0 0 1 0 1.414l-4.5 4.5a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L6.75 8.836l3.793-3.793a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/></svg>'}className="w-html-embed"/></SelectItemIndicator>- <SelectItemText- data-ws-id="28"- data-ws-component="SelectItemText"- className="w-item-text"- >- {"Dark"}- </SelectItemText>+ <SelectItemText className="w-item-text">{"Dark"}</SelectItemText></SelectItem><SelectItem- data-ws-id="29"- data-ws-component="SelectItem"value={"system"}className="w-select-item w-select-item-3">- <SelectItemIndicator- data-ws-id="32"- data-ws-component="SelectItemIndicator"- className="w-indicator w-indicator-3"- >+ <SelectItemIndicator className="w-indicator w-indicator-3"><HtmlEmbed- data-ws-id="34"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M11.957 5.043a1 1 0 0 1 0 1.414l-4.5 4.5a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L6.75 8.836l3.793-3.793a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/></svg>'}className="w-html-embed"/></SelectItemIndicator>- <SelectItemText- data-ws-id="36"- data-ws-component="SelectItemText"- className="w-item-text"- >+ <SelectItemText className="w-item-text">{"System"}</SelectItemText></SelectItem>diff --git a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsxindex 70c70ab01e..c16f04a015 100644--- a/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/sheet.stories.tsx@@ -16,17 +16,11 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Dialog data-ws-id="1" data-ws-component="Dialog">- <DialogTrigger data-ws-id="2" data-ws-component="DialogTrigger">- <Button- data-ws-id="3"- data-ws-component="Button"- className="w-button w-button-1"- >+ <Box className="w-box">+ <Dialog>+ <DialogTrigger>+ <Button className="w-button w-button-1"><HtmlEmbed- data-ws-id="5"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M2 5.998a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Zm0 5.5a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Zm0 5.5a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Z" clip-rule="evenodd"/></svg>'}@@ -34,55 +28,21 @@ const Component = () => {/></Button></DialogTrigger>- <DialogOverlay- data-ws-id="7"- data-ws-component="DialogOverlay"- className="w-dialog-overlay w-sheet-overlay"- >- <DialogContent- data-ws-id="9"- data-ws-component="DialogContent"- className="w-dialog-content w-sheet-content"- >- <Box- data-ws-id="11"- data-ws-component="Box"- tag={"nav"}- role={"navigation"}- className="w-box"- >- <Box- data-ws-id="14"- data-ws-component="Box"- className="w-box w-sheet-header"- >- <DialogTitle- data-ws-id="16"- data-ws-component="DialogTitle"- className="w-dialog-title w-sheet-title"- >+ <DialogOverlay className="w-dialog-overlay w-sheet-overlay">+ <DialogContent className="w-dialog-content w-sheet-content">+ <Box tag={"nav"} role={"navigation"} className="w-box">+ <Box className="w-box w-sheet-header">+ <DialogTitle className="w-dialog-title w-sheet-title">{"Sheet Title"}</DialogTitle>- <DialogDescription- data-ws-id="18"- data-ws-component="DialogDescription"- className="w-dialog-description w-sheet-description"- >+ <DialogDescription className="w-dialog-description w-sheet-description">{"Sheet description text you can edit"}</DialogDescription></Box>- <Text data-ws-id="20" data-ws-component="Text" className="w-text">- {"The text you can edit"}- </Text>+ <Text className="w-text">{"The text you can edit"}</Text></Box>- <DialogClose- data-ws-id="21"- data-ws-component="DialogClose"- className="w-close-button w-close-button-1"- >+ <DialogClose className="w-close-button w-close-button-1"><HtmlEmbed- data-ws-id="23"- data-ws-component="HtmlEmbed"code={'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path fill-rule="evenodd" d="M13.566 2.434a.8.8 0 0 1 0 1.132L9.13 8l4.435 4.434a.8.8 0 0 1-1.132 1.132L8 9.13l-4.434 4.435a.8.8 0 0 1-1.132-1.132L6.87 8 2.434 3.566a.8.8 0 0 1 1.132-1.132L8 6.87l4.434-4.435a.8.8 0 0 1 1.132 0Z" clip-rule="evenodd"/></svg>'}diff --git a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsxindex 25217e6167..eebcbc84be 100644--- a/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/switch.stories.tsx@@ -5,10 +5,8 @@ import { Switch as Switch, SwitchThumb as SwitchThumb } from "../components";const Component = () => {let [switchChecked, set$switchChecked] = useState<any>(false);return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">+ <Box className="w-box"><Switch- data-ws-id="1"- data-ws-component="Switch"checked={switchChecked}onCheckedChange={(checked: any) => {switchChecked = checked;@@ -16,11 +14,7 @@ const Component = () => {}}className="w-switch w-switch-1">- <SwitchThumb- data-ws-id="6"- data-ws-component="SwitchThumb"- className="w-switch-thumb w-switch-thumb-1"- />+ <SwitchThumb className="w-switch-thumb w-switch-thumb-1" /></Switch></Box>);diff --git a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsxindex 09ae1b8e89..e86d7f6058 100644--- a/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tabs.stories.tsx@@ -8,29 +8,16 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Tabs- data-ws-id="1"- data-ws-component="Tabs"- defaultValue={"0"}- className="w-tabs"- >- <TabsList- data-ws-id="3"- data-ws-component="TabsList"- className="w-tabs-list w-tabs-list-1"- >+ <Box className="w-box">+ <Tabs defaultValue={"0"} className="w-tabs">+ <TabsList className="w-tabs-list w-tabs-list-1"><TabsTrigger- data-ws-id="5"- data-ws-component="TabsTrigger"data-ws-index="0"className="w-tab-trigger w-tab-trigger-1">{"Account"}</TabsTrigger><TabsTrigger- data-ws-id="7"- data-ws-component="TabsTrigger"data-ws-index="1"className="w-tab-trigger w-tab-trigger-2">@@ -38,16 +25,12 @@ const Component = () => {</TabsTrigger></TabsList><TabsContent- data-ws-id="9"- data-ws-component="TabsContent"data-ws-index="0"className="w-tab-content w-tab-content-1">{"Make changes to your account here."}</TabsContent><TabsContent- data-ws-id="11"- data-ws-component="TabsContent"data-ws-index="1"className="w-tab-content w-tab-content-2">diff --git a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsxindex c2f80411bc..1560a677ac 100644--- a/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx+++ b/packages/sdk-components-react-radix/src/__generated__/tooltip.stories.tsx@@ -11,25 +11,13 @@ import {const Component = () => {return (- <Box data-ws-id="root" data-ws-component="Box" className="w-box">- <Tooltip data-ws-id="1" data-ws-component="Tooltip">- <TooltipTrigger data-ws-id="2" data-ws-component="TooltipTrigger">- <Button- data-ws-id="3"- data-ws-component="Button"- className="w-button w-button-1"- >- {"Button"}- </Button>+ <Box className="w-box">+ <Tooltip>+ <TooltipTrigger>+ <Button className="w-button w-button-1">{"Button"}</Button></TooltipTrigger>- <TooltipContent- data-ws-id="5"- data-ws-component="TooltipContent"- className="w-tooltip-content w-tooltip-content-1"- >- <Text data-ws-id="7" data-ws-component="Text" className="w-text">- {"The text you can edit"}- </Text>+ <TooltipContent className="w-tooltip-content w-tooltip-content-1">+ <Text className="w-text">{"The text you can edit"}</Text></TooltipContent></Tooltip></Box>diff --git a/packages/sdk-components-react/src/xml-node.tsx b/packages/sdk-components-react/src/xml-node.tsxindex ea553d368d..54a7894afd 100644--- a/packages/sdk-components-react/src/xml-node.tsx+++ b/packages/sdk-components-react/src/xml-node.tsx@@ -20,8 +20,8 @@ type Props = {xmlns?: string;children: ReactNode;// xxxAttribute is used for typings only- [idAttribute]: string;- [componentAttribute]: string;+ [idAttribute]?: string;+ [componentAttribute]?: string;};export const XmlNode = forwardRef<ElementRef<"div">, Props>(