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).
This commit is contained in:
1 parent
d5b653da9d
commit
0625361a18
16 files changed
+233
-124
No files matched your search
@@ -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<FlagMode>("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 (
|
||||
<InlineCluster gutter="md">
|
||||
<Toggle
|
||||
label="Pos. Flag"
|
||||
toggled={posFlag}
|
||||
onToggle={setPosFlag}
|
||||
/>
|
||||
<Toggle
|
||||
label="Driver Num."
|
||||
toggled={driverNum}
|
||||
onToggle={setDriverNum}
|
||||
/>
|
||||
{subMode === "medium" && (
|
||||
<Toggle
|
||||
label="Portrait"
|
||||
toggled={portrait}
|
||||
onToggle={setPortrait}
|
||||
/>
|
||||
)}
|
||||
<SlotSelector
|
||||
label="Flag Mode"
|
||||
items={flagModeList}
|
||||
onChange={index => setFlagMode(flagModeList[index])}
|
||||
slotWidth="12ch"
|
||||
/>
|
||||
</InlineCluster>
|
||||
);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const driverMode = (subMode: BGChyronSubMode) => (
|
||||
|
||||
<InlineCluster gutter="md">
|
||||
<Toggle
|
||||
label="Pos. Flag"
|
||||
toggled={posFlag}
|
||||
onToggle={setPosFlag}
|
||||
/>
|
||||
<Toggle
|
||||
label="Driver Num."
|
||||
toggled={driverNum}
|
||||
onToggle={setDriverNum}
|
||||
/>
|
||||
{subMode === "medium" && (
|
||||
<Toggle
|
||||
label="Portrait"
|
||||
toggled={portrait}
|
||||
onToggle={setPortrait}
|
||||
/>
|
||||
)}
|
||||
<SlotSelector
|
||||
label="Flag Mode"
|
||||
items={flagModeList}
|
||||
onChange={index => setFlagMode(flagModeList[index])}
|
||||
slotWidth="12ch"
|
||||
/>
|
||||
</InlineCluster>
|
||||
);
|
||||
|
||||
return (
|
||||
<Stack gutter="md">
|
||||
<Inline gutter="md" stretch={1}>
|
||||
@@ -92,23 +133,26 @@ export function ChyronsDirectorControls() {
|
||||
</Inline>
|
||||
<Inline gutter="sm">
|
||||
<OpenButton
|
||||
disabled={false}
|
||||
onClick={onOpen}
|
||||
disabled={chyrons != null}
|
||||
>
|
||||
<FaPlay size="0.8em" />
|
||||
</OpenButton>
|
||||
<Button
|
||||
disabled={false}
|
||||
onClick={onNext}
|
||||
disabled={chyrons == null}
|
||||
>
|
||||
<FaStepForward size="0.8em" />
|
||||
</Button>
|
||||
<CloseButton
|
||||
disabled={false}
|
||||
onClick={onClose}
|
||||
disabled={chyrons == null}
|
||||
>
|
||||
<FaStop size="0.8em" />
|
||||
</CloseButton>
|
||||
</Inline>
|
||||
</Inline>
|
||||
{controlSelector(chyronMode, chyronSubMode)}
|
||||
{modeControls(chyronMode, chyronSubMode)}
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user