diff --git a/.vscode/settings.json b/.vscode/settings.json index 52c3366..e2568a2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "jest.jestCommandLine": "node_modules/.bin/react-scripts test --run-in-band --no-cache --watchAll=false" + "jest.jestCommandLine": "node_modules/.bin/react-scripts test --run-in-band --no-cache --watchAll=false", + "typescript.tsdk": "node_modules/typescript/lib" } \ No newline at end of file diff --git a/package.json b/package.json index df8943c..42e370b 100644 --- a/package.json +++ b/package.json @@ -15,19 +15,25 @@ "@bedrock-layout/split": "^2.3.5", "@bedrock-layout/stack": "^2.3.4", "@bedrock-layout/use-forwarded-ref": "^1.1.11", + "@react-hook/resize-observer": "^1.2.5", + "@react-spring/web": "^9.4.1", "@reduxjs/toolkit": "^1.7.1", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^12.0.0", "@testing-library/user-event": "^13.2.1", "@types/d3": "^7.1.0", "@types/jest": "^27.0.1", + "@types/lodash": "^4.14.178", "@types/node": "^16.7.13", "@types/react": "^17.0.20", "@types/react-dom": "^17.0.9", "@types/react-redux": "^7.1.21", "@types/styled-components": "^5.1.18", + "@types/webpack-env": "^1.16.3", + "@use-gesture/react": "^10.2.4", "d3": "^7.2.1", "history": "5", + "lodash": "^4.17.21", "react": "^17.0.2", "react-dom": "^17.0.2", "react-redux": "^7.2.6", diff --git a/src/App.tsx b/src/App.tsx index 3b1e5de..a6f7128 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,9 @@ import { Outlet } from "react-router-dom"; import { useDimensions } from "./utils/hooks"; -import { setMenuDimensions } from "./features/pageDimensions/pageDimensionsSlice"; +import { + setDimensions, +} from "./features/pageDimensions/pageDimensionsSlice"; import { MainMenu } from "./components/Menu"; import { useDispatch } from "react-redux"; @@ -9,16 +11,34 @@ import { useEffect } from "react"; function App() { const dispatch = useDispatch(); - const [ref, { height }] = useDimensions(); + const [appRef, { + height: appHeight, + width: appWidth, + }] = useDimensions(); + const [mainMenuRef, { + height: mainMenuHeight, + width: mainMenuWidth, + }] = useDimensions(); + // Set App dimensions. useEffect(() => { - // Make sure to not dispatch during a render. - dispatch(setMenuDimensions({ height })); - }, [height]); + dispatch(setDimensions({ + name: "app", + dimensions: { height: appHeight, width: appWidth }, + })); + }, [appHeight, appWidth]); + + // Set MainMenu dimensions. + useEffect(() => { + 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 1040288..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 { menuSelector } from "../../features/pageDimensions/pageDimensionsSelector"; +import { mainMenuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector"; export default function Broadcast() { - const { height } = useSelector(menuSelector); + 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 new file mode 100644 index 0000000..72df498 --- /dev/null +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -0,0 +1,65 @@ +import { useState } from "react"; +import { useSelector, useDispatch } from "react-redux"; +import { PadBox } from "@bedrock-layout/padbox"; + +import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector"; +import { + initNewOverlayItem, + setCurrentOverlayId, + setVisibility, +} from "../../../features/overlayTool/overlayToolSlice"; + +import { Toggle } from "../../Common/Inputs/Toggle"; + + +export function OverlayControl() { + const dispatch = useDispatch(); + const { overlayIds, visible, currentOverlayItem } = useSelector(overlayToolSelector); + + + + + /* For prototyping use only */ + const [idNum, setIdNum] = useState(0); + + const nextIdNum = () => { + const nextIdNum = (idNum + 1) % overlayIds.length; + setIdNum(nextIdNum); + dispatch(setCurrentOverlayId(overlayIds[nextIdNum])); + }; + /* For prototyping use only */ + + + + const onToggle = (value: boolean) => { + if (currentOverlayItem == null) { + dispatch(initNewOverlayItem({ + overlayId: overlayIds[idNum], + initialPosition: { x: 0, y: 0 }, + setVisible: true, + })); + } else { + dispatch(setVisibility(value)); + } + }; + + return ( + + + + {/* For prototyping use only */} +
+ + Id #{idNum}: "{overlayIds[idNum]}" + + {/* For prototyping use only */} + +
+ ); +} diff --git a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx new file mode 100644 index 0000000..5c2cb46 --- /dev/null +++ b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx @@ -0,0 +1,93 @@ +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 { OverlayImage, OverlayImageContainer, OverlayImageSubContainer } from "./styles"; + +const overlayImages = require.context("../../../public/images/overlays", true); + +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); + + // Monitor element dimensions to calculate min/max drag coordinates. + const [overlayItemImageRef, { + width: overlayItemWidth, + height: overlayItemHeight, + }] = useDimensions(); + console.log(overlayItemWidth, overlayItemHeight); + 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: newX >= minX && newX <= maxX ? newX : args[0].xPos, + y: newY >= minY && newY <= maxY ? newY : args[0].yPos, + })); + }); + + const xPos = currentOverlayItem?.position.x ?? 0; + const yPos = currentOverlayItem?.position.y ?? 0; + const transition = useTransition(visible, { + from: { top: 50, opacity: 0 }, + enter: { + top: 0, + opacity: currentOverlayItem?.opacity ?? 1, + }, + leave: { top: 50, opacity: 0 }, + }); + + // Cannot make an earlier return because all hooks must run or React gets mad. + if (currentOverlayId == null || currentOverlayItem == null) { + return null; + } + + + return transition((style, visible) => + visible ? ( + + + + + + + + + + ) : null, + ); +} diff --git a/src/components/OverlayTool/OverlayDisplay/styles.ts b/src/components/OverlayTool/OverlayDisplay/styles.ts new file mode 100644 index 0000000..999f0ff --- /dev/null +++ b/src/components/OverlayTool/OverlayDisplay/styles.ts @@ -0,0 +1,28 @@ +import styled from "styled-components"; + +/** + * scale is a percentage (0-100%) + * */ +type OverlayImageProps = { + src: string, + scale?: number, +}; +export const OverlayImage = styled.img.attrs(({ + src, +}) => ({ + draggable: false, + src, +}))` + width: ${({ scale = 100 }) => `${scale}%`}; +`; +OverlayImage.displayName = "OverlayImage"; + +export const OverlayImageContainer = styled.div` + display: flex; +`; +OverlayImageContainer.displayName = "OverlayImageContainer"; + +export const OverlayImageSubContainer = styled.div` + flex-shrink: 0; +`; +OverlayImageSubContainer.displayName = "OverlayImageSubContainer"; diff --git a/src/components/OverlayTool/index.ts b/src/components/OverlayTool/index.ts new file mode 100644 index 0000000..7f14705 --- /dev/null +++ b/src/components/OverlayTool/index.ts @@ -0,0 +1,2 @@ +export { OverlayDisplay } from "./OverlayDisplay/OverlayDisplay"; +export { OverlayControl } from "./OverlayControl/OverlayControl"; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index 398c8d7..7a79ae0 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -1,19 +1,45 @@ +import { useEffect } from "react"; import { useParams } from "react-router-dom"; -import { useSelector } from "react-redux"; +import { useDispatch, useSelector } from "react-redux"; import { Center } from "@bedrock-layout/center"; import { Stack } from "@bedrock-layout/stack"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; +import { setWorkspaceId } from "../../../features/workspace/workspaceSlice"; +import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector"; +import { newWorkspace } from "../../../features/overlayTool/overlayToolSlice"; import { PreviewWindow, H2, ControlsContainer } from "./styles"; import { WorkspaceControls } from "./WorkspaceControls"; import { MockupBlock } from "../../Common/MockupBlock.styled"; +import { OverlayDisplay } from "../../OverlayTool"; import { workspaceObject } from "../workspaces"; export const Workspace = () => { + const dispatch = useDispatch(); const { workspaceId } = useParams(); const { animatedBG } = useSelector(workspaceSelector); + const { currentWorkspaceId: overlayWorkspaceId } = useSelector(overlayToolSelector); + + useEffect(() => { + if (workspaceId == null) return; + + // Update workspace store for ID. + dispatch(setWorkspaceId(workspaceId)); + + // Switching Workspace means we need to init a newWorkspace for Overlay tool. + if (overlayWorkspaceId !== workspaceId) { + dispatch(newWorkspace({ + overlayIds: workspaceObject[workspaceId].overlayIds, + workspaceId: workspaceId, + })); + } + }, [workspaceId]); + + if (workspaceId == null) return null; + const workspace = workspaceObject[workspaceId]; + return ( { maxWidth="80%" centerChildren > -

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

