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
Improve radix components (#2201)
Bogdan Chadkin86ff9d406d99
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex d0a168b2ae..0210d77129 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -67,8 +67,9 @@ const ContentEditable = ({return;}- if (rootElement?.tagName === "BUTTON") {- // button with contentEditable does not let to press space+ if (rootElement?.tagName === "BUTTON" || rootElement.tagName === "A") {+ // <button> with contentEditable does not let to press space+ // <a> stops working with inline-flex when only 1 character left// so add span inside and use it as editor element in lexicalconst span = document.createElement("span");span.contentEditable = "true";diff --git a/packages/icons/icons/item.svg b/packages/icons/icons/item.svgindex d1b230ea53..1842e9dcf4 100644--- a/packages/icons/icons/item.svg+++ b/packages/icons/icons/item.svg@@ -1,3 +1,5 @@<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.17304 1.35001H10.8269C11.3641 1.35 11.8064 1.34999 12.1665 1.37941C12.5402 1.40995 12.8822 1.47538 13.2031 1.63884C13.7017 1.8929 14.1071 2.2983 14.3611 2.79693C14.5246 3.11775 14.59 3.45978 14.6206 3.83348C14.65 4.19359 14.65 4.63591 14.65 5.17307V10.8269C14.65 11.3641 14.65 11.8064 14.6206 12.1665C14.59 12.5402 14.5246 12.8823 14.3611 13.2031C14.1071 13.7017 13.7017 14.1071 13.2031 14.3612C12.8822 14.5246 12.5402 14.5901 12.1665 14.6206C11.8064 14.65 11.3641 14.65 10.8269 14.65H5.17304C4.63588 14.65 4.19356 14.65 3.83345 14.6206C3.45975 14.5901 3.11772 14.5246 2.7969 14.3612C2.29827 14.1071 1.89287 13.7017 1.63881 13.2031C1.47534 12.8823 1.40992 12.5402 1.37938 12.1665C1.34996 11.8064 1.34997 11.3641 1.34998 10.8269V5.17307C1.34997 4.63591 1.34996 4.19359 1.37938 3.83348C1.40992 3.45978 1.47534 3.11775 1.63881 2.79693C1.89287 2.2983 2.29827 1.8929 2.7969 1.63884C3.11772 1.47538 3.45975 1.40995 3.83345 1.37941C4.19356 1.34999 4.63588 1.35 5.17304 1.35001ZM3.93931 2.6751C3.646 2.69906 3.4941 2.74262 3.38709 2.79715C3.13307 2.92658 2.92655 3.1331 2.79712 3.38712C2.74259 3.49413 2.69903 3.64603 2.67507 3.93934C2.65048 4.24024 2.64998 4.62923 2.64998 5.20001V10.8C2.64998 11.3708 2.65048 11.7598 2.67507 12.0607C2.69903 12.354 2.74259 12.5059 2.79712 12.6129C2.92655 12.8669 3.13307 13.0734 3.38709 13.2029C3.4941 13.2574 3.646 13.301 3.93931 13.3249C4.24021 13.3495 4.6292 13.35 5.19998 13.35H10.8C11.3708 13.35 11.7597 13.3495 12.0606 13.3249C12.3539 13.301 12.5059 13.2574 12.6129 13.2029C12.8669 13.0734 13.0734 12.8669 13.2028 12.6129C13.2574 12.5059 13.3009 12.354 13.3249 12.0607C13.3495 11.7598 13.35 11.3708 13.35 10.8V5.20001C13.35 4.62923 13.3495 4.24024 13.3249 3.93934C13.3009 3.64603 13.2574 3.49413 13.2028 3.38712C13.0734 3.1331 12.8669 2.92658 12.6129 2.79715C12.5059 2.74262 12.3539 2.69906 12.0606 2.6751C11.7597 2.65051 11.3708 2.65001 10.8 2.65001H5.19998C4.6292 2.65001 4.24021 2.65051 3.93931 2.6751Z" />+ <path d="M3.7 6.1752C3.7 6.64464 3.31944 7.0252 2.85 7.0252C2.38056 7.0252 2 6.64464 2 6.1752C2 5.70575 2.38056 5.3252 2.85 5.3252C3.31944 5.3252 3.7 5.70575 3.7 6.1752Z" />+ <path fill-rule="evenodd" clip-rule="evenodd" d="M5 6.1748C5 5.82963 5.27982 5.5498 5.625 5.5498H13.375C13.7202 5.5498 14 5.82963 14 6.1748C14 6.51998 13.7202 6.7998 13.375 6.7998H5.625C5.27982 6.7998 5 6.51998 5 6.1748Z" />+ <path fill-rule="evenodd" clip-rule="evenodd" d="M5 10.0498C5 9.70463 5.27982 9.4248 5.62499 9.4248H13.3748C13.72 9.4248 13.9998 9.70463 13.9998 10.0498C13.9998 10.395 13.72 10.6748 13.3748 10.6748H5.62499C5.27982 10.6748 5 10.395 5 10.0498Z" /></svg>diff --git a/packages/icons/icons/large X.svg b/packages/icons/icons/large X.svgnew file mode 100644index 0000000000..c95696778a--- /dev/null+++ b/packages/icons/icons/large X.svg@@ -0,0 +1,3 @@+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5657 2.43433C13.8781 2.74675 13.8781 3.25328 13.5657 3.5657L9.13137 8.00003L13.5657 12.4343C13.8781 12.7467 13.8781 13.2533 13.5657 13.5657C13.2533 13.8781 12.7467 13.8781 12.4343 13.5657L8 9.1314L3.5657 13.5657C3.25328 13.8781 2.74675 13.8781 2.43433 13.5657C2.12191 13.2533 2.12191 12.7467 2.43433 12.4343L6.86862 8.00003L2.43433 3.56578C2.12191 3.25336 2.12191 2.74683 2.43432 2.43441C2.74674 2.12199 3.25327 2.12198 3.5657 2.4344L7.99999 6.86866L12.4343 2.43433C12.7467 2.12191 13.2533 2.12191 13.5657 2.43433Z" />+</svg>diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex 8ce2a191a9..f65ad80fbc 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -102,6 +102,7 @@ export * from "./j-c-space-around";export * from "./j-c-space-between";export * from "./j-c-start";export * from "./label";+export * from "./large X";export * from "./link-2-unlinked";export * from "./link-2";export * from "./link";diff --git a/packages/icons/src/__generated__/item.tsx b/packages/icons/src/__generated__/item.tsxindex feff02e4f3..29ee854834 100644--- a/packages/icons/src/__generated__/item.tsx+++ b/packages/icons/src/__generated__/item.tsx@@ -7,7 +7,7 @@ import type { IconProps } from "../types";export const ItemIcon = forwardRef<SVGSVGElement, IconProps>(({ color = "currentColor", size = 16, ...props }, forwardedRef) => {return (- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M5.173 1.35h5.654c.537 0 .98 0 1.34.03.373.03.715.095 1.036.259.499.254.904.66 1.158 1.158.164.32.229.663.26 1.036.029.36.029.803.029 1.34v5.654c0 .537 0 .98-.03 1.34-.03.373-.095.715-.259 1.036a2.65 2.65 0 0 1-1.158 1.158c-.32.164-.663.23-1.037.26-.36.029-.802.029-1.34.029H5.174c-.537 0-.98 0-1.34-.03-.373-.03-.715-.095-1.036-.259a2.65 2.65 0 0 1-1.158-1.158c-.164-.32-.23-.663-.26-1.037-.029-.36-.029-.802-.029-1.34V5.174c0-.537 0-.98.03-1.34.03-.373.095-.715.259-1.036a2.65 2.65 0 0 1 1.158-1.158c.32-.164.663-.229 1.036-.26.36-.029.803-.029 1.34-.029ZM3.939 2.675c-.293.024-.445.068-.552.122a1.35 1.35 0 0 0-.59.59c-.054.107-.098.259-.122.552-.025.301-.025.69-.025 1.261v5.6c0 .57 0 .96.025 1.26.024.294.068.446.122.553.13.254.336.46.59.59.107.054.259.098.552.122.301.025.69.025 1.261.025h5.6c.57 0 .96 0 1.26-.025.294-.024.446-.068.553-.122.254-.13.46-.336.59-.59.054-.107.098-.259.122-.552.025-.301.025-.69.025-1.261V5.2c0-.57 0-.96-.025-1.26-.024-.294-.068-.446-.122-.553a1.35 1.35 0 0 0-.59-.59c-.107-.054-.26-.098-.552-.122-.301-.024-.69-.025-1.261-.025H5.2c-.57 0-.96 0-1.26.025Z" clipRule="evenodd" /></svg>+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M3.7 6.175a.85.85 0 1 1-1.7 0 .85.85 0 0 1 1.7 0Z" /><path fillRule="evenodd" d="M5 6.175c0-.345.28-.625.625-.625h7.75a.625.625 0 1 1 0 1.25h-7.75A.625.625 0 0 1 5 6.175ZM5 10.05c0-.345.28-.625.625-.625h7.75a.625.625 0 1 1 0 1.25h-7.75A.625.625 0 0 1 5 10.05Z" clipRule="evenodd" /></svg>);});diff --git a/packages/icons/src/__generated__/large X.tsx b/packages/icons/src/__generated__/large X.tsxnew file mode 100644index 0000000000..ca0c9e4283--- /dev/null+++ b/packages/icons/src/__generated__/large X.tsx@@ -0,0 +1,15 @@+// Generated from icons/large X.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const LargeXIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="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" clipRule="evenodd" /></svg>+ );+ }+);++LargeXIcon.displayName = "LargeXIcon";diff --git a/packages/icons/src/__generated__/svg/index.ts b/packages/icons/src/__generated__/svg/index.tsindex 133a9a2277..4aadb409ae 100644--- a/packages/icons/src/__generated__/svg/index.ts+++ b/packages/icons/src/__generated__/svg/index.ts@@ -102,6 +102,7 @@ export { JCSpaceAroundIcon } from "./j-c-space-around";export { JCSpaceBetweenIcon } from "./j-c-space-between";export { JCStartIcon } from "./j-c-start";export { LabelIcon } from "./label";+export { LargeXIcon } from "./large X";export { Link2UnlinkedIcon } from "./link-2-unlinked";export { Link2Icon } from "./link-2";export { LinkIcon } from "./link";diff --git a/packages/icons/src/__generated__/svg/item.ts b/packages/icons/src/__generated__/svg/item.tsindex 273c8c88f1..2cdbb0bab1 100644--- a/packages/icons/src/__generated__/svg/item.ts+++ b/packages/icons/src/__generated__/svg/item.ts@@ -1 +1 @@-export const ItemIcon = `<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="M5.173 1.35h5.654c.537 0 .98 0 1.34.03.373.03.715.095 1.036.259.499.254.904.66 1.158 1.158.164.32.229.663.26 1.036.029.36.029.803.029 1.34v5.654c0 .537 0 .98-.03 1.34-.03.373-.095.715-.259 1.036a2.65 2.65 0 0 1-1.158 1.158c-.32.164-.663.23-1.037.26-.36.029-.802.029-1.34.029H5.174c-.537 0-.98 0-1.34-.03-.373-.03-.715-.095-1.036-.259a2.65 2.65 0 0 1-1.158-1.158c-.164-.32-.23-.663-.26-1.037-.029-.36-.029-.802-.029-1.34V5.174c0-.537 0-.98.03-1.34.03-.373.095-.715.259-1.036a2.65 2.65 0 0 1 1.158-1.158c.32-.164.663-.229 1.036-.26.36-.029.803-.029 1.34-.029ZM3.939 2.675c-.293.024-.445.068-.552.122a1.35 1.35 0 0 0-.59.59c-.054.107-.098.259-.122.552-.025.301-.025.69-.025 1.261v5.6c0 .57 0 .96.025 1.26.024.294.068.446.122.553.13.254.336.46.59.59.107.054.259.098.552.122.301.025.69.025 1.261.025h5.6c.57 0 .96 0 1.26-.025.294-.024.446-.068.553-.122.254-.13.46-.336.59-.59.054-.107.098-.259.122-.552.025-.301.025-.69.025-1.261V5.2c0-.57 0-.96-.025-1.26-.024-.294-.068-.446-.122-.553a1.35 1.35 0 0 0-.59-.59c-.107-.054-.26-.098-.552-.122-.301-.024-.69-.025-1.261-.025H5.2c-.57 0-.96 0-1.26.025Z" clip-rule="evenodd"/></svg>`;+export const ItemIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="100%" height="100%" style="display: block;"><path d="M3.7 6.175a.85.85 0 1 1-1.7 0 .85.85 0 0 1 1.7 0Z"/><path fill-rule="evenodd" d="M5 6.175c0-.345.28-.625.625-.625h7.75a.625.625 0 1 1 0 1.25h-7.75A.625.625 0 0 1 5 6.175ZM5 10.05c0-.345.28-.625.625-.625h7.75a.625.625 0 1 1 0 1.25h-7.75A.625.625 0 0 1 5 10.05Z" clip-rule="evenodd"/></svg>`;diff --git a/packages/icons/src/__generated__/svg/large X.ts b/packages/icons/src/__generated__/svg/large X.tsnew file mode 100644index 0000000000..fcf5decd33--- /dev/null+++ b/packages/icons/src/__generated__/svg/large X.ts@@ -0,0 +1 @@+export const LargeXIcon = `<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/accordion.ws.ts b/packages/sdk-components-react-radix/src/accordion.ws.tsindex 42ad1cd2a0..3549eddd73 100644--- a/packages/sdk-components-react-radix/src/accordion.ws.ts+++ b/packages/sdk-components-react-radix/src/accordion.ws.ts@@ -6,12 +6,13 @@ import {ContentIcon,ChevronDownIcon,} from "@webstudio-is/icons/svg";-import type {- EmbedTemplateStyleDecl,- PresetStyle,- WsComponentMeta,- WsComponentPropsMeta,- WsEmbedTemplate,+import {+ defaultStates,+ type EmbedTemplateStyleDecl,+ type PresetStyle,+ type WsComponentMeta,+ type WsComponentPropsMeta,+ type WsEmbedTemplate,} from "@webstudio-is/react-sdk";import { div, h3, button } from "@webstudio-is/react-sdk/css-normalize";import * as tc from "./theme/tailwind-classes";@@ -224,50 +225,58 @@ export const metaAccordion: WsComponentMeta = {export const metaAccordionItem: WsComponentMeta = {category: "hidden",type: "container",+ label: "Item",icon: ItemIcon,requiredAncestors: ["Accordion"],indexWithinAncestor: "Accordion",presetStyle,- label: "Item",};export const metaAccordionHeader: WsComponentMeta = {category: "hidden",type: "container",+ label: "Item Header",icon: HeaderIcon,requiredAncestors: ["AccordionItem"],detachable: false,presetStyle: {h3: [h3, tc.my(0)].flat(),},- label: "Item Header",};export const metaAccordionTrigger: WsComponentMeta = {category: "hidden",type: "container",+ label: "Item Trigger",icon: TriggerIcon,requiredAncestors: ["AccordionHeader"],detachable: false,+ states: [+ ...defaultStates,+ {+ category: "component-states",+ label: "Open",+ selector: "[data-state=open]",+ },+ ],presetStyle: {button: [button, buttonReset].flat(),},- label: "Item Trigger",};export const metaAccordionContent: WsComponentMeta = {category: "hidden",type: "container",+ label: "Item Content",icon: ContentIcon,requiredAncestors: ["AccordionItem"],detachable: false,presetStyle,- label: "Item Content",};export const propsMetaAccordion: WsComponentPropsMeta = {props: propsAccordion,- initialProps: ["value", "collapsible", "dir", "orientation"],+ initialProps: ["value", "collapsible"],};export const propsMetaAccordionItem: WsComponentPropsMeta = {diff --git a/packages/sdk-components-react-radix/src/dialog.ws.tsx b/packages/sdk-components-react-radix/src/dialog.ws.tsxindex ca2508df35..606c3634db 100644--- a/packages/sdk-components-react-radix/src/dialog.ws.tsx+++ b/packages/sdk-components-react-radix/src/dialog.ws.tsx@@ -6,6 +6,7 @@ import {HeadingIcon,TextIcon,ButtonElementIcon,+ LargeXIcon,} from "@webstudio-is/icons/svg";import {type PresetStyle,@@ -23,16 +24,12 @@ import {propsDialogTitle,propsDialogDescription,} from "./__generated__/dialog.props";-import { getButtonStyles } from "./theme/styles";+import { buttonReset, getButtonStyles } from "./theme/styles";const presetStyle = {div,} satisfies PresetStyle<"div">;-const buttonPresetStyle = {- button,-} satisfies PresetStyle<"button">;-const titlePresetStyle = {h2,} satisfies PresetStyle<"h2">;@@ -83,7 +80,9 @@ export const metaDialogDescription: WsComponentMeta = {export const metaDialogClose: WsComponentMeta = {category: "hidden",type: "container",- presetStyle: buttonPresetStyle,+ presetStyle: {+ button: [buttonReset, button].flat(),+ },icon: ButtonElementIcon,label: "Close Button",};@@ -259,7 +258,21 @@ export const metaDialog: WsComponentMeta = {tc.hover(tc.opacity(100)),tc.focus(tc.ring("ring", 2, "background", 2)),].flat(),- children: [{ type: "text", value: "✕" }],+ children: [+ {+ type: "instance",+ component: "HtmlEmbed",+ label: "Close Icon",+ props: [+ {+ type: "string",+ name: "code",+ value: LargeXIcon,+ },+ ],+ children: [],+ },+ ],},],},diff --git a/packages/sdk-components-react-radix/src/sheet.ws.tsx b/packages/sdk-components-react-radix/src/sheet.ws.tsxindex 5ae1dfe18d..f37c233130 100644--- a/packages/sdk-components-react-radix/src/sheet.ws.tsx+++ b/packages/sdk-components-react-radix/src/sheet.ws.tsx@@ -1,4 +1,4 @@-import { HamburgerMenuIcon } from "@webstudio-is/icons/svg";+import { HamburgerMenuIcon, LargeXIcon } from "@webstudio-is/icons/svg";import type { WsComponentMeta } from "@webstudio-is/react-sdk";import * as tc from "./theme/tailwind-classes";import { getButtonStyles } from "./theme/styles";@@ -210,7 +210,21 @@ export const meta: WsComponentMeta = {tc.hover(tc.opacity(100)),tc.focus(tc.ring("ring", 2, "background", 2)),].flat(),- children: [{ type: "text", value: "✕" }],+ children: [+ {+ type: "instance",+ component: "HtmlEmbed",+ label: "Close Icon",+ props: [+ {+ type: "string",+ name: "code",+ value: LargeXIcon,+ },+ ],+ children: [],+ },+ ],},],},diff --git a/packages/sdk-components-react-radix/src/tabs.ws.ts b/packages/sdk-components-react-radix/src/tabs.ws.tsindex 9598e171d1..43638e2e27 100644--- a/packages/sdk-components-react-radix/src/tabs.ws.ts+++ b/packages/sdk-components-react-radix/src/tabs.ws.ts@@ -4,11 +4,12 @@ import {TabsIcon,TriggerIcon,} from "@webstudio-is/icons/svg";-import type {- EmbedTemplateStyleDecl,- PresetStyle,- WsComponentMeta,- WsComponentPropsMeta,+import {+ defaultStates,+ type EmbedTemplateStyleDecl,+ type PresetStyle,+ type WsComponentMeta,+ type WsComponentPropsMeta,} from "@webstudio-is/react-sdk";import { button, div } from "@webstudio-is/react-sdk/css-normalize";import * as tc from "./theme/tailwind-classes";@@ -157,6 +158,14 @@ export const metaTabsTrigger: WsComponentMeta = {invalidAncestors: ["TabsTrigger"],indexWithinAncestor: "Tabs",label: "Tab Trigger",+ states: [+ ...defaultStates,+ {+ category: "component-states",+ label: "Active",+ selector: "[data-state=active]",+ },+ ],presetStyle: {button: [button, buttonReset].flat(),},@@ -165,11 +174,11 @@ export const metaTabsTrigger: WsComponentMeta = {export const metaTabsContent: WsComponentMeta = {category: "hidden",type: "container",+ label: "Tab Content",icon: ContentIcon,requiredAncestors: ["Tabs"],indexWithinAncestor: "Tabs",presetStyle,- label: "Tab Content",};export const propsMetaTabs: WsComponentPropsMeta = {diff --git a/packages/sdk-components-react-radix/src/theme/styles.ts b/packages/sdk-components-react-radix/src/theme/styles.tsindex d6aa307caf..c2299f6901 100644--- a/packages/sdk-components-react-radix/src/theme/styles.ts+++ b/packages/sdk-components-react-radix/src/theme/styles.ts@@ -71,10 +71,6 @@ export const buttonReset: EmbedTemplateStyleDecl[] = [property: "backgroundImage",value: { type: "keyword", value: "none" },} as const,- {- property: "cursor",- value: { type: "keyword", value: "pointer" },- } as const,tc.border(0),tc.p(0),].flat();