From a3a41ef6e64cce78986a1132f9eb8fb9fb7b0a33 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Thu, 14 May 2026 15:48:13 +0800
Subject: [PATCH] fix: align psd layer hit testing

---
 .../agents/AgentPsdTemplateEditorDialog.tsx   | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/components/agents/AgentPsdTemplateEditorDialog.tsx b/components/agents/AgentPsdTemplateEditorDialog.tsx
index f0adda697..a31221d72 100644
--- a/components/agents/AgentPsdTemplateEditorDialog.tsx
+++ b/components/agents/AgentPsdTemplateEditorDialog.tsx
@@ -4043,6 +4043,8 @@ export function AgentPsdTemplateEditorDialog({
                             const layerPositionOffset =
                               effectiveLayerPositionOffsets[layer.id] ||
                               normalizeLayerPositionOffset();
+                            const baseZIndex =
+                              layerStackZIndexById.get(layer.id) || 1;
                             const layerBoxStyle = {
                               left: layer.x + layerPositionOffset.offsetX,
                               top: layer.y + layerPositionOffset.offsetY,
@@ -4076,7 +4078,16 @@ export function AgentPsdTemplateEditorDialog({
                                   onPointerDown={(event) =>
                                     handleLayerDragStart(layer, event)
                                   }
-                                  style={assignedImageContainerStyle}
+                                  style={{
+                                    ...assignedImageContainerStyle,
+                                    zIndex: baseZIndex,
+                                    cursor:
+                                      layerDragStateRef.current?.layerId ===
+                                      layer.id
+                                        ? "grabbing"
+                                        : "grab",
+                                    touchAction: "none",
+                                  }}
                                   title={`${getLayerLabel(layer)}：${layer.layerName}`}
                                 >
                                   <img
@@ -4148,7 +4159,16 @@ export function AgentPsdTemplateEditorDialog({
                                   onPointerDown={(event) =>
                                     handleTextDragStart(layer, event)
                                   }
-                                  style={layerBoxStyle}
+                                  style={{
+                                    ...layerBoxStyle,
+                                    zIndex: baseZIndex,
+                                    cursor:
+                                      textDragStateRef.current?.layerId ===
+                                      layer.id
+                                        ? "grabbing"
+                                        : "grab",
+                                    touchAction: "none",
+                                  }}
                                   title={`${getLayerLabel(layer)}：${layer.layerName}`}
                                 >
                                   <img
@@ -4197,6 +4217,7 @@ export function AgentPsdTemplateEditorDialog({
                                     textFrame.offsetY,
                                   width: textFrame.width,
                                   height: textFrame.height,
+                                  zIndex: baseZIndex,
                                   cursor:
                                     textDragStateRef.current?.layerId ===
                                     layer.id