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
Use styled radix button at dialog, sheet, popover and tooltip (#2111)
Ivan Starkov37c6e7adbccb
diff --git a/packages/sdk-components-react-radix/src/button.ws.ts b/packages/sdk-components-react-radix/src/button.ws.tsindex 54d4b1377d..82321f21f7 100644--- a/packages/sdk-components-react-radix/src/button.ws.ts+++ b/packages/sdk-components-react-radix/src/button.ws.ts@@ -1,6 +1,7 @@import { ButtonElementIcon } from "@webstudio-is/icons/svg";import {defaultStates,+ EmbedTemplateInstance,type PresetStyle,type WsComponentMeta,type WsComponentPropsMeta,@@ -13,6 +14,105 @@ const presetStyle = {button,} satisfies PresetStyle<"button">;+export const template = (props?: {+ props?: EmbedTemplateInstance["props"];+ children?: WsComponentMeta["template"];+}): NonNullable<WsComponentMeta["template"]> => [+ {+ type: "instance",+ component: "Button",+ styles: [+ // 'inline-flex items-center justify-center rounded-md text-sm font-medium+ // ring-offset-background transition-colors+ // focus-visible:outline-none focus-visible:ring-2+ // focus-visible:ring-ring focus-visible:ring-offset-2+ // disabled:pointer-events-none disabled:opacity-50'+ tc.border(0),+ tc.bg("transparent"),+ tc.inlineFlex(),+ tc.items("center"),+ tc.justify("center"),+ tc.rounded("md"),+ tc.text("sm"),+ tc.font("medium"),+ tc.focusVisible(+ [tc.outline("none"), tc.ring("ring", 2, "background", 2)].flat()+ ),+ tc.state([tc.pointerEvents("none"), tc.opacity(50)].flat(), ":disabled"),++ // VARIANT+ // default: 'bg-primary text-primary-foreground hover:bg-primary/90',+ tc.state(+ [tc.bg("primary"), tc.text("primaryForeground")].flat(),+ "[data-variant=default]"+ ),+ tc.state(+ [[tc.bg("primary", 90)].flat()].flat(),+ "[data-variant=default]:hover"+ ),++ // destructive:'bg-destructive text-destructive-foreground hover:bg-destructive/90',+ tc.state(+ [tc.bg("destructive"), tc.text("destructiveForeground")].flat(),+ "[data-variant=destructive]"+ ),+ tc.state(+ [[tc.bg("destructive", 90)].flat()].flat(),+ "[data-variant=destructive]:hover"+ ),++ // outline: 'border border-input bg-background hover:bg-accent hover:text-accent-foreground',+ tc.state(+ [tc.border(), tc.border("input"), tc.bg("background")].flat(),+ "[data-variant=outline]"+ ),+ tc.state(+ [[tc.bg("accent", 90), tc.text("accentForeground")].flat()].flat(),+ "[data-variant=outline]:hover"+ ),++ // secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',+ tc.state(+ [tc.bg("secondary"), tc.text("secondaryForeground")].flat(),+ "[data-variant=secondary]"+ ),+ tc.state(+ [[tc.bg("secondary", 80)].flat()].flat(),+ "[data-variant=secondary]:hover"+ ),++ // ghost: 'hover:bg-accent hover:text-accent-foreground',+ tc.state(+ [[tc.bg("accent"), tc.text("accentForeground")].flat()].flat(),+ "[data-variant=ghost]:hover"+ ),++ // link: 'text-primary underline-offset-4 hover:underline',+ tc.state(+ [tc.text("primary"), tc.underlineOffset(4)].flat(),+ "[data-variant=link]"+ ),+ tc.state([[tc.underline()].flat()].flat(), "[data-variant=link]:hover"),++ // SIZE+ // default: 'h-10 px-4 py-2',+ tc.state([tc.h(10), tc.px(4), tc.py(2)].flat(), "[data-size=default]"),++ // sm: 'h-9 rounded-md px-3',+ tc.state([tc.h(10), tc.px(3)].flat(), "[data-size=sm]"),++ // lg: 'h-11 rounded-md px-8',+ tc.state([tc.h(11), tc.px(8)].flat(), "[data-size=lg]"),++ // icon: 'h-10 w-10',+ tc.state([tc.h(10), tc.w(10)].flat(), "[data-size=icon]"),+ ].flat(),++ children: props?.children ?? [{ type: "text", value: "Button" }],+ props: props?.props,+ },+];+export const meta: WsComponentMeta = {category: "radix",type: "container",@@ -46,103 +146,7 @@ export const meta: WsComponentMeta = {{ selector: "[data-variant=link]:hover", label: "Link Hover" },],order: 1,- template: [- {- type: "instance",- component: "Button",- styles: [- // 'inline-flex items-center justify-center rounded-md text-sm font-medium- // ring-offset-background transition-colors- // focus-visible:outline-none focus-visible:ring-2- // focus-visible:ring-ring focus-visible:ring-offset-2- // disabled:pointer-events-none disabled:opacity-50'- tc.border(0),- tc.bg("transparent"),- tc.inlineFlex(),- tc.items("center"),- tc.justify("center"),- tc.rounded("md"),- tc.text("sm"),- tc.font("medium"),- tc.focusVisible(- [tc.outline("none"), tc.ring("ring", 2, "background", 2)].flat()- ),- tc.state(- [tc.pointerEvents("none"), tc.opacity(50)].flat(),- ":disabled"- ),-- // VARIANT- // default: 'bg-primary text-primary-foreground hover:bg-primary/90',- tc.state(- [tc.bg("primary"), tc.text("primaryForeground")].flat(),- "[data-variant=default]"- ),- tc.state(- [[tc.bg("primary", 90)].flat()].flat(),- "[data-variant=default]:hover"- ),-- // destructive:'bg-destructive text-destructive-foreground hover:bg-destructive/90',- tc.state(- [tc.bg("destructive"), tc.text("destructiveForeground")].flat(),- "[data-variant=destructive]"- ),- tc.state(- [[tc.bg("destructive", 90)].flat()].flat(),- "[data-variant=destructive]:hover"- ),-- // outline: 'border border-input bg-background hover:bg-accent hover:text-accent-foreground',- tc.state(- [tc.border(), tc.border("input"), tc.bg("background")].flat(),- "[data-variant=outline]"- ),- tc.state(- [[tc.bg("accent", 90), tc.text("accentForeground")].flat()].flat(),- "[data-variant=outline]:hover"- ),-- // secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',- tc.state(- [tc.bg("secondary"), tc.text("secondaryForeground")].flat(),- "[data-variant=secondary]"- ),- tc.state(- [[tc.bg("secondary", 80)].flat()].flat(),- "[data-variant=secondary]:hover"- ),-- // ghost: 'hover:bg-accent hover:text-accent-foreground',- tc.state(- [[tc.bg("accent"), tc.text("accentForeground")].flat()].flat(),- "[data-variant=ghost]:hover"- ),-- // link: 'text-primary underline-offset-4 hover:underline',- tc.state(- [tc.text("primary"), tc.underlineOffset(4)].flat(),- "[data-variant=link]"- ),- tc.state([[tc.underline()].flat()].flat(), "[data-variant=link]:hover"),-- // SIZE- // default: 'h-10 px-4 py-2',- tc.state([tc.h(10), tc.px(4), tc.py(2)].flat(), "[data-size=default]"),-- // sm: 'h-9 rounded-md px-3',- tc.state([tc.h(10), tc.px(3)].flat(), "[data-size=sm]"),-- // lg: 'h-11 rounded-md px-8',- tc.state([tc.h(11), tc.px(8)].flat(), "[data-size=lg]"),-- // icon: 'h-10 w-10',- tc.state([tc.h(10), tc.w(10)].flat(), "[data-size=icon]"),- ].flat(),-- children: [{ type: "text", value: "Button you can edit" }],- },- ],+ template: template(),};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/sdk-components-react-radix/src/dialog.ws.tsx b/packages/sdk-components-react-radix/src/dialog.ws.tsxindex 423a49aea3..0bf69d50f0 100644--- a/packages/sdk-components-react-radix/src/dialog.ws.tsx+++ b/packages/sdk-components-react-radix/src/dialog.ws.tsx@@ -22,6 +22,7 @@ import {propsDialogTitle,propsDialogDescription,} from "./__generated__/dialog.props";+import { template as buttonTemplate } from "./button.ws";import { div, button, h2, p } from "@webstudio-is/react-sdk/css-normalize";@@ -127,13 +128,9 @@ export const metaDialog: WsComponentMeta = {type: "instance",component: "DialogTrigger",props: [],- children: [- {- type: "instance",- component: "Button",- children: [{ type: "text", value: "Button" }],- },- ],+ children: buttonTemplate({+ children: [{ type: "text", value: "Button" }],+ }),},{type: "instance",diff --git a/packages/sdk-components-react-radix/src/popover.ws.tsx b/packages/sdk-components-react-radix/src/popover.ws.tsxindex a0219be654..d79c9c869c 100644--- a/packages/sdk-components-react-radix/src/popover.ws.tsx+++ b/packages/sdk-components-react-radix/src/popover.ws.tsx@@ -11,6 +11,7 @@ import {propsPopoverTrigger,} from "./__generated__/popover.props";import { div } from "@webstudio-is/react-sdk/css-normalize";+import { template as buttonTemplate } from "./button.ws";const presetStyle = {div,@@ -73,13 +74,9 @@ export const metaPopover: WsComponentMeta = {type: "instance",component: "PopoverTrigger",props: [],- children: [- {- type: "instance",- component: "Button",- children: [{ type: "text", value: "Button" }],- },- ],+ children: buttonTemplate({+ children: [{ type: "text", value: "Button" }],+ }),},{type: "instance",diff --git a/packages/sdk-components-react-radix/src/sheet.ws.tsx b/packages/sdk-components-react-radix/src/sheet.ws.tsxindex a79db358dc..996e7041e9 100644--- a/packages/sdk-components-react-radix/src/sheet.ws.tsx+++ b/packages/sdk-components-react-radix/src/sheet.ws.tsx@@ -25,6 +25,7 @@ import {import { div, nav, button, h2, p } from "@webstudio-is/react-sdk/css-normalize";import type { SheetContent } from "./sheet";import type { ComponentProps } from "react";+import { template as buttonTemplate } from "./button.ws";type ContentTags = NonNullable<ComponentProps<typeof SheetContent>["tag"]>;@@ -141,13 +142,27 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "SheetTrigger",- children: [- {- type: "instance",- component: "Button",- children: [{ type: "text", value: "Button" }],- },- ],+ children: buttonTemplate({+ props: [+ { name: "variant", type: "string", value: "ghost" },+ { name: "size", type: "string", value: "icon" },+ ],+ children: [+ {+ type: "instance",+ component: "HtmlEmbed",+ label: "Hamburger Menu Svg",+ props: [+ {+ type: "string",+ name: "code",+ value: HamburgerMenuIcon,+ },+ ],+ children: [],+ },+ ],+ }),},{type: "instance",diff --git a/packages/sdk-components-react-radix/src/tooltip.ws.tsx b/packages/sdk-components-react-radix/src/tooltip.ws.tsxindex 8d1600ea16..9ce106d37a 100644--- a/packages/sdk-components-react-radix/src/tooltip.ws.tsx+++ b/packages/sdk-components-react-radix/src/tooltip.ws.tsx@@ -11,6 +11,7 @@ import {propsTooltipTrigger,} from "./__generated__/tooltip.props";import { div } from "@webstudio-is/react-sdk/css-normalize";+import { template as buttonTemplate } from "./button.ws";const presetStyle = {div,@@ -73,13 +74,9 @@ export const metaTooltip: WsComponentMeta = {type: "instance",component: "TooltipTrigger",props: [],- children: [- {- type: "instance",- component: "Button",- children: [{ type: "text", value: "Button" }],- },- ],+ children: buttonTemplate({+ children: [{ type: "text", value: "Button" }],+ }),},{type: "instance",