From 5d009a3d708727c0edf8b0e858e0075ad5a7e166 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 27 Jan 2022 13:39:52 -0500 Subject: [PATCH 1/9] ISSUE-032 - Defined a great number of new state types for use with the race event's state, the broadcast director's controls, and the broadcast graphics states. Taking a second to make a commit to save my progress so far. --- .../Chyrons/Driver/ChyronDriver.tsx | 4 + .../Workspaces/Workspace/Workspace.tsx | 4 +- src/domain/data/workspaces.ts | 10 +- .../director/broadcastDirectorSelector.ts | 3 + .../director/broadcastDirectorSlice.ts | 46 ++++++++ .../graphics/broadcastGraphicsSelector.ts | 3 + .../graphics/broadcastGraphicsSlice.ts | 34 ++++++ src/features/event/eventSelector.ts | 3 + src/features/event/eventSlice.ts | 58 ++++++++++ src/store.ts | 2 + src/types/state.d.ts | 105 +++++++++++++++--- src/types/util.d.ts | 3 + 12 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 src/features/broadcast/director/broadcastDirectorSelector.ts create mode 100644 src/features/broadcast/director/broadcastDirectorSlice.ts create mode 100644 src/features/broadcast/graphics/broadcastGraphicsSelector.ts create mode 100644 src/features/broadcast/graphics/broadcastGraphicsSlice.ts create mode 100644 src/features/event/eventSelector.ts create mode 100644 src/features/event/eventSlice.ts create mode 100644 src/types/util.d.ts diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index c0c223d..6f5714f 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -60,3 +60,7 @@ export function ChyronDriver() { ); } + +// export function ChyronDriverStateContainer() { + +// } diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index 6f903ef..67d8b63 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -41,6 +41,7 @@ export const Workspace = () => { if (workspaceId == null) return null; + const [graphic, controls] = fetchBroadcastGraphic(workspaceId); return ( { dimensions={workspaceProperties.previewWindowDimensions} animatedBG={animatedBG} > - {fetchBroadcastGraphic(workspaceId)} + {graphic} + {controls} ); diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 1c4db41..85f6c06 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -29,7 +29,7 @@ export const workspaces: WorkspaceObject = { ], previewWindowDimensions: { width: 750, - height: 200, + height: 300, }, }, angledFlag: { @@ -44,11 +44,11 @@ export const workspaces: WorkspaceObject = { }, }; -export function fetchBroadcastGraphic(workspaceId: WorkspaceId): ReactNode { +export function fetchBroadcastGraphic(workspaceId: WorkspaceId): [ReactNode, ReactNode] { switch(workspaceId) { - case "chyronDriver": return ChyronDriver(); - case "angledFlag": return AngledFlagWorkSpace(); - default: return null; + case "chyronDriver": return [ChyronDriver(), null]; + case "angledFlag": return [AngledFlagWorkSpace(), null]; + default: return [null, null]; } } diff --git a/src/features/broadcast/director/broadcastDirectorSelector.ts b/src/features/broadcast/director/broadcastDirectorSelector.ts new file mode 100644 index 0000000..2709bf7 --- /dev/null +++ b/src/features/broadcast/director/broadcastDirectorSelector.ts @@ -0,0 +1,3 @@ +import { RootState } from "../../../types/state"; + +export const broadcastDirectorSelector = (state: RootState) => state.broadcastDirector; diff --git a/src/features/broadcast/director/broadcastDirectorSlice.ts b/src/features/broadcast/director/broadcastDirectorSlice.ts new file mode 100644 index 0000000..ccdf055 --- /dev/null +++ b/src/features/broadcast/director/broadcastDirectorSlice.ts @@ -0,0 +1,46 @@ +import { createSlice, PayloadAction } from "@reduxjs/toolkit"; +import { findIndex } from "lodash"; + +import { RootState, Car } from "../../../types/state"; + +const initialState: RootState["broadcastDirector"] = { + selectedCars: [], +}; + +const carMatch = (targetCar: Car) => (checkedCar: Car) => + checkedCar.driver.id === targetCar.driver.id; + +export const broadcastDirectorSlice = createSlice({ + name: "broadcastDirector", + initialState, + reducers: { + selectedCarsAdd: (state, action: PayloadAction) => { + const index = findIndex(state.selectedCars, carMatch(action.payload)); + if (index === -1) { + state.selectedCars = state.selectedCars.concat(action.payload); + } + }, + selectedCarsSet: (state, action: PayloadAction) => { // Might be removed. + state.selectedCars = [action.payload]; + }, + selectedCarsRemove: (state, action: PayloadAction) => { + const index = typeof action.payload === "number" + ? action.payload + : findIndex(state.selectedCars, carMatch(action.payload)); + state.selectedCars = state.selectedCars.slice(0, index).concat( + state.selectedCars.slice(index + 1), + ); + }, + selectedCarsClear: (state) => { + state.selectedCars = []; + }, + }, +}); + +export const { + selectedCarsAdd, + selectedCarsSet, + selectedCarsRemove, + selectedCarsClear, +} = broadcastDirectorSlice.actions; +export default broadcastDirectorSlice.reducer; diff --git a/src/features/broadcast/graphics/broadcastGraphicsSelector.ts b/src/features/broadcast/graphics/broadcastGraphicsSelector.ts new file mode 100644 index 0000000..fce0697 --- /dev/null +++ b/src/features/broadcast/graphics/broadcastGraphicsSelector.ts @@ -0,0 +1,3 @@ +import { RootState } from "../../../types/state"; + +export const broadcastGraphicsSelector = (state: RootState) => state.broadcastGraphics; diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts new file mode 100644 index 0000000..617acd4 --- /dev/null +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -0,0 +1,34 @@ +import { createSlice, PayloadAction } from "@reduxjs/toolkit"; + +import { BGChyrons, OpenState, RootState } from "../../../types/state"; + +const initialState: RootState["broadcastGraphics"] = { + chyrons: null, +}; + +export const broadcastGraphicsSlice = createSlice({ + name: "broadcastGraphics", + initialState, + reducers: { + chyronsLaunch: (state, action: PayloadAction) => { + state.chyrons = action.payload; + }, + chyronsSetOpenState: (state, action: PayloadAction) => { + if (state.chyrons == null) return; + state.chyrons.primary.openState = action.payload; + + if (state.chyrons.secondary != null) { + state.chyrons.secondary.openState = action.payload; + } + }, + chyronsClear: (state) => { + state.chyrons = null; + }, + }, +}); + +export const { + chyronsLaunch, + chyronsClear, +} = broadcastGraphicsSlice.actions; +export default broadcastGraphicsSlice.reducer; diff --git a/src/features/event/eventSelector.ts b/src/features/event/eventSelector.ts new file mode 100644 index 0000000..9ce42d5 --- /dev/null +++ b/src/features/event/eventSelector.ts @@ -0,0 +1,3 @@ +import { RootState } from "../../types/state"; + +export const eventSelector = (state: RootState) => state.event; diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts new file mode 100644 index 0000000..5313d6b --- /dev/null +++ b/src/features/event/eventSlice.ts @@ -0,0 +1,58 @@ +import { createSlice, PayloadAction } from "@reduxjs/toolkit"; + +import { CourseFlag, RootState } from "../../types/state"; +import { getDriver } from "../../utils/dataLookup"; + +const initialState: RootState["event"] = { + trackName: "Melbourne", + courseStatus: { + courseFlag: "green", + sectorFlags: ["green", "green", "green"], + safetyCar: "clear", + virtualSafetyCar: "clear", + }, + mode: "race", + progress: { + startTime: Date.now(), + timeLimit: 60 * 60 * 2 * 1000, + currentLap: 1, + lapCount: 10, + }, + grid: [ + { position: 1, driver: getDriver("verstappen") }, + { position: 3, driver: getDriver("hamilton") }, + { position: 2, driver: getDriver("bottas") }, + { position: 4, driver: getDriver("perez") }, + { position: 5, driver: getDriver("sainz") }, + { position: 6, driver: getDriver("norris") }, + { position: 7, driver: getDriver("leclerc") }, + { position: 8, driver: getDriver("ricciardo") }, + { position: 9, driver: getDriver("gasly") }, + { position: 10, driver: getDriver("alonso") }, + { position: 11, driver: getDriver("ocon") }, + { position: 12, driver: getDriver("vettel") }, + { position: 13, driver: getDriver("stroll") }, + { position: 14, driver: getDriver("tsunoda") }, + { position: 15, driver: getDriver("russell") }, + { position: 16, driver: getDriver("raikkonen") }, + { position: 17, driver: getDriver("latifi") }, + { position: 18, driver: getDriver("giovinazzi") }, + { position: 19, driver: getDriver("schumacher") }, + { position: 20, driver: getDriver("mazepin") }, + ], +}; + +export const eventSlice = createSlice({ + name: "event", + initialState, + reducers: { + courseFlagSet: (state, action: PayloadAction) => { + state.courseStatus.courseFlag = action.payload; + }, + }, +}); + +export const { + courseFlagSet, +} = eventSlice.actions; +export default eventSlice.reducer; diff --git a/src/store.ts b/src/store.ts index 5cc2731..6ff2325 100644 --- a/src/store.ts +++ b/src/store.ts @@ -3,11 +3,13 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit"; import pageDimensions from "./features/pageDimensions/pageDimensionsSlice"; import workspace from "./features/workspace/workspaceSlice"; import overlayTool from "./features/overlayTool/overlayToolSlice"; +import broadcastGraphics from "./features/broadcast/graphics/broadcastGraphicsSlice"; export const store = configureStore({ reducer: combineReducers({ pageDimensions, workspace, overlayTool, + broadcastGraphics, }), }); diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 0b6e997..89713e6 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -1,7 +1,12 @@ +import { Milliseconds, Optional } from "./util"; + export interface RootState { pageDimensions: PageDimensions; workspace: Workspace; overlayTool: OverlayTool; + event: Event, + broadcastDirector: BroadcastDirector; + broadcastGraphics: BroadcastGraphics; } // Page Dimensions @@ -42,14 +47,54 @@ export interface OverlayItem { opacity: number; } -// Race State. +// Event State +export interface Event { + trackName: string; + courseStatus: CourseStatus; + mode: EventMode; + progress: EventProgress; + grid: Grid; +} +export interface EventProgress { + startTime: Milliseconds; + timeLimit: Milliseconds; + currentLap: number; + lapCount: number; +} +export type EventMode = + | "race" + | "sprint" + | "p1" + | "p2" + | "p3" + | "q1" + | "q2" + | "q3"; +export interface CourseStatus { + courseFlag: CourseFlags; + sectorFlags: Array; + safetyCar: SafetyCarStatus; + virtualSafetyCar: VirtualSafetyCarStatus; +} +export type CourseFlag = + | "green" + | "yellow" + | "doubleYellow" + | "chequered" + | "red" + | "white" + | "redYellow"; +export type SafetyCarStatus = "clear" | "starting" | "out" | "ending"; +export type VirtualSafetyCarStatus = "clear" | "out" | "ending"; +export type Grid = Array; // Grid order does not change. export interface Car { position: number; driver: Driver; - // status: ???; + // status: ???; // retired + // flags: ???, // blue, red, meatball, black/white, black + // notices: ???; // Penalties, warnings, investigations, blue flags, etc // distance: number; } -export type Grid = Array; export interface Driver { id: DriverId; firstName: string; @@ -126,6 +171,11 @@ export type TeamFullName = | "Red Bull Racing" | "Williams Racing"; +// Broadcast Director +export interface BroadcastDirector { + selectedCars: Array; +} + // Broadcast Graphics export interface BGRelativePos { top?: string; @@ -133,34 +183,59 @@ export interface BGRelativePos { bottom?: string; left?: string; } +export interface BGBaseState { + relativePos: BGRelativePos; + openState: OpenState; +} +/** + * -1 closing, 0 closed, 1 open, 2... different states + */ +export type OpenState = number; + export interface BroadcastGraphics { // timingBoard: BGTimingBoard; // statusIndicator: BGStatusIndicator; // indicators: BGIndicators - chyrons: BGChyrons; + chyrons: Optional; // gems: BGGems // toasts: BGToasts; } -export interface BGChyrons { - primary: BGChyron; - secondary: BGChyron; - // sponsorGem: BGSponsorGem; -} - +// Chyrons export type FlagMode = "country" | "team"; export type BGChyronMode = | "driver-basic-small" | "driver-basic-medium" | "driver-basic-large"; -export interface BGChyron extends BGRelativePos { +export interface BGChyron extends BGBaseState { mode: BGChyronMode; - cars: Array; + car: Car; + flagMode: FlagMode; + showPosFlag: boolean; + showDriverNumber: boolean; + dimensions: Dimensions; + props?: unknown; +} +export interface BGChyrons { + primary: BGChyron; + secondary: Optional; + // sponsorGem: BGSponsorGem; } export interface BGChyronMedium extends BGChyron { mode: "driver-basic-medium"; - flag: FlagMode; - showPosFlag: boolean; - showDriverNumber: boolean; + dimensions: { + width: 582; + height: 72; + } + props: { + showPortrait: boolean; + } +} +export interface BGChyronLarge extends BGChyron { + mode: "driver-basic-large"; + dimensions: { + width: 638; + height: 98; + } } diff --git a/src/types/util.d.ts b/src/types/util.d.ts new file mode 100644 index 0000000..86126fb --- /dev/null +++ b/src/types/util.d.ts @@ -0,0 +1,3 @@ +export type Optional = TEntity | null; +export type Milliseconds = number; +export type Seconds = number; From e676c7a95a9f881437d56071446a3e66769abe35 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 27 Jan 2022 17:47:49 -0500 Subject: [PATCH 2/9] ISSUE-032 - Progress checkpoint. Have a working "selectedCars" modifying component named GridSelection. Have a work-in-progress AngledFlag prototype controller that relying on a central state property in the Workspaces portion of the store. It's a bit hacky. But it made me realize that my desire to do silly things with extending interfaces won't work that way I'm going to need to rely on them in the future. I cannot demand more specific data from a state that uses a less specific interface. Rookie mistake. I am also at the mercy of a design flaw when it comes to using React Hooks: The way I organize Workspaces makes React very angry. When I switch between workspaces that rely on hooks to render correctly the whole thing explodes. I believe I need to use components directly to correctly unmount - instead of the very hacky switch statement I have in the form of fetchBroadcastGraphic(). I might need to try seeing if ReactRouter can provide my solution. --- src/components/Common/MenuItem.styled.ts | 2 +- .../CustomWorkSpaces/AngledFlagWorkSpace.tsx | 21 ++++++- .../AngledFlagPrototypeControls.tsx | 32 ++++++++++ .../AngledFlagPrototype/index.ts | 1 + .../ChyronPrototypeControls.tsx | 15 +++++ .../ChyronPrototype/index.ts | 1 + .../GridSelection/GridSelection.tsx | 58 +++++++++++++++++++ .../GridSelection/index.ts | 1 + .../GridSelection/styles.ts | 42 ++++++++++++++ src/domain/data/workspaces.ts | 19 +++++- .../director/broadcastDirectorSlice.ts | 17 ++++-- src/features/event/eventSlice.ts | 42 +++++++------- src/features/workspace/workspaceSlice.ts | 7 ++- src/store.ts | 4 ++ src/types/state.d.ts | 7 +++ src/utils/comparators.ts | 4 ++ src/utils/dataLookup.ts | 7 +++ 17 files changed, 247 insertions(+), 33 deletions(-) create mode 100644 src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx create mode 100644 src/components/Workspaces/PrototypingControls/AngledFlagPrototype/index.ts create mode 100644 src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx create mode 100644 src/components/Workspaces/PrototypingControls/ChyronPrototype/index.ts create mode 100644 src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx create mode 100644 src/components/Workspaces/PrototypingControls/GridSelection/index.ts create mode 100644 src/components/Workspaces/PrototypingControls/GridSelection/styles.ts create mode 100644 src/utils/comparators.ts diff --git a/src/components/Common/MenuItem.styled.ts b/src/components/Common/MenuItem.styled.ts index cc7bad7..2ed6020 100644 --- a/src/components/Common/MenuItem.styled.ts +++ b/src/components/Common/MenuItem.styled.ts @@ -12,7 +12,7 @@ type MenuItemProps = { }; export const MenuItem = styled(PadBox).attrs(() => ({ padding: ["sm", "lg"], -})) ` +}))` border-radius: ${p => p.theme.design.button.borderRadius}; color: ${p => p.theme.colors.darkGrey}; font-family: ${p => p.theme.fonts.f1Regular}; diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx index 88d8f05..23d1d35 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx @@ -1,17 +1,34 @@ +import { useEffect } from "react"; +import { useDispatch, useSelector } from "react-redux"; + +import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; + import { AngledFlag } from "../../BroadcastGraphics/Common/AngledFlag"; import { BasicBlock } from "./styles"; + export function AngledFlagWorkSpace() { + const { prototypeState } = useSelector(workspaceSelector); + // const dispatch = useDispatch(); + // useEffect(() => { + // dispatch(setPrototypeState({ + // angledFlag: { + // flagA: "GBR", + // flagB: "GBR", + // }, + // })); + // }, [currentWorkspaceId]); + return ( diff --git a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx new file mode 100644 index 0000000..2c4ad61 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx @@ -0,0 +1,32 @@ +import { PadBox } from "@bedrock-layout/padbox"; +import { Split } from "@bedrock-layout/split"; +import { useDispatch, useSelector } from "react-redux"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; + +import { setPrototypeState } from "../../../../features/workspace/workspaceSlice"; + +import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; + +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); + + const onChange = (flag: "flagA" | "flagB") => (value: string) => { + dispatch(setPrototypeState({ + angledFlag: { + flagA: flag === "flagA" ? value : prototypeState?.angledFlag?.flagA ?? "GBR", + flagB: flag === "flagB" ? value : prototypeState?.angledFlag?.flagB ?? "GBR", + }, + })); + }; + return ( + + + + + ); +} diff --git a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/index.ts b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/index.ts new file mode 100644 index 0000000..87fc05a --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/index.ts @@ -0,0 +1 @@ +export * from "./AngledFlagPrototypeControls"; diff --git a/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx new file mode 100644 index 0000000..d37a04b --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx @@ -0,0 +1,15 @@ +import { Grid } from "@bedrock-layout/grid"; +import { PadBox } from "@bedrock-layout/padbox"; + +import { GridSelection } from "../GridSelection"; + +export function ChyronPrototypeControls() { + return ( + + + + + Launcher/Closer + + ); +} diff --git a/src/components/Workspaces/PrototypingControls/ChyronPrototype/index.ts b/src/components/Workspaces/PrototypingControls/ChyronPrototype/index.ts new file mode 100644 index 0000000..e5e3b7d --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/ChyronPrototype/index.ts @@ -0,0 +1 @@ +export * from "./ChyronPrototypeControls"; diff --git a/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx b/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx new file mode 100644 index 0000000..9f6b7a7 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx @@ -0,0 +1,58 @@ +import { InlineCluster } from "@bedrock-layout/inline-cluster"; +import { findIndex } from "lodash"; +import { useDispatch, useSelector } from "react-redux"; + +import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector"; +import { selectedCarsAdd, selectedCarsClear, selectedCarsRemove } from "../../../../features/broadcast/director/broadcastDirectorSlice"; +import { eventSelector } from "../../../../features/event/eventSelector"; +import { Car } from "../../../../types/state"; +import { carMatch } from "../../../../utils/comparators"; + +import { DriverLabel, GridItem, SelectionLabel } from "./styles"; + +export function GridSelection() { + const dispatch = useDispatch(); + const { + grid, + } = useSelector(eventSelector); + const { + selectedCars, + } = useSelector(broadcastDirectorSelector); + + const carClick = (car: Car, selected: boolean) => () => { + if (selected) { + dispatch(selectedCarsRemove(car)); + } else { + dispatch(selectedCarsAdd(car)); + } + }; + const carDoubleClick = (car: Car) => () => { + dispatch(selectedCarsClear(car)); + }; + + return ( + + {grid.map(car => { + const selectedIndex = findIndex(selectedCars, carMatch(car)); + const selected = selectedIndex !== -1; + const onClick = carClick(car, selected); + const onDoubleClick = carDoubleClick(car); + return ( + + + {car.driver.initials} + + {selected && ( + {selectedIndex + 1} + )} + + ); + })} + + ); +} diff --git a/src/components/Workspaces/PrototypingControls/GridSelection/index.ts b/src/components/Workspaces/PrototypingControls/GridSelection/index.ts new file mode 100644 index 0000000..86a2232 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/GridSelection/index.ts @@ -0,0 +1 @@ +export * from "./GridSelection"; diff --git a/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts b/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts new file mode 100644 index 0000000..88f8bb6 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts @@ -0,0 +1,42 @@ +import { PadBox } from "@bedrock-layout/padbox"; +import styled from "styled-components"; + +type GridItemProps = { + selected: boolean, +}; +export const GridItem = styled(PadBox).attrs(() => ({ + padding: ["md", "xs"], +}))` + position: relative; + width: 4.5ch; + border-radius: 0.2em; + + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: 0.8em; + text-align: center; + user-select: none; + + background-color: ${({ selected }) => selected + ? p => p.theme.colors.grey + : p => p.theme.colors.faintGrey}; + + &:hover { + background-color: ${({ selected }) => selected ? p => p.theme.colors.darkGrey : p => p.theme.colors.grey}; + > span { + color: ${p => p.theme.colors.faintGrey}; + } + } + + cursor: pointer; +`; + +export const DriverLabel = styled.span` + text-transform: uppercase; +`; + +export const SelectionLabel = styled.span` + position: absolute; + bottom: 0; + right: 5%; + font-size: 0.3em; +`; diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 85f6c06..e235d9b 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -3,7 +3,9 @@ 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, @@ -42,12 +44,23 @@ export const workspaces: WorkspaceObject = { height: 500, }, }, + foo: { + name: "Foo", + overlayIds: [], + previewWindowDimensions: { width: 500, height: 500 }, + }, }; -export function fetchBroadcastGraphic(workspaceId: WorkspaceId): [ReactNode, ReactNode] { +export function fetchBroadcastGraphic(workspaceId?: WorkspaceId): [ReactNode, ReactNode] { switch(workspaceId) { - case "chyronDriver": return [ChyronDriver(), null]; - case "angledFlag": return [AngledFlagWorkSpace(), null]; + case "chyronDriver": return [ + ChyronDriver(), + ChyronPrototypeControls(), + ]; + case "angledFlag": return [ + AngledFlagWorkSpace(), + AngledFlagPrototypeControls(), + ]; default: return [null, null]; } } diff --git a/src/features/broadcast/director/broadcastDirectorSlice.ts b/src/features/broadcast/director/broadcastDirectorSlice.ts index ccdf055..0406510 100644 --- a/src/features/broadcast/director/broadcastDirectorSlice.ts +++ b/src/features/broadcast/director/broadcastDirectorSlice.ts @@ -2,14 +2,13 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { findIndex } from "lodash"; import { RootState, Car } from "../../../types/state"; +import { Optional } from "../../../types/util"; +import { carMatch } from "../../../utils/comparators"; const initialState: RootState["broadcastDirector"] = { selectedCars: [], }; -const carMatch = (targetCar: Car) => (checkedCar: Car) => - checkedCar.driver.id === targetCar.driver.id; - export const broadcastDirectorSlice = createSlice({ name: "broadcastDirector", initialState, @@ -31,8 +30,16 @@ export const broadcastDirectorSlice = createSlice({ state.selectedCars.slice(index + 1), ); }, - selectedCarsClear: (state) => { - state.selectedCars = []; + /** + * Shortcut to clear out selected cars. There is also a trick - if you + * @param action Car (optional) - if provided, it'll clear all and add this. + */ + selectedCarsClear: (state, action: PayloadAction>) => { + if (action.payload == null) { + state.selectedCars = []; + } else { + state.selectedCars = [action.payload]; + } }, }, }); diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index 5313d6b..83114f0 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { CourseFlag, RootState } from "../../types/state"; -import { getDriver } from "../../utils/dataLookup"; +import { cloneDriver } from "../../utils/dataLookup"; const initialState: RootState["event"] = { trackName: "Melbourne", @@ -19,26 +19,26 @@ const initialState: RootState["event"] = { lapCount: 10, }, grid: [ - { position: 1, driver: getDriver("verstappen") }, - { position: 3, driver: getDriver("hamilton") }, - { position: 2, driver: getDriver("bottas") }, - { position: 4, driver: getDriver("perez") }, - { position: 5, driver: getDriver("sainz") }, - { position: 6, driver: getDriver("norris") }, - { position: 7, driver: getDriver("leclerc") }, - { position: 8, driver: getDriver("ricciardo") }, - { position: 9, driver: getDriver("gasly") }, - { position: 10, driver: getDriver("alonso") }, - { position: 11, driver: getDriver("ocon") }, - { position: 12, driver: getDriver("vettel") }, - { position: 13, driver: getDriver("stroll") }, - { position: 14, driver: getDriver("tsunoda") }, - { position: 15, driver: getDriver("russell") }, - { position: 16, driver: getDriver("raikkonen") }, - { position: 17, driver: getDriver("latifi") }, - { position: 18, driver: getDriver("giovinazzi") }, - { position: 19, driver: getDriver("schumacher") }, - { position: 20, driver: getDriver("mazepin") }, + { position: 1, driver: cloneDriver("verstappen") }, + { position: 3, driver: cloneDriver("hamilton") }, + { position: 2, driver: cloneDriver("bottas") }, + { position: 4, driver: cloneDriver("perez") }, + { position: 5, driver: cloneDriver("sainz") }, + { position: 6, driver: cloneDriver("norris") }, + { position: 7, driver: cloneDriver("leclerc") }, + { position: 8, driver: cloneDriver("ricciardo") }, + { position: 9, driver: cloneDriver("gasly") }, + { position: 10, driver: cloneDriver("alonso") }, + { position: 11, driver: cloneDriver("ocon") }, + { position: 12, driver: cloneDriver("vettel") }, + { position: 13, driver: cloneDriver("stroll") }, + { position: 14, driver: cloneDriver("tsunoda") }, + { position: 15, driver: cloneDriver("russell") }, + { position: 16, driver: cloneDriver("raikkonen") }, + { position: 17, driver: cloneDriver("latifi") }, + { position: 18, driver: cloneDriver("giovinazzi") }, + { position: 19, driver: cloneDriver("schumacher") }, + { position: 20, driver: cloneDriver("mazepin") }, ], }; diff --git a/src/features/workspace/workspaceSlice.ts b/src/features/workspace/workspaceSlice.ts index 9913f80..417a956 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, WorkspaceProperties } from "../../types/state"; +import { PrototypeState, RootState, WorkspaceId, WorkspaceProperties } from "../../types/state"; const initialState: RootState["workspace"] = { workspaceId: "", @@ -9,6 +9,7 @@ const initialState: RootState["workspace"] = { overlayIds: [], previewWindowDimensions: { width: 0, height: 0 }, }, + prototypeState: null, }; export type UpdateWorkspaceAction = { @@ -30,6 +31,9 @@ export const workspaceSlice = createSlice({ state.workspaceId = action.payload.workspaceId; state.workspaceProperties = action.payload.workspaceProperties; }, + setPrototypeState: (state, action: PayloadAction) => { + state.prototypeState = action.payload; + }, }, }); @@ -37,5 +41,6 @@ export const { setWorkspaceId, setAnimatedBG, updateWorkspace, + setPrototypeState, } = workspaceSlice.actions; export default workspaceSlice.reducer; diff --git a/src/store.ts b/src/store.ts index 6ff2325..82c1c83 100644 --- a/src/store.ts +++ b/src/store.ts @@ -3,6 +3,8 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit"; import pageDimensions from "./features/pageDimensions/pageDimensionsSlice"; import workspace from "./features/workspace/workspaceSlice"; import overlayTool from "./features/overlayTool/overlayToolSlice"; +import event from "./features/event/eventSlice"; +import broadcastDirector from "./features/broadcast/director/broadcastDirectorSlice"; import broadcastGraphics from "./features/broadcast/graphics/broadcastGraphicsSlice"; export const store = configureStore({ @@ -10,6 +12,8 @@ export const store = configureStore({ pageDimensions, workspace, overlayTool, + event, + broadcastDirector, broadcastGraphics, }), }); diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 89713e6..9850297 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -22,6 +22,7 @@ export interface Workspace { workspaceId: WorkspaceId; animatedBG: boolean; workspaceProperties: WorkspaceProperties; + prototypeState: Optional; } export type WorkspaceId = string; @@ -30,6 +31,12 @@ export interface WorkspaceProperties { overlayIds: OverlayIds; previewWindowDimensions: Dimensions; } +export interface PrototypeState { + angledFlag?: { + flagA: string; + flagB: string; + }; +} // Overlay Tool export interface OverlayTool { diff --git a/src/utils/comparators.ts b/src/utils/comparators.ts new file mode 100644 index 0000000..29d5265 --- /dev/null +++ b/src/utils/comparators.ts @@ -0,0 +1,4 @@ +import { Car } from "../types/state"; + +export const carMatch = (targetCar: Car) => (checkedCar: Car) => + checkedCar.driver.id === targetCar.driver.id; diff --git a/src/utils/dataLookup.ts b/src/utils/dataLookup.ts index 6731b3c..dc48757 100644 --- a/src/utils/dataLookup.ts +++ b/src/utils/dataLookup.ts @@ -1,3 +1,4 @@ +import { cloneDeep } from "lodash"; import { drivers, teams, teamNumberStyles, NumberStyle } from "../domain/data/teams"; import { Driver, DriverId, Team, TeamId } from "../types/state"; @@ -11,10 +12,16 @@ import { Driver, DriverId, Team, TeamId } from "../types/state"; export function getDriver(driverId: DriverId): Driver { return drivers[driverId]; } +export function cloneDriver(driverId: DriverId): Driver { + return cloneDeep(drivers[driverId]); +} export function getTeam(teamId: TeamId): Team { return teams[teamId]; } +export function cloneTeam(teamId: TeamId): Team { + return cloneDeep(teams[teamId]); +} export function getTeamNumberStyle(teamId: TeamId): NumberStyle { return teamNumberStyles[teamId]; From f9f7b739ee35366489d95c2bb18d62aa0444d430 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 28 Jan 2022 09:16:50 -0500 Subject: [PATCH 3/9] ISSUE-032 - Found a fix to the Hooks rendering error by using ReactRouter. --- .../Inputs/SlotSelector/SlotSelector.tsx | 4 +-- .../AngledFlagPrototypeControls.tsx | 1 + .../Workspaces/Workspace/Workspace.tsx | 35 +++++++++++++++---- .../WorkspaceControls/WorkspaceControls.tsx | 8 ++--- .../Workspaces/WorkspaceControls/index.ts | 1 + .../WorkspaceList/WorkspaceList.tsx | 2 +- src/domain/data/workspaces.ts | 27 -------------- src/index.tsx | 2 +- 8 files changed, 38 insertions(+), 42 deletions(-) rename src/components/Workspaces/{Workspace => }/WorkspaceControls/WorkspaceControls.tsx (68%) create mode 100644 src/components/Workspaces/WorkspaceControls/index.ts 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} /> From ae4a7e7818f810a4e0f37f49af91fbf11ce94560 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 28 Jan 2022 10:12:12 -0500 Subject: [PATCH 4/9] ISSUE-032 - Adjusted my ReactRouter solution to drop the need for an interim path element. I am also now using WorkspacesRoute for more things, which I think is appropriate. --- .../Inputs/SlotSelector/SlotSelector.tsx | 6 +-- .../Workspaces/Workspace/Workspace.tsx | 46 ++++++------------- .../WorkspaceList/WorkspaceList.tsx | 2 +- src/components/Workspaces/WorkspacesRoute.tsx | 27 ++++++++++- src/index.tsx | 5 +- 5 files changed, 44 insertions(+), 42 deletions(-) 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} /> From d9b6f6fbfa8bb0ed482f235d33c5e6b0749183ce Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 28 Jan 2022 10:58:48 -0500 Subject: [PATCH 5/9] ISSUE-039 - Simplified MEX and ESP flags, saving 130 and 50kb, respectively. Also removed the non-angled flags as, well, I don't currently have a use for them and might never. --- src/public/images/countryFlags/AUS.svg | 24 - src/public/images/countryFlags/CAN.svg | 5 - src/public/images/countryFlags/CHN.svg | 12 - src/public/images/countryFlags/DEU.svg | 6 - src/public/images/countryFlags/ESP.svg | 1 - src/public/images/countryFlags/FIN.svg | 6 - src/public/images/countryFlags/FRA.svg | 6 - src/public/images/countryFlags/GBR.svg | 11 - src/public/images/countryFlags/ITA.svg | 6 - src/public/images/countryFlags/JPN.svg | 5 - src/public/images/countryFlags/MCO.svg | 1 - src/public/images/countryFlags/MEX.svg | 1 - src/public/images/countryFlags/NLD.svg | 5 - src/public/images/countryFlags/POL.svg | 1 - src/public/images/countryFlags/RAF.svg | 12 - src/public/images/countryFlags/RUS.svg | 6 - src/public/images/countryFlags/THA.svg | 6 - src/public/images/countryFlags/angled/ESP.svg | 506 +----------------- src/public/images/countryFlags/angled/MEX.svg | 391 +------------- 19 files changed, 2 insertions(+), 1009 deletions(-) delete mode 100644 src/public/images/countryFlags/AUS.svg delete mode 100644 src/public/images/countryFlags/CAN.svg delete mode 100644 src/public/images/countryFlags/CHN.svg delete mode 100644 src/public/images/countryFlags/DEU.svg delete mode 100644 src/public/images/countryFlags/ESP.svg delete mode 100644 src/public/images/countryFlags/FIN.svg delete mode 100644 src/public/images/countryFlags/FRA.svg delete mode 100644 src/public/images/countryFlags/GBR.svg delete mode 100644 src/public/images/countryFlags/ITA.svg delete mode 100644 src/public/images/countryFlags/JPN.svg delete mode 100644 src/public/images/countryFlags/MCO.svg delete mode 100644 src/public/images/countryFlags/MEX.svg delete mode 100644 src/public/images/countryFlags/NLD.svg delete mode 100644 src/public/images/countryFlags/POL.svg delete mode 100644 src/public/images/countryFlags/RAF.svg delete mode 100644 src/public/images/countryFlags/RUS.svg delete mode 100644 src/public/images/countryFlags/THA.svg diff --git a/src/public/images/countryFlags/AUS.svg b/src/public/images/countryFlags/AUS.svg deleted file mode 100644 index 3d1060d..0000000 --- a/src/public/images/countryFlags/AUS.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/public/images/countryFlags/CAN.svg b/src/public/images/countryFlags/CAN.svg deleted file mode 100644 index 472c431..0000000 --- a/src/public/images/countryFlags/CAN.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Flag of Canada (Pantone colours) - - - diff --git a/src/public/images/countryFlags/CHN.svg b/src/public/images/countryFlags/CHN.svg deleted file mode 100644 index 61f4fdc..0000000 --- a/src/public/images/countryFlags/CHN.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/public/images/countryFlags/DEU.svg b/src/public/images/countryFlags/DEU.svg deleted file mode 100644 index 4a5a153..0000000 --- a/src/public/images/countryFlags/DEU.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/public/images/countryFlags/ESP.svg b/src/public/images/countryFlags/ESP.svg deleted file mode 100644 index 8fda47a..0000000 --- a/src/public/images/countryFlags/ESP.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/public/images/countryFlags/FIN.svg b/src/public/images/countryFlags/FIN.svg deleted file mode 100644 index e7f293b..0000000 --- a/src/public/images/countryFlags/FIN.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/public/images/countryFlags/FRA.svg b/src/public/images/countryFlags/FRA.svg deleted file mode 100644 index 3165e37..0000000 --- a/src/public/images/countryFlags/FRA.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/public/images/countryFlags/GBR.svg b/src/public/images/countryFlags/GBR.svg deleted file mode 100644 index 37f96ce..0000000 --- a/src/public/images/countryFlags/GBR.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/public/images/countryFlags/ITA.svg b/src/public/images/countryFlags/ITA.svg deleted file mode 100644 index 9ee6003..0000000 --- a/src/public/images/countryFlags/ITA.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/public/images/countryFlags/JPN.svg b/src/public/images/countryFlags/JPN.svg deleted file mode 100644 index 8f45475..0000000 --- a/src/public/images/countryFlags/JPN.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/public/images/countryFlags/MCO.svg b/src/public/images/countryFlags/MCO.svg deleted file mode 100644 index 797f9f2..0000000 --- a/src/public/images/countryFlags/MCO.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/public/images/countryFlags/MEX.svg b/src/public/images/countryFlags/MEX.svg deleted file mode 100644 index 7a80b6f..0000000 --- a/src/public/images/countryFlags/MEX.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/public/images/countryFlags/NLD.svg b/src/public/images/countryFlags/NLD.svg deleted file mode 100644 index f19bd00..0000000 --- a/src/public/images/countryFlags/NLD.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/public/images/countryFlags/POL.svg b/src/public/images/countryFlags/POL.svg deleted file mode 100644 index b08d025..0000000 --- a/src/public/images/countryFlags/POL.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/public/images/countryFlags/RAF.svg b/src/public/images/countryFlags/RAF.svg deleted file mode 100644 index 9c187b0..0000000 --- a/src/public/images/countryFlags/RAF.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/public/images/countryFlags/RUS.svg b/src/public/images/countryFlags/RUS.svg deleted file mode 100644 index 387307f..0000000 --- a/src/public/images/countryFlags/RUS.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/public/images/countryFlags/THA.svg b/src/public/images/countryFlags/THA.svg deleted file mode 100644 index 2a9fa1c..0000000 --- a/src/public/images/countryFlags/THA.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/public/images/countryFlags/angled/ESP.svg b/src/public/images/countryFlags/angled/ESP.svg index 0105dfe..82b7058 100644 --- a/src/public/images/countryFlags/angled/ESP.svg +++ b/src/public/images/countryFlags/angled/ESP.svg @@ -1,505 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/public/images/countryFlags/angled/MEX.svg b/src/public/images/countryFlags/angled/MEX.svg index 4aead72..4c9b6fe 100644 --- a/src/public/images/countryFlags/angled/MEX.svg +++ b/src/public/images/countryFlags/angled/MEX.svg @@ -1,390 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file From 536d81fb6150710331b623d927d60278bde7f33b Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 28 Jan 2022 14:36:50 -0500 Subject: [PATCH 6/9] ISSUE-038 - Switched SlotSelector from using strings for onChange() to simply returning the selected index. As well as just being a little bit better this was necessary to support specifically typed values. We were always going to be selecting between strictly strings. This should allow us to be more flexible. Also, to avoid a minor bug with switching the Overlay tool with it being invisible SlotSelector now supports being disabled. --- .../Common/Inputs/SlotSelector/SlotSelector.tsx | 13 ++++++++++--- src/components/Common/Inputs/SlotSelector/styles.ts | 8 ++++++-- .../OverlayTool/OverlayControl/OverlayControl.tsx | 3 ++- .../AngledFlagPrototypeControls.tsx | 6 +++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx index 196d88e..518a784 100644 --- a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx +++ b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx @@ -6,10 +6,11 @@ import { SlotText, SlotWindow } from "./styles"; type SlotSelectorProps = { items: Array, - onChange: (value: string) => void, + onChange: (index: number) => void, removePrefix?: boolean, formatter?: (value: string) => string, initialIndex?: number, + disabled?: boolean, }; export function SlotSelector({ items, @@ -17,11 +18,16 @@ export function SlotSelector({ removePrefix = false, formatter = (x) => x, initialIndex = 0, + disabled = false, }: SlotSelectorProps) { const [index, setIndex] = useState(initialIndex); const [prefixMask, setPrefixMask] = useState(0); const [formattedItems, setFormattedItems] = useState>([]); + useEffect(() => { + setIndex(initialIndex); + }, [items]); + // useMemo makes these functions only run once when mounting. Not every re-render. useMemo(() => { const tempFormattedItems = items.map(item => formatter(item)); @@ -30,9 +36,10 @@ export function SlotSelector({ }, [items]); const onClick = () => { + if (disabled) return; const nextIndex = (index + 1) % items.length; setIndex(nextIndex); - onChange(items[nextIndex]); + onChange(nextIndex); }; const getItem = (i: number) => @@ -56,7 +63,7 @@ export function SlotSelector({ }, [index]); return ( - + {transitions((style, i) => ( {getItem(i)} ))} diff --git a/src/components/Common/Inputs/SlotSelector/styles.ts b/src/components/Common/Inputs/SlotSelector/styles.ts index 132395a..9e2b68f 100644 --- a/src/components/Common/Inputs/SlotSelector/styles.ts +++ b/src/components/Common/Inputs/SlotSelector/styles.ts @@ -1,12 +1,16 @@ import styled from "styled-components"; -export const SlotWindow = styled.div` +type SlotWindowProps = { + disabled: boolean, +}; +export const SlotWindow = styled.div` position: relative; height: 1.5em; width: auto; border-radius: 0.6em; - background-color: white; + background-color: ${({ disabled }) => disabled + ? p => p.theme.colors.lightGrey : "white"}; box-shadow: inset 0 0 50px -50px ${p => p.theme.colors.darkGrey}; border: 1px solid ${p => p.theme.colors.darkGrey}; diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index 261dd2d..b6b8c09 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -46,9 +46,10 @@ export function OverlayControl() { /> dispatch(setCurrentOverlayId(value))} + onChange={(index) => dispatch(setCurrentOverlayId(overlayIds[index]))} removePrefix formatter={(value) => value.replace(/(\.png)|(\.jpg)$/, "")} + disabled={!visible} /> (value: string) => { + const onChange = (flag: "flagA" | "flagB") => (index: number) => { dispatch(setPrototypeState({ angledFlag: { - flagA: flag === "flagA" ? value : prototypeState?.angledFlag?.flagA ?? "GBR", - flagB: flag === "flagB" ? value : prototypeState?.angledFlag?.flagB ?? "GBR", + flagA: flag === "flagA" ? countries[index] : prototypeState?.angledFlag?.flagA ?? "GBR", + flagB: flag === "flagB" ? countries[index] : prototypeState?.angledFlag?.flagB ?? "GBR", }, })); }; From 5e7940a1512f909c8719c3efed4aa403d0817332 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 28 Jan 2022 17:53:50 -0500 Subject: [PATCH 7/9] ISSUE-032 - Progress checkpoint. Have a lot of the scaffolding in place. Next step is to make the Chyron controls actually work. Dramatic re-thinking of the chyron state definitions. Lots of goofy type following tricks in broadcastGraphics.ts. --- package.json | 1 + .../Chyrons/ChyronsDirectorControls.tsx | 94 +++++++++++++++++++ .../BroadcastDirectorUI/Chyrons/index.ts | 1 + .../BroadcastDirectorUI/Chyrons/styles.ts | 43 +++++++++ .../Inputs/SlotSelector/SlotSelector.tsx | 24 +++-- .../Common/Inputs/SlotSelector/styles.ts | 10 +- src/components/Common/Inputs/Toggle/styles.ts | 6 +- .../CustomWorkSpaces/AngledFlagWorkSpace.tsx | 12 +-- .../ChyronPrototypeControls.tsx | 14 ++- .../ChyronPrototype/styles.ts | 7 ++ src/domain/data/broadcastGraphics.ts | 42 +++++++++ .../graphics/broadcastGraphicsSlice.ts | 12 ++- src/shared/theme.ts | 7 ++ src/types/state.d.ts | 42 +++------ yarn.lock | 5 + 15 files changed, 266 insertions(+), 54 deletions(-) create mode 100644 src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx create mode 100644 src/components/Broadcast/BroadcastDirectorUI/Chyrons/index.ts create mode 100644 src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts create mode 100644 src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts create mode 100644 src/domain/data/broadcastGraphics.ts diff --git a/package.json b/package.json index 1e02dbe..15f2b71 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "lodash": "^4.17.21", "react": "^17.0.2", "react-dom": "^17.0.2", + "react-icons": "^4.3.1", "react-redux": "^7.2.6", "react-router-dom": "6", "react-scripts": "5.0.0", diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx new file mode 100644 index 0000000..e546fe3 --- /dev/null +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -0,0 +1,94 @@ +import { InlineCluster } from "@bedrock-layout/inline-cluster"; +import { useEffect, useState } from "react"; +import { useDispatch, useSelector } from "react-redux"; + +import { FaPlay, FaStepForward, FaStop } from "react-icons/fa"; +import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; + +import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics"; +import { BGChyronMode, BGChyronSubMode, FlagMode } from "../../../../types/state"; + +import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; +import { Button, CloseButton, OpenButton, SlotContainer, Title } from "./styles"; +import { Toggle } from "../../../Common/Inputs/Toggle"; + +export function ChyronsDirectorControls() { + // Use state to prevent unnecessary resetting on re-renders. + const [chyronModes] = useState>(getChyronModesList()); + const [chyronSubModes, setChyronSubModes] = useState>([]); + + // Interface states. + const [chyronMode, setChyronMode] = useState("driver"); + const [chyronSubMode, setChyronSubMode] = useState("medium"); + const [posFlag, setPosFlag] = useState(true); + const [driverNum, setDriverNum] = useState(true); + const [portrait, setPortrait] = useState(false); + const [flagMode, setFlagMode] = useState("country"); + + const dispatch = useDispatch(); + const { chyrons } = useSelector(broadcastGraphicsSelector); + + useEffect(() => { + setChyronSubModes(getChyronSubModesList(chyronMode)); + }, [chyronMode]); + + const onLaunch = () => { + const x = 0; + return x; + }; + + return ( + + Chyrons + + setChyronMode(chyronModes[index])} + /> + + + setChyronSubMode(chyronSubModes[index])} + /> + + + + + + + + + + + + + setFlagMode(flagModeList[index])} + /> + + + ); +} diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/index.ts b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/index.ts new file mode 100644 index 0000000..e69fc02 --- /dev/null +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/index.ts @@ -0,0 +1 @@ +export * from "./ChyronsDirectorControls"; diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts new file mode 100644 index 0000000..75f02dc --- /dev/null +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts @@ -0,0 +1,43 @@ +import styled from "styled-components"; +import { Px } from "../../../../types/style"; + +export const Title = styled.h4` + font-family: ${p => p.theme.fonts.f1Italic}; +`; +Title.displayName = "Title"; + +type SlotContainerProps = { + width: Px, +}; +export const SlotContainer = styled.div` + width: ${({ width }) => `${width}px`}; +`; +SlotContainer.displayName = "SlotContainer"; + +type ButtonProps = { + disabled: boolean, +}; +export const Button = styled.button` + font-family: ${p => p.theme.fonts.f1Regular}; + color: ${({ disabled }) => disabled + ? p => p.theme.colors.grey : "black"}; + + background-color: ${p => p.theme.colors.lightGrey}; + border-radius: ${p => p.theme.design.button.borderRadius}; + border: 1px black solid; + + cursor: pointer; +`; +Button.displayName = "Button"; + +export const OpenButton = styled(Button)` + background-color: ${({ disabled }) => disabled + ? p => p.theme.colors.disabledGreen : p => p.theme.colors.activeGreen}; +`; +OpenButton.displayName = "OpenButton"; + +export const CloseButton = styled(Button)` + background-color: ${({ disabled }) => disabled + ? p => p.theme.colors.disabledRed : p => p.theme.colors.activeRed}; +`; +CloseButton.displayName = "CloseButton"; diff --git a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx index 518a784..7472929 100644 --- a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx +++ b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx @@ -2,19 +2,26 @@ import { useEffect, useMemo, useState } from "react"; import { animated, useSpringRef, useTransition } from "@react-spring/web"; import { findPrefixCount } from "../../../../utils/strings"; -import { SlotText, SlotWindow } from "./styles"; +import { SelectorLabel, SlotText, SlotWindow } from "./styles"; +import { Inline } from "@bedrock-layout/inline"; type SlotSelectorProps = { items: Array, onChange: (index: number) => void, + label?: string, removePrefix?: boolean, formatter?: (value: string) => string, initialIndex?: number, disabled?: boolean, }; +/** + * If items are defined in a component make sure they are stateful to prevent + * random resets of the index during changes. + */ export function SlotSelector({ items, onChange, + label, removePrefix = false, formatter = (x) => x, initialIndex = 0, @@ -63,10 +70,15 @@ export function SlotSelector({ }, [index]); return ( - - {transitions((style, i) => ( - {getItem(i)} - ))} - + + {(label ?? null) && ( + {label} + )} + + {transitions((style, i) => ( + {getItem(i)} + ))} + + ); } diff --git a/src/components/Common/Inputs/SlotSelector/styles.ts b/src/components/Common/Inputs/SlotSelector/styles.ts index 9e2b68f..5996590 100644 --- a/src/components/Common/Inputs/SlotSelector/styles.ts +++ b/src/components/Common/Inputs/SlotSelector/styles.ts @@ -20,13 +20,21 @@ export const SlotWindow = styled.div` white-space: nowrap; text-overflow: ellipsis; `; +SlotWindow.displayName = "SlotWindow"; export const SlotText = styled.span` position: absolute; display: block; margin-left: .4em; font-family: ${p => p.theme.fonts.f1Regular}; - font-size: 0.9em; + font-size: ${p => p.theme.fontSizes.selector}; color: ${p => p.theme.colors.darkGrey}; user-select: none; `; +SlotText.displayName = "SlotText"; + +export const SelectorLabel = styled.span` + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: ${p => p.theme.fontSizes.label}; +`; +SelectorLabel.displayName = "SelectorLabel"; diff --git a/src/components/Common/Inputs/Toggle/styles.ts b/src/components/Common/Inputs/Toggle/styles.ts index e51a11b..5be4f32 100644 --- a/src/components/Common/Inputs/Toggle/styles.ts +++ b/src/components/Common/Inputs/Toggle/styles.ts @@ -5,7 +5,7 @@ type ToggleContainerProps = { } export const ToggleContainer = styled.div` display: flex; - justify-content: center; + align-items: flex-end; font-size: ${({ fontSize = "inherit" }) => fontSize}; `; ToggleContainer.displayName = "ToggleContainer"; @@ -24,7 +24,10 @@ ToggleInput.displayName = "ToggleInput"; export const ToggleLabelText = styled.span` margin-right: 1ch; + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: ${p => p.theme.fontSizes.label}; `; +ToggleLabelText.displayName = "ToggleLabelText"; export const ToggleLabel = styled.label` display: block; @@ -95,4 +98,3 @@ export const ToggleCircle = styled.div` ${({ toggled }) => toggled ? css`right: 0;` : css`left: 0;`} `; ToggleCircle.displayName = "ToggleCircle"; - diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx index 23d1d35..08ecf83 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx @@ -1,5 +1,4 @@ -import { useEffect } from "react"; -import { useDispatch, useSelector } from "react-redux"; +import { useSelector } from "react-redux"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; @@ -9,15 +8,6 @@ import { BasicBlock } from "./styles"; export function AngledFlagWorkSpace() { const { prototypeState } = useSelector(workspaceSelector); - // const dispatch = useDispatch(); - // useEffect(() => { - // dispatch(setPrototypeState({ - // angledFlag: { - // flagA: "GBR", - // flagB: "GBR", - // }, - // })); - // }, [currentWorkspaceId]); return ( diff --git a/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx index d37a04b..9f22149 100644 --- a/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx @@ -1,15 +1,21 @@ -import { Grid } from "@bedrock-layout/grid"; import { PadBox } from "@bedrock-layout/padbox"; +import { Split } from "@bedrock-layout/split"; +import { ChyronsDirectorControls } from "../../../Broadcast/BroadcastDirectorUI/Chyrons"; import { GridSelection } from "../GridSelection"; +import { ChyronControlsContainer } from "./styles"; export function ChyronPrototypeControls() { return ( - + + + + + + - Launcher/Closer - + ); } diff --git a/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts b/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts new file mode 100644 index 0000000..6f0499e --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts @@ -0,0 +1,7 @@ +import styled from "styled-components"; + +export const ChyronControlsContainer = styled.div` + width: 420px; + height: auto; +`; +ChyronControlsContainer.displayName = "ChyronControlsContainer"; diff --git a/src/domain/data/broadcastGraphics.ts b/src/domain/data/broadcastGraphics.ts new file mode 100644 index 0000000..05940ce --- /dev/null +++ b/src/domain/data/broadcastGraphics.ts @@ -0,0 +1,42 @@ +import { keys } from "lodash"; +import { BGChyronSubMode, BGChyronMode, BGRelativePos, FlagMode } from "../../types/state"; + +// Chyrons Section +const chyronsData: { + [mode: BGChyronMode]: { + relativePos: BGRelativePos, + subModes: { + [subMode: BGChyronSubMode]: Record, + }, + }, +} = { + driver: { + relativePos: { top: "0", right: "0", bottom: "0", left: "0" }, + subModes: { + medium: { width: 582, height: 72 }, + large: { width: 638, height: 98 }, + }, + }, +}; + +export const flagModeList: Array = ["country", "team", "none"]; + +export function getChyronModesList(): Array { + return keys(chyronsData); +} + +export function getChyronRelativePos(mode: BGChyronMode): BGRelativePos { + return chyronsData[mode]?.relativePos + ?? { top: "0", right: "0", bottom: "0", left: "0" }; +} + +export function getChyronSubModesList(mode: BGChyronMode): Array { + return keys(chyronsData[mode]?.subModes ?? {}); +} + +export function getChyronSubModeProps( + mode: BGChyronMode, + subMode: BGChyronSubMode, +): Record { + return chyronsData[mode]?.subModes[subMode] ?? {}; +} diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index 617acd4..0d8be0b 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -13,7 +13,7 @@ export const broadcastGraphicsSlice = createSlice({ chyronsLaunch: (state, action: PayloadAction) => { state.chyrons = action.payload; }, - chyronsSetOpenState: (state, action: PayloadAction) => { + chyronsOpenStateSet: (state, action: PayloadAction) => { if (state.chyrons == null) return; state.chyrons.primary.openState = action.payload; @@ -21,6 +21,14 @@ export const broadcastGraphicsSlice = createSlice({ state.chyrons.secondary.openState = action.payload; } }, + chyronsOpenStateIncrement: (state) => { + if (state.chyrons == null) return; + ++state.chyrons.primary.openState; + + if (state.chyrons.secondary != null) { + ++state.chyrons.secondary.openState; + } + }, chyronsClear: (state) => { state.chyrons = null; }, @@ -29,6 +37,8 @@ export const broadcastGraphicsSlice = createSlice({ export const { chyronsLaunch, + chyronsOpenStateSet, + chyronsOpenStateIncrement, chyronsClear, } = broadcastGraphicsSlice.actions; export default broadcastGraphicsSlice.reducer; diff --git a/src/shared/theme.ts b/src/shared/theme.ts index 755e588..019b999 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -15,6 +15,9 @@ export const theme = { blue: "#387af5", pink: "#eb57a3", activeGreen: "#65c466", + disabledGreen: "#b1d3b2", + activeRed: "#e63746", + disabledRed: "#e08a91", grey: "#aaa", lightGrey: "#ddd", faintGrey: "#eee", @@ -33,6 +36,10 @@ export const theme = { williams: "#005aff", }, }, + fontSizes: { + label: "0.9em", + selector: "0.9em", + }, design: { button: { borderRadius: "0.25rem", diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 9850297..4f083e1 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -195,7 +195,7 @@ export interface BGBaseState { openState: OpenState; } /** - * -1 closing, 0 closed, 1 open, 2... different states + * -1 closing, 0 closed, 1 open, 2... different states (for progressive anims) */ export type OpenState = number; @@ -209,40 +209,24 @@ export interface BroadcastGraphics { } // Chyrons -export type FlagMode = "country" | "team"; -export type BGChyronMode = - | "driver-basic-small" - | "driver-basic-medium" - | "driver-basic-large"; +export type BGChyronMode = string; +export type BGChyronSubMode = string; export interface BGChyron extends BGBaseState { mode: BGChyronMode; - car: Car; - flagMode: FlagMode; - showPosFlag: boolean; - showDriverNumber: boolean; - dimensions: Dimensions; - props?: unknown; } export interface BGChyrons { primary: BGChyron; secondary: Optional; // sponsorGem: BGSponsorGem; } -export interface BGChyronMedium extends BGChyron { - mode: "driver-basic-medium"; - dimensions: { - width: 582; - height: 72; - } - props: { - showPortrait: boolean; - } -} -export interface BGChyronLarge extends BGChyron { - mode: "driver-basic-large"; - dimensions: { - width: 638; - height: 98; - } -} +export type FlagMode = "country" | "team" | "none"; +export interface BGChyronDriver extends BGChyron { + car: Car; + subMode: BGChyronSubMode; + baseDimensions: Dimensions; + flagMode: FlagMode; + showPosFlag: boolean; + showDriverNumber: boolean; + showPortrait: boolean; +} diff --git a/yarn.lock b/yarn.lock index b665779..b3da133 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7726,6 +7726,11 @@ react-error-overlay@^6.0.10: resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz" integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== +react-icons@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca" + integrity sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ== + react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" From d5b653da9d48bc248af67c7a5f0b6240cdb3c2e7 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 31 Jan 2022 12:44:12 -0500 Subject: [PATCH 8/9] ISSUE-032 - Making some organizational changes to how the Chyron director controls are built. Have more work to perform but making a checkpoint commit to keep track of my work so far. --- .../Chyrons/ChyronsDirectorControls.tsx | 100 +++++++++++------- .../Inputs/SlotSelector/SlotSelector.tsx | 4 +- .../Common/Inputs/SlotSelector/styles.ts | 4 +- .../ChyronPrototypeControls.tsx | 2 +- 4 files changed, 67 insertions(+), 43 deletions(-) diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index e546fe3..ca1f0c5 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -11,6 +11,8 @@ import { BGChyronMode, BGChyronSubMode, FlagMode } from "../../../../types/state import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; import { Button, CloseButton, OpenButton, SlotContainer, Title } from "./styles"; import { Toggle } from "../../../Common/Inputs/Toggle"; +import { Stack } from "@bedrock-layout/stack"; +import { Inline } from "@bedrock-layout/inline"; export function ChyronsDirectorControls() { // Use state to prevent unnecessary resetting on re-renders. @@ -37,36 +39,17 @@ export function ChyronsDirectorControls() { return x; }; - return ( + const controlSelector = (mode: BGChyronMode, subMode: BGChyronSubMode) => { + if (mode === "driver") { + return driverMode(subMode); + } else { + return null; + } + }; + + const driverMode = (subMode: BGChyronSubMode) => ( + - Chyrons - - setChyronMode(chyronModes[index])} - /> - - - setChyronSubMode(chyronSubModes[index])} - /> - - - - - - - - - - - setFlagMode(flagModeList[index])} + {subMode === "medium" && ( + - + )} + setFlagMode(flagModeList[index])} + slotWidth="12ch" + /> ); + + return ( + + + Chyrons + + setChyronMode(chyronModes[index])} + /> + setChyronSubMode(chyronSubModes[index])} + /> + + + + + + + + + + + + {controlSelector(chyronMode, chyronSubMode)} + + ); } diff --git a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx index 7472929..b9f8c50 100644 --- a/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx +++ b/src/components/Common/Inputs/SlotSelector/SlotSelector.tsx @@ -13,6 +13,7 @@ type SlotSelectorProps = { formatter?: (value: string) => string, initialIndex?: number, disabled?: boolean, + slotWidth?: string, }; /** * If items are defined in a component make sure they are stateful to prevent @@ -26,6 +27,7 @@ export function SlotSelector({ formatter = (x) => x, initialIndex = 0, disabled = false, + slotWidth = "6ch", }: SlotSelectorProps) { const [index, setIndex] = useState(initialIndex); const [prefixMask, setPrefixMask] = useState(0); @@ -74,7 +76,7 @@ export function SlotSelector({ {(label ?? null) && ( {label} )} - + {transitions((style, i) => ( {getItem(i)} ))} diff --git a/src/components/Common/Inputs/SlotSelector/styles.ts b/src/components/Common/Inputs/SlotSelector/styles.ts index 5996590..9a2f580 100644 --- a/src/components/Common/Inputs/SlotSelector/styles.ts +++ b/src/components/Common/Inputs/SlotSelector/styles.ts @@ -2,11 +2,13 @@ import styled from "styled-components"; type SlotWindowProps = { disabled: boolean, + width?: string, }; export const SlotWindow = styled.div` position: relative; height: 1.5em; - width: auto; + width: ${({ width = "auto" }) => width}; + min-width: 6ch; border-radius: 0.6em; background-color: ${({ disabled }) => disabled diff --git a/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx index 9f22149..44945cc 100644 --- a/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/ChyronPrototype/ChyronPrototypeControls.tsx @@ -8,7 +8,7 @@ import { ChyronControlsContainer } from "./styles"; export function ChyronPrototypeControls() { return ( - + From 0625361a180da51c0391f1f88b2ea858d724c856 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 31 Jan 2022 18:24:25 -0500 Subject: [PATCH 9/9] ISSUE-032 - Have Chyron prototyping controls configured and hooked up. Support for double driver chyrons. Serious refactoring of the BroadcastGraphics states. Simplification and improvements to how the chyron states work (I was using interfaces in a way that was incompatible with reality and have fixed it). --- .../Chyrons/ChyronsDirectorControls.tsx | 140 ++++++++++++------ .../BroadcastDirectorUI/Chyrons/styles.ts | 16 +- .../Chyrons/Container/ChyronContainer.tsx | 32 ++++ .../Chyrons/Container/index.ts | 1 + .../Chyrons/Container/styles.ts | 6 + .../Chyrons/Driver/ChyronDriver.tsx | 63 ++++---- .../CustomWorkSpaces/AngledFlagWorkSpace.tsx | 11 +- .../AngledFlagPrototypeControls.tsx | 4 +- src/components/Workspaces/Workspace/styles.ts | 4 +- src/components/Workspaces/WorkspacesRoute.tsx | 21 ++- src/domain/data/workspaces.ts | 20 ++- .../director/broadcastDirectorSlice.ts | 4 +- .../graphics/broadcastGraphicsSlice.ts | 16 +- src/features/event/eventSlice.ts | 4 +- .../chyron-driver-medium-full-sai-ric.png | Bin 0 -> 67360 bytes src/types/state.d.ts | 15 +- 16 files changed, 233 insertions(+), 124 deletions(-) create mode 100644 src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx create mode 100644 src/components/BroadcastGraphics/Chyrons/Container/index.ts create mode 100644 src/components/BroadcastGraphics/Chyrons/Container/styles.ts create mode 100644 src/public/images/overlays/chyron-driver-medium-full-sai-ric.png diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index ca1f0c5..7e1a02e 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -1,18 +1,23 @@ import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; - -import { FaPlay, FaStepForward, FaStop } from "react-icons/fa"; -import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; - -import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics"; -import { BGChyronMode, BGChyronSubMode, FlagMode } from "../../../../types/state"; - -import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; -import { Button, CloseButton, OpenButton, SlotContainer, Title } from "./styles"; -import { Toggle } from "../../../Common/Inputs/Toggle"; import { Stack } from "@bedrock-layout/stack"; import { Inline } from "@bedrock-layout/inline"; +import { FaPlay, FaStepForward, FaStop } from "react-icons/fa"; + +import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; +import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector"; +import { + chyronsClear, + chyronsOpenStateIncrement, + chyronsSet, +} from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; +import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics"; +import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, Car, FlagMode } from "../../../../types/state"; + +import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; +import { Button, CloseButton, OpenButton, Title } from "./styles"; +import { Toggle } from "../../../Common/Inputs/Toggle"; export function ChyronsDirectorControls() { // Use state to prevent unnecessary resetting on re-renders. @@ -27,55 +32,91 @@ export function ChyronsDirectorControls() { const [portrait, setPortrait] = useState(false); const [flagMode, setFlagMode] = useState("country"); + // Central state. const dispatch = useDispatch(); const { chyrons } = useSelector(broadcastGraphicsSelector); + const { selectedCars } = useSelector(broadcastDirectorSelector); useEffect(() => { setChyronSubModes(getChyronSubModesList(chyronMode)); }, [chyronMode]); - const onLaunch = () => { - const x = 0; - return x; + const onOpen = () => { + if (chyronMode === "driver") { + if (selectedCars.length === 0) return; + let primaryCar = selectedCars[0]; + let secondaryCar = selectedCars.length > 1 ? selectedCars[1] : null; + + // Auto-sort drivers by position so trailing car always appears second. + if (chyronSubMode === "medium" && secondaryCar != null + && secondaryCar.position < primaryCar.position) { + secondaryCar = selectedCars[0]; + primaryCar = selectedCars[1]; + } + const newChyrons: BGChyrons = { + openState: 1, + relativePos: { top: "0", right: "0", bottom: "0", left: "0" }, + mode: chyronMode, + subMode: chyronSubMode, + driver: { + primary: buildDriverChyron(primaryCar), + secondary: secondaryCar != null ? buildDriverChyron(secondaryCar) : null, + }, + }; + dispatch(chyronsSet(newChyrons)); + } }; - const controlSelector = (mode: BGChyronMode, subMode: BGChyronSubMode) => { + const onNext = () => { + dispatch(chyronsOpenStateIncrement()); + }; + + const onClose = () => { + dispatch(chyronsClear()); + }; + + const buildDriverChyron = (car: Car): BGChyronDriver => ({ + car, + flagMode, + showPosFlag: posFlag, + showDriverNumber: driverNum, + showPortrait: chyronSubMode === "large" ? false : portrait, + }); + + const modeControls = (mode: BGChyronMode, subMode: BGChyronSubMode) => { if (mode === "driver") { - return driverMode(subMode); + return ( + + + + {subMode === "medium" && ( + + )} + setFlagMode(flagModeList[index])} + slotWidth="12ch" + /> + + ); } else { return null; } }; - const driverMode = (subMode: BGChyronSubMode) => ( - - - - - {subMode === "medium" && ( - - )} - setFlagMode(flagModeList[index])} - slotWidth="12ch" - /> - - ); - return ( @@ -92,23 +133,26 @@ export function ChyronsDirectorControls() { - {controlSelector(chyronMode, chyronSubMode)} + {modeControls(chyronMode, chyronSubMode)} ); } diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts index 75f02dc..869a386 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts @@ -1,19 +1,10 @@ import styled from "styled-components"; -import { Px } from "../../../../types/style"; export const Title = styled.h4` font-family: ${p => p.theme.fonts.f1Italic}; `; Title.displayName = "Title"; -type SlotContainerProps = { - width: Px, -}; -export const SlotContainer = styled.div` - width: ${({ width }) => `${width}px`}; -`; -SlotContainer.displayName = "SlotContainer"; - type ButtonProps = { disabled: boolean, }; @@ -27,6 +18,13 @@ export const Button = styled.button` border: 1px black solid; cursor: pointer; + + &:hover { + box-shadow: inset 0px 0px 10px 0px rgba(0, 0, 0, 0.3); + } + &:active { + box-shadow: inset 0px 0px 10px 4px rgba(255, 255, 255, 0.8); + } `; Button.displayName = "Button"; diff --git a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx new file mode 100644 index 0000000..bc220b7 --- /dev/null +++ b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx @@ -0,0 +1,32 @@ +import { Inline } from "@bedrock-layout/inline"; +import { useSelector } from "react-redux"; + +import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; + +import { ChyronDriver } from "../Driver"; +import { Spacer } from "./styles"; + +export function ChyronContainer() { + const { chyrons } = useSelector(broadcastGraphicsSelector); + + if (chyrons == null || chyrons.driver == null) return null; + + return ( + + + + {chyrons.subMode == "medium" && chyrons.driver.secondary && ( + <> + + + + )} + + ); +} diff --git a/src/components/BroadcastGraphics/Chyrons/Container/index.ts b/src/components/BroadcastGraphics/Chyrons/Container/index.ts new file mode 100644 index 0000000..b130ced --- /dev/null +++ b/src/components/BroadcastGraphics/Chyrons/Container/index.ts @@ -0,0 +1 @@ +export * from "./ChyronContainer"; diff --git a/src/components/BroadcastGraphics/Chyrons/Container/styles.ts b/src/components/BroadcastGraphics/Chyrons/Container/styles.ts new file mode 100644 index 0000000..8805b35 --- /dev/null +++ b/src/components/BroadcastGraphics/Chyrons/Container/styles.ts @@ -0,0 +1,6 @@ +import styled from "styled-components"; + +export const Spacer = styled.div` + width: 32px; +`; +Spacer.displayName = "Spacer"; diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 6f5714f..d3e23d9 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -1,3 +1,7 @@ +import { BGChyronDriver, BGChyronSubMode } from "../../../../types/state"; + +import { theme } from "../../../../shared/theme"; + import { DriverNumber } from "../../Common/DriverNumber"; import { AngledFlag } from "../../Common/AngledFlag"; import { @@ -14,37 +18,46 @@ import { TextContainer, FlagContainer, } from "./styles"; -import { drivers } from "../../../../domain/data/teams"; -import { theme } from "../../../../shared/theme"; -export function ChyronDriver() { - // TODO - Get driver details from Redux. - const driver = drivers["hamilton"]; - const baseWidth = 582; - const baseHeight = 72; +type ChyronDriverProps = { + chyronData: BGChyronDriver, + subMode: BGChyronSubMode, +}; +export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) { + const [baseWidth, baseHeight] = subMode === "medium" ? [582, 72] + : subMode === "large" ? [638, 98] + : [0, 0]; + + const { car, flagMode, showPosFlag, showDriverNumber } = chyronData; return ( - - 1 - + {showPosFlag && ( + + + {car.position} + + + )} - + - {driver.firstName} - {driver.lastName} - - - + {car.driver.firstName} + {car.driver.lastName} + {showDriverNumber && ( + + + + )} - {driver.team.shortName} + {car.driver.team.shortName} ); } - -// export function ChyronDriverStateContainer() { - -// } diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx index 08ecf83..cfcc591 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx @@ -1,23 +1,26 @@ import { useSelector } from "react-redux"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; +import { FlagMode } from "../../../types/state"; import { AngledFlag } from "../../BroadcastGraphics/Common/AngledFlag"; import { BasicBlock } from "./styles"; - -export function AngledFlagWorkSpace() { +type AngledFlagWorkSpaceProps = { + flagMode: FlagMode, +}; +export function AngledFlagWorkSpace({ flagMode }: AngledFlagWorkSpaceProps) { const { prototypeState } = useSelector(workspaceSelector); return ( diff --git a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx index d1ddb0c..38c3cd6 100644 --- a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx @@ -26,8 +26,8 @@ export function AngledFlagPrototypeControls() { }; return ( - - + + ); } diff --git a/src/components/Workspaces/Workspace/styles.ts b/src/components/Workspaces/Workspace/styles.ts index 8d689ed..8a270ba 100644 --- a/src/components/Workspaces/Workspace/styles.ts +++ b/src/components/Workspaces/Workspace/styles.ts @@ -13,9 +13,7 @@ export type PreviewWindowProps = { dimensions: Dimensions, animatedBG?: boolean, }; -export const PreviewWindow = styled(PadBox).attrs(() => ({ - padding: "lg", -}))` +export const PreviewWindow = styled.div` position: relative; display: flex; justify-content: center; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index eaab0bb..8660810 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -11,10 +11,10 @@ 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"; +import { ChyronContainer } from "../BroadcastGraphics/Chyrons/Container"; const WORKSPACE_LIST_WIDTH = 180; @@ -49,17 +49,24 @@ export default function Workspaces() { > Workspaces Home} /> - } + workspaceId="chyron" + previewContent={} prototypeControls={} /> } /> - } + workspaceId="chyronWide" + previewContent={} + prototypeControls={} + /> + } /> + } prototypeControls={} /> } /> diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 16086cd..a1132f9 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -4,8 +4,8 @@ type WorkspaceObject = { [id: WorkspaceId]: WorkspaceProperties, }; export const workspaces: WorkspaceObject = { - chyronDriver: { - name: "Chyron Driver", + chyron: { + name: "Chyron", overlayIds: [ "chyron-driver-medium-full-ham.png", "chyron-driver-medium-full-alo.png", @@ -24,11 +24,21 @@ export const workspaces: WorkspaceObject = { ], previewWindowDimensions: { width: 750, - height: 300, + height: 400, }, }, - angledFlag: { - name: "Angled Flag", + chyronWide: { + name: "Chyron (Wide)", + overlayIds: [ + "chyron-driver-medium-full-sai-ric.png", + ], + previewWindowDimensions: { + width: 1200, + height: 150, + }, + }, + angledFlagCountry: { + name: "Angled Flag (Country)", overlayIds: [ "angled-flag-gbr.png", ], diff --git a/src/features/broadcast/director/broadcastDirectorSlice.ts b/src/features/broadcast/director/broadcastDirectorSlice.ts index 0406510..5bd72aa 100644 --- a/src/features/broadcast/director/broadcastDirectorSlice.ts +++ b/src/features/broadcast/director/broadcastDirectorSlice.ts @@ -32,7 +32,9 @@ export const broadcastDirectorSlice = createSlice({ }, /** * Shortcut to clear out selected cars. There is also a trick - if you - * @param action Car (optional) - if provided, it'll clear all and add this. + * provide a single Car it'll replace all selected cars with that single + * car. + * @param action Car (optional) */ selectedCarsClear: (state, action: PayloadAction>) => { if (action.payload == null) { diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index 0d8be0b..d5acc27 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -10,23 +10,23 @@ export const broadcastGraphicsSlice = createSlice({ name: "broadcastGraphics", initialState, reducers: { - chyronsLaunch: (state, action: PayloadAction) => { + chyronsSet: (state, action: PayloadAction) => { state.chyrons = action.payload; }, chyronsOpenStateSet: (state, action: PayloadAction) => { if (state.chyrons == null) return; - state.chyrons.primary.openState = action.payload; + state.chyrons.openState = action.payload; - if (state.chyrons.secondary != null) { - state.chyrons.secondary.openState = action.payload; + if (state.chyrons != null) { + state.chyrons.openState = action.payload; } }, chyronsOpenStateIncrement: (state) => { if (state.chyrons == null) return; - ++state.chyrons.primary.openState; + ++state.chyrons.openState; - if (state.chyrons.secondary != null) { - ++state.chyrons.secondary.openState; + if (state.chyrons != null) { + ++state.chyrons.openState; } }, chyronsClear: (state) => { @@ -36,7 +36,7 @@ export const broadcastGraphicsSlice = createSlice({ }); export const { - chyronsLaunch, + chyronsSet, chyronsOpenStateSet, chyronsOpenStateIncrement, chyronsClear, diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index 83114f0..108ded2 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -20,8 +20,8 @@ const initialState: RootState["event"] = { }, grid: [ { position: 1, driver: cloneDriver("verstappen") }, - { position: 3, driver: cloneDriver("hamilton") }, - { position: 2, driver: cloneDriver("bottas") }, + { position: 2, driver: cloneDriver("hamilton") }, + { position: 3, driver: cloneDriver("bottas") }, { position: 4, driver: cloneDriver("perez") }, { position: 5, driver: cloneDriver("sainz") }, { position: 6, driver: cloneDriver("norris") }, diff --git a/src/public/images/overlays/chyron-driver-medium-full-sai-ric.png b/src/public/images/overlays/chyron-driver-medium-full-sai-ric.png new file mode 100644 index 0000000000000000000000000000000000000000..080c6542d1ea78e6dd0ffdf83ab25573e2c9ffb3 GIT binary patch literal 67360 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

