diff --git a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx
index 75cfe2c..196d88e 100644
--- a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx
+++ b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx
@@ -46,9 +46,9 @@ export function SlotSelector({
const transitions = useTransition(index, {
ref: transRef,
keys: null,
- from: { opacity: 0, transform: "translate3d(0, 100%, 0" },
- enter: { opacity: 1, transform: "translate3d(0, 0%, 0" },
- leave: { opacity: 0, transform: "translate3d(0, -100%, 0" },
+ from: { opacity: 0, transform: "translate3d(0, 100%, 0)" },
+ enter: { opacity: 1, transform: "translate3d(0, 0%, 0)" },
+ leave: { opacity: 0, transform: "translate3d(0, -100%, 0)" },
});
useEffect(() => {
diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx
index f99025a..e4ce926 100644
--- a/src/components/Workspaces/Workspace/Workspace.tsx
+++ b/src/components/Workspaces/Workspace/Workspace.tsx
@@ -1,5 +1,4 @@
-import { useEffect } from "react";
-import { Route, Routes, useParams } from "react-router-dom";
+import { ReactNode, useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import { Center } from "@bedrock-layout/center";
import { Stack } from "@bedrock-layout/stack";
@@ -14,16 +13,23 @@ import { WorkspaceControls } from "../WorkspaceControls";
import { OverlayDisplay } from "../../OverlayTool";
import { workspaces } from "../../../domain/data/workspaces";
+import { WorkspaceId } from "../../../types/state";
-export const Workspace = () => {
+type WorkspaceProps = {
+ workspaceId: WorkspaceId,
+ previewContent: ReactNode,
+ prototypeControls: ReactNode,
+};
+export const Workspace = ({
+ workspaceId,
+ previewContent,
+ prototypeControls,
+}: WorkspaceProps) => {
const dispatch = useDispatch();
- const { "*": workspaceId } = useParams();
const { animatedBG, workspaceProperties } = useSelector(workspaceSelector);
const { currentWorkspaceId: overlayWorkspaceId } = useSelector(overlayToolSelector);
useEffect(() => {
- if (workspaceId == null) return;
-
// Update workspace store for ID.
dispatch(updateWorkspace({
workspaceId,
@@ -39,8 +45,6 @@ export const Workspace = () => {
}
}, [workspaceId]);
- if (workspaceId == null) return null;
-
return (
{
dimensions={workspaceProperties.previewWindowDimensions}
animatedBG={animatedBG}
>
-
+ {previewContent}
-
+ {prototypeControls}
);
};
-
-
-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/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx
index e5e661d..017f5ff 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/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx
index dcf3bf5..eaab0bb 100644
--- a/src/components/Workspaces/WorkspacesRoute.tsx
+++ b/src/components/Workspaces/WorkspacesRoute.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
-import { Outlet } from "react-router-dom";
+import { Route, Routes } from "react-router-dom";
import useMeasure from "react-use-measure";
import { mainMenuDimensionsSelector } from "../../features/pageDimensions/pageDimensionsSelector";
@@ -10,6 +10,12 @@ import { FullScreenContainer } from "../Common/FullScreenContainer.styled";
import { WorkspaceList } from "./WorkspaceList";
import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled";
+import { Workspace } from "./Workspace";
+import { ChyronDriver } from "../BroadcastGraphics/Chyrons/Driver";
+import { ChyronPrototypeControls } from "./PrototypingControls/ChyronPrototype";
+import { AngledFlagWorkSpace } from "./CustomWorkSpaces/AngledFlagWorkSpace";
+import { AngledFlagPrototypeControls } from "./PrototypingControls/AngledFlagPrototype";
+
const WORKSPACE_LIST_WIDTH = 180;
export default function Workspaces() {
@@ -41,7 +47,24 @@ export default function Workspaces() {
heightCutoff={mainMenuHeight}
widthCutoff={WORKSPACE_LIST_WIDTH}
>
-
+
+ Workspaces Home} />
+ }
+ prototypeControls={}
+ />
+ } />
+ }
+ prototypeControls={}
+ />
+ } />
+ Unknown Workspace} />
+
diff --git a/src/index.tsx b/src/index.tsx
index 38bcd44..f6042fe 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -26,10 +26,7 @@ ReactDOM.render(
}>
Home} />
} />
- }>
- Workspaces Home} />
- } />
-
+ } />
Page Not Found} />