From 61b60b98199fb53b65173508f7038a953ef67dc2 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 11 Jan 2022 19:12:21 -0500 Subject: [PATCH] ISSUE-017 - Improvements to a number of things. * Moved FullScreenContainer in WorkspacesRoute to make scrolling much better. Seriously, 100% works better. * Simplified dimensions state actions to a shared one. * Abandoned the noisy and useless "AnimatedBG" type. * Added workspace dimensions state (I'll need this later to prevent off-screen dragging). * Placed OverlayDisplay component in PreviewWindow, where it makes more sense. I'll still allow it to roam around outside of it, though. * Renamed "menu" dimensions to "mainMenu". * Improved initNewOverlayItem action to support setting visible. * Correct handling of showing the OverlayItemContainer. * Simplified the initial position of a new OverlayItem to a simple initial value instead of setting it in the middle of provided dimensions. * Made PreviewWindow `position: relative` to allow absolute positioning of OverlayItem from it. * Added importHelpers to tsconfig because VSCode was complaining about it. --- src/App.tsx | 29 +++++++---- src/components/Broadcast/BroadcastRoute.tsx | 4 +- .../Common/Inputs/Toggle/Toggle.tsx | 4 +- .../OverlayControl/OverlayControl.tsx | 13 +++-- .../OverlayDisplay/OverlayDisplay.tsx | 10 +++- .../OverlayTool/OverlayDisplay/styles.ts | 5 ++ .../Workspaces/Workspace/Workspace.tsx | 2 + .../Workspace/WorkspaceControls.tsx | 3 +- src/components/Workspaces/Workspace/styles.ts | 1 + src/components/Workspaces/WorkspacesRoute.tsx | 50 +++++++++++++------ src/features/overlayTool/overlayToolSlice.ts | 14 +++--- .../pageDimensions/pageDimensionsSelector.ts | 6 ++- .../pageDimensions/pageDimensionsSlice.ts | 26 +++++----- src/features/workspace/workspaceSlice.ts | 4 +- src/types/state.d.ts | 17 ++----- tsconfig.json | 1 + 16 files changed, 113 insertions(+), 76 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 839640c..a6f7128 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,8 +2,7 @@ import { Outlet } from "react-router-dom"; import { useDimensions } from "./utils/hooks"; import { - setMenuDimensions, - setAppDimensions, + setDimensions, } from "./features/pageDimensions/pageDimensionsSlice"; import { MainMenu } from "./components/Menu"; @@ -12,18 +11,30 @@ import { useEffect } from "react"; function App() { const dispatch = useDispatch(); - const [appRef, { height: appHeight, width: appWidth }] = useDimensions(); - const [mainMenuRef, { height: mainMenuHeight }] = useDimensions(); + const [appRef, { + height: appHeight, + width: appWidth, + }] = useDimensions(); + const [mainMenuRef, { + height: mainMenuHeight, + width: mainMenuWidth, + }] = useDimensions(); - // Set App height and width. + // Set App dimensions. useEffect(() => { - dispatch(setAppDimensions({ height: appHeight, width: appWidth })); + dispatch(setDimensions({ + name: "app", + dimensions: { height: appHeight, width: appWidth }, + })); }, [appHeight, appWidth]); - // Set MainMenu height. + // Set MainMenu dimensions. useEffect(() => { - dispatch(setMenuDimensions({ height: mainMenuHeight })); - }, [mainMenuHeight]); + dispatch(setDimensions({ + name: "mainMenu", + dimensions: { height: mainMenuHeight, width: mainMenuWidth }, + })); + }, [mainMenuHeight, mainMenuWidth]); return (
diff --git a/src/components/Broadcast/BroadcastRoute.tsx b/src/components/Broadcast/BroadcastRoute.tsx index cf1e7ba..fbff5da 100644 --- a/src/components/Broadcast/BroadcastRoute.tsx +++ b/src/components/Broadcast/BroadcastRoute.tsx @@ -2,10 +2,10 @@ import { useSelector } from "react-redux"; import { FullScreenContainer } from "../Common/FullScreenContainer.styled"; import { Layout } from "./Layout"; -import { menuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector"; +import { mainMenuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector"; export default function Broadcast() { - const { height } = useSelector(menuDimensionsSelector); + const { height } = useSelector(mainMenuDimensionsSelector); return ( diff --git a/src/components/Common/Inputs/Toggle/Toggle.tsx b/src/components/Common/Inputs/Toggle/Toggle.tsx index 8273ede..43b7876 100644 --- a/src/components/Common/Inputs/Toggle/Toggle.tsx +++ b/src/components/Common/Inputs/Toggle/Toggle.tsx @@ -1,5 +1,5 @@ import { useState } from "react"; -import { AnimatedBG } from "../../../../types/state"; + import { ToggleContainer, ToggleBody, @@ -12,7 +12,7 @@ import { export type ToggleProps = { label: string, toggled: boolean, - onToggle: (value: AnimatedBG) => void, + onToggle: (value: boolean) => void, // eslint-disable-line no-unused-vars showIndicators?: boolean, }; /** diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index 5d6d684..b6c76f1 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -2,7 +2,6 @@ import { useState } from "react"; import { useSelector, useDispatch } from "react-redux"; import { PadBox } from "@bedrock-layout/padbox"; -import { appDimensionsSelector } from "../../../features/pageDimensions/pageDimensionsSelector"; import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector"; import { initNewOverlayItem, @@ -22,17 +21,15 @@ export function OverlayControl() { /* For prototyping use only */ - const { width: appWidth, height: appHeight } = useSelector(appDimensionsSelector); const [overlayId, setOverlayId] = useState("foo_1.00000"); - const { width, height } = useSelector(appDimensionsSelector); const getRandomArbitrary = (min: number, max: number) => Math.random() * (max - min) + min; const posRandomizer = () => { dispatch(setPosition({ - x: Math.floor(getRandomArbitrary(50, width - 50)), - y: Math.floor(getRandomArbitrary(50, height - 50)), + x: Math.floor(getRandomArbitrary(-50, 850)), + y: Math.floor(getRandomArbitrary(-50, 650)), })); }; const idRandomizer = () => { @@ -48,10 +45,12 @@ export function OverlayControl() { if (currentOverlayItem == null) { dispatch(initNewOverlayItem({ overlayId, - appDimensions: { height: appHeight, width: appWidth }, + initialPosition: { x: 400, y: 300 }, + setVisible: true, })); + } else { + dispatch(setVisibility(value)); } - dispatch(setVisibility(value)); }; return ( diff --git a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx index 2b0610d..be3d70d 100644 --- a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx +++ b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx @@ -4,11 +4,17 @@ import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSe import { OverlayItemContainer } from "./styles"; export function OverlayDisplay() { - const { currentOverlayItem } = useSelector(overlayToolSelector); + const { currentOverlayItem, visible } = useSelector(overlayToolSelector); + if (currentOverlayItem == null) return null; + const { id, position } = currentOverlayItem; + return ( - + {id}
({position.x}px {position.y}px) diff --git a/src/components/OverlayTool/OverlayDisplay/styles.ts b/src/components/OverlayTool/OverlayDisplay/styles.ts index e843298..6ff1885 100644 --- a/src/components/OverlayTool/OverlayDisplay/styles.ts +++ b/src/components/OverlayTool/OverlayDisplay/styles.ts @@ -3,16 +3,21 @@ import { OverlayPosition } from "../../../types/state"; export type OverlayItemContainerProps = { position: OverlayPosition, + visible: boolean, }; export const OverlayItemContainer = styled.div.attrs(({ position: { x, y }, + visible, }) => ({ style: { top: y, left: x, + display: visible ? undefined : "none", }, }))` position: absolute; + + /* Temporary. Overlay will be transparent and based on an image. */ width: 150px; height: 150px; background-color: white; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index 398c8d7..2f8a764 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -8,6 +8,7 @@ import { workspaceSelector } from "../../../features/workspace/workspaceSelector import { PreviewWindow, H2, ControlsContainer } from "./styles"; import { WorkspaceControls } from "./WorkspaceControls"; import { MockupBlock } from "../../Common/MockupBlock.styled"; +import { OverlayDisplay } from "../../OverlayTool"; import { workspaceObject } from "../workspaces"; @@ -28,6 +29,7 @@ export const Workspace = () => { height="300px" width="400px" >Preview Item + diff --git a/src/components/Workspaces/Workspace/WorkspaceControls.tsx b/src/components/Workspaces/Workspace/WorkspaceControls.tsx index 06ec061..900a21d 100644 --- a/src/components/Workspaces/Workspace/WorkspaceControls.tsx +++ b/src/components/Workspaces/Workspace/WorkspaceControls.tsx @@ -3,7 +3,6 @@ import { useDispatch, useSelector } from "react-redux"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; import { setAnimatedBG } from "../../../features/workspace/workspaceSlice"; -import { AnimatedBG } from "../../../types/state"; import { Toggle } from "../../Common/Inputs/Toggle"; import { OverlayControl } from "../../OverlayTool"; @@ -17,7 +16,7 @@ export const WorkspaceControls = () => { { + onToggle={(value: boolean) => { dispatch(setAnimatedBG(value)); }} /> diff --git a/src/components/Workspaces/Workspace/styles.ts b/src/components/Workspaces/Workspace/styles.ts index 17de027..a756a75 100644 --- a/src/components/Workspaces/Workspace/styles.ts +++ b/src/components/Workspaces/Workspace/styles.ts @@ -16,6 +16,7 @@ export type PreviewWindowProps = { export const PreviewWindow = styled(PadBox).attrs(() => ({ padding: "lg", }))` + position: relative; display: flex; justify-content: center; align-items: center; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index 2d0c105..a563750 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -1,27 +1,49 @@ -import { useSelector } from "react-redux"; +import { useEffect } from "react"; +import { useDispatch, useSelector } from "react-redux"; import { Outlet } from "react-router-dom"; -import { menuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector"; +import { mainMenuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector"; +import { useDimensions } from "../../utils/hooks"; +import { setDimensions } from "../../features/pageDimensions/pageDimensionsSlice"; import { FullScreenContainer } from "../Common/FullScreenContainer.styled"; import { WorkspaceList } from "./WorkspaceList"; import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled"; -import { OverlayDisplay } from "../OverlayTool"; + +const WORKSPACE_LIST_WIDTH = 180; export default function Workspaces() { - const { height } = useSelector(menuDimensionsSelector); + const { height } = useSelector(mainMenuDimensionsSelector); + const dispatch = useDispatch(); + const [workspaceRef, { + height: workspaceHeight, + width: workspaceWidth, + }] = useDimensions(); + + // Set Workspace dimensions. + useEffect(() => { + dispatch(setDimensions({ + name: "workspace", + dimensions: { height: workspaceHeight, width: workspaceWidth }, + })); + }, [workspaceHeight, workspaceWidth]); return ( - - - - - - + + + + + + - - - - +
+ + ); } diff --git a/src/features/overlayTool/overlayToolSlice.ts b/src/features/overlayTool/overlayToolSlice.ts index dba96ad..36bb4e6 100644 --- a/src/features/overlayTool/overlayToolSlice.ts +++ b/src/features/overlayTool/overlayToolSlice.ts @@ -4,7 +4,6 @@ import { RootState, OverlayPosition, OverlayId, - AppDimensions, } from "../../types/state"; const initialState: RootState["overlayTool"] = { @@ -16,13 +15,10 @@ const initialState: RootState["overlayTool"] = { const makeNewOverlayItem = ( overlayId: OverlayId, - appDimensions: AppDimensions, + initialPosition: OverlayPosition, ) => ({ id: overlayId, - position: { - x: appDimensions.width / 2, - y: appDimensions.height / 2, - }, + position: initialPosition, opacity: 1, scale: 1, }); @@ -30,7 +26,8 @@ const makeNewOverlayItem = ( type InitNewOverlayItemAction = { overlayId: OverlayId, - appDimensions: AppDimensions, + initialPosition: OverlayPosition, + setVisible: boolean, }; export const overlayToolSlice = createSlice({ @@ -41,9 +38,10 @@ export const overlayToolSlice = createSlice({ if (state.currentOverlayItem == null) { state.currentOverlayItem = makeNewOverlayItem( action.payload.overlayId, - action.payload.appDimensions, + action.payload.initialPosition, ); state.currentOverlayId = action.payload.overlayId; + state.visible = action.payload.setVisible; } }, setVisibility: (state, action: PayloadAction) => { diff --git a/src/features/pageDimensions/pageDimensionsSelector.ts b/src/features/pageDimensions/pageDimensionsSelector.ts index f9db815..37f9f33 100644 --- a/src/features/pageDimensions/pageDimensionsSelector.ts +++ b/src/features/pageDimensions/pageDimensionsSelector.ts @@ -1,6 +1,8 @@ import { RootState } from "../../types/state"; -export const menuDimensionsSelector = (state: RootState) => - state.pageDimensions.menu; +export const mainMenuDimensionsSelector = (state: RootState) => + state.pageDimensions.mainMenu; export const appDimensionsSelector = (state: RootState) => state.pageDimensions.app; +export const workspaceDimensionsSelector = (state: RootState) => + state.pageDimensions.workspace; diff --git a/src/features/pageDimensions/pageDimensionsSlice.ts b/src/features/pageDimensions/pageDimensionsSlice.ts index 9c2128a..30776e0 100644 --- a/src/features/pageDimensions/pageDimensionsSlice.ts +++ b/src/features/pageDimensions/pageDimensionsSlice.ts @@ -1,29 +1,27 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; -import { RootState, MenuDimensions, AppDimensions } from "../../types/state"; +import { RootState, Dimensions } from "../../types/state"; const initialState: RootState["pageDimensions"] = { - menu: { - height: 0, - }, - app: { - height: 0, - width: 0, - }, + mainMenu: { height: 0, width: 0 }, + app: { height: 0, width: 0 }, + workspace: { height: 0, width: 0 }, +}; + +type SetDimensionsAction = { + name: "mainMenu" | "app" | "workspace", + dimensions: Dimensions, }; export const pageDimensionsSlice = createSlice({ name: "pageDimensions", initialState, reducers: { - setMenuDimensions: (state, action: PayloadAction) => { - state.menu = action.payload; - }, - setAppDimensions: (state, action: PayloadAction) => { - state.app = action.payload; + setDimensions: (state, action: PayloadAction) => { + state[action.payload.name] = action.payload.dimensions; }, }, }); -export const { setMenuDimensions, setAppDimensions } = pageDimensionsSlice.actions; +export const { setDimensions } = pageDimensionsSlice.actions; export default pageDimensionsSlice.reducer; diff --git a/src/features/workspace/workspaceSlice.ts b/src/features/workspace/workspaceSlice.ts index eeb9e13..4abc2e0 100644 --- a/src/features/workspace/workspaceSlice.ts +++ b/src/features/workspace/workspaceSlice.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; -import { RootState, WorkspaceId, AnimatedBG } from "../../types/state"; +import { RootState, WorkspaceId } from "../../types/state"; const initialState: RootState["workspace"] = { workspaceId: "", @@ -13,7 +13,7 @@ export const workspaceSlice = createSlice({ setWorkspaceId: (state, action: PayloadAction) => { state.workspaceId = action.payload; }, - setAnimatedBG: (state, action: PayloadAction) => { + setAnimatedBG: (state, action: PayloadAction) => { state.animatedBG = action.payload; }, }, diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 2591d87..f0bffdb 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -6,26 +6,19 @@ export type RootState = { // Page Dimensions export type PageDimensions = { - menu: MenuDimensions, - app: AppDimensions, -}; - -export type MenuDimensions = { - height: number, -}; -export type AppDimensions = { - height: number, - width: number, + mainMenu: Dimensions, + app: Dimensions, + workspace: Dimensions, }; +export type Dimensions = { width: number, height: number }; // Workspace export type Workspace = { workspaceId: WorkspaceId, - animatedBG: AnimatedBG, + animatedBG: boolean, }; export type WorkspaceId = string; -export type AnimatedBG = boolean; // Overlay Tool export type OverlayTool = { diff --git a/tsconfig.json b/tsconfig.json index f356c58..06df788 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "importHelpers": true, "target": "es5", "lib": [ "dom",