- +

{workspaceId ? workspace.name : "Unknown"}

+ Preview Item + diff --git a/src/components/Workspaces/Workspace/WorkspaceControls.tsx b/src/components/Workspaces/Workspace/WorkspaceControls.tsx index a88c1f9..c0b53f3 100644 --- a/src/components/Workspaces/Workspace/WorkspaceControls.tsx +++ b/src/components/Workspaces/Workspace/WorkspaceControls.tsx @@ -3,22 +3,23 @@ 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"; export const WorkspaceControls = () => { const dispatch = useDispatch(); const { animatedBG } = useSelector(workspaceSelector); return( - + { + onToggle={(value: boolean) => { dispatch(setAnimatedBG(value)); }} /> + ); }; diff --git a/src/components/Workspaces/Workspace/styles.ts b/src/components/Workspaces/Workspace/styles.ts index 17de027..8d689ed 100644 --- a/src/components/Workspaces/Workspace/styles.ts +++ b/src/components/Workspaces/Workspace/styles.ts @@ -2,6 +2,7 @@ import styled, { css, keyframes } from "styled-components"; import { PadBox } from "@bedrock-layout/padbox"; import bg from "../../../public/images/misc/checker-40x40.png"; +import { Dimensions } from "../../../types/state"; const scrollAnimation = keyframes` from { background-position: 0 0; } @@ -9,19 +10,19 @@ const scrollAnimation = keyframes` `; export type PreviewWindowProps = { - height: number, - width: number, + dimensions: Dimensions, animatedBG?: boolean, }; export const PreviewWindow = styled(PadBox).attrs(() => ({ padding: "lg", }))` + position: relative; display: flex; justify-content: center; align-items: center; - height: ${({ height }) => height}px; - width: ${({ width }) => width}px; + height: ${({ dimensions }) => dimensions.height}px; + width: ${({ dimensions }) => dimensions.width}px; border-radius: 1em; @@ -48,5 +49,7 @@ export const ControlsContainer = styled(PadBox).attrs(() => ({ }))` background-color: ${p => p.theme.colors.faintGrey}; border-radius: 1em; + width: 800px; + margin-bottom: 1em; `; ControlsContainer.displayName = "ControlsContainer"; diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx index 1c805d2..bc5c27d 100644 --- a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -1,21 +1,31 @@ +import _ from "lodash"; +import { NavLink } from "react-router-dom"; + import { WorkspaceListBox } from "./styles"; import { Stack } from "@bedrock-layout/stack"; -import { NavLink } from "react-router-dom"; import { MenuItem } from "../../Common/MenuItem.styled"; -import { workspaceList } from "../workspaces"; + +import { workspaceObject } from "../workspaces"; type WorkspaceListProps = { headerOffset?: number, }; -export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => ( - - - {workspaceList.map((workspace, i) => ( - - ))} - - -); +export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => { + const workspaceList = _.keys(workspaceObject); + return ( + + + {workspaceList.map((id) => ( + + ))} + + + ); +}; type WorkspaceListNavLinkProps = { to: string, diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index 0a5de85..c1da8ee 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -1,25 +1,49 @@ -import { useSelector } from "react-redux"; +import { useEffect } from "react"; +import { useDispatch, useSelector } from "react-redux"; import { Outlet } from "react-router-dom"; -import { menuSelector } 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"; +const WORKSPACE_LIST_WIDTH = 180; + export default function Workspaces() { - const { height } = useSelector(menuSelector); + const { height: mainMenuHeight } = 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/components/Workspaces/workspaces.ts b/src/components/Workspaces/workspaces.ts index d10fb05..db93ab1 100644 --- a/src/components/Workspaces/workspaces.ts +++ b/src/components/Workspaces/workspaces.ts @@ -1,56 +1,24 @@ -export const workspaceList = [ - { - name: "Workspace 1", - id: "workspace1", +import { Dimensions, OverlayIds } from "../../types/state"; + +export type WorkspaceObject = { + [id: string]: { + name: string, + overlayIds: OverlayIds, + previewWindowDimensions: Dimensions, }, - { - name: "Workspace 2", - id: "workspace2", +}; +export const workspaceObject: WorkspaceObject = { + chyronSimple: { + name: "Chyron Simple", + overlayIds: [ + "chyron-simple-full.png", + "chyron-simple-opening-1.png", + "chyron-simple-opening-2.png", + ], + previewWindowDimensions: { + width: 650, + height: 200, + }, }, - { - name: "Workspace 3", - id: "workspace3", - }, - { - name: "Workspace 4 has a longer name than the rest", - id: "workspace4", - }, - { name: "blah", id: "blah0" }, - { name: "blah", id: "blah1" }, - { name: "blah", id: "blah2" }, - { name: "blah", id: "blah3" }, - { name: "blah", id: "blah4" }, - { name: "blah", id: "blah5" }, - { name: "blah", id: "blah6" }, - { name: "blah", id: "blah7" }, - { name: "blah", id: "blah8" }, - { name: "blah", id: "blah9" }, - { name: "blah", id: "blah10" }, - { name: "blah", id: "blah11" }, - { name: "blah", id: "blah12" }, - { name: "blah", id: "blah13" }, - { name: "blah", id: "blah14" }, - { name: "blah", id: "blah15" }, - { name: "blah", id: "blah16" }, - { name: "blah", id: "blah17" }, - { name: "blah", id: "blah18" }, - { name: "blah", id: "blah19" }, - { name: "blah", id: "blah20" }, - { name: "blah", id: "blah21" }, - { name: "blah", id: "blah22" }, - { name: "blah", id: "blah23" }, - { name: "blah", id: "blah24" }, - { name: "blah", id: "blah25" }, - { name: "blah", id: "blah26" }, - { name: "blah", id: "blah27" }, - { name: "blah", id: "blah28" }, - { name: "blah", id: "blah29" }, -]; +}; -export const workspaceObject = ((list: typeof workspaceList) => { - const obj: {[key: string]: string} = {}; - list.forEach(item => { - obj[item.id] = item.name; - }); - return obj; -})(workspaceList); diff --git a/src/features/overlayTool/overlayToolSelector.ts b/src/features/overlayTool/overlayToolSelector.ts new file mode 100644 index 0000000..8c3523d --- /dev/null +++ b/src/features/overlayTool/overlayToolSelector.ts @@ -0,0 +1,3 @@ +import { RootState } from "../../types/state"; + +export const overlayToolSelector = (state: RootState) => state.overlayTool; diff --git a/src/features/overlayTool/overlayToolSlice.ts b/src/features/overlayTool/overlayToolSlice.ts new file mode 100644 index 0000000..966dafc --- /dev/null +++ b/src/features/overlayTool/overlayToolSlice.ts @@ -0,0 +1,78 @@ +import { createSlice, PayloadAction } from "@reduxjs/toolkit"; + +import { + RootState, + WorkspaceId, + OverlayPosition, + OverlayId, + OverlayIds, +} from "../../types/state"; + +const initialState: RootState["overlayTool"] = { + currentWorkspaceId: "", + overlayIds: [], + currentOverlayId: null, + currentOverlayItem: null, + visible: false, +}; + + +type InitNewOverlayItemAction = { + overlayId: OverlayId, + initialPosition: OverlayPosition, + setVisible: boolean, +}; + +type NewWorkspaceAction = { + overlayIds: OverlayIds, + workspaceId: WorkspaceId, +} + +export const overlayToolSlice = createSlice({ + name: "overlayTool", + initialState, + reducers: { + initNewOverlayItem: (state, action: PayloadAction) => { + if (state.currentOverlayItem == null) { + state.currentOverlayItem = { + position: action.payload.initialPosition, + opacity: 1, + }; + state.currentOverlayId = action.payload.overlayId; + state.visible = action.payload.setVisible; + } + }, + setVisibility: (state, action: PayloadAction) => { + state.visible = action.payload; + }, + setCurrentOverlayId: (state, action: PayloadAction) => { + if ( + action.payload !== state.currentOverlayId && + state.currentOverlayItem != null + ) { + state.currentOverlayId = action.payload; + } + }, + setPosition: (state, action: PayloadAction) => { + if (state.currentOverlayItem != null) { + state.currentOverlayItem.position = action.payload; + } + }, + newWorkspace: (state, action: PayloadAction) => { + state.currentOverlayId = null; + state.currentOverlayItem = null; + state.visible = false; + state.currentWorkspaceId = action.payload.workspaceId; + state.overlayIds = action.payload.overlayIds; + }, + }, +}); + +export const { + initNewOverlayItem, + setVisibility, + setCurrentOverlayId, + setPosition, + newWorkspace, +} = overlayToolSlice.actions; +export default overlayToolSlice.reducer; diff --git a/src/features/pageDimensions/pageDimensionsSelector.ts b/src/features/pageDimensions/pageDimensionsSelector.ts index 413d347..37f9f33 100644 --- a/src/features/pageDimensions/pageDimensionsSelector.ts +++ b/src/features/pageDimensions/pageDimensionsSelector.ts @@ -1,3 +1,8 @@ import { RootState } from "../../types/state"; -export const menuSelector = (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 fd1c5f2..30776e0 100644 --- a/src/features/pageDimensions/pageDimensionsSlice.ts +++ b/src/features/pageDimensions/pageDimensionsSlice.ts @@ -1,22 +1,27 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; -import { RootState, MenuDimensions } from "../../types/state"; +import { RootState, Dimensions } from "../../types/state"; const initialState: RootState["pageDimensions"] = { - menu: { - height: 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; + setDimensions: (state, action: PayloadAction) => { + state[action.payload.name] = action.payload.dimensions; }, }, }); -export const { setMenuDimensions } = 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/public/images/overlays/chyron-simple-full.png b/src/public/images/overlays/chyron-simple-full.png new file mode 100644 index 0000000..2e28040 Binary files /dev/null and b/src/public/images/overlays/chyron-simple-full.png differ diff --git a/src/public/images/overlays/chyron-simple-opening-1.png b/src/public/images/overlays/chyron-simple-opening-1.png new file mode 100644 index 0000000..6a526bd Binary files /dev/null and b/src/public/images/overlays/chyron-simple-opening-1.png differ diff --git a/src/public/images/overlays/chyron-simple-opening-2.png b/src/public/images/overlays/chyron-simple-opening-2.png new file mode 100644 index 0000000..10792ba Binary files /dev/null and b/src/public/images/overlays/chyron-simple-opening-2.png differ diff --git a/src/store.ts b/src/store.ts index ff421a5..5cc2731 100644 --- a/src/store.ts +++ b/src/store.ts @@ -2,10 +2,12 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit"; import pageDimensions from "./features/pageDimensions/pageDimensionsSlice"; import workspace from "./features/workspace/workspaceSlice"; +import overlayTool from "./features/overlayTool/overlayToolSlice"; export const store = configureStore({ reducer: combineReducers({ pageDimensions, workspace, + overlayTool, }), }); diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 07edffe..0d7d47f 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -1,22 +1,37 @@ export type RootState = { pageDimensions: PageDimensions, workspace: Workspace, + overlayTool: OverlayTool, }; // Page Dimensions export type PageDimensions = { - menu: MenuDimensions, -}; - -export type MenuDimensions = { - height: 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 = { + currentWorkspaceId: WorkspaceId, + overlayIds: OverlayIds, + currentOverlayId: OverlayId | null, + currentOverlayItem: OverlayItem | null, + visible: boolean, +}; +export type OverlayId = string; +export type OverlayIds = Array; +export type OverlayPosition = { x: number, y: number }; +export type OverlayItem = { + position: OverlayPosition, + opacity: number, +}; diff --git a/src/utils/hooks.ts b/src/utils/hooks.ts index 2c5652a..d4ab622 100644 --- a/src/utils/hooks.ts +++ b/src/utils/hooks.ts @@ -1,4 +1,5 @@ -import React, { useEffect, useRef, useState } from "react"; +import useResizeObserver from "@react-hook/resize-observer"; +import React, { useEffect, useLayoutEffect, useRef, useState } from "react"; import ResizeObserver from "resize-observer-polyfill"; export const useDimensions = () => { @@ -32,3 +33,46 @@ export const useDimensions = () => { { height: number, width: number }, ]; }; + +/** + * Proven to be less reliable than using resizeObserver directly. + * @returns + */ +export const useDimensionsAlt1 = () => { + const ref = useRef(null); + const [size, setSize] = useState(); + + useLayoutEffect(() => { + const element = ref.current; + if (element == null) return; + setSize(element.getBoundingClientRect()); + }, [ref]); + + useResizeObserver(ref, (entry) => setSize(entry.contentRect)); + + // Returning correctly with generics apparently requires type def here. + return [ + ref, + size ?? { width: 0, height: 0 }, + ] as [ + React.RefObject, + DOMRect, + ]; +}; + +/** + * Based off the code demo for useResizeObserver. + * https://github.com/jaredLunde/react-hook/tree/master/packages/resize-observer + * @param target React Ref + * @returns + */ +export const useDimensionsAlt2 = (target: React.RefObject) => { + const [size, setSize] = useState(); + + useLayoutEffect(() => { + setSize(target.current?.getBoundingClientRect()); + }, [target]); + + useResizeObserver(target, entry => setSize(entry.contentRect)); + return size ?? { width: 0, height: 0, x: 0, y: 0 }; +}; diff --git a/tsconfig.json b/tsconfig.json index f356c58..7735bf2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "importHelpers": true, "target": "es5", "lib": [ "dom", @@ -21,6 +22,9 @@ "jsx": "react-jsx", "noUnusedLocals": false, "noUnusedParameters": false, + "types": [ + "webpack-env" + ] }, "include": [ "src", diff --git a/yarn.lock b/yarn.lock index a72fe20..6f7f759 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1430,6 +1430,11 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" +"@juggle/resize-observer@^3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.3.1.tgz#b50a781709c81e10701004214340f25475a171a0" + integrity sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" @@ -1466,6 +1471,73 @@ schema-utils "^3.0.0" source-map "^0.7.3" +"@react-hook/latest@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@react-hook/latest/-/latest-1.0.3.tgz#c2d1d0b0af8b69ec6e2b3a2412ba0768ac82db80" + integrity sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg== + +"@react-hook/passive-layout-effect@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@react-hook/passive-layout-effect/-/passive-layout-effect-1.2.1.tgz#c06dac2d011f36d61259aa1c6df4f0d5e28bc55e" + integrity sha512-IwEphTD75liO8g+6taS+4oqz+nnroocNfWVHWz7j+N+ZO2vYrc6PV1q7GQhuahL0IOR7JccFTsFKQ/mb6iZWAg== + +"@react-hook/resize-observer@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@react-hook/resize-observer/-/resize-observer-1.2.5.tgz#b59e2300de98bc6ddc6946942f21243cde10f984" + integrity sha512-qa0pPvRxq5VbdI8mMK2apPFsZOckhQ6D3Jc9yLuyHMNhui8yEih4qyFCZBDzzK3ymZS6LAltVSVg3l1Dg9vA0w== + dependencies: + "@juggle/resize-observer" "^3.3.1" + "@react-hook/latest" "^1.0.2" + "@react-hook/passive-layout-effect" "^1.2.0" + "@types/raf-schd" "^4.0.0" + raf-schd "^4.0.2" + +"@react-spring/animated@~9.4.0": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.4.1.tgz#6b5e57725408ba8347f098a5111a9fb4de74a81b" + integrity sha512-uAJkcrSlpg8uSe8zy7eJcDdNpI5QvRXrZUKhn5dlGAPk3psgY5qj6pahzB0k5NZZQ27ls8Z5Nt4VKhGaXPJNDQ== + dependencies: + "@react-spring/shared" "~9.4.0" + "@react-spring/types" "~9.4.0" + +"@react-spring/core@~9.4.0": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.4.1.tgz#0658611dd961d745ac9cfc9dde5e86f2895e182a" + integrity sha512-sXQmGg4wNeyoVZ/LdEF01xtzQKZtLIyFDX03hoa0oa9VTgLNTVSbVXD9q2xsH8HtWpY4OFPTi/9Noi93gjnYyg== + dependencies: + "@react-spring/animated" "~9.4.0" + "@react-spring/rafz" "~9.4.0" + "@react-spring/shared" "~9.4.0" + "@react-spring/types" "~9.4.0" + +"@react-spring/rafz@~9.4.0": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.4.1.tgz#66ed8eadf5c1784d89b210f443fd2ec9fdb59fb6" + integrity sha512-R/mNOQ4axraWsL/jwzoaqfeX6RwUODg3WOGweL8zYbHHheRqQV+QwnhGmDATepBZ1H3UUulhXvOqkzWzjnpuQQ== + +"@react-spring/shared@~9.4.0": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.4.1.tgz#6c688cbe093ada7f6cd8ed2b9d28a807b6665ede" + integrity sha512-7atTQOhEQmw5UEYbb5yk7YEaf11AcRF7UISfAmr9FJ2FJD4VUVCn1R4V78omiFiRvnU6qI3GRhkRnIvYM8aAZw== + dependencies: + "@react-spring/rafz" "~9.4.0" + "@react-spring/types" "~9.4.0" + +"@react-spring/types@~9.4.0": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.4.1.tgz#93a203e5b922362e6643b95aff0989dd1a33b77b" + integrity sha512-eZmlFRc+XkY/HJi4RswLkIHH0nKQkqKRHPUqnseffcBuZ5FNXKDUmNnLUpqkrCpl746QCFVQtI5QptLklDATfQ== + +"@react-spring/web@^9.4.1": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.4.1.tgz#dd8560af6834a9c41cd7061bc98721e9f64a8557" + integrity sha512-ajlGJl0Zqa3idhZw0KL5chP8AIn4wPHpDY7WjtWaWjVZSZRSBAeHmfqNLtAGCjazeO/Q6zmt6wdGs8bX8q42rQ== + dependencies: + "@react-spring/animated" "~9.4.0" + "@react-spring/core" "~9.4.0" + "@react-spring/shared" "~9.4.0" + "@react-spring/types" "~9.4.0" + "@reduxjs/toolkit@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.7.1.tgz#994962aeb7df3c77be343dd2ad1aa48221dbaa0c" @@ -2057,6 +2129,11 @@ resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/lodash@^4.14.178": + version "4.14.178" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" + integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== + "@types/node@*": version "17.0.0" resolved "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz" @@ -2087,6 +2164,11 @@ resolved "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz" integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== +"@types/raf-schd@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/raf-schd/-/raf-schd-4.0.1.tgz#1f9e03736f277fe9c7b82102bf18570a6ee19f82" + integrity sha512-Ha+EnKHFIh9EKW0/XZJPUd3EGDFisEvauaBd4VVCRPKeOqUxNEc9TodiY2Zhk33XCgzJucoFEcaoNcBAPHTQ2A== + "@types/react-dom@^17.0.9": version "17.0.11" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz" @@ -2156,6 +2238,11 @@ resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz" integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== +"@types/webpack-env@^1.16.3": + version "1.16.3" + resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a" + integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw== + "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz" @@ -2238,6 +2325,18 @@ "@typescript-eslint/types" "5.7.0" eslint-visitor-keys "^3.0.0" +"@use-gesture/core@10.2.4": + version "10.2.4" + resolved "https://registry.yarnpkg.com/@use-gesture/core/-/core-10.2.4.tgz#139370223174b0589bd4b4f8ac7c0beb6ba64ba2" + integrity sha512-fk1LjCBj43BKb8NE05qkdtPOR0ngA7PwgvEqfFap/h+s7QHi+JTv4/mtDQ4wI9zzem+Ry5EKrHS/cVdBehI4wA== + +"@use-gesture/react@^10.2.4": + version "10.2.4" + resolved "https://registry.yarnpkg.com/@use-gesture/react/-/react-10.2.4.tgz#b333e91b00670785ee32e8f4f1530ac6b8894bbc" + integrity sha512-CbqyRj+qNbRBOGmS8OWtaOa29fxEr7bKTYHvPuMQ1wsgQDh2/DqQxbp7cFxAg6WZ8oZjppDj/EkWnw22WpIIWQ== + dependencies: + "@use-gesture/core" "10.2.4" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz" @@ -7532,6 +7631,11 @@ quick-lru@^5.1.1: resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +raf-schd@^4.0.2: + version "4.0.3" + resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a" + integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ== + raf@^3.4.1: version "3.4.1" resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz"