diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index e83671f..be19b50 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -5,6 +5,7 @@ import { theme } from "../../../../shared/theme"; import { DriverNumber } from "../../Common/DriverNumber"; import { AngledFlag } from "../../Common/AngledFlag"; import { PositionFlag } from "../../Common/PositionFlag"; +import { DriverPortrait } from "../../Common/DriverPortrait"; import { BaseBackground, FirstName, @@ -16,12 +17,10 @@ import { TeamName, TextContainer, FlagContainer, - PortraitDiv, BaseContainer, + DriverPortraitContainer, } from "./styles"; -const driverPortraits = require.context("../../../../public/images/drivers/front", true); - type ChyronDriverProps = { chyronData: BGChyronDriver, subMode: BGChyronSubMode, @@ -76,11 +75,13 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) { {showPortrait && ( - + + + )} ); diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 23e5e3d..537c022 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -1,5 +1,6 @@ import styled from "styled-components"; -import { Px } from "../../../../types/style"; +import { Placement, Px } from "../../../../types/style"; +import { placementStyleRules } from "../../../../utils/styling"; type BaseContainerProps = { width: Px, @@ -117,23 +118,12 @@ export const FlagContainer = styled.div` `; FlagContainer.displayName = "FlagContainer"; -type PortraitDivProps = { - src: string, - height: Px, - rightMargin: Px, +type DriverPortraitContainerProps = { + placement: Placement, }; -export const PortraitDiv = styled.div` +export const DriverPortraitContainer = styled.div` position: absolute; - height: ${({ height }) => `${height}px`}; - width: ${({ height }) => `${height * 1.4}px`}; - - bottom: 0; - right: ${({ rightMargin }) => `${rightMargin}px`}; - - background-image: url(${({ src }) => src}); - background-size: contain; - background-repeat: no-repeat; - background-position: center ${({ height }) => `${height * .18}px`}; + ${({ placement }) => placementStyleRules(placement)} `; -PortraitDiv.displayName = "PortraitDiv"; +DriverPortraitContainer.displayName = "DriverPortraitContainer"; diff --git a/src/components/BroadcastGraphics/Common/DriverPortrait/DriverPortrait.tsx b/src/components/BroadcastGraphics/Common/DriverPortrait/DriverPortrait.tsx new file mode 100644 index 0000000..ac235fe --- /dev/null +++ b/src/components/BroadcastGraphics/Common/DriverPortrait/DriverPortrait.tsx @@ -0,0 +1,25 @@ +import { DriverId } from "../../../../types/state"; +import { Percent, Px } from "../../../../types/style"; + +import { PortraitDiv } from "./styles"; + +const driverPortraits = require.context("../../../../public/images/drivers/front", true); + +type DriverPortraitProps = { + driverId: DriverId, + height: Px, + verticalOffsetPercentage?: Percent, +}; +export function DriverPortrait({ + driverId, + height, + verticalOffsetPercentage = 0, +}: DriverPortraitProps) { + return ( + + ); +} diff --git a/src/components/BroadcastGraphics/Common/DriverPortrait/index.ts b/src/components/BroadcastGraphics/Common/DriverPortrait/index.ts new file mode 100644 index 0000000..032c94a --- /dev/null +++ b/src/components/BroadcastGraphics/Common/DriverPortrait/index.ts @@ -0,0 +1 @@ +export * from "./DriverPortrait"; diff --git a/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts b/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts new file mode 100644 index 0000000..f509334 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts @@ -0,0 +1,29 @@ +import styled from "styled-components"; + +import { Percent, Px } from "../../../../types/style"; + +type PortraitDivProps = { + src: string, + height: Px, + verticalOffsetPercentage: Percent, +}; +export const PortraitDiv = styled.div` + height: ${({ height }) => `${height}px`}; + width: ${({ height }) => `${height * 1.4}px`}; + + --image: url(${({ src }) => src}); + --position: center ${({ height, verticalOffsetPercentage }) => + `${height * (verticalOffsetPercentage / 100)}px`}; + + background-image: var(--image); + background-size: contain; + background-repeat: no-repeat; + background-position: var(--position); + + /* Redundant masking to allow special filters to work. */ + mask-image: var(--image); + mask-size: contain; + mask-repeat: no-repeat; + mask-position: var(--position); +`; +PortraitDiv.displayName = "PortraitDiv"; diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx new file mode 100644 index 0000000..799bfc9 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -0,0 +1,17 @@ +import { VenetianBlindsFilter } from "./styles"; + +type VenetianBlindsTransitionProps = { + color: string, +}; +export const VenetianBlindsTransition = ( + { color, children }: React.PropsWithChildren, +) => ( + + {children} + +); diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/index.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/index.ts new file mode 100644 index 0000000..a2169a7 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/index.ts @@ -0,0 +1 @@ +export * from "./VenetianBlindsTransition"; diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts new file mode 100644 index 0000000..d15e123 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts @@ -0,0 +1,23 @@ +import styled from "styled-components"; +import { Px } from "../../../../types/style"; + +type VenetianBlindsFilterProps = { + deg: number, + transparentWidth: Px, + opaqueWidth: Px, + opaqueColor: string, +}; +export const VenetianBlindsFilter = styled.div` + mask-image: repeating-linear-gradient( + ${({ deg }) => deg}deg, + black, + black ${({ opaqueWidth }) => opaqueWidth}px, + transparent ${({ opaqueWidth }) => opaqueWidth}px, + transparent ${({ transparentWidth, opaqueWidth }) => transparentWidth + opaqueWidth}px + ); + + > * { + box-shadow: inset 0 0 0 99999px ${({ opaqueColor }) => opaqueColor}; + } +`; +VenetianBlindsFilter.displayName = "VenetianBlindsFilter"; diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx index a715d82..3ce1e9c 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx @@ -4,7 +4,7 @@ import { workspaceSelector } from "../../../../features/workspace/workspaceSelec import { FlagMode, TeamId } from "../../../../types/state"; import { AngledFlag } from "../../../BroadcastGraphics/Common/AngledFlag"; -import { BasicBlock } from "./styles"; +import { BasicBlock } from "../styles"; type AngledFlagWorkspaceProps = { flagMode: FlagMode, diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx new file mode 100644 index 0000000..87729bf --- /dev/null +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -0,0 +1,31 @@ +import { useSelector } from "react-redux"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; +import { theme } from "../../../../shared/theme"; +import { DriverPortrait } from "../../../BroadcastGraphics/Common/DriverPortrait"; +import { PositionFlag } from "../../../BroadcastGraphics/Common/PositionFlag"; +import { VenetianBlindsTransition } from "../../../BroadcastGraphics/Common/VenetianBlindsTransition"; +import { BasicBlock } from "../styles"; + +export function VenetianBlindsWorkspace() { + const { prototypeState } = useSelector(workspaceSelector); + + const bgColor = prototypeState?.venetianTransition?.showBG + ? "black" : "transparent"; + + return ( + + {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( + + + + ) : ( + + + + )} + + ); +} diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/index.ts b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/index.ts new file mode 100644 index 0000000..757738d --- /dev/null +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/index.ts @@ -0,0 +1 @@ +export * from "./VenetianBlindsWorkspace"; diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/styles.ts b/src/components/Workspaces/CustomWorkSpaces/styles.ts similarity index 83% rename from src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/styles.ts rename to src/components/Workspaces/CustomWorkSpaces/styles.ts index 0af3649..f12e41d 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/styles.ts +++ b/src/components/Workspaces/CustomWorkSpaces/styles.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Px } from "../../../../types/style"; +import { Px } from "../../../types/style"; type BasicBlockProps = { width: Px, @@ -19,3 +19,4 @@ export const BasicBlock = styled.div` border-radius: 15px; `; +BasicBlock.displayName = "BasicBlock"; diff --git a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx new file mode 100644 index 0000000..51c8379 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx @@ -0,0 +1,53 @@ +import { InlineCluster } from "@bedrock-layout/inline-cluster"; +import { PadBox } from "@bedrock-layout/padbox"; +import { useDispatch, useSelector } from "react-redux"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; +import { setPrototypeState } from "../../../../features/workspace/workspaceSlice"; +import { VenetianTransitionWorkspaceMode } from "../../../../types/state"; + +import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; +import { Toggle } from "../../../Common/Inputs/Toggle"; + +const modes: Array = [ + "positionFlag", + "driverPortrait", +]; + +export function VenetianBlindsPrototypeControls() { + const dispatch = useDispatch(); + const { prototypeState } = useSelector(workspaceSelector); + + const onChange = (index: number) => { + dispatch(setPrototypeState({ + venetianTransition: { + mode: modes[index], + showBG: prototypeState?.venetianTransition?.showBG ?? false, + }, + })); + }; + + const onToggle = (value: boolean) => { + dispatch(setPrototypeState({ + venetianTransition: { + mode: prototypeState?.venetianTransition?.mode ?? "positionFlag", + showBG: value, + }, + })); + }; + + return ( + + + + + ); +} diff --git a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/index.ts b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/index.ts new file mode 100644 index 0000000..d2f50d4 --- /dev/null +++ b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/index.ts @@ -0,0 +1 @@ +export * from "./VenetianBlindsPrototypeControls"; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index fcd777b..da75648 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -7,6 +7,7 @@ import { mainMenuDimensionsSelector } from "../../features/pageDimensions/pageDi import { setDimensions } from "../../features/pageDimensions/pageDimensionsSlice"; import { FullScreenContainer } from "../Common/FullScreenContainer.styled"; +import { IndexHeading } from "../Common/IndexHeading.styled"; import { WorkspaceList } from "./WorkspaceList"; import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled"; @@ -15,7 +16,8 @@ import { ChyronPrototypeControls } from "./PrototypingControls/ChyronPrototype"; import { AngledFlagWorkspace } from "./CustomWorkSpaces/AngledFlagWorkspace"; import { AngledFlagPrototypeControls } from "./PrototypingControls/AngledFlagPrototype"; import { ChyronContainer } from "../BroadcastGraphics/Chyrons/Container"; -import { IndexHeading } from "../Common/IndexHeading.styled"; +import { VenetianBlindsWorkspace } from "./CustomWorkSpaces/VenetianBlindsWorkspace"; +import { VenetianBlindsPrototypeControls } from "./PrototypingControls/VenetianBlindsPrototype"; const WORKSPACE_LIST_WIDTH = 180; @@ -78,11 +80,11 @@ export default function Workspaces() { prototypeControls={} /> } /> - } + prototypeControls={} /> } /> Unknown Workspace} /> diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 88bac92..f8eb9ec 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -67,8 +67,8 @@ export const workspaces: WorkspaceObject = { height: 500, }, }, - venetianTransitionPosFlag: { - name: "Venetian Transition (Pos Flag)", + venetianTransition: { + name: "Venetian Transition", overlayIds: [ "venetian-pos-1.png", "venetian-pos-2.png", @@ -79,8 +79,8 @@ export const workspaces: WorkspaceObject = { "venetian-pos-7.png", ], previewWindowDimensions: { - width: 300, - height: 300, + width: 700, + height: 500, }, }, }; diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 6842461..fcab41a 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -40,7 +40,12 @@ export interface PrototypeState { flagA: TeamId; flagB: TeamId; }; + venetianTransition?: { + mode: VenetianTransitionWorkspaceMode; + showBG: boolean; + }; } +export type VenetianTransitionWorkspaceMode = "positionFlag" | "driverPortrait"; // Overlay Tool export interface OverlayTool { diff --git a/src/types/style.d.ts b/src/types/style.d.ts index 40800d3..d1af8a2 100644 --- a/src/types/style.d.ts +++ b/src/types/style.d.ts @@ -4,6 +4,16 @@ export type Px = number; /** - * Type to remind you that we're dealing with percentages. + * Type to remind you that we're dealing with percentages (100 = 100%). */ export type Percent = number; + +/** + * Object to cleanly define relative/absolute placement for a styled component. + */ +export interface Placement { + top?: string; + right?: string; + bottom?: string; + left?: string; +} diff --git a/src/utils/styling.ts b/src/utils/styling.ts new file mode 100644 index 0000000..b316106 --- /dev/null +++ b/src/utils/styling.ts @@ -0,0 +1,12 @@ +import { css }from "styled-components"; + +import { Placement } from "../types/style"; + +export function placementStyleRules(pos: Placement) { + return css` + ${pos.top ? `top: ${pos.top};` : ""} + ${pos.right ? `right: ${pos.right};` : ""} + ${pos.bottom ? `bottom: ${pos.bottom};` : ""} + ${pos.left ? `left: ${pos.left};` : ""} + `; +}