From 16dedbb4b731c09d60af8c50ff3cd65315dcaebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= <kvtodev@outlook.com>
Date: Thu, 3 Sep 2026 14:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E7=B4=A7=E9=A2=84=E8=A7=88=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=BA=8B=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将节点与缩放手势的 cancel 回调改为必填

更新所有 UiTreeRenderer 调用点显式传入取消处理
---
 .../ui-editor/components/preview/UiTreeRenderer.tsx    | 10 ++++------
 .../tests/uiEditorPreview.test.tsx                     | 10 ++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/view/ui-editor/components/preview/UiTreeRenderer.tsx b/apps/ai-game-creator-shell/src/view/ui-editor/components/preview/UiTreeRenderer.tsx
index 101fb2163..35ffe84b3 100644
--- a/apps/ai-game-creator-shell/src/view/ui-editor/components/preview/UiTreeRenderer.tsx
+++ b/apps/ai-game-creator-shell/src/view/ui-editor/components/preview/UiTreeRenderer.tsx
@@ -44,7 +44,7 @@ type UiTreeRendererProps = {
   onNodePointerDown: NodePointerDown;
   onNodePointerMove: (event: ReactPointerEvent<HTMLDivElement>) => void;
   onNodePointerUp: (event: ReactPointerEvent<HTMLDivElement>) => void;
-  onNodePointerCancel?: (event: ReactPointerEvent<HTMLDivElement>) => void;
+  onNodePointerCancel: (event: ReactPointerEvent<HTMLDivElement>) => void;
   onNodeResizePointerDown: (
     event: ReactPointerEvent<HTMLDivElement>,
     node: UiNode,
@@ -52,9 +52,7 @@ type UiTreeRendererProps = {
   ) => void;
   onNodeResizePointerMove: (event: ReactPointerEvent<HTMLDivElement>) => void;
   onNodeResizePointerUp: (event: ReactPointerEvent<HTMLDivElement>) => void;
-  onNodeResizePointerCancel?: (
-    event: ReactPointerEvent<HTMLDivElement>,
-  ) => void;
+  onNodeResizePointerCancel: (event: ReactPointerEvent<HTMLDivElement>) => void;
   onSelectExclusiveChild: (nodeId: NodeId) => void;
   viewportScale: number;
 };
@@ -90,11 +88,11 @@ function RenderNode({
   onNodePointerDown,
   onNodePointerMove,
   onNodePointerUp,
-  onNodePointerCancel = onNodePointerUp,
+  onNodePointerCancel,
   onNodeResizePointerDown,
   onNodeResizePointerMove,
   onNodeResizePointerUp,
-  onNodeResizePointerCancel = onNodeResizePointerUp,
+  onNodeResizePointerCancel,
   onSelectExclusiveChild,
   viewportScale,
 }: Omit<UiTreeRendererProps, 'tree'> & {
diff --git a/apps/ai-game-creator-shell/tests/uiEditorPreview.test.tsx b/apps/ai-game-creator-shell/tests/uiEditorPreview.test.tsx
index 855bac497..4fee75539 100644
--- a/apps/ai-game-creator-shell/tests/uiEditorPreview.test.tsx
+++ b/apps/ai-game-creator-shell/tests/uiEditorPreview.test.tsx
@@ -79,9 +79,11 @@ function renderTree(
       onNodePointerDown={vi.fn()}
       onNodePointerMove={vi.fn()}
       onNodePointerUp={vi.fn()}
+      onNodePointerCancel={vi.fn()}
       onNodeResizePointerDown={vi.fn()}
       onNodeResizePointerMove={vi.fn()}
       onNodeResizePointerUp={vi.fn()}
+      onNodeResizePointerCancel={vi.fn()}
       viewportScale={1}
     />,
   );
@@ -170,9 +172,11 @@ describe('UI tree preview visibility', () => {
         onNodePointerDown={vi.fn()}
         onNodePointerMove={vi.fn()}
         onNodePointerUp={vi.fn()}
+        onNodePointerCancel={vi.fn()}
         onNodeResizePointerDown={vi.fn()}
         onNodeResizePointerMove={vi.fn()}
         onNodeResizePointerUp={vi.fn()}
+        onNodeResizePointerCancel={vi.fn()}
         viewportScale={1}
       />,
     );
@@ -247,9 +251,11 @@ describe('UI tree preview visibility', () => {
           onNodePointerDown={vi.fn()}
           onNodePointerMove={vi.fn()}
           onNodePointerUp={vi.fn()}
+          onNodePointerCancel={vi.fn()}
           onNodeResizePointerDown={vi.fn()}
           onNodeResizePointerMove={vi.fn()}
           onNodeResizePointerUp={vi.fn()}
+          onNodeResizePointerCancel={vi.fn()}
           viewportScale={1}
         />,
       );
@@ -319,9 +325,11 @@ describe('UI tree preview visibility', () => {
         onNodePointerDown={onNodePointerDown}
         onNodePointerMove={vi.fn()}
         onNodePointerUp={vi.fn()}
+        onNodePointerCancel={vi.fn()}
         onNodeResizePointerDown={vi.fn()}
         onNodeResizePointerMove={vi.fn()}
         onNodeResizePointerUp={vi.fn()}
+        onNodeResizePointerCancel={vi.fn()}
         onSelectExclusiveChild={onSelectChild}
         viewportScale={1}
       />,
@@ -351,9 +359,11 @@ describe('UI tree preview visibility', () => {
         onNodePointerDown={vi.fn()}
         onNodePointerMove={vi.fn()}
         onNodePointerUp={vi.fn()}
+        onNodePointerCancel={vi.fn()}
         onNodeResizePointerDown={vi.fn()}
         onNodeResizePointerMove={vi.fn()}
         onNodeResizePointerUp={vi.fn()}
+        onNodeResizePointerCancel={vi.fn()}
         viewportScale={1}
       />,
     );