Merge pull request #23 from TiE23/ISSUE-017

Issue 017
This commit is contained in:
Kyle Geib authored and GitHub committed 2022-01-14 14:04:36 -05:00
commit fb48517bac
28 files changed
+631 -118

No files matched your search

+2 -1
View File
@@ -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"
} }
+6
View File
@@ -15,19 +15,25 @@
"@bedrock-layout/split": "^2.3.5", "@bedrock-layout/split": "^2.3.5",
"@bedrock-layout/stack": "^2.3.4", "@bedrock-layout/stack": "^2.3.4",
"@bedrock-layout/use-forwarded-ref": "^1.1.11", "@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", "@reduxjs/toolkit": "^1.7.1",
"@testing-library/jest-dom": "^5.14.1", "@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0", "@testing-library/react": "^12.0.0",
"@testing-library/user-event": "^13.2.1", "@testing-library/user-event": "^13.2.1",
"@types/d3": "^7.1.0", "@types/d3": "^7.1.0",
"@types/jest": "^27.0.1", "@types/jest": "^27.0.1",
"@types/lodash": "^4.14.178",
"@types/node": "^16.7.13", "@types/node": "^16.7.13",
"@types/react": "^17.0.20", "@types/react": "^17.0.20",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.9",
"@types/react-redux": "^7.1.21", "@types/react-redux": "^7.1.21",
"@types/styled-components": "^5.1.18", "@types/styled-components": "^5.1.18",
"@types/webpack-env": "^1.16.3",
"@use-gesture/react": "^10.2.4",
"d3": "^7.2.1", "d3": "^7.2.1",
"history": "5", "history": "5",
"lodash": "^4.17.21",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-redux": "^7.2.6", "react-redux": "^7.2.6",
+27 -7
View File
@@ -1,7 +1,9 @@
import { Outlet } from "react-router-dom"; import { Outlet } from "react-router-dom";
import { useDimensions } from "./utils/hooks"; import { useDimensions } from "./utils/hooks";
import { setMenuDimensions } from "./features/pageDimensions/pageDimensionsSlice"; import {
setDimensions,
} from "./features/pageDimensions/pageDimensionsSlice";
import { MainMenu } from "./components/Menu"; import { MainMenu } from "./components/Menu";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
@@ -9,16 +11,34 @@ import { useEffect } from "react";
function App() { function App() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const [ref, { height }] = useDimensions<HTMLDivElement>(); const [appRef, {
height: appHeight,
width: appWidth,
}] = useDimensions<HTMLDivElement>();
const [mainMenuRef, {
height: mainMenuHeight,
width: mainMenuWidth,
}] = useDimensions<HTMLDivElement>();
// Set App dimensions.
useEffect(() => { useEffect(() => {
// Make sure to not dispatch during a render. dispatch(setDimensions({
dispatch(setMenuDimensions({ height })); name: "app",
}, [height]); dimensions: { height: appHeight, width: appWidth },
}));
}, [appHeight, appWidth]);
// Set MainMenu dimensions.
useEffect(() => {
dispatch(setDimensions({
name: "mainMenu",
dimensions: { height: mainMenuHeight, width: mainMenuWidth },
}));
}, [mainMenuHeight, mainMenuWidth]);
return ( return (
<div className="App"> <div className="App" ref={appRef}>
<MainMenu ref={ref} /> <MainMenu ref={mainMenuRef} />
<Outlet /> <Outlet />
</div> </div>
); );
+2 -2
View File
@@ -2,10 +2,10 @@ import { useSelector } from "react-redux";
import { FullScreenContainer } from "../Common/FullScreenContainer.styled"; import { FullScreenContainer } from "../Common/FullScreenContainer.styled";
import { Layout } from "./Layout"; import { Layout } from "./Layout";
import { menuSelector } from "../../features/pageDimensions/pageDimensionsSelector"; import { mainMenuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector";
export default function Broadcast() { export default function Broadcast() {
const { height } = useSelector(menuSelector); const { height } = useSelector(mainMenuDimensionsSelector);
return ( return (
<FullScreenContainer minHeight={700} minWidth={900} heightCutoff={height}> <FullScreenContainer minHeight={700} minWidth={900} heightCutoff={height}>
@@ -1,5 +1,5 @@
import { useState } from "react"; import { useState } from "react";
import { AnimatedBG } from "../../../../types/state";
import { import {
ToggleContainer, ToggleContainer,
ToggleBody, ToggleBody,
@@ -12,7 +12,7 @@ import {
export type ToggleProps = { export type ToggleProps = {
label: string, label: string,
toggled: boolean, toggled: boolean,
onToggle: (value: AnimatedBG) => void, onToggle: (value: boolean) => void, // eslint-disable-line no-unused-vars
showIndicators?: boolean, showIndicators?: boolean,
}; };
/** /**
@@ -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 (
<PadBox padding="sm">
<Toggle
label="Show Overlay"
toggled={visible}
onToggle={onToggle}
/>
{/* For prototyping use only */}
<br />
<a
onClick={nextIdNum}
>
Id #{idNum}: &quot;{overlayIds[idNum]}&quot;
</a>
{/* For prototyping use only */}
</PadBox>
);
}
@@ -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<HTMLImageElement>();
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 ? (
<animated.div
{...bindOverlayItem({ xPos, yPos })}
style={{
left: xPos,
top: yPos,
position: "absolute",
touchAction: "none",
zIndex: 1,
}}
>
<animated.div style={{ ...style, position: "absolute" }}>
<OverlayImageContainer>
<OverlayImageSubContainer>
<OverlayImage
ref={overlayItemImageRef}
src={overlayImages(`./${currentOverlayId}`)}
/>
</OverlayImageSubContainer>
</OverlayImageContainer>
</animated.div>
</animated.div>
) : null,
);
}
@@ -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<OverlayImageProps>(({
src,
}) => ({
draggable: false,
src,
}))<OverlayImageProps>`
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";
+2
View File
@@ -0,0 +1,2 @@
export { OverlayDisplay } from "./OverlayDisplay/OverlayDisplay";
export { OverlayControl } from "./OverlayControl/OverlayControl";
@@ -1,19 +1,45 @@
import { useEffect } from "react";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { Center } from "@bedrock-layout/center"; import { Center } from "@bedrock-layout/center";
import { Stack } from "@bedrock-layout/stack"; import { Stack } from "@bedrock-layout/stack";
import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; 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 { PreviewWindow, H2, ControlsContainer } from "./styles";
import { WorkspaceControls } from "./WorkspaceControls"; import { WorkspaceControls } from "./WorkspaceControls";
import { MockupBlock } from "../../Common/MockupBlock.styled"; import { MockupBlock } from "../../Common/MockupBlock.styled";
import { OverlayDisplay } from "../../OverlayTool";
import { workspaceObject } from "../workspaces"; import { workspaceObject } from "../workspaces";
export const Workspace = () => { export const Workspace = () => {
const dispatch = useDispatch();
const { workspaceId } = useParams(); const { workspaceId } = useParams();
const { animatedBG } = useSelector(workspaceSelector); 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 ( return (
<Stack <Stack
gutter="lg" gutter="lg"
@@ -21,13 +47,19 @@ export const Workspace = () => {
maxWidth="80%" maxWidth="80%"
centerChildren centerChildren
> >
<H2>{workspaceId ? workspaceObject[workspaceId] : "Unknown"}</H2> <H2>{workspaceId ? workspace.name : "Unknown"}</H2>
<PreviewWindow height={600} width={800} animatedBG={animatedBG}> <PreviewWindow
dimensions={workspace.previewWindowDimensions}
animatedBG={animatedBG}
>
<MockupBlock <MockupBlock
color="#415bad" color="#415bad"
height="300px" height="100px"
width="400px" width="100px"
>Preview Item</MockupBlock> >Preview Item</MockupBlock>
<OverlayDisplay
containerDimensions={workspace.previewWindowDimensions}
/>
</PreviewWindow> </PreviewWindow>
<ControlsContainer> <ControlsContainer>
<WorkspaceControls /> <WorkspaceControls />
@@ -3,22 +3,23 @@ import { useDispatch, useSelector } from "react-redux";
import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector";
import { setAnimatedBG } from "../../../features/workspace/workspaceSlice"; import { setAnimatedBG } from "../../../features/workspace/workspaceSlice";
import { AnimatedBG } from "../../../types/state";
import { Toggle } from "../../Common/Inputs/Toggle"; import { Toggle } from "../../Common/Inputs/Toggle";
import { OverlayControl } from "../../OverlayTool";
export const WorkspaceControls = () => { export const WorkspaceControls = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { animatedBG } = useSelector(workspaceSelector); const { animatedBG } = useSelector(workspaceSelector);
return( return(
<Grid gutter="sm"> <Grid gutter="sm" minItemWidth="25rem">
<Toggle <Toggle
label="Animate BG" label="Animate BG"
toggled={animatedBG} toggled={animatedBG}
onToggle={(value: AnimatedBG) => { onToggle={(value: boolean) => {
dispatch(setAnimatedBG(value)); dispatch(setAnimatedBG(value));
}} /> }} />
<OverlayControl />
</Grid> </Grid>
); );
}; };
@@ -2,6 +2,7 @@ import styled, { css, keyframes } from "styled-components";
import { PadBox } from "@bedrock-layout/padbox"; import { PadBox } from "@bedrock-layout/padbox";
import bg from "../../../public/images/misc/checker-40x40.png"; import bg from "../../../public/images/misc/checker-40x40.png";
import { Dimensions } from "../../../types/state";
const scrollAnimation = keyframes` const scrollAnimation = keyframes`
from { background-position: 0 0; } from { background-position: 0 0; }
@@ -9,19 +10,19 @@ const scrollAnimation = keyframes`
`; `;
export type PreviewWindowProps = { export type PreviewWindowProps = {
height: number, dimensions: Dimensions,
width: number,
animatedBG?: boolean, animatedBG?: boolean,
}; };
export const PreviewWindow = styled(PadBox).attrs(() => ({ export const PreviewWindow = styled(PadBox).attrs(() => ({
padding: "lg", padding: "lg",
}))<PreviewWindowProps>` }))<PreviewWindowProps>`
position: relative;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: ${({ height }) => height}px; height: ${({ dimensions }) => dimensions.height}px;
width: ${({ width }) => width}px; width: ${({ dimensions }) => dimensions.width}px;
border-radius: 1em; border-radius: 1em;
@@ -48,5 +49,7 @@ export const ControlsContainer = styled(PadBox).attrs(() => ({
}))` }))`
background-color: ${p => p.theme.colors.faintGrey}; background-color: ${p => p.theme.colors.faintGrey};
border-radius: 1em; border-radius: 1em;
width: 800px;
margin-bottom: 1em;
`; `;
ControlsContainer.displayName = "ControlsContainer"; ControlsContainer.displayName = "ControlsContainer";
@@ -1,21 +1,31 @@
import _ from "lodash";
import { NavLink } from "react-router-dom";
import { WorkspaceListBox } from "./styles"; import { WorkspaceListBox } from "./styles";
import { Stack } from "@bedrock-layout/stack"; import { Stack } from "@bedrock-layout/stack";
import { NavLink } from "react-router-dom";
import { MenuItem } from "../../Common/MenuItem.styled"; import { MenuItem } from "../../Common/MenuItem.styled";
import { workspaceList } from "../workspaces";
import { workspaceObject } from "../workspaces";
type WorkspaceListProps = { type WorkspaceListProps = {
headerOffset?: number, headerOffset?: number,
}; };
export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => ( export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => {
<WorkspaceListBox headerOffset={headerOffset}> const workspaceList = _.keys(workspaceObject);
<Stack as="ul" gutter="md"> return (
{workspaceList.map((workspace, i) => ( <WorkspaceListBox headerOffset={headerOffset}>
<WorkspaceListNavLink key={i} to={workspace.id} label={workspace.name} /> <Stack as="ul" gutter="md">
))} {workspaceList.map((id) => (
</Stack> <WorkspaceListNavLink
</WorkspaceListBox> key={id}
); to={id}
label={workspaceObject[id].name}
/>
))}
</Stack>
</WorkspaceListBox>
);
};
type WorkspaceListNavLinkProps = { type WorkspaceListNavLinkProps = {
to: string, to: string,
+36 -12
View File
@@ -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 { 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 { FullScreenContainer } from "../Common/FullScreenContainer.styled";
import { WorkspaceList } from "./WorkspaceList"; import { WorkspaceList } from "./WorkspaceList";
import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled"; import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled";
const WORKSPACE_LIST_WIDTH = 180;
export default function Workspaces() { export default function Workspaces() {
const { height } = useSelector(menuSelector); const { height: mainMenuHeight } = useSelector(mainMenuDimensionsSelector);
const dispatch = useDispatch();
const [workspaceRef, {
height: workspaceHeight,
width: workspaceWidth,
}] = useDimensions<HTMLDivElement>();
// Set Workspace dimensions.
useEffect(() => {
dispatch(setDimensions({
name: "workspace",
dimensions: { height: workspaceHeight, width: workspaceWidth },
}));
}, [workspaceHeight, workspaceWidth]);
return ( return (
<FullScreenContainer minHeight={700} minWidth={900} heightCutoff={height}> <LayoutGrid columns={[`${WORKSPACE_LIST_WIDTH}px`, 1]} rows={1}>
<LayoutGrid columns={["180px", 1]} rows={1}> <LayoutGridItem column={1} row={1}>
<LayoutGridItem column={1} row={1}> <WorkspaceList headerOffset={mainMenuHeight} />
<WorkspaceList headerOffset={height} /> </LayoutGridItem>
</LayoutGridItem> <LayoutGridItem column={2} row={1}>
<LayoutGridItem column={2} row={1}> <FullScreenContainer
ref={workspaceRef}
minHeight={700}
minWidth={900}
heightCutoff={mainMenuHeight}
widthCutoff={WORKSPACE_LIST_WIDTH}
>
<Outlet /> <Outlet />
</LayoutGridItem> </FullScreenContainer>
</LayoutGrid> </LayoutGridItem>
</FullScreenContainer> </LayoutGrid>
); );
} }
+21 -53
View File
@@ -1,56 +1,24 @@
export const workspaceList = [ import { Dimensions, OverlayIds } from "../../types/state";
{
name: "Workspace 1", export type WorkspaceObject = {
id: "workspace1", [id: string]: {
name: string,
overlayIds: OverlayIds,
previewWindowDimensions: Dimensions,
}, },
{ };
name: "Workspace 2", export const workspaceObject: WorkspaceObject = {
id: "workspace2", 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);
@@ -0,0 +1,3 @@
import { RootState } from "../../types/state";
export const overlayToolSelector = (state: RootState) => state.overlayTool;
@@ -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<InitNewOverlayItemAction>) => {
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<boolean>) => {
state.visible = action.payload;
},
setCurrentOverlayId: (state, action: PayloadAction<OverlayId>) => {
if (
action.payload !== state.currentOverlayId &&
state.currentOverlayItem != null
) {
state.currentOverlayId = action.payload;
}
},
setPosition: (state, action: PayloadAction<OverlayPosition>) => {
if (state.currentOverlayItem != null) {
state.currentOverlayItem.position = action.payload;
}
},
newWorkspace: (state, action: PayloadAction<NewWorkspaceAction>) => {
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;
@@ -1,3 +1,8 @@
import { RootState } from "../../types/state"; 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;
@@ -1,22 +1,27 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { createSlice, PayloadAction } from "@reduxjs/toolkit";
import { RootState, MenuDimensions } from "../../types/state"; import { RootState, Dimensions } from "../../types/state";
const initialState: RootState["pageDimensions"] = { const initialState: RootState["pageDimensions"] = {
menu: { mainMenu: { height: 0, width: 0 },
height: 0, app: { height: 0, width: 0 },
}, workspace: { height: 0, width: 0 },
};
type SetDimensionsAction = {
name: "mainMenu" | "app" | "workspace",
dimensions: Dimensions,
}; };
export const pageDimensionsSlice = createSlice({ export const pageDimensionsSlice = createSlice({
name: "pageDimensions", name: "pageDimensions",
initialState, initialState,
reducers: { reducers: {
setMenuDimensions: (state, action: PayloadAction<MenuDimensions>) => { setDimensions: (state, action: PayloadAction<SetDimensionsAction>) => {
state.menu = action.payload; state[action.payload.name] = action.payload.dimensions;
}, },
}, },
}); });
export const { setMenuDimensions } = pageDimensionsSlice.actions; export const { setDimensions } = pageDimensionsSlice.actions;
export default pageDimensionsSlice.reducer; export default pageDimensionsSlice.reducer;
+2 -2
View File
@@ -1,5 +1,5 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { createSlice, PayloadAction } from "@reduxjs/toolkit";
import { RootState, WorkspaceId, AnimatedBG } from "../../types/state"; import { RootState, WorkspaceId } from "../../types/state";
const initialState: RootState["workspace"] = { const initialState: RootState["workspace"] = {
workspaceId: "", workspaceId: "",
@@ -13,7 +13,7 @@ export const workspaceSlice = createSlice({
setWorkspaceId: (state, action: PayloadAction<WorkspaceId>) => { setWorkspaceId: (state, action: PayloadAction<WorkspaceId>) => {
state.workspaceId = action.payload; state.workspaceId = action.payload;
}, },
setAnimatedBG: (state, action: PayloadAction<AnimatedBG>) => { setAnimatedBG: (state, action: PayloadAction<boolean>) => {
state.animatedBG = action.payload; state.animatedBG = action.payload;
}, },
}, },
Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

+2
View File
@@ -2,10 +2,12 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit";
import pageDimensions from "./features/pageDimensions/pageDimensionsSlice"; import pageDimensions from "./features/pageDimensions/pageDimensionsSlice";
import workspace from "./features/workspace/workspaceSlice"; import workspace from "./features/workspace/workspaceSlice";
import overlayTool from "./features/overlayTool/overlayToolSlice";
export const store = configureStore({ export const store = configureStore({
reducer: combineReducers({ reducer: combineReducers({
pageDimensions, pageDimensions,
workspace, workspace,
overlayTool,
}), }),
}); });
+22 -7
View File
@@ -1,22 +1,37 @@
export type RootState = { export type RootState = {
pageDimensions: PageDimensions, pageDimensions: PageDimensions,
workspace: Workspace, workspace: Workspace,
overlayTool: OverlayTool,
}; };
// Page Dimensions // Page Dimensions
export type PageDimensions = { export type PageDimensions = {
menu: MenuDimensions, mainMenu: Dimensions,
}; app: Dimensions,
workspace: Dimensions,
export type MenuDimensions = {
height: number,
}; };
export type Dimensions = { width: number, height: number };
// Workspace // Workspace
export type Workspace = { export type Workspace = {
workspaceId: WorkspaceId, workspaceId: WorkspaceId,
animatedBG: AnimatedBG, animatedBG: boolean,
}; };
export type WorkspaceId = string; 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<OverlayId>;
export type OverlayPosition = { x: number, y: number };
export type OverlayItem = {
position: OverlayPosition,
opacity: number,
};
+45 -1
View File
@@ -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"; import ResizeObserver from "resize-observer-polyfill";
export const useDimensions = <T extends HTMLElement>() => { export const useDimensions = <T extends HTMLElement>() => {
@@ -32,3 +33,46 @@ export const useDimensions = <T extends HTMLElement>() => {
{ height: number, width: number }, { height: number, width: number },
]; ];
}; };
/**
* Proven to be less reliable than using resizeObserver directly.
* @returns
*/
export const useDimensionsAlt1 = <T extends HTMLElement>() => {
const ref = useRef<T>(null);
const [size, setSize] = useState<DOMRect>();
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<T>,
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 = <T extends HTMLElement>(target: React.RefObject<T>) => {
const [size, setSize] = useState<DOMRect>();
useLayoutEffect(() => {
setSize(target.current?.getBoundingClientRect());
}, [target]);
useResizeObserver(target, entry => setSize(entry.contentRect));
return size ?? { width: 0, height: 0, x: 0, y: 0 };
};
+4
View File
@@ -1,5 +1,6 @@
{ {
"compilerOptions": { "compilerOptions": {
"importHelpers": true,
"target": "es5", "target": "es5",
"lib": [ "lib": [
"dom", "dom",
@@ -21,6 +22,9 @@
"jsx": "react-jsx", "jsx": "react-jsx",
"noUnusedLocals": false, "noUnusedLocals": false,
"noUnusedParameters": false, "noUnusedParameters": false,
"types": [
"webpack-env"
]
}, },
"include": [ "include": [
"src", "src",
+104
View File
@@ -1430,6 +1430,11 @@
"@types/yargs" "^16.0.0" "@types/yargs" "^16.0.0"
chalk "^4.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": "@nodelib/fs.scandir@2.1.5":
version "2.1.5" version "2.1.5"
resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
@@ -1466,6 +1471,73 @@
schema-utils "^3.0.0" schema-utils "^3.0.0"
source-map "^0.7.3" 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": "@reduxjs/toolkit@^1.7.1":
version "1.7.1" version "1.7.1"
resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.7.1.tgz#994962aeb7df3c77be343dd2ad1aa48221dbaa0c" 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" resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= 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@*": "@types/node@*":
version "17.0.0" version "17.0.0"
resolved "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz" 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" resolved "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz"
integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== 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": "@types/react-dom@^17.0.9":
version "17.0.11" version "17.0.11"
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz" 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" resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz"
integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== 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@*": "@types/yargs-parser@*":
version "20.2.1" version "20.2.1"
resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"
@@ -2238,6 +2325,18 @@
"@typescript-eslint/types" "5.7.0" "@typescript-eslint/types" "5.7.0"
eslint-visitor-keys "^3.0.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": "@webassemblyjs/ast@1.11.1":
version "1.11.1" version "1.11.1"
resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz" 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" resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"
integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== 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: raf@^3.4.1:
version "3.4.1" version "3.4.1"
resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz" resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz"