From 5eab4fd47c908cb58375094692942bcb55723cdd Mon Sep 17 00:00:00 2001 From: christian Date: Sat, 2 Nov 2024 18:25:14 +0100 Subject: [PATCH] moved state out of url --- app/routes/DragableBox.tsx | 52 +++++++++++++++++--------------------- app/routes/_index.tsx | 33 +++++++++++++----------- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/app/routes/DragableBox.tsx b/app/routes/DragableBox.tsx index fa53727..0e64a1a 100644 --- a/app/routes/DragableBox.tsx +++ b/app/routes/DragableBox.tsx @@ -1,37 +1,32 @@ -import { useSearchParams } from '@remix-run/react'; -import { useState, useEffect, MouseEvent, useRef } from 'react'; +import { useState, useEffect, MouseEvent, useRef, Dispatch, SetStateAction } from 'react'; + +type Coordinates = { + x: number; + y: number; +} interface DraggableBoxProps { - tag: string; initialX: number; initialY: number; className?: string; children?: React.ReactNode; + setter?: Dispatch>; } const DraggableBox = ({ - tag, initialX, initialY, className = "", - children = "" + children = "", + setter }: DraggableBoxProps) => { const [isDragging, setIsDragging] = useState(false); const [dragOffset, setDragOffset] = useState({ x: 0, y: 0 }); - const [searchParams, setSearchParams] = useSearchParams(); + const [xPosition, setXPosition] = useState(initialX) + const [yPosition, setYPosition] = useState(initialY) const dragRef = useRef(null); - const xParam = `x${tag}`; - const yParam = `y${tag}`; - useEffect(() => { - if (!searchParams.has(xParam) || !searchParams.has(yParam)) { - const newParams = new URLSearchParams(searchParams); - newParams.set(xParam, initialX.toString()); - newParams.set(yParam, initialY.toString()); - setSearchParams(newParams, { replace: true }); - } - if (!isDragging) return; const handleMouseMove = (e: globalThis.MouseEvent) => { @@ -47,13 +42,14 @@ const DraggableBox = ({ const maxX = parentRect.width - boxRect.width; const maxY = parentRect.height - boxRect.height; - const newX = Math.max(0, Math.min(relativeX, maxX)); - const newY = Math.max(0, Math.min(relativeY, maxY)); - - const newParams = new URLSearchParams(searchParams); - newParams.set(xParam, newX.toString()); - newParams.set(yParam, newY.toString()); - setSearchParams(newParams, { replace: true }); + setXPosition(Math.max(0, Math.min(relativeX, maxX))); + setYPosition(Math.max(0, Math.min(relativeY, maxY))); + if (setter) { + setter({ + x: relativeX, + y: relativeY + }) + } }; const handleMouseUp = () => setIsDragging(false); @@ -65,18 +61,16 @@ const DraggableBox = ({ window.removeEventListener('mousemove', handleMouseMove); window.removeEventListener('mouseup', handleMouseUp); }; - }, [isDragging, dragOffset, tag, searchParams, initialX, initialY]); + }, [isDragging, dragOffset, xPosition, yPosition, initialX, initialY]); const handleMouseDown = (e: MouseEvent) => { if (!dragRef.current?.parentElement) return; const parentRect = dragRef.current.parentElement.getBoundingClientRect(); - const currentX = parseInt(searchParams.get(xParam) || '0'); - const currentY = parseInt(searchParams.get(yParam) || '0'); setDragOffset({ - x: e.clientX - parentRect.left - currentX, - y: e.clientY - parentRect.top - currentY + x: e.clientX - parentRect.left - xPosition, + y: e.clientY - parentRect.top - yPosition }); setIsDragging(true); }; @@ -86,7 +80,7 @@ const DraggableBox = ({ ref={dragRef} className={`absolute cursor-move bg-red-500 rounded-full w-4 h-4 text-white shadow-lg ${className}`} style={{ - transform: `translate(${searchParams.get(xParam) || 0}px, ${searchParams.get(yParam) || 0}px)`, + transform: `translate(${xPosition}px, ${yPosition}px)`, userSelect: 'none', }} onMouseDown={handleMouseDown} diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx index 8304bd2..043d3ae 100644 --- a/app/routes/_index.tsx +++ b/app/routes/_index.tsx @@ -16,29 +16,32 @@ export default function Index() { const [selectorWidth, setSelectorWidth] = useState(0); const [selectorTop, setSelectorTop] = useState(0); const [selectorLeft, setSelectorLeft] = useState(0); + const [firstDragable, setFirstDragable] = useState({ + x: 0, + y: 0 + }) - // Parse the values and convert to numbers, using 0 as fallback - let x1 = Number(searchParams.get("x1") || 0); - let y1 = Number(searchParams.get("y1") || 0); - let x2 = Number(searchParams.get("x2") || 0); - let y2 = Number(searchParams.get("y2") || 0); + const [secondDragable, setSecondDragable] = useState({ + x: 0, + y: 0 + }) // Use useEffect to calculate dimensions and position useEffect(() => { // Calculate width - const width = Math.abs(x2 - x1); + const width = Math.abs(secondDragable.x - firstDragable.x); setSelectorWidth(width); - + // Calculate height - const height = Math.abs(y2 - y1); + const height = Math.abs(secondDragable.y - firstDragable.y); setSelectorHeight(height); - + // Calculate top position (minimum of y coordinates) - setSelectorTop(Math.min(y1, y2)); - + setSelectorTop(Math.min(firstDragable.y, secondDragable.y)); + // Calculate left position (minimum of x coordinates) - setSelectorLeft(Math.min(x1, x2)); - }, [x1, x2, y1, y2]); + setSelectorLeft(Math.min(firstDragable.x, secondDragable.x)); + }, [firstDragable, secondDragable]); return (
@@ -52,8 +55,8 @@ export default function Index() { width: `${selectorWidth}px`, }} /> - - + +
);