ISSUE-032 - Found a fix to the Hooks rendering error by using ReactRouter.
This commit is contained in:
1 parent
e676c7a95a
commit
f9f7b739ee
8 files changed
+38
-42
No files matched your search
+1
@@ -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);
|
||||
|
||||
@@ -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 (
|
||||
<Stack
|
||||
gutter="lg"
|
||||
@@ -54,15 +53,37 @@ export const Workspace = () => {
|
||||
dimensions={workspaceProperties.previewWindowDimensions}
|
||||
animatedBG={animatedBG}
|
||||
>
|
||||
{graphic}
|
||||
<PreviewContent />
|
||||
<OverlayDisplay
|
||||
containerDimensions={workspaceProperties.previewWindowDimensions}
|
||||
/>
|
||||
</PreviewWindow>
|
||||
<ControlsContainer>
|
||||
<WorkspaceControls />
|
||||
{controls}
|
||||
<PrototypeControls />
|
||||
</ControlsContainer>
|
||||
</Stack>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
import { ChyronDriver } from "../../BroadcastGraphics/Chyrons/Driver";
|
||||
import { AngledFlagWorkSpace } from "../CustomWorkSpaces/AngledFlagWorkSpace";
|
||||
import { ChyronPrototypeControls } from "../PrototypingControls/ChyronPrototype";
|
||||
import { AngledFlagPrototypeControls } from "../PrototypingControls/AngledFlagPrototype";
|
||||
|
||||
const PreviewContent = () => (
|
||||
<Routes>
|
||||
<Route path="chyronDriver" element={<ChyronDriver />} />
|
||||
<Route path="angledFlag" element={<AngledFlagWorkSpace />} />
|
||||
<Route path="*" element={null} />
|
||||
</Routes>
|
||||
);
|
||||
|
||||
const PrototypeControls = () => (
|
||||
<Routes>
|
||||
<Route path="chyronDriver" element={<ChyronPrototypeControls />} />
|
||||
<Route path="angledFlag" element={<AngledFlagPrototypeControls />} />
|
||||
<Route path="*" element={null} />
|
||||
</Routes>
|
||||
);
|
||||
+4
-4
@@ -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();
|
||||
@@ -0,0 +1 @@
|
||||
export * from "./WorkspaceControls";
|
||||
@@ -18,7 +18,7 @@ export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => {
|
||||
{workspaceList.map((id) => (
|
||||
<WorkspaceListNavLink
|
||||
key={id}
|
||||
to={id}
|
||||
to={`s/${id}`}
|
||||
label={workspaces[id].name}
|
||||
/>
|
||||
))}
|
||||
|
||||
Reference in new issue
Block a user