fix bug guide line
This commit is contained in:
@@ -14,6 +14,7 @@ import GuidesLayer from "./canvas/GuidesLayer";
|
|||||||
import { getSnappedPosition, type Guide } from "./canvas/useSnap";
|
import { getSnappedPosition, type Guide } from "./canvas/useSnap";
|
||||||
import CellEditor from "@/components/CellEditor";
|
import CellEditor from "@/components/CellEditor";
|
||||||
import ZoomControls from "./ZoomControls";
|
import ZoomControls from "./ZoomControls";
|
||||||
|
import { createScopedId } from "../store/editorStore.helpers";
|
||||||
|
|
||||||
type EditorCanvasProps = {
|
type EditorCanvasProps = {
|
||||||
catalogSize?: string;
|
catalogSize?: string;
|
||||||
@@ -24,10 +25,6 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
|||||||
const layerRef = useRef<Konva.Layer>(null);
|
const layerRef = useRef<Konva.Layer>(null);
|
||||||
const activeGuideIdsRef = useRef<string[]>([]);
|
const activeGuideIdsRef = useRef<string[]>([]);
|
||||||
const stageWrapRef = useRef<HTMLDivElement>(null);
|
const stageWrapRef = useRef<HTMLDivElement>(null);
|
||||||
const draggingGuideRef = useRef<{
|
|
||||||
id: string;
|
|
||||||
orientation: Guide["orientation"];
|
|
||||||
} | null>(null);
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
tool,
|
tool,
|
||||||
@@ -100,7 +97,7 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const addGuide = (orientation: Guide["orientation"], position: number) => {
|
const addGuide = (orientation: Guide["orientation"], position: number) => {
|
||||||
const id = `guide-${orientation}-${crypto.randomUUID()}`;
|
const id = createScopedId(`guide-${orientation}`);
|
||||||
setGuides([...guides, { id, orientation, position }]);
|
setGuides([...guides, { id, orientation, position }]);
|
||||||
setSelectedGuideId(id);
|
setSelectedGuideId(id);
|
||||||
};
|
};
|
||||||
@@ -112,7 +109,6 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleGuideDragEnd = (id: string, position: number, shouldRemove: boolean) => {
|
const handleGuideDragEnd = (id: string, position: number, shouldRemove: boolean) => {
|
||||||
draggingGuideRef.current = null;
|
|
||||||
if (shouldRemove) {
|
if (shouldRemove) {
|
||||||
removeGuide(id);
|
removeGuide(id);
|
||||||
return;
|
return;
|
||||||
@@ -120,51 +116,6 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
|||||||
handleGuidePositionChange(id, position);
|
handleGuidePositionChange(id, position);
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const forceFinishGuideDrag = () => {
|
|
||||||
const draggingGuide = draggingGuideRef.current;
|
|
||||||
if (!draggingGuide) return;
|
|
||||||
|
|
||||||
const stage = stageRef.current;
|
|
||||||
if (!stage) return;
|
|
||||||
|
|
||||||
const node = stage.findOne(`#${draggingGuide.id}`) as Konva.Node | null;
|
|
||||||
if (!node) {
|
|
||||||
draggingGuideRef.current = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.isDragging()) {
|
|
||||||
node.stopDrag();
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextPosition =
|
|
||||||
draggingGuide.orientation === "vertical"
|
|
||||||
? node.x()
|
|
||||||
: node.y();
|
|
||||||
const shouldRemove =
|
|
||||||
draggingGuide.orientation === "vertical"
|
|
||||||
? nextPosition < 0 || nextPosition > stageSize.width
|
|
||||||
: nextPosition < 0 || nextPosition > stageSize.height;
|
|
||||||
|
|
||||||
handleGuideDragEnd(draggingGuide.id, nextPosition, shouldRemove);
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener("pointerup", forceFinishGuideDrag);
|
|
||||||
window.addEventListener("mouseup", forceFinishGuideDrag);
|
|
||||||
window.addEventListener("touchend", forceFinishGuideDrag);
|
|
||||||
window.addEventListener("pointercancel", forceFinishGuideDrag);
|
|
||||||
window.addEventListener("blur", forceFinishGuideDrag);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener("pointerup", forceFinishGuideDrag);
|
|
||||||
window.removeEventListener("mouseup", forceFinishGuideDrag);
|
|
||||||
window.removeEventListener("touchend", forceFinishGuideDrag);
|
|
||||||
window.removeEventListener("pointercancel", forceFinishGuideDrag);
|
|
||||||
window.removeEventListener("blur", forceFinishGuideDrag);
|
|
||||||
};
|
|
||||||
}, [stageSize.height, stageSize.width]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleDeleteGuide = (e: KeyboardEvent) => {
|
const handleDeleteGuide = (e: KeyboardEvent) => {
|
||||||
if (!selectedGuideId) return;
|
if (!selectedGuideId) return;
|
||||||
@@ -396,10 +347,6 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
|||||||
selectedGuideId={selectedGuideId}
|
selectedGuideId={selectedGuideId}
|
||||||
draftGuide={draftGuide}
|
draftGuide={draftGuide}
|
||||||
onGuideSelect={setSelectedGuideId}
|
onGuideSelect={setSelectedGuideId}
|
||||||
onGuideDragStart={(id, orientation) => {
|
|
||||||
draggingGuideRef.current = { id, orientation };
|
|
||||||
setSelectedGuideId(id);
|
|
||||||
}}
|
|
||||||
onGuideDragEnd={handleGuideDragEnd}
|
onGuideDragEnd={handleGuideDragEnd}
|
||||||
/>
|
/>
|
||||||
</Stage>
|
</Stage>
|
||||||
|
|||||||
@@ -1,6 +1,22 @@
|
|||||||
|
import { useEffect, useRef } from "react";
|
||||||
|
import Konva from "konva";
|
||||||
import { Layer, Line } from "react-konva";
|
import { Layer, Line } from "react-konva";
|
||||||
import type { Guide } from "./useSnap";
|
import type { Guide } from "./useSnap";
|
||||||
|
|
||||||
|
/** پروداکشن: `sessionStorage.setItem('DEBUG_GUIDE_DRAG','1')` سپس رفرش */
|
||||||
|
function guideDragLog(stage: string, detail: Record<string, unknown>): void {
|
||||||
|
if (typeof window === "undefined") return;
|
||||||
|
const dev = import.meta.env.DEV;
|
||||||
|
let enabled = dev;
|
||||||
|
try {
|
||||||
|
if (!enabled) enabled = window.sessionStorage.getItem("DEBUG_GUIDE_DRAG") === "1";
|
||||||
|
} catch {
|
||||||
|
/* private mode */
|
||||||
|
}
|
||||||
|
if (!enabled) return;
|
||||||
|
console.info("[guide-drag]", new Date().toISOString(), stage, detail);
|
||||||
|
}
|
||||||
|
|
||||||
type GuidesLayerProps = {
|
type GuidesLayerProps = {
|
||||||
guides: Guide[];
|
guides: Guide[];
|
||||||
stageWidth: number;
|
stageWidth: number;
|
||||||
@@ -9,7 +25,6 @@ type GuidesLayerProps = {
|
|||||||
selectedGuideId: string | null;
|
selectedGuideId: string | null;
|
||||||
draftGuide: { orientation: Guide["orientation"]; position: number } | null;
|
draftGuide: { orientation: Guide["orientation"]; position: number } | null;
|
||||||
onGuideSelect: (id: string) => void;
|
onGuideSelect: (id: string) => void;
|
||||||
onGuideDragStart: (id: string, orientation: Guide["orientation"]) => void;
|
|
||||||
onGuideDragEnd: (id: string, position: number, shouldRemove: boolean) => void;
|
onGuideDragEnd: (id: string, position: number, shouldRemove: boolean) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -21,23 +36,155 @@ const GuidesLayer = ({
|
|||||||
selectedGuideId,
|
selectedGuideId,
|
||||||
draftGuide,
|
draftGuide,
|
||||||
onGuideSelect,
|
onGuideSelect,
|
||||||
onGuideDragStart,
|
|
||||||
onGuideDragEnd,
|
onGuideDragEnd,
|
||||||
}: GuidesLayerProps) => {
|
}: GuidesLayerProps) => {
|
||||||
|
const abortActiveSessionRef = useRef<(() => void) | null>(null);
|
||||||
|
|
||||||
|
useEffect(
|
||||||
|
() => () => {
|
||||||
|
abortActiveSessionRef.current?.();
|
||||||
|
abortActiveSessionRef.current = null;
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
const finalizeGuideDrag = (
|
const finalizeGuideDrag = (
|
||||||
guideId: string,
|
guideId: string,
|
||||||
orientation: Guide["orientation"],
|
orientation: Guide["orientation"],
|
||||||
x: number,
|
x: number,
|
||||||
y: number,
|
y: number,
|
||||||
|
reason?: string,
|
||||||
) => {
|
) => {
|
||||||
const nextPosition = orientation === "vertical" ? x : y;
|
const nextPosition = orientation === "vertical" ? x : y;
|
||||||
const shouldRemove =
|
const shouldRemove =
|
||||||
orientation === "vertical"
|
orientation === "vertical"
|
||||||
? nextPosition < 0 || nextPosition > stageWidth
|
? nextPosition < 0 || nextPosition > stageWidth
|
||||||
: nextPosition < 0 || nextPosition > stageHeight;
|
: nextPosition < 0 || nextPosition > stageHeight;
|
||||||
|
guideDragLog("finalize", {
|
||||||
|
guideId,
|
||||||
|
orientation,
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
nextPosition,
|
||||||
|
shouldRemove,
|
||||||
|
reason,
|
||||||
|
});
|
||||||
onGuideDragEnd(guideId, nextPosition, shouldRemove);
|
onGuideDragEnd(guideId, nextPosition, shouldRemove);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const attachPointerGuideDrag = (
|
||||||
|
guide: Guide,
|
||||||
|
e: Konva.KonvaEventObject<PointerEvent>,
|
||||||
|
) => {
|
||||||
|
const evt = e.evt;
|
||||||
|
if (evt.pointerType === "mouse" && evt.button !== 0) return;
|
||||||
|
|
||||||
|
const node = e.target as Konva.Line;
|
||||||
|
const stage = node.getStage();
|
||||||
|
if (!stage) {
|
||||||
|
guideDragLog("abort-no-stage", { guideId: guide.id });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const container = stage.container();
|
||||||
|
|
||||||
|
abortActiveSessionRef.current?.();
|
||||||
|
abortActiveSessionRef.current = null;
|
||||||
|
|
||||||
|
let settled = false;
|
||||||
|
const settle = (reason: string) => {
|
||||||
|
if (settled) return;
|
||||||
|
settled = true;
|
||||||
|
guideDragLog("settle", { guideId: guide.id, pointerId: evt.pointerId, reason });
|
||||||
|
|
||||||
|
window.removeEventListener("pointermove", onPointerMove);
|
||||||
|
window.removeEventListener("pointerup", onPointerEnd);
|
||||||
|
window.removeEventListener("pointercancel", onPointerEnd);
|
||||||
|
window.removeEventListener("blur", onBlur);
|
||||||
|
document.removeEventListener("visibilitychange", onVisibilityHidden);
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (typeof container.releasePointerCapture === "function") {
|
||||||
|
container.releasePointerCapture(evt.pointerId);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
|
|
||||||
|
abortActiveSessionRef.current = null;
|
||||||
|
|
||||||
|
const x = node.x();
|
||||||
|
const y = node.y();
|
||||||
|
const nextPosition = guide.orientation === "vertical" ? x : y;
|
||||||
|
const guidesWillRemove =
|
||||||
|
guide.orientation === "vertical"
|
||||||
|
? nextPosition < 0 || nextPosition > stageWidth
|
||||||
|
: nextPosition < 0 || nextPosition > stageHeight;
|
||||||
|
|
||||||
|
if (!guidesWillRemove) {
|
||||||
|
onGuideSelect(guide.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
finalizeGuideDrag(guide.id, guide.orientation, x, y, reason);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPointerMove = (moveEvt: PointerEvent) => {
|
||||||
|
if (moveEvt.pointerId !== evt.pointerId) return;
|
||||||
|
moveEvt.preventDefault();
|
||||||
|
const pp = stage.getPointerPosition();
|
||||||
|
if (!pp) {
|
||||||
|
guideDragLog("move-no-pointer-pos", {});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const x = pp.x / stage.scaleX();
|
||||||
|
const y = pp.y / stage.scaleY();
|
||||||
|
|
||||||
|
const isVertical = guide.orientation === "vertical";
|
||||||
|
if (isVertical) {
|
||||||
|
node.x(x);
|
||||||
|
node.y(0);
|
||||||
|
} else {
|
||||||
|
node.x(0);
|
||||||
|
node.y(y);
|
||||||
|
}
|
||||||
|
node.getLayer()?.batchDraw();
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPointerEnd = (endEvt: PointerEvent) => {
|
||||||
|
if (endEvt.pointerId !== evt.pointerId) return;
|
||||||
|
settle(endEvt.type === "pointercancel" ? "pointercancel" : "pointerup");
|
||||||
|
};
|
||||||
|
|
||||||
|
const onBlur = () => settle("window-blur");
|
||||||
|
|
||||||
|
const onVisibilityHidden = () => {
|
||||||
|
if (document.visibilityState === "hidden") settle("document-hidden");
|
||||||
|
};
|
||||||
|
|
||||||
|
abortActiveSessionRef.current = () => settle("session-aborted");
|
||||||
|
|
||||||
|
window.addEventListener("pointermove", onPointerMove, { passive: false });
|
||||||
|
window.addEventListener("pointerup", onPointerEnd);
|
||||||
|
window.addEventListener("pointercancel", onPointerEnd);
|
||||||
|
window.addEventListener("blur", onBlur);
|
||||||
|
document.addEventListener("visibilitychange", onVisibilityHidden);
|
||||||
|
|
||||||
|
guideDragLog("pointerdown-attached", {
|
||||||
|
guideId: guide.id,
|
||||||
|
pointerId: evt.pointerId,
|
||||||
|
pointerType: evt.pointerType,
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
container.setPointerCapture(evt.pointerId);
|
||||||
|
} catch (err) {
|
||||||
|
guideDragLog("set-pointer-capture-failed", {
|
||||||
|
pointerId: evt.pointerId,
|
||||||
|
message: String(err),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layer>
|
<Layer>
|
||||||
{guides.map((guide) => {
|
{guides.map((guide) => {
|
||||||
@@ -56,27 +203,12 @@ const GuidesLayer = ({
|
|||||||
stroke={isSelected ? "#2563eb" : isActive ? "#1d4ed8" : "#60a5fa"}
|
stroke={isSelected ? "#2563eb" : isActive ? "#1d4ed8" : "#60a5fa"}
|
||||||
strokeWidth={isSelected ? 2.5 : isActive ? 2 : 1}
|
strokeWidth={isSelected ? 2.5 : isActive ? 2 : 1}
|
||||||
dash={[6, 6]}
|
dash={[6, 6]}
|
||||||
hitStrokeWidth={10}
|
hitStrokeWidth={12}
|
||||||
draggable
|
listening
|
||||||
dragBoundFunc={(pos) =>
|
draggable={false}
|
||||||
isVertical ? { x: pos.x, y: 0 } : { x: 0, y: pos.y }
|
onPointerDown={(e) => {
|
||||||
}
|
e.cancelBubble = true;
|
||||||
onMouseDown={() => onGuideSelect(guide.id)}
|
attachPointerGuideDrag(guide, e);
|
||||||
onDragStart={() => onGuideDragStart(guide.id, guide.orientation)}
|
|
||||||
onDragMove={(e) => {
|
|
||||||
const nativeEvent = e.evt as MouseEvent | PointerEvent | TouchEvent;
|
|
||||||
// Safari can miss dragend/mouseup; if no pressed pointer exists, end drag immediately.
|
|
||||||
if ("buttons" in nativeEvent && nativeEvent.buttons === 0) {
|
|
||||||
const node = e.target;
|
|
||||||
if (node.isDragging()) {
|
|
||||||
node.stopDrag();
|
|
||||||
}
|
|
||||||
finalizeGuideDrag(guide.id, guide.orientation, node.x(), node.y());
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
onDragEnd={(e) => {
|
|
||||||
const node = e.target;
|
|
||||||
finalizeGuideDrag(guide.id, guide.orientation, node.x(), node.y());
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@@ -85,6 +217,7 @@ const GuidesLayer = ({
|
|||||||
<Line
|
<Line
|
||||||
name="guide-line-draft"
|
name="guide-line-draft"
|
||||||
listening={false}
|
listening={false}
|
||||||
|
draggable={false}
|
||||||
x={draftGuide.orientation === "vertical" ? draftGuide.position : 0}
|
x={draftGuide.orientation === "vertical" ? draftGuide.position : 0}
|
||||||
y={draftGuide.orientation === "vertical" ? 0 : draftGuide.position}
|
y={draftGuide.orientation === "vertical" ? 0 : draftGuide.position}
|
||||||
points={
|
points={
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ export const buildGroupResult = (
|
|||||||
|
|
||||||
if (allObjectIdsToGroup.size < 2) return null;
|
if (allObjectIdsToGroup.size < 2) return null;
|
||||||
|
|
||||||
const groupId = nextGroupId ?? `group-${crypto.randomUUID()}`;
|
const groupId = nextGroupId ?? createScopedId("group");
|
||||||
const objectsToGroup = objects.filter(
|
const objectsToGroup = objects.filter(
|
||||||
(obj) => allObjectIdsToGroup.has(obj.id) && obj.type !== "group",
|
(obj) => allObjectIdsToGroup.has(obj.id) && obj.type !== "group",
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ export const useEditorStore = create<EditorStoreType>((set, get) => {
|
|||||||
const sourceIds = new Set(sourceObjects.map((obj) => obj.id));
|
const sourceIds = new Set(sourceObjects.map((obj) => obj.id));
|
||||||
const idMap = new Map<string, string>();
|
const idMap = new Map<string, string>();
|
||||||
sourceObjects.forEach((obj) => {
|
sourceObjects.forEach((obj) => {
|
||||||
idMap.set(obj.id, `${obj.id}-${crypto.randomUUID()}`);
|
idMap.set(obj.id, createScopedId(obj.id));
|
||||||
});
|
});
|
||||||
|
|
||||||
return sourceObjects.map((objectToClone) => ({
|
return sourceObjects.map((objectToClone) => ({
|
||||||
@@ -136,13 +136,13 @@ export const useEditorStore = create<EditorStoreType>((set, get) => {
|
|||||||
...(objectToClone.tableData && {
|
...(objectToClone.tableData && {
|
||||||
tableData: {
|
tableData: {
|
||||||
...objectToClone.tableData,
|
...objectToClone.tableData,
|
||||||
id: `table-${crypto.randomUUID()}`,
|
id: createScopedId("table"),
|
||||||
cells: Object.fromEntries(
|
cells: Object.fromEntries(
|
||||||
Object.entries(objectToClone.tableData.cells).map(([key, cell]) => [
|
Object.entries(objectToClone.tableData.cells).map(([key, cell]) => [
|
||||||
key,
|
key,
|
||||||
{
|
{
|
||||||
...cell,
|
...cell,
|
||||||
id: `cell-${crypto.randomUUID()}`,
|
id: createScopedId("cell"),
|
||||||
},
|
},
|
||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
@@ -384,7 +384,7 @@ export const useEditorStore = create<EditorStoreType>((set, get) => {
|
|||||||
editingCell: null,
|
editingCell: null,
|
||||||
setEditingCell: (cell) => set({ editingCell: cell }),
|
setEditingCell: (cell) => set({ editingCell: cell }),
|
||||||
addTable: (x, y, rows = 4, cols = 5) => {
|
addTable: (x, y, rows = 4, cols = 5) => {
|
||||||
const tableId = `table-${crypto.randomUUID()}`;
|
const tableId = createScopedId("table");
|
||||||
const cellWidth = 100;
|
const cellWidth = 100;
|
||||||
const cellHeight = 50;
|
const cellHeight = 50;
|
||||||
const tableData: TableData = {
|
const tableData: TableData = {
|
||||||
@@ -626,7 +626,7 @@ export const useEditorStore = create<EditorStoreType>((set, get) => {
|
|||||||
|
|
||||||
const duplicatedObjects = pageToDuplicate.objects.map((obj) => ({
|
const duplicatedObjects = pageToDuplicate.objects.map((obj) => ({
|
||||||
...obj,
|
...obj,
|
||||||
id: `${obj.id}-${crypto.randomUUID()}`,
|
id: createScopedId(obj.id),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const newPage: Page = {
|
const newPage: Page = {
|
||||||
|
|||||||
Reference in New Issue
Block a user