ISSUE-062 - Basic base in place with no real interactivity or anything like that.

Saving progress for the day. It's dinner time!
This commit is contained in:
Kyle Geib committed 2022-03-07 18:28:49 -05:00
1 parent c42f64f43c
commit 28e0e7f3d4
12 files changed
+77 -27

No files matched your search

@@ -2,7 +2,7 @@ import { useSpring } from "@react-spring/web";
import { useDispatch } from "react-redux";
import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state";
import { Fraction } from "../../../../types/style";
import { DebugDurationProps, Fraction } from "../../../../types/style";
import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { theme } from "../../../../shared/theme";
import { outlineClipPath } from "../../../../utils/styling";
@@ -30,11 +30,10 @@ import {
import { VenetianBlindsTransition } from "../../Common/VenetianBlindsTransition";
import { Spacer } from "../../Common/Spacer.styled";
type ChyronDriverProps = {
type ChyronDriverProps = DebugDurationProps & {
chyronData: BGChyronDriver,
subMode: BGChyronSubMode,
openState: OpenState,
debugDurationMultiplier?: Fraction,
};
export function ChyronDriver({
chyronData,
@@ -0,0 +1,21 @@
import { useSelector } from "react-redux";
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
import { DebugDurationProps } from "../../../../types/style";
import { StatusIndicatorBase } from "./styles";
type StatusIndicatorProps = DebugDurationProps;
export function StatusIndicator({
debugDurationMultiplier: DDM = 1.0,
}: StatusIndicatorProps) {
const { timingBoard: { statusIndicator: { mode } } } =
useSelector(broadcastGraphicsSelector);
return (
<StatusIndicatorBase
mode={mode}
/>
);
}
@@ -0,0 +1 @@
export * from "./StatusIndicator";
@@ -0,0 +1,22 @@
import styled, { css } from "styled-components";
import { BGStatusIndicatorModes } from "../../../../types/state";
type StatusIndicatorBaseProps = {
mode: BGStatusIndicatorModes,
};
export const StatusIndicatorBase = styled.div<StatusIndicatorBaseProps>`
background-color: black;
border-top-right-radius: ${p => p.theme.design.statusIndicator.roundedCornerRadiusPx}px;
height: ${p => p.theme.design.statusIndicator.heightNormalPx}px;
width: ${({ theme: { design: { timingTower } }, mode }) => {
if (mode === BGStatusIndicatorModes.LapNarrow) {
return timingTower.rowLeftHalfWidthPx;
}
if (mode === BGStatusIndicatorModes.LapWide) {
return timingTower.rowLeftHalfWidthPx + timingTower.rowRightHalfWidthPx;
}
return 10;
}}px;
`;
StatusIndicatorBase.displayName = "StatusIndicatorBase";
@@ -1,23 +1,23 @@
import { useSelector } from "react-redux";
import { workspaceSelector } from "../../../features/workspace/workspaceSelector";
import { theme } from "../../../shared/theme";
import { TimingBoardLayout } from "./styles";
import { MockupBlock } from "../../Common/MockupBlock.styled";
import { TimingTower } from "./TimingTower";
import { StatusIndicator } from "./StatusIndicator";
export function TimingBoard() {
type TimingBoardProps = {
debug?: boolean,
};
export function TimingBoard({ debug = false }: TimingBoardProps) {
const { debugDurationMultiplier } = useSelector(workspaceSelector);
return (
<TimingBoardLayout>
<MockupBlock
height="73px"
width={`${theme.design.timingTower.rowLeftHalfWidthPx}px`}
color="black"
<StatusIndicator
debugDurationMultiplier={debug ? debugDurationMultiplier : 1}
/>
<TimingTower
debugDurationMultiplier={debugDurationMultiplier}
debugDurationMultiplier={debug ? debugDurationMultiplier : 1}
/>
</TimingBoardLayout>
);
@@ -4,14 +4,12 @@ import { useSelector } from "react-redux";
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
import { eventSelector } from "../../../../features/event/eventSelector";
import { BGTimingTowerDisplayMode, CarStatus } from "../../../../types/state";
import { Fraction } from "../../../../types/style";
import { DebugDurationProps } from "../../../../types/style";
import { RowsContainer } from "./styles";
import { TimingTowerRow } from "./TimingTowerRow";
type TimingTowerProps = {
debugDurationMultiplier?: Fraction,
};
type TimingTowerProps = DebugDurationProps;
export function TimingTower({ debugDurationMultiplier: DDM }: TimingTowerProps) {
const { lastUpdate, grid, trackLength } = useSelector(eventSelector);
@@ -7,7 +7,7 @@ import { orMatch } from "../../../../utils/common";
import { getCarAtPos, timeDiff } from "../../../../utils/event";
import { formatTime, outlineClipPath } from "../../../../utils/styling";
import { Fraction } from "../../../../types/style";
import { DebugDurationProps, Fraction } from "../../../../types/style";
import { Meters, Milliseconds } from "../../../../types/util";
import {
BGTimingTowerDisplayMode,
@@ -45,7 +45,7 @@ const TRAVEL_DURATION: Milliseconds = 750;
const FULL_WIDTH_DURATION: Milliseconds = 750;
const FULL_WIDTH_CLOSE_DELAY: Milliseconds = 333;
interface TimingTowerRowProps {
type TimingTowerRowProps = DebugDurationProps & {
car: Car;
grid: Grid;
startingCarsCount: number;
@@ -53,7 +53,6 @@ interface TimingTowerRowProps {
splitsMode: BGTimingTowerSplitsMode;
displayMode: BGTimingTowerDisplayMode;
trackLength: Meters;
debugDurationMultiplier?: Fraction,
}
export function TimingTowerRow({
car,
@@ -165,14 +164,14 @@ export function TimingTowerRow({
<RowLeftHalf
roundedCornerTop={
(displayMode === BGTimingTowerDisplayMode.FullLeft &&
car.position === 1) ? 5 : 0
car.position === 1) ? timingTowerTheme.rowRoundedCornerRadiusPx : 0
}
roundedCornerBottom={
bottomRounded && orMatch(
displayMode,
BGTimingTowerDisplayMode.LeftOnly,
BGTimingTowerDisplayMode.FullLeft,
) ? 5 : 0
) ? timingTowerTheme.rowRoundedCornerRadiusPx : 0
}
open={displayMode === BGTimingTowerDisplayMode.FullLeft}
transitionOpeningProps={[{
@@ -312,13 +311,14 @@ export function TimingTowerRow({
</RowLeftHalf>
<RowRightHalf
roundedCornerTop={car.position === 1 ? 5 : 0}
roundedCornerTop={car.position === 1
? timingTowerTheme.rowRoundedCornerRadiusPx : 0}
roundedCornerBottom={
bottomRounded && orMatch(
splitsMode,
BGTimingTowerSplitsMode.Leader,
BGTimingTowerSplitsMode.Interval,
) ? 5 : 0
) ? timingTowerTheme.rowRoundedCornerRadiusPx : 0
}
open={displayMode === BGTimingTowerDisplayMode.LeftAndRight}
transitionProps={[{
@@ -94,7 +94,7 @@ export default function Workspaces() {
<Route path="timingBoard" element={
<Workspace
workspaceId="timingBoard"
previewContent={<TimingBoard />}
previewContent={<TimingBoard debug />}
prototypeControls={<TimingTowerPrototypeControls />}
bleedover={500}
showAnimationSpeedSelector