diff --git a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx index 5c72800..75cfe2c 100644 --- a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx +++ b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx @@ -22,7 +22,7 @@ export function SlotSelector({ const [prefixMask, setPrefixMask] = useState(0); const [formattedItems, setFormattedItems] = useState>([]); - // useMemo makes these functions only run once when mounting. Not ever re-render. + // useMemo makes these functions only run once when mounting. Not every re-render. useMemo(() => { const tempFormattedItems = items.map(item => formatter(item)); setFormattedItems(tempFormattedItems); @@ -39,7 +39,7 @@ export function SlotSelector({ formattedItems.length && removePrefix && formattedItems[0].length !== prefixMask ? - formattedItems[i].slice(prefixMask) : + formattedItems[i]?.slice(prefixMask) ?? undefined : formattedItems[i]; const transRef = useSpringRef(); diff --git a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx index 2c4ad61..1c6606c 100644 --- a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx @@ -11,6 +11,7 @@ const countries = [ "GBR", "NLD", "FIN", "JPN", "FRA", "DEU", "MEX", "POL", "MCO", "CHN", "THA", "CAN", "RUS", "RAF", "AUS", "ESP", "ITA", ]; + export function AngledFlagPrototypeControls() { const dispatch = useDispatch(); const { prototypeState } = useSelector(workspaceSelector); diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index 67d8b63..f99025a 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { useParams } from "react-router-dom"; +import { Route, Routes, useParams } from "react-router-dom"; import { useDispatch, useSelector } from "react-redux"; import { Center } from "@bedrock-layout/center"; import { Stack } from "@bedrock-layout/stack"; @@ -10,14 +10,14 @@ import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSe import { newWorkspace } from "../../../features/overlayTool/overlayToolSlice"; import { PreviewWindow, H2, ControlsContainer } from "./styles"; -import { WorkspaceControls } from "./WorkspaceControls/WorkspaceControls"; +import { WorkspaceControls } from "../WorkspaceControls"; import { OverlayDisplay } from "../../OverlayTool"; -import { fetchBroadcastGraphic, workspaces } from "../../../domain/data/workspaces"; +import { workspaces } from "../../../domain/data/workspaces"; export const Workspace = () => { const dispatch = useDispatch(); - const { workspaceId } = useParams(); + const { "*": workspaceId } = useParams(); const { animatedBG, workspaceProperties } = useSelector(workspaceSelector); const { currentWorkspaceId: overlayWorkspaceId } = useSelector(overlayToolSelector); @@ -41,7 +41,6 @@ export const Workspace = () => { if (workspaceId == null) return null; - const [graphic, controls] = fetchBroadcastGraphic(workspaceId); return ( { dimensions={workspaceProperties.previewWindowDimensions} animatedBG={animatedBG} > - {graphic} + - {controls} + ); }; + + +import { ChyronDriver } from "../../BroadcastGraphics/Chyrons/Driver"; +import { AngledFlagWorkSpace } from "../CustomWorkSpaces/AngledFlagWorkSpace"; +import { ChyronPrototypeControls } from "../PrototypingControls/ChyronPrototype"; +import { AngledFlagPrototypeControls } from "../PrototypingControls/AngledFlagPrototype"; + +const PreviewContent = () => ( + + } /> + } /> + + +); + +const PrototypeControls = () => ( + + } /> + } /> + + +); diff --git a/src/components/Workspaces/Workspace/WorkspaceControls/WorkspaceControls.tsx b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx similarity index 68% rename from src/components/Workspaces/Workspace/WorkspaceControls/WorkspaceControls.tsx rename to src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx index ea90e0a..406d9be 100644 --- a/src/components/Workspaces/Workspace/WorkspaceControls/WorkspaceControls.tsx +++ b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx @@ -2,11 +2,11 @@ import { Grid } from "@bedrock-layout/grid"; import { PadBox } from "@bedrock-layout/padbox"; import { useDispatch, useSelector } from "react-redux"; -import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; -import { setAnimatedBG } from "../../../../features/workspace/workspaceSlice"; +import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; +import { setAnimatedBG } from "../../../features/workspace/workspaceSlice"; -import { Toggle } from "../../../Common/Inputs/Toggle"; -import { OverlayControl } from "../../../OverlayTool"; +import { Toggle } from "../../Common/Inputs/Toggle"; +import { OverlayControl } from "../../OverlayTool"; export const WorkspaceControls = () => { const dispatch = useDispatch(); diff --git a/src/components/Workspaces/WorkspaceControls/index.ts b/src/components/Workspaces/WorkspaceControls/index.ts new file mode 100644 index 0000000..53db3ad --- /dev/null +++ b/src/components/Workspaces/WorkspaceControls/index.ts @@ -0,0 +1 @@ +export * from "./WorkspaceControls"; diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx index 017f5ff..e5e661d 100644 --- a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -18,7 +18,7 @@ export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => { {workspaceList.map((id) => ( ))} diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index e235d9b..16086cd 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -1,12 +1,5 @@ -import { ReactNode } from "react"; import { WorkspaceId, WorkspaceProperties } from "../../types/state"; -// Broadcast Graphics -import { ChyronDriver } from "../../components/BroadcastGraphics/Chyrons/Driver"; -import { ChyronPrototypeControls } from "../../components/Workspaces/PrototypingControls/ChyronPrototype"; -import { AngledFlagWorkSpace } from "../../components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace"; -import { AngledFlagPrototypeControls } from "../../components/Workspaces/PrototypingControls/AngledFlagPrototype"; - type WorkspaceObject = { [id: WorkspaceId]: WorkspaceProperties, }; @@ -44,24 +37,4 @@ export const workspaces: WorkspaceObject = { height: 500, }, }, - foo: { - name: "Foo", - overlayIds: [], - previewWindowDimensions: { width: 500, height: 500 }, - }, }; - -export function fetchBroadcastGraphic(workspaceId?: WorkspaceId): [ReactNode, ReactNode] { - switch(workspaceId) { - case "chyronDriver": return [ - ChyronDriver(), - ChyronPrototypeControls(), - ]; - case "angledFlag": return [ - AngledFlagWorkSpace(), - AngledFlagPrototypeControls(), - ]; - default: return [null, null]; - } -} - diff --git a/src/index.tsx b/src/index.tsx index 735b07f..38bcd44 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,7 +28,7 @@ ReactDOM.render( } /> }> Workspaces Home} /> - } /> + } /> Page Not Found} />