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
Components Panel (#1284)
Oleg Isonenb22dfe038e5f
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx b/apps/builder/app/builder/features/props-panel/props-panel.stories.tsxindex dffcc8c3a9..97a5e6569d 100644--- a/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx+++ b/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx@@ -108,6 +108,7 @@ const multiSelectProp = (const instanceId = "0";const componentMeta: WsComponentMeta = {+ category: "general",type: "rich-text",label: "Button",Icon: ButtonIcon,diff --git a/apps/builder/app/builder/features/props-panel/props-panel.tsx b/apps/builder/app/builder/features/props-panel/props-panel.tsxindex cf70c4dc06..e974718fed 100644--- a/apps/builder/app/builder/features/props-panel/props-panel.tsx+++ b/apps/builder/app/builder/features/props-panel/props-panel.tsx@@ -19,7 +19,7 @@ import {import { ChevronDownIcon } from "@webstudio-is/icons";import type { Publish } from "~/shared/pubsub";import { propsStore, useInstanceProps } from "~/shared/nano-states";-import { CollapsibleSectionWithAddButton } from "~/builder/shared/inspector";+import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";import {useStyleData,type SetProperty as SetCssProperty,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 3a75cfca0d..4ab02a1442 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@@ -1,66 +1,53 @@-import { useState } from "react";-import { useStore } from "@nanostores/react";-import { createPortal } from "react-dom";-import type { Instance } from "@webstudio-is/project-build";+import { useMemo } from "react";+import { usePress } from "@react-aria/interactions";import {type ComponentName,getComponentMeta,getComponentNames,+ WsComponentMeta,+ componentCategories,} from "@webstudio-is/react-sdk";import {theme,Flex,- useDrag,- type Point,ComponentCard,+ Tooltip,+ ArrowFocus,} from "@webstudio-is/design-system";import { PlusIcon } from "@webstudio-is/icons";-import { findClosestDroppableTarget } from "~/shared/tree-utils";-import {- instancesStore,- selectedInstanceSelectorStore,- selectedPageStore,-} from "~/shared/nano-states";-import { useSubscribe, type Publish } from "~/shared/pubsub";-import {- isCanvasPointerEventsEnabledStore,- useCanvasRect,-} from "~/builder/shared/nano-states";-import { insertNewComponentInstance } from "~/shared/instance-utils";-import { zoomStore } from "~/shared/nano-states/breakpoints";+import type { Publish } from "~/shared/pubsub";+import { CollapsibleSection } from "~/builder/shared/collapsible-section";import type { TabName } from "../../types";import { Header, CloseButton } from "../../header";+import {+ dragItemAttribute,+ elementToComponentName,+ useDraggable,+} from "./use-draggable";-const DragLayer = ({- component,- point,-}: {- component: Instance["component"];- point: Point;-}) => {- const meta = getComponentMeta(component);- if (meta === undefined) {- return null;- }+const getMetaMaps = () => {+ const metaByComponentName: Map<ComponentName, WsComponentMeta> = new Map();+ const metaByCategory: Map<+ WsComponentMeta["category"],+ Array<WsComponentMeta>+ > = new Map();+ const componentNamesByMeta: Map<WsComponentMeta, ComponentName> = new Map();- return createPortal(- <Flex- // Container is used to position card- css={{- position: "absolute",- inset: 0,- }}- >- <ComponentCard- label={meta.label}- icon={<meta.Icon />}- style={{- transform: `translate3d(${point.x}px, ${point.y}px, 0)`,- }}- />- </Flex>,- document.body- );+ for (const name of getComponentNames()) {+ const meta = getComponentMeta(name);+ if (meta?.category === undefined) {+ continue;+ }+ let categoryMetas = metaByCategory.get(meta.category);+ if (categoryMetas === undefined) {+ categoryMetas = [];+ metaByCategory.set(meta.category, categoryMetas);+ }+ categoryMetas.push(meta);+ metaByComponentName.set(name, meta);+ componentNamesByMeta.set(meta, name);+ }+ return { metaByComponentName, metaByCategory, componentNamesByMeta };};type TabContentProps = {@@ -68,93 +55,26 @@ type TabContentProps = {publish: Publish;};-const elementToComponentName = (- element: Element,- listedComponentNames: ComponentName[]-) => {- // If drag doesn't start on the button element directly but on one of its children,- // we need to trace back to the button that has the data.- const parentWithData = element.closest("[data-drag-component]");-- if (!(parentWithData instanceof HTMLElement)) {- return;- }- const { dragComponent } = parentWithData.dataset;- return listedComponentNames.find((component) => component === dragComponent);-};--const listedComponentNames = getComponentNames().filter((name) => {- const meta = getComponentMeta(name);- return (- meta?.type === "container" ||- meta?.type === "control" ||- meta?.type === "embed" ||- meta?.type === "rich-text"- );-});--const toCanvasCoordinates = (- { x, y }: Point,- zoom: number,- canvasRect?: DOMRect-) => {- if (canvasRect === undefined) {- return { x: 0, y: 0 };- }- const scale = zoom / 100;- return { x: (x - canvasRect.x) / scale, y: (y - canvasRect.y) / scale };-};-export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {- const [dragComponent, setDragComponent] = useState<Instance["component"]>();- const [point, setPoint] = useState<Point>({ x: 0, y: 0 });- const [canvasRect] = useCanvasRect();- const zoom = useStore(zoomStore);-- const useDragHandlers = useDrag<Instance["component"]>({- elementToData(element) {- const componentName = elementToComponentName(- element,- listedComponentNames+ const { metaByComponentName, metaByCategory, componentNamesByMeta } = useMemo(+ getMetaMaps,+ []+ );+ const { dragCard, handleInsert, draggableContainerRef } = useDraggable({+ publish,+ metaByComponentName,+ });+ const { pressProps } = usePress({+ onPress(event) {+ const component = elementToComponentName(+ event.target,+ metaByComponentName);- if (componentName === undefined) {- return false;+ if (component) {+ onSetActiveTab("none");+ handleInsert(component);}- return componentName;- },- onStart({ data: componentName }) {- setDragComponent(componentName);- publish({- type: "dragStart",- payload: {- origin: "panel",- type: "insert",- dragComponent: componentName,- },- });- isCanvasPointerEventsEnabledStore.set(false);- },- onMove: (point) => {- setPoint(point);- publish({- type: "dragMove",- payload: {- canvasCoordinates: toCanvasCoordinates(point, zoom, canvasRect),- },- });},- onEnd({ isCanceled }) {- setDragComponent(undefined);- publish({- type: "dragEnd",- payload: { isCanceled },- });- isCanvasPointerEventsEnabledStore.set(true);- },- });-- useSubscribe("cancelCurrentDrag", () => {- useDragHandlers.cancelCurrentDrag();});return (@@ -163,43 +83,43 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {title="Add"suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}/>- <Flex- gap="1"- wrap="wrap"- css={{ padding: theme.spacing[3], overflow: "auto" }}- ref={useDragHandlers.rootRef}- >- {listedComponentNames.map((component: Instance["component"]) => {- const meta = getComponentMeta(component);- if (meta === undefined) {- return null;- }- return (- <ComponentCard- onClick={() => {- onSetActiveTab("none");- const selectedPage = selectedPageStore.get();- if (selectedPage === undefined) {- return;- }- const dropTarget = findClosestDroppableTarget(- instancesStore.get(),- // fallback to root as drop target- selectedInstanceSelectorStore.get() ?? [- selectedPage.rootInstanceId,- ]- );- insertNewComponentInstance(component, dropTarget);- }}- data-drag-component={component}- label={meta.label}- icon={<meta.Icon />}- key={component}+ <div ref={draggableContainerRef}>+ {Array.from(componentCategories).map((category) => (+ <CollapsibleSection label={category} key={category} fullWidth>+ <ArrowFocus+ render={({ handleKeyDown }) => (+ <Flex+ onKeyDown={handleKeyDown}+ gap="2"+ wrap="wrap"+ css={{ px: theme.spacing[9], overflow: "auto" }}+ >+ {(metaByCategory.get(category) ?? []).map(+ (meta: WsComponentMeta, index) => {+ const component = componentNamesByMeta.get(meta);+ if (component === undefined) {+ return null;+ }+ return (+ <Tooltip content={meta.label} key={component}>+ <ComponentCard+ {...pressProps}+ {...{ [dragItemAttribute]: component }}+ label={meta.label}+ icon={<meta.Icon />}+ tabIndex={index === 0 ? 0 : -1}+ />+ </Tooltip>+ );+ }+ )}+ {dragCard}+ </Flex>+ )}/>- );- })}- {dragComponent && <DragLayer component={dragComponent} point={point} />}- </Flex>+ </CollapsibleSection>+ ))}+ </div></Flex>);};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsxnew file mode 100644index 0000000000..5abb8c5d10--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx@@ -0,0 +1,168 @@+import { useState } from "react";+import { useStore } from "@nanostores/react";+import { createPortal } from "react-dom";+import type { Instance } from "@webstudio-is/project-build";+import {+ type ComponentName,+ type WsComponentMeta,+ getComponentMeta,+} from "@webstudio-is/react-sdk";+import {+ type Point,+ Flex,+ useDrag,+ ComponentCard,+} from "@webstudio-is/design-system";+import { findClosestDroppableTarget } from "~/shared/tree-utils";+import {+ instancesStore,+ selectedInstanceSelectorStore,+ selectedPageStore,+} from "~/shared/nano-states";+import { useSubscribe, type Publish } from "~/shared/pubsub";+import {+ isCanvasPointerEventsEnabledStore,+ useCanvasRect,+} from "~/builder/shared/nano-states";+import { insertNewComponentInstance } from "~/shared/instance-utils";+import { zoomStore } from "~/shared/nano-states/breakpoints";++const DragLayer = ({+ component,+ point,+}: {+ component: Instance["component"];+ point: Point;+}) => {+ const meta = getComponentMeta(component);+ if (meta === undefined) {+ return null;+ }++ return createPortal(+ <Flex+ // Container is used to position card+ css={{+ position: "absolute",+ // Prevents flickering between hover/outside mouse position+ pointerEvents: "none",+ inset: 0,+ }}+ >+ <ComponentCard+ label={meta.label}+ icon={<meta.Icon />}+ style={{+ transform: `translate3d(${point.x}px, ${point.y}px, 0)`,+ }}+ />+ </Flex>,+ document.body+ );+};++export const dragItemAttribute = "data-drag-component";++const toCanvasCoordinates = (+ { x, y }: Point,+ zoom: number,+ canvasRect?: DOMRect+) => {+ if (canvasRect === undefined) {+ return { x: 0, y: 0 };+ }+ const scale = zoom / 100;+ return { x: (x - canvasRect.x) / scale, y: (y - canvasRect.y) / scale };+};++export const elementToComponentName = (+ element: Element,+ metaByComponentName: Map<ComponentName, WsComponentMeta>+) => {+ // If drag doesn't start on the button element directly but on one of its children,+ // we need to trace back to the button that has the data.+ const parentWithData = element.closest(`[${dragItemAttribute}]`);++ if (parentWithData instanceof HTMLElement) {+ const dragComponent = parentWithData.dataset.dragComponent as ComponentName;+ if (metaByComponentName.has(dragComponent)) {+ return dragComponent;+ }+ }+ return false;+};++export const useDraggable = ({+ publish,+ metaByComponentName,+}: {+ publish: Publish;+ metaByComponentName: Map<ComponentName, WsComponentMeta>;+}) => {+ const [dragComponent, setDragComponent] = useState<Instance["component"]>();+ const [point, setPoint] = useState<Point>({ x: 0, y: 0 });+ const [canvasRect] = useCanvasRect();+ const zoom = useStore(zoomStore);++ const dragHandlers = useDrag<Instance["component"]>({+ elementToData(element) {+ return elementToComponentName(element, metaByComponentName);+ },+ onStart({ data: componentName }) {+ setDragComponent(componentName);+ publish({+ type: "dragStart",+ payload: {+ origin: "panel",+ type: "insert",+ dragComponent: componentName,+ },+ });+ isCanvasPointerEventsEnabledStore.set(false);+ },+ onMove: (point) => {+ setPoint(point);+ publish({+ type: "dragMove",+ payload: {+ canvasCoordinates: toCanvasCoordinates(point, zoom, canvasRect),+ },+ });+ },+ onEnd({ isCanceled }) {+ setDragComponent(undefined);+ publish({+ type: "dragEnd",+ payload: { isCanceled },+ });+ isCanvasPointerEventsEnabledStore.set(true);+ },+ });++ useSubscribe("cancelCurrentDrag", () => {+ dragHandlers.cancelCurrentDrag();+ });++ const dragCard = dragComponent ? (+ <DragLayer component={dragComponent} point={point} />+ ) : undefined;++ const handleInsert = (component: ComponentName) => {+ const selectedPage = selectedPageStore.get();+ if (selectedPage === undefined) {+ return;+ }+ const dropTarget = findClosestDroppableTarget(+ instancesStore.get(),+ // fallback to root as drop target+ selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId]+ );+ insertNewComponentInstance(component, dropTarget);+ };++ return {+ dragCard,+ draggableContainerRef: dragHandlers.rootRef,+ handleInsert,+ };+};diff --git a/apps/builder/app/builder/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsxindex 05ffb0f231..3e29de6f44 100644--- a/apps/builder/app/builder/features/style-panel/style-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx@@ -8,7 +8,7 @@ import {styleConfigs,styleConfigByName,} from "./shared/configs";-import { CollapsibleSection } from "~/builder/shared/inspector";+import { CollapsibleSection } from "~/builder/shared/collapsible-section";import { renderCategory, shouldRenderCategory } from "./style-sections";import { dependencies } from "./shared/dependencies";import type { SetProperty, CreateBatchUpdate } from "./shared/use-style-data";diff --git a/apps/builder/app/builder/shared/inspector/collapsible-section.tsx b/apps/builder/app/builder/shared/collapsible-section.tsxsimilarity index 100%rename from apps/builder/app/builder/shared/inspector/collapsible-section.tsxrename to apps/builder/app/builder/shared/collapsible-section.tsxdiff --git a/apps/builder/app/builder/shared/inspector/component-info.tsx b/apps/builder/app/builder/shared/inspector/component-info.tsxdeleted file mode 100644index 4c898367f0..0000000000--- a/apps/builder/app/builder/shared/inspector/component-info.tsx+++ /dev/null@@ -1,22 +0,0 @@-import type { Instance } from "@webstudio-is/project-build";-import { getComponentMeta } from "@webstudio-is/react-sdk";-import { Flex, Text } from "@webstudio-is/design-system";-import { getInstanceLabel } from "../tree";--export const ComponentInfo = ({- selectedInstance,-}: {- selectedInstance: Instance;-}) => {- const meta = getComponentMeta(selectedInstance.component);- if (meta === undefined) {- return null;- }- return (- <Flex justify="between" align="center">- <Text>{`Selected: ${getInstanceLabel(selectedInstance, meta)} (${- meta.label- })`}</Text>- </Flex>- );-};diff --git a/apps/builder/app/builder/shared/inspector/index.tsx b/apps/builder/app/builder/shared/inspector/index.tsxdeleted file mode 100644index 4d3df3ac85..0000000000--- a/apps/builder/app/builder/shared/inspector/index.tsx+++ /dev/null@@ -1,2 +0,0 @@-export * from "./collapsible-section";-export * from "./component-info";diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsxindex 03a50269f3..e99a9e64b4 100644--- a/apps/builder/app/builder/shared/tree/index.tsx+++ b/apps/builder/app/builder/shared/tree/index.tsx@@ -60,7 +60,7 @@ export const InstanceTree = (return false;}const meta = getComponentMeta(instance.component);- return meta?.type === "body" || meta?.type === "container";+ return meta?.type === "container";},[instances]);diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.tsindex fbd8390cc6..3614638ed5 100644--- a/apps/builder/app/canvas/shared/use-drag-drop.ts+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts@@ -78,7 +78,7 @@ const findClosestDroppableInstanceSelector = (const instance = instances.get(instanceId);if (instance !== undefined) {const meta = getComponentMeta(instance.component);- if (meta?.type === "body" || meta?.type === "container") {+ if (meta?.type === "container") {return getAncestorInstanceSelector(instanceSelector, instanceId);}}diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.tsindex 16d51f2300..1109fb7f4c 100644--- a/apps/builder/app/shared/tree-utils.ts+++ b/apps/builder/app/shared/tree-utils.ts@@ -100,7 +100,7 @@ export const createInstancesIndex = (const isInstanceDroppable = (instance: InstancesItem) => {const meta = getComponentMeta(instance.component);- return meta?.type === "body" || meta?.type === "container";+ return meta?.type === "container";};export type DroppableTarget = {diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex e41fe6519a..8cd555b45b 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -30,6 +30,7 @@"@nanostores/react": "^0.4.1","@radix-ui/react-select": "^1.0.0","@radix-ui/react-tooltip": "^1.0.0",+ "@react-aria/interactions": "^3.11.0","@remix-run/node": "1.12.0","@remix-run/react": "1.12.0","@remix-run/serve": "1.12.0",diff --git a/packages/design-system/src/components/component-card.tsx b/packages/design-system/src/components/component-card.tsxindex 52201c1ed8..37a024639b 100644--- a/packages/design-system/src/components/component-card.tsx+++ b/packages/design-system/src/components/component-card.tsx@@ -8,6 +8,7 @@ import { textVariants } from "../";import { css, theme } from "../stitches.config";const cardStyle = css({+ boxSizing: "border-box",display: "flex",flexDirection: "column",alignItems: "center",diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex 5a03b1efdc..7be179368a 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -31,6 +31,7 @@ export * from "./components/text-area";export * from "./components/radio";export * from "./components/checkbox";export * from "./components/component-card";+export * from "./components/primitives/arrow-focus";// Not aligneddiff --git a/packages/react-sdk/src/app/custom-components/index.ts b/packages/react-sdk/src/app/custom-components/index.tsindex 17ec312362..746b3e6d0b 100644--- a/packages/react-sdk/src/app/custom-components/index.ts+++ b/packages/react-sdk/src/app/custom-components/index.ts@@ -3,7 +3,7 @@ import { Link } from "./link";import { LinkBlock } from "./link-block";import { RichTextLink } from "./rich-text-link";import { imageProps } from "@webstudio-is/image";-import type { WsComponentPropsMeta } from "../../components/component-type";+import type { WsComponentPropsMeta } from "../../components/component-meta";export const customComponents = {Image,diff --git a/packages/react-sdk/src/components/blockquote.ws.tsx b/packages/react-sdk/src/components/blockquote.ws.tsxindex 885956ae8e..36dd908b33 100644--- a/packages/react-sdk/src/components/blockquote.ws.tsx+++ b/packages/react-sdk/src/components/blockquote.ws.tsx@@ -1,5 +1,5 @@import { BlockquoteIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/blockquote.props";const presetStyle = {@@ -42,6 +42,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "typography",type: "rich-text",label: "Blockquote",Icon: BlockquoteIcon,diff --git a/packages/react-sdk/src/components/body.ws.tsx b/packages/react-sdk/src/components/body.ws.tsxindex 4f574b9df8..5cbceda098 100644--- a/packages/react-sdk/src/components/body.ws.tsx+++ b/packages/react-sdk/src/components/body.ws.tsx@@ -1,5 +1,5 @@import { BodyIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/body.props";const presetStyle = {@@ -53,7 +53,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {- type: "body",+ type: "container",label: "Body",Icon: BodyIcon,presetStyle,diff --git a/packages/react-sdk/src/components/bold.ws.tsx b/packages/react-sdk/src/components/bold.ws.tsxindex f720223e64..d9444e22f7 100644--- a/packages/react-sdk/src/components/bold.ws.tsx+++ b/packages/react-sdk/src/components/bold.ws.tsx@@ -1,5 +1,5 @@import { FontBoldIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/bold.props";export const meta: WsComponentMeta = {diff --git a/packages/react-sdk/src/components/box.ws.ts b/packages/react-sdk/src/components/box.ws.tsindex 2be1ae39d8..c94b191ebb 100644--- a/packages/react-sdk/src/components/box.ws.ts+++ b/packages/react-sdk/src/components/box.ws.ts@@ -1,5 +1,5 @@import { BoxIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/box.props";const presetStyle = {@@ -10,6 +10,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "general",type: "container",label: "Box",Icon: BoxIcon,diff --git a/packages/react-sdk/src/components/button.ws.tsx b/packages/react-sdk/src/components/button.ws.tsxindex bd74c22388..bca40f380f 100644--- a/packages/react-sdk/src/components/button.ws.tsx+++ b/packages/react-sdk/src/components/button.ws.tsx@@ -1,8 +1,9 @@import { ButtonIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/button.props";export const meta: WsComponentMeta = {+ category: "forms",type: "container",label: "Button",Icon: ButtonIcon,diff --git a/packages/react-sdk/src/components/code.ws.tsx b/packages/react-sdk/src/components/code.ws.tsxindex 769909789b..aabc672388 100644--- a/packages/react-sdk/src/components/code.ws.tsx+++ b/packages/react-sdk/src/components/code.ws.tsx@@ -1,5 +1,5 @@import { CodeIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { displayVarNamespace } from "./code";import { props } from "./__generated__/code.props";@@ -33,6 +33,7 @@ const presetStyle: WsComponentMeta["presetStyle"] = {};export const meta: WsComponentMeta = {+ category: "general",type: "rich-text",label: "Code",Icon: CodeIcon,diff --git a/packages/react-sdk/src/components/component-type.ts b/packages/react-sdk/src/components/component-meta.tssimilarity index 60%rename from packages/react-sdk/src/components/component-type.tsrename to packages/react-sdk/src/components/component-meta.tsindex 9c7638db36..089788c27f 100644--- a/packages/react-sdk/src/components/component-type.ts+++ b/packages/react-sdk/src/components/component-meta.ts@@ -13,31 +13,21 @@ const WsComponentPropsMeta = z.object({export type WsComponentPropsMeta = z.infer<typeof WsComponentPropsMeta>;-export type WsComponentMeta = {- /**- * body - can accept other components with dnd but not listed- * container - can accept other components with dnd- * control - usually form controls like inputs, without children- * embed - images, videos or other embeddable components, without children- * rich-text - editable text component- * rich-text-child - formatted text fragment, not listed in components list- */- type:- | "body"- | "container"- | "control"- | "embed"- | "rich-text"- | "rich-text-child";- label: string;- Icon: FunctionComponent<IconProps>;- presetStyle?: Style;- children?: Array<string>;-};+export const componentCategories = [+ "general",+ "typography",+ "media",+ "forms",+] as const;const WsComponentMeta = z.object({+ category: z.enum(componentCategories).optional(),+ // container - can accept other components with dnd+ // control - usually form controls like inputs, without children+ // embed - images, videos or other embeddable components, without children+ // rich-text - editable text component+ // rich-text-child - formatted text fragment, not listed in components listtype: z.enum([- "body","container","control","embed",@@ -45,7 +35,15 @@ const WsComponentMeta = z.object({"rich-text-child",]),label: z.string(),- Icon: z.any(),+ Icon: z.function(),presetStyle: z.optional(z.any()),children: z.optional(z.array(z.string())),});++export type WsComponentMeta = Omit<+ z.infer<typeof WsComponentMeta>,+ "presetStyle" | "Icon"+> & {+ presetStyle?: Style;+ Icon: FunctionComponent<IconProps>;+};diff --git a/packages/react-sdk/src/components/components-utils.ts b/packages/react-sdk/src/components/components-utils.tsindex 9b104fbb58..251ba3a022 100644--- a/packages/react-sdk/src/components/components-utils.ts+++ b/packages/react-sdk/src/components/components-utils.ts@@ -6,6 +6,8 @@ export type ComponentName = keyof typeof components;/*** We need to define component names manually here, instead of using Object.keys(components)* Otherwise every component would be included in the bundle, even if it is not used+ *+ * @todo this list should not be hardcoded!*/const componentNames = Object.keys({Box: 1,diff --git a/packages/react-sdk/src/components/form.ws.tsx b/packages/react-sdk/src/components/form.ws.tsxindex af5ee1479d..3e3858bb96 100644--- a/packages/react-sdk/src/components/form.ws.tsx+++ b/packages/react-sdk/src/components/form.ws.tsx@@ -1,5 +1,5 @@import { FormIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/form.props";const presetStyle = {@@ -15,6 +15,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "forms",type: "container",label: "Form",Icon: FormIcon,diff --git a/packages/react-sdk/src/components/heading.ws.tsx b/packages/react-sdk/src/components/heading.ws.tsxindex 376c2b694c..c5cdf36288 100644--- a/packages/react-sdk/src/components/heading.ws.tsx+++ b/packages/react-sdk/src/components/heading.ws.tsx@@ -1,8 +1,9 @@import { HeadingIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/heading.props";export const meta: WsComponentMeta = {+ category: "typography",type: "rich-text",label: "Heading",Icon: HeadingIcon,diff --git a/packages/react-sdk/src/components/image.ws.tsx b/packages/react-sdk/src/components/image.ws.tsxindex 9c37b3b40a..99056959c1 100644--- a/packages/react-sdk/src/components/image.ws.tsx+++ b/packages/react-sdk/src/components/image.ws.tsx@@ -1,5 +1,5 @@import { ImageIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/image.props";const presetStyle = {@@ -18,6 +18,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "media",type: "embed",label: "Image",Icon: ImageIcon,diff --git a/packages/react-sdk/src/components/index.ts b/packages/react-sdk/src/components/index.tsindex f6bd730541..7afd5dc760 100644--- a/packages/react-sdk/src/components/index.ts+++ b/packages/react-sdk/src/components/index.ts@@ -1,5 +1,5 @@import { PropMeta } from "@webstudio-is/generate-arg-types";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import type { ComponentName } from "./components-utils";import { meta as BodyMeta } from "./body.ws";import { meta as BoxMeta } from "./box.ws";@@ -48,6 +48,7 @@ import { propsMeta as ListItemPropsMeta } from "./list-item.ws";import { propsMeta as SeparatorPropsMeta } from "./separator.ws";import { propsMeta as CodePropsMeta } from "./code.ws";+// @todo this list should not be hardcoded!const defaultMetas: Record<string, WsComponentMeta> = {Box: BoxMeta,Body: BodyMeta,@@ -89,6 +90,7 @@ export const registerComponentMetas = (currentMetas = result;};+// @todo this list should not be hardcoded!const defaultPropsMetasRaw = {Box: BoxMetaPropsMeta,Body: BodyMetaPropsMeta,diff --git a/packages/react-sdk/src/components/input.ws.tsx b/packages/react-sdk/src/components/input.ws.tsxindex 26864cdbc4..c2e6fafc90 100644--- a/packages/react-sdk/src/components/input.ws.tsx+++ b/packages/react-sdk/src/components/input.ws.tsx@@ -1,8 +1,9 @@import { InputIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/input.props";export const meta: WsComponentMeta = {+ category: "forms",type: "control",label: "Input",Icon: InputIcon,diff --git a/packages/react-sdk/src/components/italic.ws.tsx b/packages/react-sdk/src/components/italic.ws.tsxindex ca2184825a..c9532bf29c 100644--- a/packages/react-sdk/src/components/italic.ws.tsx+++ b/packages/react-sdk/src/components/italic.ws.tsx@@ -1,5 +1,5 @@import { FontItalicIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/italic.props";const presetStyle = {diff --git a/packages/react-sdk/src/components/link-block.ws.tsx b/packages/react-sdk/src/components/link-block.ws.tsxindex f9f950d605..7cbc77ae32 100644--- a/packages/react-sdk/src/components/link-block.ws.tsx+++ b/packages/react-sdk/src/components/link-block.ws.tsx@@ -1,5 +1,5 @@import { BoxLinkIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/link-block.props";const presetStyle = {@@ -14,6 +14,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "general",type: "container",label: "Link Block",Icon: BoxLinkIcon,diff --git a/packages/react-sdk/src/components/link.ws.tsx b/packages/react-sdk/src/components/link.ws.tsxindex c16792ffd4..732c0e04a4 100644--- a/packages/react-sdk/src/components/link.ws.tsx+++ b/packages/react-sdk/src/components/link.ws.tsx@@ -1,5 +1,5 @@import { Link2Icon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/link.props";const presetStyle = {@@ -15,6 +15,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "general",type: "rich-text",label: "Link Text",Icon: Link2Icon,diff --git a/packages/react-sdk/src/components/list-item.ws.tsx b/packages/react-sdk/src/components/list-item.ws.tsxindex 03f70150ea..96b0ff5842 100644--- a/packages/react-sdk/src/components/list-item.ws.tsx+++ b/packages/react-sdk/src/components/list-item.ws.tsx@@ -1,8 +1,9 @@import { ListItemIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/list-item.props";export const meta: WsComponentMeta = {+ category: "typography",type: "rich-text",label: "List Item",Icon: ListItemIcon,diff --git a/packages/react-sdk/src/components/list.ws.tsx b/packages/react-sdk/src/components/list.ws.tsxindex 2e19d2159c..10faad0023 100644--- a/packages/react-sdk/src/components/list.ws.tsx+++ b/packages/react-sdk/src/components/list.ws.tsx@@ -1,5 +1,5 @@import { ListIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/list.props";const presetStyle = {@@ -18,6 +18,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "typography",type: "container",label: "List",Icon: ListIcon,diff --git a/packages/react-sdk/src/components/paragraph.ws.tsx b/packages/react-sdk/src/components/paragraph.ws.tsxindex a384f250b5..e08bb7093e 100644--- a/packages/react-sdk/src/components/paragraph.ws.tsx+++ b/packages/react-sdk/src/components/paragraph.ws.tsx@@ -1,8 +1,9 @@import { TextAlignLeftIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/paragraph.props";export const meta: WsComponentMeta = {+ category: "typography",type: "rich-text",label: "Paragraph",Icon: TextAlignLeftIcon,diff --git a/packages/react-sdk/src/components/rich-text-link.ws.tsx b/packages/react-sdk/src/components/rich-text-link.ws.tsxindex 96c01c802d..f30660f302 100644--- a/packages/react-sdk/src/components/rich-text-link.ws.tsx+++ b/packages/react-sdk/src/components/rich-text-link.ws.tsx@@ -1,9 +1,11 @@-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/rich-text-link.props";import { meta as linkMeta, propsMeta as propsLinkMeta } from "./link.ws";+const { category, ...linkMetaRest } = linkMeta;+export const meta: WsComponentMeta = {- ...linkMeta,+ ...linkMetaRest,type: "rich-text-child",children: [],};diff --git a/packages/react-sdk/src/components/separator.ws.tsx b/packages/react-sdk/src/components/separator.ws.tsxindex 43cbe164a8..dfd8277ce3 100644--- a/packages/react-sdk/src/components/separator.ws.tsx+++ b/packages/react-sdk/src/components/separator.ws.tsx@@ -1,5 +1,5 @@import { DashIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/separator.props";const presetStyle = {@@ -18,6 +18,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "general",type: "embed",label: "Separator",Icon: DashIcon,diff --git a/packages/react-sdk/src/components/span.ws.tsx b/packages/react-sdk/src/components/span.ws.tsxindex f40ce7e3aa..b24fe9a872 100644--- a/packages/react-sdk/src/components/span.ws.tsx+++ b/packages/react-sdk/src/components/span.ws.tsx@@ -1,5 +1,5 @@import { BrushIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/span.props";export const meta: WsComponentMeta = {diff --git a/packages/react-sdk/src/components/subscript.ws.tsx b/packages/react-sdk/src/components/subscript.ws.tsxindex ca851534b8..1ac80c2bd0 100644--- a/packages/react-sdk/src/components/subscript.ws.tsx+++ b/packages/react-sdk/src/components/subscript.ws.tsx@@ -1,5 +1,5 @@import { SubscriptIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/subscript.props";export const meta: WsComponentMeta = {diff --git a/packages/react-sdk/src/components/superscript.ws.tsx b/packages/react-sdk/src/components/superscript.ws.tsxindex 2ab5d4a1de..11d1fb5573 100644--- a/packages/react-sdk/src/components/superscript.ws.tsx+++ b/packages/react-sdk/src/components/superscript.ws.tsx@@ -1,5 +1,5 @@import { SuperscriptIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/superscript.props";export const meta: WsComponentMeta = {diff --git a/packages/react-sdk/src/components/text-block.ws.tsx b/packages/react-sdk/src/components/text-block.ws.tsxindex d279ba145d..3db2b16cbf 100644--- a/packages/react-sdk/src/components/text-block.ws.tsx+++ b/packages/react-sdk/src/components/text-block.ws.tsx@@ -1,5 +1,5 @@import { TextIcon } from "@webstudio-is/icons";-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-type";+import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/text-block.props";const presetStyle = {@@ -11,6 +11,7 @@ const presetStyle = {} as const;export const meta: WsComponentMeta = {+ category: "typography",type: "rich-text",label: "Text Block",Icon: TextIcon,diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.tsindex 88633b414a..42be105827 100644--- a/packages/react-sdk/src/index.ts+++ b/packages/react-sdk/src/index.ts@@ -10,7 +10,8 @@ export {customComponentMetas,customComponentPropsMetas,} from "./app/custom-components";-export type {- WsComponentPropsMeta,- WsComponentMeta,-} from "./components/component-type";+export {+ type WsComponentPropsMeta,+ type WsComponentMeta,+ componentCategories,+} from "./components/component-meta";diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 3a94390dc6..d35d5d0920 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -85,6 +85,9 @@ importers:'@radix-ui/react-tooltip':specifier: ^1.0.0+ '@react-aria/interactions':+ specifier: ^3.11.0+ version: 3.14.0([email protected])'@remix-run/node':specifier: 1.12.0version: 1.12.0@@ -4723,7 +4726,7 @@ packages:react-refresh: 0.11.0schema-utils: 3.1.1source-map: 0.7.4- webpack: 5.75.0+ webpack: 5.75.0([email protected])dev: true/@prisma/[email protected]([email protected]):@@ -6972,7 +6975,7 @@ packages:typescript: 4.9.5unfetch: 4.2.0util-deprecate: 1.0.2- webpack: 5.75.0+ webpack: 5.75.0([email protected])dev: true/@storybook/[email protected]([email protected])([email protected])([email protected])([email protected]):@@ -7227,7 +7230,7 @@ packages:react: 17.0.2react-dom: 17.0.2([email protected])typescript: 4.9.5- webpack: 5.75.0+ webpack: 5.75.0([email protected])transitivePeerDependencies:- '@storybook/mdx2-csf'- bluebird@@ -7433,7 +7436,7 @@ packages:react-docgen-typescript: 2.2.2([email protected])tslib: 2.5.0typescript: 4.9.5- webpack: 5.75.0+ webpack: 5.75.0([email protected])transitivePeerDependencies:- supports-colordev: true