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: Canvas drawing of xml element (#3245)
Ivan Starkovcc72849a6282
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxindex eea44c52be..09dde21755 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx@@ -50,6 +50,14 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {if (category === "hidden") {return false;}++ if (+ isFeatureEnabled("xmlElement") === false &&+ category === "xml"+ ) {+ return false;+ }+return true;}).map((category) => (diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex c2f433d8fb..ee6a715dd5 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -5,3 +5,4 @@ export const aiRadixComponents = false;export const cms = false;export const cssVars = false;export const filters = false;+export const xmlElement = false;diff --git a/packages/react-sdk/src/components/component-meta.ts b/packages/react-sdk/src/components/component-meta.tsindex e049d087bf..8dc3d95a3b 100644--- a/packages/react-sdk/src/components/component-meta.ts+++ b/packages/react-sdk/src/components/component-meta.ts@@ -24,6 +24,7 @@ export const componentCategories = ["media","forms","radix",+ "xml","hidden",] as const;diff --git a/packages/sdk-components-react/src/__generated__/xml-node.props.ts b/packages/sdk-components-react/src/__generated__/xml-node.props.tsnew file mode 100644index 0000000000..ad701984c3--- /dev/null+++ b/packages/sdk-components-react/src/__generated__/xml-node.props.ts@@ -0,0 +1,5 @@+import type { PropMeta } from "@webstudio-is/react-sdk";++export const props: Record<string, PropMeta> = {+ tag: { required: false, control: "text", type: "string", defaultValue: "" },+};diff --git a/packages/sdk-components-react/src/components.ts b/packages/sdk-components-react/src/components.tsindex be3b4cd4ba..25cfea2ba9 100644--- a/packages/sdk-components-react/src/components.ts+++ b/packages/sdk-components-react/src/components.ts@@ -30,3 +30,4 @@ export { Vimeo } from "./vimeo";export { VimeoPreviewImage } from "./vimeo-preview-image";export { VimeoPlayButton } from "./vimeo-play-button";export { VimeoSpinner } from "./vimeo-spinner";+export { XmlNode } from "./xml-node";diff --git a/packages/sdk-components-react/src/metas.ts b/packages/sdk-components-react/src/metas.tsindex 1fbb40020a..65932da17a 100644--- a/packages/sdk-components-react/src/metas.ts+++ b/packages/sdk-components-react/src/metas.ts@@ -30,3 +30,4 @@ 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 { meta as XmlNode } from "./xml-node.ws";diff --git a/packages/sdk-components-react/src/props.ts b/packages/sdk-components-react/src/props.tsindex f6c1fef4e3..2413b43f5e 100644--- a/packages/sdk-components-react/src/props.ts+++ b/packages/sdk-components-react/src/props.ts@@ -30,3 +30,4 @@ 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 { propsMeta as XmlNode } from "./xml-node.ws";diff --git a/packages/sdk-components-react/src/xml-node.tsx b/packages/sdk-components-react/src/xml-node.tsxnew file mode 100644index 0000000000..4020bf2090--- /dev/null+++ b/packages/sdk-components-react/src/xml-node.tsx@@ -0,0 +1,36 @@+import { componentAttribute } from "@webstudio-is/react-sdk";+import { Children, forwardRef, type ElementRef, type ReactNode } from "react";++export const defaultTag = "div";++// We don't want to enable all tags because Box is usually a container and we have specific components for many tags.+type Props = {+ tag: string;+ children: ReactNode;+} & Record<typeof componentAttribute, string>;++export const XmlNode = forwardRef<ElementRef<"div">, Props>(+ ({ tag = "", children, ...props }, ref) => {+ const isTextChild = Children.toArray(children).every(+ (child) => typeof child === "string"+ );++ const elementName = tag+ // Must start from letter or underscore+ .replace(/^[^\p{L}_]+/u, "")+ // Clear all non letter, number, underscore, dot, and dash+ .replaceAll(/[^\p{L}\p{N}\-._]+/gu, "");++ return (+ <div style={{ display: isTextChild ? "flex" : "contents" }} {...props}>+ <div style={{ color: "rgb(16, 23, 233)" }}><{elementName}></div>+ <div ref={ref} style={{ marginLeft: isTextChild ? 0 : "1rem" }}>+ {children}+ </div>+ <div style={{ color: "rgb(16, 23, 233)" }}></{elementName}></div>+ </div>+ );+ }+);++XmlNode.displayName = "XmlNode";diff --git a/packages/sdk-components-react/src/xml-node.ws.ts b/packages/sdk-components-react/src/xml-node.ws.tsnew file mode 100644index 0000000000..34114115ad--- /dev/null+++ b/packages/sdk-components-react/src/xml-node.ws.ts@@ -0,0 +1,22 @@+import { XmlIcon } from "@webstudio-is/icons/svg";++import {+ type WsComponentMeta,+ type WsComponentPropsMeta,+} from "@webstudio-is/react-sdk";++import { props } from "./__generated__/xml-node.props";++export const meta: WsComponentMeta = {+ category: "xml",+ order: 6,+ type: "container",+ icon: XmlIcon,+ stylable: false,+ description: "Xml Node",+};++export const propsMeta: WsComponentPropsMeta = {+ props,+ initialProps: ["tag"],+};