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.

Move radix components into dedicated package (#2011)

Bogdan Chadkin292dad7f2ef6
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.json
index 0f2cb2439f..f4e9e58bf4 100644
--- a/packages/sdk-components-react-radix/package.json
+++ b/packages/sdk-components-react-radix/package.json
@@ -48,9 +48,14 @@
},
"dependencies": {
"@radix-ui/react-collapsible": "^1.0.3",
+ "@radix-ui/react-dialog": "^1.0.4",
+ "@radix-ui/react-popover": "^1.0.6",
+ "@radix-ui/react-tooltip": "^1.0.6",
+ "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/generate-arg-types": "workspace:^",
"@webstudio-is/icons": "workspace:^",
- "@webstudio-is/react-sdk": "workspace:^"
+ "@webstudio-is/react-sdk": "workspace:^",
+ "tailwindcss": "^3.3.3"
},
"devDependencies": {
"@storybook/react": "^7.1.0",
diff --git a/packages/sdk-components-react/src/__generated__/radix-dialog.props.ts b/packages/sdk-components-react-radix/src/__generated__/dialog.props.ts
similarity index 100%
rename from packages/sdk-components-react/src/__generated__/radix-dialog.props.ts
rename to packages/sdk-components-react-radix/src/__generated__/dialog.props.ts
diff --git a/packages/sdk-components-react/src/__generated__/radix-popover.props.ts b/packages/sdk-components-react-radix/src/__generated__/popover.props.ts
similarity index 100%
rename from packages/sdk-components-react/src/__generated__/radix-popover.props.ts
rename to packages/sdk-components-react-radix/src/__generated__/popover.props.ts
diff --git a/packages/sdk-components-react/src/__generated__/radix-tooltip.props.ts b/packages/sdk-components-react-radix/src/__generated__/tooltip.props.ts
similarity index 100%
rename from packages/sdk-components-react/src/__generated__/radix-tooltip.props.ts
rename to packages/sdk-components-react-radix/src/__generated__/tooltip.props.ts
diff --git a/packages/sdk-components-react-radix/src/components.ts b/packages/sdk-components-react-radix/src/components.ts
index 6bdb6ae85f..539d42d19b 100644
--- a/packages/sdk-components-react-radix/src/components.ts
+++ b/packages/sdk-components-react-radix/src/components.ts
@@ -3,3 +3,14 @@ export {
CollapsibleTrigger,
CollapsibleContent,
} from "./collapsible";
+export {
+ Dialog,
+ DialogTrigger,
+ DialogOverlay,
+ DialogContent,
+ DialogClose,
+ DialogTitle,
+ DialogDescription,
+} from "./dialog";
+export { Popover, PopoverTrigger, PopoverContent } from "./popover";
+export { Tooltip, TooltipTrigger, TooltipContent } from "./tooltip";
diff --git a/packages/sdk-components-react/src/radix-dialog.tsx b/packages/sdk-components-react-radix/src/dialog.tsx
similarity index 100%
rename from packages/sdk-components-react/src/radix-dialog.tsx
rename to packages/sdk-components-react-radix/src/dialog.tsx
diff --git a/packages/sdk-components-react/src/radix-dialog.ws.tsx b/packages/sdk-components-react-radix/src/dialog.ws.tsx
similarity index 99%
rename from packages/sdk-components-react/src/radix-dialog.ws.tsx
rename to packages/sdk-components-react-radix/src/dialog.ws.tsx
index 30a3a4c7f4..1ac80b46dd 100644
--- a/packages/sdk-components-react/src/radix-dialog.ws.tsx
+++ b/packages/sdk-components-react-radix/src/dialog.ws.tsx
@@ -4,7 +4,6 @@ import {
type WsComponentPropsMeta,
} from "@webstudio-is/react-sdk";
import * as tc from "./theme/tailwind-classes";
-
import {
propsDialog,
propsDialogContent,
@@ -13,7 +12,7 @@ import {
propsDialogClose,
propsDialogTitle,
propsDialogDescription,
-} from "./__generated__/radix-dialog.props";
+} from "./__generated__/dialog.props";
// @todo add [data-state] to button and link
export const metaDialogTrigger: WsComponentMeta = {
diff --git a/packages/sdk-components-react-radix/src/metas.ts b/packages/sdk-components-react-radix/src/metas.ts
index e35be7a3ea..623263d31f 100644
--- a/packages/sdk-components-react-radix/src/metas.ts
+++ b/packages/sdk-components-react-radix/src/metas.ts
@@ -3,3 +3,22 @@ export {
metaCollapsibleTrigger as CollapsibleTrigger,
metaCollapsibleContent as CollapsibleContent,
} from "./collapsible.ws";
+export {
+ metaDialog as Dialog,
+ metaDialogTrigger as DialogTrigger,
+ metaDialogOverlay as DialogOverlay,
+ metaDialogContent as DialogContent,
+ metaDialogClose as DialogClose,
+ metaDialogTitle as DialogTitle,
+ metaDialogDescription as DialogDescription,
+} from "./dialog.ws";
+export {
+ metaPopover as Popover,
+ metaPopoverTrigger as PopoverTrigger,
+ metaPopoverContent as PopoverContent,
+} from "./popover.ws";
+export {
+ metaTooltip as Tooltip,
+ metaTooltipTrigger as TooltipTrigger,
+ metaTooltipContent as TooltipContent,
+} from "./tooltip.ws";
diff --git a/packages/sdk-components-react/src/radix-popover.tsx b/packages/sdk-components-react-radix/src/popover.tsx
similarity index 100%
rename from packages/sdk-components-react/src/radix-popover.tsx
rename to packages/sdk-components-react-radix/src/popover.tsx
diff --git a/packages/sdk-components-react/src/radix-popover.ws.tsx b/packages/sdk-components-react-radix/src/popover.ws.tsx
similarity index 98%
rename from packages/sdk-components-react/src/radix-popover.ws.tsx
rename to packages/sdk-components-react-radix/src/popover.ws.tsx
index 15656679bf..1c222a01b3 100644
--- a/packages/sdk-components-react/src/radix-popover.ws.tsx
+++ b/packages/sdk-components-react-radix/src/popover.ws.tsx
@@ -4,12 +4,11 @@ import {
type WsComponentPropsMeta,
} from "@webstudio-is/react-sdk";
import * as tc from "./theme/tailwind-classes";
-
import {
propsPopover,
propsPopoverContent,
propsPopoverTrigger,
-} from "./__generated__/radix-popover.props";
+} from "./__generated__/popover.props";
// @todo add [data-state] to button and link
export const metaPopoverTrigger: WsComponentMeta = {
diff --git a/packages/sdk-components-react-radix/src/props.ts b/packages/sdk-components-react-radix/src/props.ts
index b4d01e9e6b..d089e17a46 100644
--- a/packages/sdk-components-react-radix/src/props.ts
+++ b/packages/sdk-components-react-radix/src/props.ts
@@ -3,3 +3,22 @@ export {
propsMetaCollapsibleTrigger as CollapsibleTrigger,
propsMetaCollapsibleContent as CollapsibleContent,
} from "./collapsible.ws";
+export {
+ propsMetaDialog as Dialog,
+ propsMetaDialogTrigger as DialogTrigger,
+ propsMetaDialogOverlay as DialogOverlay,
+ propsMetaDialogContent as DialogContent,
+ propsMetaDialogClose as DialogClose,
+ propsMetaDialogTitle as DialogTitle,
+ propsMetaDialogDescription as DialogDescription,
+} from "./dialog.ws";
+export {
+ propsMetaPopover as Popover,
+ propsMetaPopoverTrigger as PopoverTrigger,
+ propsMetaPopoverContent as PopoverContent,
+} from "./popover.ws";
+export {
+ propsMetaTooltip as Tooltip,
+ propsMetaTooltipTrigger as TooltipTrigger,
+ propsMetaTooltipContent as TooltipContent,
+} from "./tooltip.ws";
diff --git a/packages/sdk-components-react/src/theme/radix-common-types.ts b/packages/sdk-components-react-radix/src/theme/radix-common-types.ts
similarity index 100%
rename from packages/sdk-components-react/src/theme/radix-common-types.ts
rename to packages/sdk-components-react-radix/src/theme/radix-common-types.ts
diff --git a/packages/sdk-components-react/src/theme/tailwind-classes.ts b/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts
similarity index 100%
rename from packages/sdk-components-react/src/theme/tailwind-classes.ts
rename to packages/sdk-components-react-radix/src/theme/tailwind-classes.ts
diff --git a/packages/sdk-components-react/src/theme/tailwind-colors.ts b/packages/sdk-components-react-radix/src/theme/tailwind-colors.ts
similarity index 100%
rename from packages/sdk-components-react/src/theme/tailwind-colors.ts
rename to packages/sdk-components-react-radix/src/theme/tailwind-colors.ts
diff --git a/packages/sdk-components-react/src/theme/tailwind-theme.ts b/packages/sdk-components-react-radix/src/theme/tailwind-theme.ts
similarity index 100%
rename from packages/sdk-components-react/src/theme/tailwind-theme.ts
rename to packages/sdk-components-react-radix/src/theme/tailwind-theme.ts
diff --git a/packages/sdk-components-react/src/radix-tooltip.tsx b/packages/sdk-components-react-radix/src/tooltip.tsx
similarity index 100%
rename from packages/sdk-components-react/src/radix-tooltip.tsx
rename to packages/sdk-components-react-radix/src/tooltip.tsx
diff --git a/packages/sdk-components-react/src/radix-tooltip.ws.tsx b/packages/sdk-components-react-radix/src/tooltip.ws.tsx
similarity index 98%
rename from packages/sdk-components-react/src/radix-tooltip.ws.tsx
rename to packages/sdk-components-react-radix/src/tooltip.ws.tsx
index 3d3172dbb7..e51c82a41e 100644
--- a/packages/sdk-components-react/src/radix-tooltip.ws.tsx
+++ b/packages/sdk-components-react-radix/src/tooltip.ws.tsx
@@ -4,12 +4,11 @@ import {
type WsComponentPropsMeta,
} from "@webstudio-is/react-sdk";
import * as tc from "./theme/tailwind-classes";
-
import {
propsTooltip,
propsTooltipContent,
propsTooltipTrigger,
-} from "./__generated__/radix-tooltip.props";
+} from "./__generated__/tooltip.props";
// @todo add [data-state] to button and link
export const metaTooltipTrigger: WsComponentMeta = {
diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.json
index 3fff2bd528..bbbc846d6c 100644
--- a/packages/sdk-components-react/package.json
+++ b/packages/sdk-components-react/package.json
@@ -47,19 +47,14 @@
"react-dom": "^18.2.0"
},
"dependencies": {
- "@radix-ui/react-dialog": "^1.0.4",
- "@radix-ui/react-popover": "^1.0.6",
- "@radix-ui/react-tooltip": "^1.0.6",
"@react-aria/utils": "^3.18.0",
- "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/css-vars": "workspace:^",
"@webstudio-is/generate-arg-types": "workspace:^",
"@webstudio-is/icons": "workspace:^",
"@webstudio-is/image": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^",
"colord": "^2.9.3",
- "shallow-equal": "^3.1.0",
- "tailwindcss": "^3.3.3"
+ "shallow-equal": "^3.1.0"
},
"devDependencies": {
"@storybook/react": "^7.1.0",
diff --git a/packages/sdk-components-react/src/components.ts b/packages/sdk-components-react/src/components.ts
index 5a7112731d..be3b4cd4ba 100644
--- a/packages/sdk-components-react/src/components.ts
+++ b/packages/sdk-components-react/src/components.ts
@@ -30,14 +30,3 @@ export { Vimeo } from "./vimeo";
export { VimeoPreviewImage } from "./vimeo-preview-image";
export { VimeoPlayButton } from "./vimeo-play-button";
export { VimeoSpinner } from "./vimeo-spinner";
-export { Tooltip, TooltipContent, TooltipTrigger } from "./radix-tooltip";
-export { Popover, PopoverContent, PopoverTrigger } from "./radix-popover";
-export {
- Dialog,
- DialogContent,
- DialogTrigger,
- DialogOverlay,
- DialogClose,
- DialogDescription,
- DialogTitle,
-} from "./radix-dialog";
diff --git a/packages/sdk-components-react/src/metas.ts b/packages/sdk-components-react/src/metas.ts
index c80609e73b..1fbb40020a 100644
--- a/packages/sdk-components-react/src/metas.ts
+++ b/packages/sdk-components-react/src/metas.ts
@@ -30,24 +30,3 @@ export { meta as Vimeo } from "./vimeo.ws";
export { meta as VimeoPreviewImage } from "./vimeo-preview-image.ws";
export { meta as VimeoPlayButton } from "./vimeo-play-button.ws";
export { meta as VimeoSpinner } from "./vimeo-spinner.ws";
-export {
- metaTooltip as Tooltip,
- metaTooltipContent as TooltipContent,
- metaTooltipTrigger as TooltipTrigger,
-} from "./radix-tooltip.ws";
-
-export {
- metaPopover as Popover,
- metaPopoverContent as PopoverContent,
- metaPopoverTrigger as PopoverTrigger,
-} from "./radix-popover.ws";
-
-export {
- metaDialog as Dialog,
- metaDialogContent as DialogContent,
- metaDialogTrigger as DialogTrigger,
- metaDialogOverlay as DialogOverlay,
- metaDialogClose as DialogClose,
- metaDialogDescription as DialogDescription,
- metaDialogTitle as DialogTitle,
-} from "./radix-dialog.ws";
diff --git a/packages/sdk-components-react/src/props.ts b/packages/sdk-components-react/src/props.ts
index f1260c627d..f6c1fef4e3 100644
--- a/packages/sdk-components-react/src/props.ts
+++ b/packages/sdk-components-react/src/props.ts
@@ -30,22 +30,3 @@ export { propsMeta as Vimeo } from "./vimeo.ws";
export { propsMeta as VimeoPreviewImage } from "./vimeo-preview-image.ws";
export { propsMeta as VimeoPlayButton } from "./vimeo-play-button.ws";
export { propsMeta as VimeoSpinner } from "./vimeo-spinner.ws";
-export {
- propsMetaTooltip as Tooltip,
- propsMetaTooltipContent as TooltipContent,
- propsMetaTooltipTrigger as TooltipTrigger,
-} from "./radix-tooltip.ws";
-export {
- propsMetaPopover as Popover,
- propsMetaPopoverContent as PopoverContent,
- propsMetaPopoverTrigger as PopoverTrigger,
-} from "./radix-popover.ws";
-export {
- propsMetaDialog as Dialog,
- propsMetaDialogContent as DialogContent,
- propsMetaDialogTrigger as DialogTrigger,
- propsMetaDialogOverlay as DialogOverlay,
- propsMetaDialogClose as DialogClose,
- propsMetaDialogDescription as DialogDescription,
- propsMetaDialogTitle as DialogTitle,
-} from "./radix-dialog.ws";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 941db61c03..bcfd975f81 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1261,21 +1261,9 @@ importers:
packages/sdk-components-react:
dependencies:
- '@radix-ui/react-dialog':
- specifier: ^1.0.4
- '@radix-ui/react-popover':
- specifier: ^1.0.6
- '@radix-ui/react-tooltip':
- specifier: ^1.0.6
'@react-aria/utils':
specifier: ^3.18.0
version: 3.18.0([email protected])
- '@webstudio-is/css-data':
- specifier: workspace:^
- version: link:../css-data
'@webstudio-is/css-vars':
specifier: workspace:^
version: link:../css-vars
@@ -1297,9 +1285,6 @@ importers:
shallow-equal:
specifier: ^3.1.0
version: 3.1.0
- tailwindcss:
- specifier: ^3.3.3
- version: 3.3.3
devDependencies:
'@storybook/react':
specifier: ^7.1.0
@@ -1334,6 +1319,18 @@ importers:
'@radix-ui/react-collapsible':
specifier: ^1.0.3
+ '@radix-ui/react-dialog':
+ specifier: ^1.0.4
+ '@radix-ui/react-popover':
+ specifier: ^1.0.6
+ '@radix-ui/react-tooltip':
+ specifier: ^1.0.6
+ '@webstudio-is/css-data':
+ specifier: workspace:^
+ version: link:../css-data
'@webstudio-is/generate-arg-types':
specifier: workspace:^
version: link:../generate-arg-types
@@ -1343,6 +1340,9 @@ importers:
'@webstudio-is/react-sdk':
specifier: workspace:^
version: link:../react-sdk
+ tailwindcss:
+ specifier: ^3.3.3
+ version: 3.3.3
devDependencies:
'@storybook/react':
specifier: ^7.1.0