From aba5cc20be286dc8fa848dabb3e705a42cd041b8 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 13 Jan 2022 15:00:21 -0500 Subject: [PATCH] ISSUE-017 - Implemented drag bounds that consider the dimensions of dragged element. This is bugged as the resize observer I'm using doesn't update itself when I reveal the OverlayItem from hiding. --- .../OverlayControl/OverlayControl.tsx | 17 +-------- .../OverlayDisplay/OverlayDisplay.tsx | 37 ++++++++++++++++--- .../OverlayTool/OverlayDisplay/styles.ts | 1 + .../Workspaces/Workspace/Workspace.tsx | 19 ++++++++-- .../WorkspaceList/WorkspaceList.tsx | 2 +- 5 files changed, 51 insertions(+), 25 deletions(-) diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index 6cc4af5..35c17bc 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -23,15 +23,6 @@ export function OverlayControl() { /* For prototyping use only */ const [idNum, setIdNum] = useState(0); - const getRandomArbitrary = (min: number, max: number) => - Math.random() * (max - min) + min; - - const posRandomizer = () => { - dispatch(setPosition({ - x: Math.floor(getRandomArbitrary(-50, 850)), - y: Math.floor(getRandomArbitrary(-50, 650)), - })); - }; const nextIdNum = () => { const nextIdNum = (idNum + 1) % overlayIds.length; setIdNum(nextIdNum); @@ -45,7 +36,7 @@ export function OverlayControl() { if (currentOverlayItem == null) { dispatch(initNewOverlayItem({ overlayId: overlayIds[idNum], - initialPosition: { x: 0, y: 300 }, + initialPosition: { x: 400, y: 300 }, setVisible: true, })); } else { @@ -63,12 +54,6 @@ export function OverlayControl() { {/* For prototyping use only */}
- - Random Location - -
diff --git a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx index 16392a1..6f19e0f 100644 --- a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx +++ b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx @@ -2,24 +2,47 @@ import { useSelector, useDispatch } from "react-redux"; import { useTransition, animated } from "@react-spring/web"; import { useDrag } from "@use-gesture/react"; +import { useDimensions } from "../../../utils/hooks"; import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector"; import { setPosition } from "../../../features/overlayTool/overlayToolSlice"; import { OverlayItemContainer } from "./styles"; -export function OverlayDisplay() { +type OverlayDisplayProps = { + containerDimensions: { + width: number, + height: number, + }, + bleedover?: number, +}; +export function OverlayDisplay({ + containerDimensions: { width: containerWidth, height: containerHeight }, + bleedover = 0, +}: OverlayDisplayProps) { + const dispatch = useDispatch(); const { currentOverlayId, currentOverlayItem, visible, } = useSelector(overlayToolSelector); - const dispatch = useDispatch(); + // Monitor element dimensions to calculate min/max drag coordinates. + const [overlayItemRef, { + width: overlayItemWidth, + height: overlayItemHeight, + }] = useDimensions(); + const + minX = -bleedover, + minY = -bleedover, + maxX = containerWidth - overlayItemWidth + bleedover, + maxY = containerHeight - overlayItemHeight + bleedover; const bindOverlayItem = useDrag(({ args, delta }) => { + const newX = args[0].xPos + delta[0]; + const newY = args[0].yPos + delta[1]; dispatch(setPosition({ - x: args[0].xPos + delta[0], - y: args[0].yPos + delta[1], + x: newX >= minX && newX <= maxX ? newX : args[0].xPos, + y: newY >= minY && newY <= maxY ? newY : args[0].yPos, })); }); @@ -54,7 +77,11 @@ export function OverlayDisplay() { }} > - + {currentOverlayId}
(x:{Math.floor(position.x)}px, y:{Math.floor(position.y)}px) diff --git a/src/components/OverlayTool/OverlayDisplay/styles.ts b/src/components/OverlayTool/OverlayDisplay/styles.ts index 66deb2d..39eae1d 100644 --- a/src/components/OverlayTool/OverlayDisplay/styles.ts +++ b/src/components/OverlayTool/OverlayDisplay/styles.ts @@ -12,6 +12,7 @@ export const OverlayItemContainer = styled.div.attrs( }, }))` /* Temporary. Overlay will be transparent and based on an image. */ + /* width: ${({ tempColor }) => tempColor == "red" ? "150px" : "100px"}; */ width: 150px; height: 150px; background-color: ${({ tempColor }) => tempColor}; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index be39521..e42f9f6 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -16,11 +16,14 @@ import { OverlayDisplay } from "../../OverlayTool"; import { workspaceObject } from "../workspaces"; +const PREVIEW_WINDOW_HEIGHT = 600; +const PREVIEW_WINDOW_WIDTH = 800; + export const Workspace = () => { + const dispatch = useDispatch(); const { workspaceId } = useParams(); const { animatedBG } = useSelector(workspaceSelector); const { currentWorkspaceId: overlayWorkspaceId } = useSelector(overlayToolSelector); - const dispatch = useDispatch(); useEffect(() => { if (workspaceId == null) return; @@ -45,13 +48,23 @@ export const Workspace = () => { centerChildren >

{workspaceId ? workspaceObject[workspaceId].name : "Unknown"}

- + Preview Item - + diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx index 064b680..bc5c27d 100644 --- a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -15,7 +15,7 @@ export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => { return ( - {workspaceList.map((id, i) => ( + {workspaceList.map((id) => (