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.

Provide drag origin for canvas and side panel (#1282)

Bogdan Chadkincb020a7a06c7
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 b306820f9d..885eb75563 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
@@ -126,6 +126,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
publish({
type: "dragStart",
payload: {
+ origin: "panel",
type: "insert",
dragComponent: componentName,
},
diff --git a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx
index 1f96a8447f..29468b391f 100644
--- a/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/sidebar-left.tsx
@@ -67,7 +67,8 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {
// We need the node to be rendered but hidden
// to keep receiving the drag events.
visibility:
- dragAndDropState.isDragging && dragAndDropState.origin === "panel"
+ dragAndDropState.isDragging &&
+ dragAndDropState.dragPayload?.origin === "panel"
? "hidden"
: "visible",
}}
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index a87352957e..951dd06f61 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -48,7 +48,11 @@ export const NavigatorTree = () => {
onDragItemChange={(dragInstanceSelector) => {
setState({
...state,
- dragPayload: { type: "reparent", dragInstanceSelector },
+ dragPayload: {
+ origin: "panel",
+ type: "reparent",
+ dragInstanceSelector,
+ },
});
}}
onDropTargetChange={(dropTarget) => {
diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.ts
index 414153ff65..412fbbb73c 100644
--- a/apps/builder/app/canvas/shared/use-drag-drop.ts
+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts
@@ -41,9 +41,15 @@ declare module "~/shared/pubsub" {
}
}
+type Origin = "canvas" | "panel";
+
export type DragStartPayload =
- | { type: "insert"; dragComponent: Instance["component"] }
- | { type: "reparent"; dragInstanceSelector: InstanceSelector };
+ | { origin: Origin; type: "insert"; dragComponent: Instance["component"] }
+ | {
+ origin: Origin;
+ type: "reparent";
+ dragInstanceSelector: InstanceSelector;
+ };
export type DragEndPayload = {
isCanceled: boolean;
@@ -221,6 +227,7 @@ export const useDragAndDrop = () => {
type: "dragStart",
payload: {
type: "reparent",
+ origin: "canvas",
dragInstanceSelector,
},
});
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 966fb3c02a..2a2e27d5e5 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -430,7 +430,6 @@ export const useTextEditingInstanceId = () =>
export type DragAndDropState = {
isDragging: boolean;
- origin?: "canvas" | "panel";
dropTarget?: ItemDropTarget;
dragPayload?: DragStartPayload;
placementIndicator?: Placement;