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: expose missing states to Radix components (#5699)
Oleg Isonenb44e0fa452f2
diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts b/apps/builder/app/builder/features/style-panel/style-source-section.test.tsindex ed8f56d707..6081339794 100644--- a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts+++ b/apps/builder/app/builder/features/style-panel/style-source-section.test.ts@@ -80,19 +80,47 @@ describe("getComponentStates", () => {const result = getComponentStates({predefinedStates: [],componentStates: [- { label: "Open", selector: "[data-state=open]" },- { label: "Closed", selector: "[data-state=closed]" },+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },],instanceStyleSourceIds: new Set(),styles: [],selectedStyleState: undefined,});- const openState = result.find((s) => s.selector === "[data-state=open]");+ const openState = result.find((s) => s.selector === '[data-state="open"]');expect(openState?.source).toBe("component");expect(openState?.label).toBe("Open");});+ test("does not duplicate component states when styles exist for the same selector", () => {+ const result = getComponentStates({+ predefinedStates: [],+ componentStates: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],+ instanceStyleSourceIds: new Set(["style1"]),+ styles: [+ { styleSourceId: "style1", state: '[data-state="open"]' },+ { styleSourceId: "style1", state: '[data-state="closed"]' },+ ],+ selectedStyleState: undefined,+ });++ const openStates = result.filter(+ (s) => s.selector === '[data-state="open"]'+ );+ expect(openStates).toHaveLength(1);+ expect(openStates[0].source).toBe("component");++ const closedStates = result.filter(+ (s) => s.selector === '[data-state="closed"]'+ );+ expect(closedStates).toHaveLength(1);+ expect(closedStates[0].source).toBe("component");+ });+test("removes selector when styles are cleared", () => {// First, with stylesconst withStyles = getComponentStates({diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsxindex 99a61ae6fd..ce8c383428 100644--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx@@ -316,6 +316,9 @@ const getComponentStates = ({usedSelectors.add(selectedStyleState);}+ const componentStateSelectors = new Set(+ componentStates.map((s) => s.selector)+ );const allStateSelectors = new Set([...allStates, ...usedSelectors]);const toConfig = (selector: string): SelectorConfig => ({@@ -326,7 +329,9 @@ const getComponentStates = ({});const states = Array.from(allStateSelectors)- .filter((state) => !isPseudoElement(state))+ .filter(+ (state) => !isPseudoElement(state) && !componentStateSelectors.has(state)+ ).map(toConfig);const pseudoElements = Array.from(allStateSelectors)diff --git a/packages/sdk-components-react-radix/src/accordion.template.tsx b/packages/sdk-components-react-radix/src/accordion.template.tsxindex f0a98a7959..43a6123714 100644--- a/packages/sdk-components-react-radix/src/accordion.template.tsx+++ b/packages/sdk-components-react-radix/src/accordion.template.tsx@@ -76,6 +76,12 @@ const createAccordionItem = (triggerText: string, contentText: string) => {line-height: ${fontSizeLineHeight.sm};transition: ${transition.all};padding-bottom: ${spacing[4]};+ &[data-state="closed"] {+ height: 0;+ }+ &[data-state="open"] {+ height: var(--radix-accordion-content-height);+ }`}>{new PlaceholderValue(contentText)}diff --git a/packages/sdk-components-react-radix/src/accordion.ws.ts b/packages/sdk-components-react-radix/src/accordion.ws.tsindex 2795935ac1..279857b4fe 100644--- a/packages/sdk-components-react-radix/src/accordion.ws.ts+++ b/packages/sdk-components-react-radix/src/accordion.ws.ts@@ -38,6 +38,10 @@ export const metaAccordionItem: WsComponentMeta = {children: ["instance"],descendants: [radix.AccordionHeader, radix.AccordionContent],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: { div },initialProps: ["value"],props: propsAccordionItem,@@ -51,6 +55,10 @@ export const metaAccordionHeader: WsComponentMeta = {children: ["instance"],descendants: [radix.AccordionTrigger],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {h3: [...h3,@@ -74,7 +82,10 @@ export const metaAccordionTrigger: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},- states: [{ label: "Open", selector: "[data-state=open]" }],+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {button: [button, buttonReset].flat(),},@@ -88,6 +99,10 @@ export const metaAccordionContent: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {div,},diff --git a/packages/sdk-components-react-radix/src/checkbox.ws.ts b/packages/sdk-components-react-radix/src/checkbox.ws.tsindex 2b6da74027..77f6752665 100644--- a/packages/sdk-components-react-radix/src/checkbox.ws.ts+++ b/packages/sdk-components-react-radix/src/checkbox.ws.ts@@ -16,8 +16,9 @@ export const metaCheckbox: WsComponentMeta = {descendants: [radix.CheckboxIndicator],},states: [- { label: "Checked", selector: "[data-state=checked]" },- { label: "Unchecked", selector: "[data-state=unchecked]" },+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },+ { label: "Indeterminate", selector: '[data-state="indeterminate"]' },],presetStyle: {button: [button, buttonReset].flat(),@@ -32,6 +33,11 @@ export const metaCheckboxIndicator: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},+ states: [+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },+ { label: "Indeterminate", selector: '[data-state="indeterminate"]' },+ ],presetStyle: {span,},diff --git a/packages/sdk-components-react-radix/src/collapsible.ws.ts b/packages/sdk-components-react-radix/src/collapsible.ws.tsindex 19bb850b37..dad6e4bb27 100644--- a/packages/sdk-components-react-radix/src/collapsible.ws.ts+++ b/packages/sdk-components-react-radix/src/collapsible.ws.ts@@ -19,6 +19,10 @@ export const metaCollapsible: WsComponentMeta = {children: ["instance"],descendants: [radix.CollapsibleTrigger, radix.CollapsibleContent],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {div,},@@ -32,6 +36,10 @@ export const metaCollapsibleTrigger: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],props: propsCollapsibleTrigger,};@@ -41,6 +49,10 @@ export const metaCollapsibleContent: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {div,},diff --git a/packages/sdk-components-react-radix/src/dialog.ws.ts b/packages/sdk-components-react-radix/src/dialog.ws.tsindex ed71518c1f..def2afcdd1 100644--- a/packages/sdk-components-react-radix/src/dialog.ws.ts+++ b/packages/sdk-components-react-radix/src/dialog.ws.ts@@ -21,13 +21,16 @@ import {} from "./__generated__/dialog.props";import { buttonReset } from "./shared/preset-styles";-// @todo add [data-state] to button and linkexport const metaDialogTrigger: WsComponentMeta = {icon: TriggerIcon,contentModel: {category: "none",children: ["instance"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],props: propsDialogTrigger,};@@ -38,6 +41,10 @@ export const metaDialogOverlay: WsComponentMeta = {children: ["instance"],descendants: [radix.DialogContent],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: { div },props: propsDialogOverlay,};@@ -53,6 +60,10 @@ export const metaDialogContent: WsComponentMeta = {radix.DialogClose,],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: { div },props: propsDialogContent,};diff --git a/packages/sdk-components-react-radix/src/navigation-menu.ws.ts b/packages/sdk-components-react-radix/src/navigation-menu.ws.tsindex 7f169f2275..25442dd4ed 100644--- a/packages/sdk-components-react-radix/src/navigation-menu.ws.ts+++ b/packages/sdk-components-react-radix/src/navigation-menu.ws.ts@@ -73,6 +73,10 @@ export const metaNavigationMenuTrigger: WsComponentMeta = {category: "none",children: ["instance"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],props: propsNavigationMenuTrigger,};@@ -84,6 +88,10 @@ export const metaNavigationMenuContent: WsComponentMeta = {children: ["instance"],descendants: [radix.NavigationMenuLink],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {div,},@@ -107,6 +115,10 @@ export const metaNavigationMenuViewport: WsComponentMeta = {category: "none",children: ["instance"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {div,},diff --git a/packages/sdk-components-react-radix/src/popover.ws.ts b/packages/sdk-components-react-radix/src/popover.ws.tsindex 69c490ae7b..030ddc22a8 100644--- a/packages/sdk-components-react-radix/src/popover.ws.ts+++ b/packages/sdk-components-react-radix/src/popover.ws.ts@@ -15,13 +15,16 @@ import {} from "./__generated__/popover.props";import { buttonReset } from "./shared/preset-styles";-// @todo add [data-state] to button and linkexport const metaPopoverTrigger: WsComponentMeta = {icon: TriggerIcon,contentModel: {category: "none",children: ["instance"],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],props: propsPopoverTrigger,};@@ -32,6 +35,10 @@ export const metaPopoverContent: WsComponentMeta = {children: ["instance"],descendants: [radix.PopoverClose],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: {div,},diff --git a/packages/sdk-components-react-radix/src/radio-group.ws.ts b/packages/sdk-components-react-radix/src/radio-group.ws.tsindex d73e4bca98..6edd34b00b 100644--- a/packages/sdk-components-react-radix/src/radio-group.ws.ts+++ b/packages/sdk-components-react-radix/src/radio-group.ws.ts@@ -31,8 +31,8 @@ export const metaRadioGroupItem: WsComponentMeta = {descendants: [radix.RadioGroupIndicator],},states: [- { label: "Checked", selector: "[data-state=checked]" },- { label: "Unchecked", selector: "[data-state=unchecked]" },+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },],presetStyle: {button: [button, buttonReset].flat(),@@ -48,8 +48,8 @@ export const metaRadioGroupIndicator: WsComponentMeta = {children: ["instance"],},states: [- { label: "Checked", selector: "[data-state=checked]" },- { label: "Unchecked", selector: "[data-state=unchecked]" },+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },],presetStyle: {span,diff --git a/packages/sdk-components-react-radix/src/select.ws.ts b/packages/sdk-components-react-radix/src/select.ws.tsindex 4d34468d9e..43ac5272a4 100644--- a/packages/sdk-components-react-radix/src/select.ws.ts+++ b/packages/sdk-components-react-radix/src/select.ws.ts@@ -40,6 +40,10 @@ export const metaSelectTrigger: WsComponentMeta = {children: ["instance"],descendants: [radix.SelectValue],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: { button },props: propsSelectTrigger,};@@ -63,6 +67,10 @@ export const metaSelectContent: WsComponentMeta = {children: ["instance"],descendants: [radix.SelectViewport],},+ states: [+ { label: "Open", selector: '[data-state="open"]' },+ { label: "Closed", selector: '[data-state="closed"]' },+ ],presetStyle: { div },props: propsSelectContent,};@@ -85,6 +93,10 @@ export const metaSelectItem: WsComponentMeta = {children: ["instance"],descendants: [radix.SelectItemIndicator, radix.SelectItemText],},+ states: [+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },+ ],presetStyle: { div },initialProps: ["value"],props: propsSelectItem,diff --git a/packages/sdk-components-react-radix/src/switch.ws.ts b/packages/sdk-components-react-radix/src/switch.ws.tsindex da4cc43e5d..1bc6eb3fd8 100644--- a/packages/sdk-components-react-radix/src/switch.ws.ts+++ b/packages/sdk-components-react-radix/src/switch.ws.ts@@ -13,8 +13,8 @@ export const metaSwitch: WsComponentMeta = {descendants: [radix.SwitchThumb],},states: [- { label: "Checked", selector: "[data-state=checked]" },- { label: "Unchecked", selector: "[data-state=unchecked]" },+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },],presetStyle: {button: [button, buttonReset].flat(),@@ -30,8 +30,8 @@ export const metaSwitchThumb: WsComponentMeta = {children: ["instance"],},states: [- { label: "Checked", selector: "[data-state=checked]" },- { label: "Unchecked", selector: "[data-state=unchecked]" },+ { label: "Checked", selector: '[data-state="checked"]' },+ { label: "Unchecked", selector: '[data-state="unchecked"]' },],presetStyle: {span,diff --git a/packages/sdk-components-react-radix/src/tabs.ws.ts b/packages/sdk-components-react-radix/src/tabs.ws.tsindex a359621141..c06401182c 100644--- a/packages/sdk-components-react-radix/src/tabs.ws.ts+++ b/packages/sdk-components-react-radix/src/tabs.ws.ts@@ -45,7 +45,10 @@ export const metaTabsTrigger: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},- states: [{ label: "Active", selector: "[data-state=active]" }],+ states: [+ { label: "Active", selector: '[data-state="active"]' },+ { label: "Inactive", selector: '[data-state="inactive"]' },+ ],presetStyle: {button: [button, buttonReset].flat(),},@@ -60,6 +63,10 @@ export const metaTabsContent: WsComponentMeta = {category: "none",children: ["instance", "rich-text"],},+ states: [+ { label: "Active", selector: '[data-state="active"]' },+ { label: "Inactive", selector: '[data-state="inactive"]' },+ ],presetStyle: { div },props: propsTabsContent,};diff --git a/packages/sdk-components-react-radix/src/tooltip.ws.ts b/packages/sdk-components-react-radix/src/tooltip.ws.tsindex 084d0549de..551227d8f5 100644--- a/packages/sdk-components-react-radix/src/tooltip.ws.ts+++ b/packages/sdk-components-react-radix/src/tooltip.ws.ts@@ -8,13 +8,17 @@ import {propsTooltipTrigger,} from "./__generated__/tooltip.props";-// @todo add [data-state] to button and linkexport const metaTooltipTrigger: WsComponentMeta = {icon: TriggerIcon,contentModel: {category: "none",children: ["instance"],},+ states: [+ { label: "Closed", selector: '[data-state="closed"]' },+ { label: "Delayed open", selector: '[data-state="delayed-open"]' },+ { label: "Instant open", selector: '[data-state="instant-open"]' },+ ],props: propsTooltipTrigger,};@@ -24,6 +28,11 @@ export const metaTooltipContent: WsComponentMeta = {category: "none",children: ["instance"],},+ states: [+ { label: "Closed", selector: '[data-state="closed"]' },+ { label: "Delayed open", selector: '[data-state="delayed-open"]' },+ { label: "Instant open", selector: '[data-state="instant-open"]' },+ ],presetStyle: { div },initialProps: ["side", "sideOffset", "align", "alignOffset"],props: propsTooltipContent,