guide line and magnet
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useRef } from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { Stage, Layer, Rect } from "react-konva";
|
||||
import Konva from "konva";
|
||||
import { useEditorStore } from "../store/editorStore";
|
||||
@@ -10,6 +10,8 @@ import { useTransformHandlers } from "./canvas/useTransformHandlers";
|
||||
import { useObjectHandlers } from "./canvas/useObjectHandlers";
|
||||
import { useMaskGroupState } from "./canvas/useMaskGroupState";
|
||||
import ObjectsLayer from "./canvas/ObjectsLayer";
|
||||
import GuidesLayer from "./canvas/GuidesLayer";
|
||||
import { getSnappedPosition, type Guide } from "./canvas/useSnap";
|
||||
import CellEditor from "@/components/CellEditor";
|
||||
import ZoomControls from "./ZoomControls";
|
||||
|
||||
@@ -20,6 +22,8 @@ type EditorCanvasProps = {
|
||||
const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
||||
const stageRef = useRef<Konva.Stage>(null);
|
||||
const layerRef = useRef<Konva.Layer>(null);
|
||||
const activeGuideIdsRef = useRef<string[]>([]);
|
||||
const stageWrapRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const {
|
||||
tool,
|
||||
@@ -45,6 +49,14 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
||||
|
||||
useTransformHandlers(transformerRef, layerRef);
|
||||
|
||||
const [guides, setGuides] = useState<Guide[]>([]);
|
||||
const [activeGuideIds, setActiveGuideIds] = useState<string[]>([]);
|
||||
const [selectedGuideId, setSelectedGuideId] = useState<string | null>(null);
|
||||
const [draftGuide, setDraftGuide] = useState<{
|
||||
orientation: Guide["orientation"];
|
||||
position: number;
|
||||
} | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (stageRef.current) {
|
||||
setStageRef(stageRef);
|
||||
@@ -56,19 +68,198 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
||||
|
||||
|
||||
const finalScale = stageSize.scale * zoom;
|
||||
const updateActiveGuides = (nextActiveGuideIds: string[]) => {
|
||||
const prev = activeGuideIdsRef.current;
|
||||
const changed =
|
||||
prev.length !== nextActiveGuideIds.length ||
|
||||
prev.some((id, index) => id !== nextActiveGuideIds[index]);
|
||||
|
||||
if (changed) {
|
||||
activeGuideIdsRef.current = nextActiveGuideIds;
|
||||
setActiveGuideIds(nextActiveGuideIds);
|
||||
}
|
||||
};
|
||||
|
||||
const handleGuidePositionChange = (id: string, position: number) => {
|
||||
setGuides((prev) =>
|
||||
prev.map((guide) =>
|
||||
guide.id === id
|
||||
? {
|
||||
...guide,
|
||||
position,
|
||||
}
|
||||
: guide,
|
||||
),
|
||||
);
|
||||
};
|
||||
|
||||
const addGuide = (orientation: Guide["orientation"], position: number) => {
|
||||
const id = `guide-${orientation}-${crypto.randomUUID()}`;
|
||||
setGuides((prev) => [...prev, { id, orientation, position }]);
|
||||
setSelectedGuideId(id);
|
||||
};
|
||||
|
||||
const removeGuide = (id: string) => {
|
||||
setGuides((prev) => prev.filter((guide) => guide.id !== id));
|
||||
setActiveGuideIds((prev) => prev.filter((activeId) => activeId !== id));
|
||||
setSelectedGuideId((prev) => (prev === id ? null : prev));
|
||||
};
|
||||
|
||||
const handleGuideDragEnd = (id: string, position: number, shouldRemove: boolean) => {
|
||||
if (shouldRemove) {
|
||||
removeGuide(id);
|
||||
return;
|
||||
}
|
||||
handleGuidePositionChange(id, position);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const handleDeleteGuide = (e: KeyboardEvent) => {
|
||||
if (!selectedGuideId) return;
|
||||
const target = e.target as HTMLElement;
|
||||
if (
|
||||
target?.tagName === "INPUT" ||
|
||||
target?.tagName === "TEXTAREA" ||
|
||||
target?.isContentEditable
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (e.key === "Delete" || e.key === "Backspace") {
|
||||
e.preventDefault();
|
||||
removeGuide(selectedGuideId);
|
||||
}
|
||||
};
|
||||
|
||||
window.addEventListener("keydown", handleDeleteGuide);
|
||||
return () => {
|
||||
window.removeEventListener("keydown", handleDeleteGuide);
|
||||
};
|
||||
}, [selectedGuideId]);
|
||||
|
||||
const startRulerGuideDrag = (orientation: Guide["orientation"]) => {
|
||||
const updateFromPointer = (event: MouseEvent) => {
|
||||
const rect = stageWrapRef.current?.getBoundingClientRect();
|
||||
if (!rect) return null;
|
||||
const rawPos =
|
||||
orientation === "vertical"
|
||||
? (event.clientX - rect.left) / finalScale
|
||||
: (event.clientY - rect.top) / finalScale;
|
||||
return rawPos;
|
||||
};
|
||||
|
||||
const updateDraft = (event: MouseEvent) => {
|
||||
const pointerPos = updateFromPointer(event);
|
||||
if (pointerPos === null) return;
|
||||
const boundedPos =
|
||||
orientation === "vertical"
|
||||
? Math.max(0, Math.min(stageSize.width, pointerPos))
|
||||
: Math.max(0, Math.min(stageSize.height, pointerPos));
|
||||
setDraftGuide({ orientation, position: boundedPos });
|
||||
};
|
||||
|
||||
const handleMouseMove = (event: MouseEvent) => {
|
||||
updateDraft(event);
|
||||
};
|
||||
|
||||
const handleMouseUp = (event: MouseEvent) => {
|
||||
const rect = stageWrapRef.current?.getBoundingClientRect();
|
||||
if (!rect) {
|
||||
setDraftGuide(null);
|
||||
return;
|
||||
}
|
||||
|
||||
const isInside =
|
||||
event.clientX >= rect.left &&
|
||||
event.clientX <= rect.right &&
|
||||
event.clientY >= rect.top &&
|
||||
event.clientY <= rect.bottom;
|
||||
|
||||
if (isInside) {
|
||||
const pointerPos = updateFromPointer(event);
|
||||
if (pointerPos !== null) {
|
||||
const boundedPos = orientation === "vertical"
|
||||
? Math.max(0, Math.min(stageSize.width, pointerPos))
|
||||
: Math.max(0, Math.min(stageSize.height, pointerPos));
|
||||
addGuide(orientation, boundedPos);
|
||||
}
|
||||
}
|
||||
|
||||
setDraftGuide(null);
|
||||
window.removeEventListener("mousemove", handleMouseMove);
|
||||
window.removeEventListener("mouseup", handleMouseUp);
|
||||
};
|
||||
|
||||
window.addEventListener("mousemove", handleMouseMove);
|
||||
window.addEventListener("mouseup", handleMouseUp, { once: true });
|
||||
};
|
||||
|
||||
const handleDragMove = (e: Konva.KonvaEventObject<DragEvent>) => {
|
||||
const node = e.target;
|
||||
if (!node || node.name() === "guide-line") return;
|
||||
|
||||
const snapped = getSnappedPosition({ x: node.x(), y: node.y() }, guides);
|
||||
|
||||
if (node.x() !== snapped.position.x || node.y() !== snapped.position.y) {
|
||||
node.position(snapped.position);
|
||||
node.getLayer()?.batchDraw();
|
||||
}
|
||||
|
||||
updateActiveGuides(snapped.activeGuideIds);
|
||||
};
|
||||
|
||||
const handleDragEnd = () => {
|
||||
updateActiveGuides([]);
|
||||
};
|
||||
|
||||
const handleStageMouseDownWithGuideReset = (e: Konva.KonvaEventObject<MouseEvent>) => {
|
||||
if (e.target?.name() !== "guide-line") {
|
||||
setSelectedGuideId(null);
|
||||
}
|
||||
handleStageMouseDown(e);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="flex-1 flex items-center justify-center pb-8 overflow-auto relative">
|
||||
<div className="shadow-lg mt-8">
|
||||
<div className="mt-8">
|
||||
<div
|
||||
className="relative select-none"
|
||||
style={{
|
||||
width: stageSize.width * finalScale,
|
||||
height: stageSize.height * finalScale,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="absolute -top-6 left-0 h-6 bg-slate-100 border-b border-slate-300 cursor-col-resize"
|
||||
style={{ width: stageSize.width * finalScale }}
|
||||
onMouseDown={(e) => {
|
||||
e.preventDefault();
|
||||
startRulerGuideDrag("vertical");
|
||||
}}
|
||||
title="Drag to create vertical guide"
|
||||
/>
|
||||
<div
|
||||
className="absolute top-0 -left-6 w-6 bg-slate-100 border-r border-slate-300 cursor-row-resize"
|
||||
style={{ height: stageSize.height * finalScale }}
|
||||
onMouseDown={(e) => {
|
||||
e.preventDefault();
|
||||
startRulerGuideDrag("horizontal");
|
||||
}}
|
||||
title="Drag to create horizontal guide"
|
||||
/>
|
||||
<div className="absolute -top-6 -left-6 w-6 h-6 bg-slate-200 border border-slate-300" />
|
||||
<div ref={stageWrapRef} className="shadow-lg">
|
||||
<Stage
|
||||
ref={stageRef}
|
||||
width={stageSize.width * finalScale}
|
||||
height={stageSize.height * finalScale}
|
||||
scaleX={finalScale}
|
||||
scaleY={finalScale}
|
||||
onMouseDown={handleStageMouseDown}
|
||||
onMouseDown={handleStageMouseDownWithGuideReset}
|
||||
onMouseMove={handleStageMouseMove}
|
||||
onMouseUp={handleStageMouseUp}
|
||||
onDragMove={handleDragMove}
|
||||
onDragEnd={handleDragEnd}
|
||||
>
|
||||
<Layer listening={false}>
|
||||
<Rect
|
||||
@@ -100,7 +291,19 @@ const EditorCanvas = ({ catalogSize }: EditorCanvasProps) => {
|
||||
onGroup={handleGroupWithMask}
|
||||
onUngroup={handleUngroupFromMask}
|
||||
/>
|
||||
<GuidesLayer
|
||||
guides={guides}
|
||||
stageWidth={stageSize.width}
|
||||
stageHeight={stageSize.height}
|
||||
activeGuideIds={activeGuideIds}
|
||||
selectedGuideId={selectedGuideId}
|
||||
draftGuide={draftGuide}
|
||||
onGuideSelect={setSelectedGuideId}
|
||||
onGuideDragEnd={handleGuideDragEnd}
|
||||
/>
|
||||
</Stage>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{editingCell && (
|
||||
<CellEditor
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
import { Layer, Line } from "react-konva";
|
||||
import type { Guide } from "./useSnap";
|
||||
|
||||
type GuidesLayerProps = {
|
||||
guides: Guide[];
|
||||
stageWidth: number;
|
||||
stageHeight: number;
|
||||
activeGuideIds: string[];
|
||||
selectedGuideId: string | null;
|
||||
draftGuide: { orientation: Guide["orientation"]; position: number } | null;
|
||||
onGuideSelect: (id: string) => void;
|
||||
onGuideDragEnd: (id: string, position: number, shouldRemove: boolean) => void;
|
||||
};
|
||||
|
||||
const GuidesLayer = ({
|
||||
guides,
|
||||
stageWidth,
|
||||
stageHeight,
|
||||
activeGuideIds,
|
||||
selectedGuideId,
|
||||
draftGuide,
|
||||
onGuideSelect,
|
||||
onGuideDragEnd,
|
||||
}: GuidesLayerProps) => {
|
||||
return (
|
||||
<Layer>
|
||||
{guides.map((guide) => {
|
||||
const isVertical = guide.orientation === "vertical";
|
||||
const isActive = activeGuideIds.includes(guide.id);
|
||||
const isSelected = selectedGuideId === guide.id;
|
||||
|
||||
return (
|
||||
<Line
|
||||
key={guide.id}
|
||||
id={guide.id}
|
||||
name="guide-line"
|
||||
x={isVertical ? guide.position : 0}
|
||||
y={isVertical ? 0 : guide.position}
|
||||
points={isVertical ? [0, 0, 0, stageHeight] : [0, 0, stageWidth, 0]}
|
||||
stroke={isSelected ? "#2563eb" : isActive ? "#1d4ed8" : "#60a5fa"}
|
||||
strokeWidth={isSelected ? 2.5 : isActive ? 2 : 1}
|
||||
dash={[6, 6]}
|
||||
hitStrokeWidth={10}
|
||||
draggable
|
||||
dragBoundFunc={(pos) =>
|
||||
isVertical ? { x: pos.x, y: 0 } : { x: 0, y: pos.y }
|
||||
}
|
||||
onMouseDown={() => onGuideSelect(guide.id)}
|
||||
onDragEnd={(e) => {
|
||||
const node = e.target;
|
||||
const nextPosition = isVertical ? node.x() : node.y();
|
||||
const shouldRemove = isVertical
|
||||
? nextPosition < 0 || nextPosition > stageWidth
|
||||
: nextPosition < 0 || nextPosition > stageHeight;
|
||||
onGuideDragEnd(guide.id, nextPosition, shouldRemove);
|
||||
}}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{draftGuide && (
|
||||
<Line
|
||||
name="guide-line-draft"
|
||||
listening={false}
|
||||
x={draftGuide.orientation === "vertical" ? draftGuide.position : 0}
|
||||
y={draftGuide.orientation === "vertical" ? 0 : draftGuide.position}
|
||||
points={
|
||||
draftGuide.orientation === "vertical"
|
||||
? [0, 0, 0, stageHeight]
|
||||
: [0, 0, stageWidth, 0]
|
||||
}
|
||||
stroke="#2563eb"
|
||||
strokeWidth={1.5}
|
||||
dash={[6, 6]}
|
||||
opacity={0.9}
|
||||
/>
|
||||
)}
|
||||
</Layer>
|
||||
);
|
||||
};
|
||||
|
||||
export default GuidesLayer;
|
||||
@@ -255,11 +255,8 @@ const ObjectRenderer = ({
|
||||
}
|
||||
}}
|
||||
onDragMove={(e) => {
|
||||
const node = e.target;
|
||||
onUpdate(obj.id, {
|
||||
x: node.x(),
|
||||
y: node.y(),
|
||||
});
|
||||
// Snapping is handled at Stage level for smoother dragging.
|
||||
e.target.getLayer()?.batchDraw();
|
||||
}}
|
||||
onDragEnd={(e) => {
|
||||
const node = e.target;
|
||||
@@ -308,10 +305,6 @@ const ObjectRenderer = ({
|
||||
|
||||
const handleGroupDragMove = (e: Konva.KonvaEventObject<DragEvent>) => {
|
||||
const node = e.target;
|
||||
onUpdate(obj.id, {
|
||||
x: node.x(),
|
||||
y: node.y(),
|
||||
});
|
||||
// بهروزرسانی transformer در حین drag
|
||||
if (transformerRef.current && isSelected) {
|
||||
transformerRef.current.nodes([node]);
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
export type Guide = {
|
||||
id: string;
|
||||
orientation: "vertical" | "horizontal";
|
||||
position: number;
|
||||
};
|
||||
|
||||
const SNAP_THRESHOLD = 5;
|
||||
|
||||
export type SnappedPositionResult = {
|
||||
position: { x: number; y: number };
|
||||
activeGuideIds: string[];
|
||||
};
|
||||
|
||||
export const getSnappedPosition = (
|
||||
pos: { x: number; y: number },
|
||||
guides: Guide[],
|
||||
): SnappedPositionResult => {
|
||||
let x = pos.x;
|
||||
let y = pos.y;
|
||||
const activeGuideIds: string[] = [];
|
||||
|
||||
guides.forEach((guide) => {
|
||||
if (
|
||||
guide.orientation === "vertical" &&
|
||||
Math.abs(pos.x - guide.position) < SNAP_THRESHOLD
|
||||
) {
|
||||
x = guide.position;
|
||||
activeGuideIds.push(guide.id);
|
||||
}
|
||||
|
||||
if (
|
||||
guide.orientation === "horizontal" &&
|
||||
Math.abs(pos.y - guide.position) < SNAP_THRESHOLD
|
||||
) {
|
||||
y = guide.position;
|
||||
activeGuideIds.push(guide.id);
|
||||
}
|
||||
});
|
||||
|
||||
return {
|
||||
position: { x, y },
|
||||
activeGuideIds,
|
||||
};
|
||||
};
|
||||
@@ -48,11 +48,8 @@ const RectangleShape = ({ obj, isSelected, onSelect, onUpdate, draggable }: Shap
|
||||
}
|
||||
}}
|
||||
onDragMove={(e) => {
|
||||
const node = e.target;
|
||||
onUpdate(obj.id, {
|
||||
x: node.x(),
|
||||
y: node.y(),
|
||||
});
|
||||
// Snapping is applied at Stage level, avoid store updates per frame.
|
||||
e.target.getLayer()?.batchDraw();
|
||||
}}
|
||||
onDragEnd={(e) => {
|
||||
const node = e.target;
|
||||
|
||||
Reference in New Issue
Block a user