Skip to content

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.

Replace card component (#1281)

Oleg Isonen5fb2d6f74dc9
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/component-thumb.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/component-thumb.tsx
deleted file mode 100644
index ddf4368935..0000000000
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/component-thumb.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import type { Instance } from "@webstudio-is/project-build";
-import { getComponentMeta } from "@webstudio-is/react-sdk";
-import { forwardRef, type ElementRef, type ComponentProps } from "react";
-import { Flex, DeprecatedText2, styled } from "@webstudio-is/design-system";
-import { theme } from "@webstudio-is/design-system";
-
-const Thumb = styled(Flex, {
- px: theme.spacing[3],
- width: 72,
- height: 72,
- border: `1px solid ${theme.colors.slate6}`,
- userSelect: "none",
- color: theme.colors.hiContrast,
- cursor: "grab",
- "&:hover": {
- background: theme.colors.slate3,
- },
- variants: {
- state: {
- dragging: {
- background: theme.colors.slate3,
- },
- },
- },
-});
-
-type ComponentThumbProps = {
- component: Instance["component"];
-} & ComponentProps<typeof Thumb>;
-
-export const ComponentThumb = forwardRef<
- ElementRef<typeof Thumb>,
- ComponentThumbProps
->(({ component, ...rest }, ref) => {
- const meta = getComponentMeta(component);
- if (meta === undefined) {
- return null;
- }
- return (
- <Thumb
- direction="column"
- align="center"
- justify="center"
- gap="3"
- ref={ref}
- {...rest}
- >
- <meta.Icon width={30} height={30} />
- <DeprecatedText2>{meta.label}</DeprecatedText2>
- </Thumb>
- );
-});
-
-ComponentThumb.displayName = "ComponentThumb";
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.tsx
index 01adf15f89..b306820f9d 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,4 +1,4 @@
-import { type MouseEventHandler, useState } from "react";
+import { useState } from "react";
import { useStore } from "@nanostores/react";
import { createPortal } from "react-dom";
import type { Instance } from "@webstudio-is/project-build";
@@ -7,7 +7,13 @@ import {
getComponentMeta,
getComponentNames,
} from "@webstudio-is/react-sdk";
-import { theme, Flex, useDrag, type Point } from "@webstudio-is/design-system";
+import {
+ theme,
+ Flex,
+ useDrag,
+ type Point,
+ ComponentCard,
+} from "@webstudio-is/design-system";
import { PlusIcon } from "@webstudio-is/icons";
import { findClosestDroppableTarget } from "~/shared/tree-utils";
import {
@@ -23,22 +29,6 @@ import { insertNewComponentInstance } from "~/shared/instance-utils";
import { zoomStore } from "~/shared/nano-states/breakpoints";
import type { TabName } from "../../types";
import { Header, CloseButton } from "../../header";
-import { ComponentThumb } from "./component-thumb";
-
-type DraggableThumbProps = {
- onClick: MouseEventHandler<HTMLDivElement>;
- component: Instance["component"];
-};
-
-const DraggableThumb = ({ component, onClick }: DraggableThumbProps) => {
- return (
- <ComponentThumb
- data-drag-component={component}
- component={component}
- onClick={onClick}
- />
- );
-};
const DragLayer = ({
component,
@@ -47,24 +37,25 @@ const DragLayer = ({
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",
- pointerEvents: "none",
- zIndex: 1,
- left: 0,
- top: 0,
- width: "100%",
- height: "100%",
+ inset: 0,
}}
>
- <ComponentThumb
- component={component}
+ <ComponentCard
+ label={meta.label}
+ icon={<meta.Icon />}
style={{
transform: `translate3d(${point.x}px, ${point.y}px, 0)`,
}}
- state="dragging"
/>
</Flex>,
document.body
@@ -91,31 +82,34 @@ const elementToComponentName = (
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 toCanvasCoordinates = ({ x, y }: Point) => {
- if (canvasRect === undefined) {
- return { x: 0, y: 0 };
- }
- const scale = zoom / 100;
- return { x: (x - canvasRect.x) / scale, y: (y - canvasRect.y) / scale };
- };
-
- const listedComponentNames = getComponentNames().filter((name) => {
- const meta = getComponentMeta(name);
- return (
- meta?.type === "container" ||
- meta?.type === "control" ||
- meta?.type === "embed" ||
- meta?.type === "rich-text"
- );
- });
-
const useDragHandlers = useDrag<Instance["component"]>({
elementToData(element) {
const componentName = elementToComponentName(
@@ -142,7 +136,9 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
setPoint(point);
publish({
type: "dragMove",
- payload: { canvasCoordinates: toCanvasCoordinates(point) },
+ payload: {
+ canvasCoordinates: toCanvasCoordinates(point, zoom, canvasRect),
+ },
});
},
onEnd({ isCanceled }) {
@@ -171,21 +167,29 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
css={{ padding: theme.spacing[3], overflow: "auto" }}
ref={useDragHandlers.rootRef}
>
- {listedComponentNames.map((component: Instance["component"]) => (
- <DraggableThumb
- key={component}
- component={component}
- onClick={() => {
- onSetActiveTab("none");
- const dropTarget = findClosestDroppableTarget(
- instancesIndexStore.get(),
- // @todo accept instance Selector
- selectedInstanceSelectorStore.get()?.[0]
- );
- insertNewComponentInstance(component, dropTarget);
- }}
- />
- ))}
+ {listedComponentNames.map((component: Instance["component"]) => {
+ const meta = getComponentMeta(component);
+ if (meta === undefined) {
+ return null;
+ }
+ return (
+ <ComponentCard
+ onClick={() => {
+ onSetActiveTab("none");
+ const dropTarget = findClosestDroppableTarget(
+ instancesIndexStore.get(),
+ // @todo accept instance Selector
+ selectedInstanceSelectorStore.get()?.[0]
+ );
+ insertNewComponentInstance(component, dropTarget);
+ }}
+ data-drag-component={component}
+ label={meta.label}
+ icon={<meta.Icon />}
+ key={component}
+ />
+ );
+ })}
{dragComponent && <DragLayer component={dragComponent} point={point} />}
</Flex>
</Flex>
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index 3eb6280bb5..5a03b1efdc 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -30,6 +30,7 @@ export * from "./components/nested-icon-label";
export * from "./components/text-area";
export * from "./components/radio";
export * from "./components/checkbox";
+export * from "./components/component-card";
// Not aligned