Merge pull request #386 from easyops-cn/steve/allow-paste-a-route-int…

…o-a-brick fix(): allow paste a route into a brick
easyops-cn · Oct 9, 2024 · 140e965 · 140e965
2 parents 3625dd4 + 42a0168
commit 140e965
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/bricks/next-builder/src/builder-container/BuilderContextMenu/useCanPaste.spec.tsx b/bricks/next-builder/src/builder-container/BuilderContextMenu/useCanPaste.spec.tsx
@@ -204,10 +204,10 @@ describe("useCanPaste", () => {
     [2, 3, true],
     [2, 100, false],
     [2, 101, true],
-    [100, 2, false],
+    [100, 2, true],
     [100, 101, false],
     [101, 100, true],
-  ])("should work", (sourceUid, targetUid, canDrop) => {
+  ])("should work for %d %d", (sourceUid, targetUid, canDrop) => {
     const wrapper = shallow(
       <TestComponent
         clipboard={{

diff --git a/bricks/next-builder/src/builder-container/BuilderContextMenu/useCanPaste.ts b/bricks/next-builder/src/builder-container/BuilderContextMenu/useCanPaste.ts
@@ -36,9 +36,10 @@ export function useCanPaste(): CanPaste {
       }
       if (
         (sourceNode || clipboard.nodeType) &&
-        (isRouteNode(sourceNode || ({ type: clipboard.nodeType } as any))
-          ? targetNode.type !== "routes"
-          : targetNode.type === "routes" || targetNode.type === "redirect")
+        (targetNode.type === "redirect" ||
+          (isRouteNode(sourceNode || ({ type: clipboard.nodeType } as any))
+            ? targetNode.type === "bricks"
+            : targetNode.type === "routes"))
       ) {
         return false;
       }