W~*HR*t%5yHn?wz=nwa}F4H0- zgI3Gld`DwO$FfnZhuJt1f^!|AMMpc|6>_qxyM40u!_5ib!GxeV`=v+;i7%yp9dib=O zx%8P|1xNhHn&;K{-UMTmkwZgsG*xZcBnoNpUVQ974gY)tcoy94)&9Jyrb_y_de zHVM)`*YCRk0WY|+3TLd1D2b9zg%Q7f<{{s61vlztmaM~dj3IG3y9a_K;u9O~xw%|$ zlB5qC6AzfTtEKNPlRD(ozqV7a-3%9MQt_cKTZq-(a^af{F1jE}wB{nH{F%f!jkd(o zw%U&sF!__dE!Y_K5zHiqpH!*9g`+mh)ZcDySj>NpK`wG{ycF`Zd`3&l*$)xmmP_1l zcNZ#C@h@5|p#Kim4@=}PPUA4NlwX;=iLZ)A)(;XR?Qw{6XHg=QL~Ng?X#vs<1!I9K zE9H`x5F7W5*Z)f5A?ashgQ_4bUMxKy`n$Dl%{@fE2KAPQe|xUiQE&an%)3vgVuIsE;nQz<)IV|L5W%RwcEo+-DTU1`p?7};vb zpvR{}>Rjp8_8Ca-Zg+l>52@ zxnef&0;C|GD>TEjQKQO;4CHSzl$EuBwgX4u$`$D2thUcqZw#bGBfkU|Yhi8{RHG{% zT=g_onax(36iaLOBw0V1Ngd7mPI?5%jfeBLF)RCc?Bx2I2Vbd=ugwHUeiOh=7nR>O zsZ3@pHXYReC40D`kh|zggq=6vh6*gz{9KeE7^BNK7d_P$K-n=Pc+FPD@Xc>9M%~DH zGQW`LHtOYnDkb$h4tCm{#?PV_fu2!({gbmP=%pfax=bgtWierP;yD-9w%Q|EMW^69 zhnMUu8N+9DD{hvGKT*{O0N7BVQQ!3B?oSLMEQ1QiI zTL3?V_T_M9(&WM_-h9io)?%>jX9zngqf0^3M_x3nIF^wD2^x~Pm+>2=oW1}gCH)<01}cKNp5Zj5g`^MyApA-g zf+q=H;?-0pJjZ+@<(17_@eC!9GP-b=a?U`%jA6q_(OoJr#pFg%(2cF;NgV!ScRvwH zx<<@bq;R^Z0;!3b6d;}RaV+BDRC@5~}0 zD>FX=b+4g_zm1)Vn$w>Gyx&kP z*ULQ3Z5k1ye3|yScO7m!jZe%P&E0-HT(v>Z6pO)>*Qpl8(|J(CsCSsxt|+z6eR;++ z>zOE(M-E%}dz_M$ovki$z?&x4}{qdBSq<`Q~UX%A? zV+?PreeZG2HyYKE2|c}=!&rHZ(|qH>ZZ;AJKFtrJQO}5=c9b@XV>o#k202;YPhEd0 zdWhB^NIur;{KxV}u8QQS>rc}E zA~uN8%9JaiY&!D?&*3VY(f#_3a|Qh|%3hW`d_*P~@0VYRyYDnG3sG6de#x|SH}jq_ z*tQULJ#T?74nMUO>nD3DY+WmLSHFAI?(@yG(^+f$VeiJs~fITfGYD*jA>_ z*Wm?#KnwbSk(IaeA~;tr%(fzh!l5ortMXL_K8f;`7GAQ~blu+2$Gzja_d>7HD~PI! zbEMCHnV)a+Tqn+Z4~x%5Ns7HfJ9#tRemYa4{E48a_F$zc)GcP7^t2xxNk&|3>(7D5 zwC!215>EC>=*@Irq52@>bEk;pN+&j^s3;hjkS;;@bO?qy4@o8Ri&7FQeZnpEB|HMI zuE0YXx}A}!f>))ob#q|dTQ*2rv z$`Mh*86-F#55v}cyQAD`}Dd2*wO-rt_mpgncce|0ZK~R>DJ3Egv=iy z(M5f`Z({6Yq)HY$doMFL9GvA7GOhIw9deA=BFH9+ZY=SyTh?l(#(p>$JbA>xq;?Z} zdO~sfSOo#*auofi6(3Or8n>u$?qkn+N>g^{`Mr5Dwo?C&hXn>)RaRZ@%YTKRBi>1nQ~-p>W{nK~aqk$_?>30{8!qJZ5wi zLJ%9cT^bRxqyc8Z!hgTj#JKv3Z8#Rw4!#(g8uK)}ud~n8YX)7tp{|`ZOz{;v)vKBd zDcl*>Qq}cMiwwz{43aPFYnOgfim#j$Nn^cPq}yxE08ZV2%Vn;)(13?f+(dM324lvw eSx{XAau-s#tjtcCGysQyA5}#yg-`O; + subMode: BGChyronSubMode; + driver?: { + primary: BGChyronDriver; + secondary: Optional; + } // sponsorGem: BGSponsorGem; } -export type FlagMode = "country" | "team" | "none"; export interface BGChyronDriver extends BGChyron { car: Car; - subMode: BGChyronSubMode; - baseDimensions: Dimensions; flagMode: FlagMode; showPosFlag: boolean; showDriverNumber: boolean; showPortrait: boolean; } +export type FlagMode = "country" | "team" | "none";