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
Don't populate an instance on paste, because its already populated (#681)
Oleg Isonen8e727a9e4760
diff --git a/apps/designer/app/canvas/canvas.tsx b/apps/designer/app/canvas/canvas.tsxindex 004fd079ce..a1a9ee5453 100644--- a/apps/designer/app/canvas/canvas.tsx+++ b/apps/designer/app/canvas/canvas.tsx@@ -123,7 +123,10 @@ const useCopyPaste = () => {publish({ type: "deleteInstance", payload: { id: instance.id } });},onPaste: (instance, props) => {- publish({ type: "insertInstance", payload: { instance, props } });+ publish({+ type: "insertInstance",+ payload: { instance, props },+ });},});};diff --git a/apps/designer/app/canvas/shared/instance.ts b/apps/designer/app/canvas/shared/instance.tsindex 63ad223c35..5a86321089 100644--- a/apps/designer/app/canvas/shared/instance.ts+++ b/apps/designer/app/canvas/shared/instance.ts@@ -18,7 +18,6 @@ import store from "immerhin";import { useSelectedInstance } from "./nano-states";import {rootInstanceContainer,- useBreakpoints,useRootInstance,useTextEditingInstanceId,} from "~/shared/nano-states";@@ -79,8 +78,6 @@ export const findInsertLocation = (export const useInsertInstance = ({ treeId }: { treeId: string }) => {const [selectedInstance, setSelectedInstance] = useSelectedInstance();- const [breakpoints] = useBreakpoints();-useSubscribe("insertInstance", ({ instance, dropTarget, props }) => {store.createTransaction([rootInstanceContainer, allUserPropsContainer],@@ -88,13 +85,9 @@ export const useInsertInstance = ({ treeId }: { treeId: string }) => {if (rootInstance === undefined) {return;}- const populatedInstance = utils.tree.populateInstance(- instance,- breakpoints[0].id- );const hasInserted = utils.tree.insertInstanceMutable(rootInstance,- populatedInstance,+ instance,dropTarget ?? findInsertLocation(rootInstance, selectedInstance?.id));if (hasInserted) {diff --git a/apps/designer/app/canvas/shared/use-drag-drop.ts b/apps/designer/app/canvas/shared/use-drag-drop.tsindex 0aa2406c34..d747092c74 100644--- a/apps/designer/app/canvas/shared/use-drag-drop.ts+++ b/apps/designer/app/canvas/shared/use-drag-drop.ts@@ -1,5 +1,6 @@import { useLayoutEffect, useRef } from "react";import {+ useBreakpoints,useRootInstance,useTextEditingInstanceId,} from "~/shared/nano-states";@@ -63,6 +64,7 @@ const initialState: {export const useDragAndDrop = () => {const [rootInstance] = useRootInstance();const [textEditingInstanceId] = useTextEditingInstanceId();+ const [breakpoints] = useBreakpoints();const state = useRef({ ...initialState });@@ -286,12 +288,17 @@ export const useDragAndDrop = () => {const { dropTarget, dragItem } = state.current;if (dropTarget && dragItem && isCanceled === false) {+ const instance = utils.tree.populateInstance(+ utils.tree.createInstance({+ component: dragItem.component,+ }),+ breakpoints[0].id+ );+publish({type: "insertInstance",payload: {- instance: utils.tree.createInstance({- component: dragItem.component,- }),+ instance,dropTarget: {parentId: dropTarget.data.id,position: dropTarget.indexWithinChildren,diff --git a/apps/designer/app/designer/designer.tsx b/apps/designer/app/designer/designer.tsxindex abf7fc26cb..9437f9eb55 100644--- a/apps/designer/app/designer/designer.tsx+++ b/apps/designer/app/designer/designer.tsx@@ -128,7 +128,10 @@ const useCopyPaste = (publish: Publish) => {publish({ type: "deleteInstance", payload: { id: instance.id } });},onPaste: (instance, props) => {- publish({ type: "insertInstance", payload: { instance, props } });+ publish({+ type: "insertInstance",+ payload: { instance, props },+ });},});};diff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx b/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsxindex be986cb1f4..9ebe854718 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx+++ b/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx@@ -14,6 +14,7 @@ import type { TabName } from "../../types";import { ComponentThumb } from "./component-thumb";import { useCanvasRect, useZoom } from "~/designer/shared/nano-states";import { Header, CloseButton } from "../../lib/header";+import { useBreakpoints } from "~/shared/nano-states";type DraggableThumbProps = {onClick: MouseEventHandler<HTMLDivElement>;@@ -84,6 +85,7 @@ const elementToComponentName = (export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {const [dragComponent, setDragComponent] = useState<Instance["component"]>();const [point, setPoint] = useState<Point>({ x: 0, y: 0 });+ const [breakpoints] = useBreakpoints();const [canvasRect] = useCanvasRect();const [zoom] = useZoom();@@ -165,9 +167,15 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {component={component}onClick={() => {onSetActiveTab("none");+ const instance = utils.tree.populateInstance(+ utils.tree.createInstance({+ component,+ }),+ breakpoints[0].id+ );publish({type: "insertInstance",- payload: { instance: utils.tree.createInstance({ component }) },+ payload: { instance },});}}/>