From 9ff77cc88a5066aa7887086b38cb88e8dabb3d98 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 10 Feb 2022 18:33:44 -0500 Subject: [PATCH] ISSUE-045 - Chyron Body - Added Team Name flicker. Added DarkBG option to Workspace PreviewWindow. Fixed issue with blindsColorFadeDelay not being correct. Calibrating the timing of animations and transitions better. Added the subtle TeamColorBar squeeze look with outline and a wide clip-path adjustment. --- .../Chyrons/ChyronsDirectorControls.tsx | 20 +++----------- .../Chyrons/Driver/ChyronDriver.tsx | 21 ++++++++------- .../Chyrons/Driver/styles.ts | 24 ++++++++++++++--- .../VenetianBlindsTransition.tsx | 4 +-- .../Workspaces/Workspace/Workspace.tsx | 3 ++- src/components/Workspaces/Workspace/styles.ts | 7 +++-- .../WorkspaceControls/WorkspaceControls.tsx | 25 ++++++++++++------ src/features/workspace/workspaceSlice.ts | 5 ++++ src/public/images/misc/checker-40x40-dark.png | Bin 0 -> 4353 bytes ...cker-40x40.png => checker-40x40-light.png} | Bin src/types/state.d.ts | 1 + 11 files changed, 68 insertions(+), 42 deletions(-) create mode 100644 src/public/images/misc/checker-40x40-dark.png rename src/public/images/misc/{checker-40x40.png => checker-40x40-light.png} (100%) diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index 221ec80..eefe809 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -38,29 +38,17 @@ export function ChyronsDirectorControls() { const { chyrons } = useSelector(broadcastGraphicsSelector); const { selectedCars } = useSelector(broadcastDirectorSelector); - - // Handle changes to the chyron mode so submodes can be changed accordingly. useEffect(() => { setChyronSubModes(getChyronSubModesList(chyronMode)); }, [chyronMode]); - // Handle changes to selected cars - // useEffect(() => { - // console.log(selectedCars, chyrons); - // // Do not change chyrons while in a non-closed state. - // if (chyrons != null && chyrons.openState !== 0) { - // return; - // } - // if (chyronMode === "driver") { - // buildDriver(); - // } - // }, [selectedCars]); - - const onOpen = () => { - // dispatch(setChyronsOpenState(1)); buildDriver(); + setTimeout(() => { + // Delay a short time and increment the open state so the animation can happen. + dispatch(incrementChyronsOpenState()); + }, 50); }; const onNext = () => { diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index c4e61a5..651a254 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -68,7 +68,7 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro open={openState !== 0} transitionProps={[{ property: "outline", - duration: 1000, + duration: 1167, }]} /> @@ -129,9 +130,9 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro open={openState !== 0} transitionProps={[{ property: "clip-path", - duration: 750, + duration: 667, timing: "ease-in-out", - delay: 750, + delay: 733, }]} color={teamColor} /> @@ -150,7 +151,9 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro )} - {car.driver.team.shortName} + + {car.driver.team.shortName} + ` clip-path: ${({ open }) => open ? "polygon(0 0, 100% 0, 100% 100%, 0 100%)" - : "polygon(0 0, 100% 0, 100% 0, 0 0)"}; + : "polygon(-100% 0, 200% 0, 200% 0, -100% 0)"}; + + outline: ${({ color }) => color} solid 1px; ${({ transitionProps }) => commonTransition(transitionProps)}; `; @@ -137,11 +141,23 @@ export const NumberContainer = styled.div` `; NumberContainer.displayName = "NumberContainer"; -export const TeamName = styled.div` +const blinkingAnimation = keyframes` + 0% { opacity: 0.4 } + 14% { opacity: 0 } + 42% { opacity: 0.4 } + 56% { opacity: 0 } + 86% { opacity: 1 } +`; + +export const TeamName = styled.div` position: relative; font-family: ${p => p.theme.fonts.f1Regular}; color: #d1d1d1; font-size: 20px; + + ${({ open }) => open && css` + animation: ${blinkingAnimation} 233ms step-end 500ms; + `} `; TeamName.displayName = "TeamName"; diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 5dd068f..6acd92c 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -92,7 +92,7 @@ export const VenetianBlindsTransition = ( opaqueWidth={blindsSize.opaque} blindsColor={blindsColor} blindsColorFadeDuration={blindsColorFadeDuration} - blindsColorFadeDelay={blindsColorFadeDelay} + blindsColorFadeDelay={blindsColorFadeDelay + delay} blindsClosing={visible} spanBlinkDuration={spanBlinkDuration} spanBlinkDelay={delay} @@ -106,7 +106,7 @@ export const VenetianBlindsTransition = ( opaqueWidth={blindsSize.opaque} blindsColor={blindsColor} blindsColorFadeDuration={blindsColorFadeDuration} - blindsColorFadeDelay={blindsColorFadeDelay} + blindsColorFadeDelay={blindsColorFadeDelay + delay} blindsClosing={visible} spanBlinkDuration={spanBlinkDuration} spanBlinkDelay={delay} diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index e4ce926..5fe0082 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -26,7 +26,7 @@ export const Workspace = ({ prototypeControls, }: WorkspaceProps) => { const dispatch = useDispatch(); - const { animatedBG, workspaceProperties } = useSelector(workspaceSelector); + const { animatedBG, darkBG, workspaceProperties } = useSelector(workspaceSelector); const { currentWorkspaceId: overlayWorkspaceId } = useSelector(overlayToolSelector); useEffect(() => { @@ -56,6 +56,7 @@ export const Workspace = ({ {previewContent} ` position: relative; @@ -24,7 +27,7 @@ export const PreviewWindow = styled.div` border-radius: 1em; - background-image: url("${bg}"); + background-image: url("${({ darkBG }) => darkBG ? bgDark : bgLight}"); background-position: 0px 0px; background-repeat: repeat; diff --git a/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx index 406d9be..d06a470 100644 --- a/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx +++ b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx @@ -1,28 +1,37 @@ -import { Grid } from "@bedrock-layout/grid"; +import { InlineCluster } from "@bedrock-layout/inline-cluster"; 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 { setAnimatedBG } from "../../../features/workspace/workspaceSlice"; +import { setAnimatedBG, setDarkBG } from "../../../features/workspace/workspaceSlice"; import { Toggle } from "../../Common/Inputs/Toggle"; import { OverlayControl } from "../../OverlayTool"; export const WorkspaceControls = () => { const dispatch = useDispatch(); - const { animatedBG } = useSelector(workspaceSelector); + const { animatedBG, darkBG } = useSelector(workspaceSelector); return( - - + + { dispatch(setAnimatedBG(value)); - }} /> - + }} + /> + { + dispatch(setDarkBG(value)); + }} + /> + - + ); }; diff --git a/src/features/workspace/workspaceSlice.ts b/src/features/workspace/workspaceSlice.ts index fad779b..e41a379 100644 --- a/src/features/workspace/workspaceSlice.ts +++ b/src/features/workspace/workspaceSlice.ts @@ -4,6 +4,7 @@ import { PrototypeState, RootState, WorkspaceId, WorkspaceProperties } from "../ const initialState: RootState["workspace"] = { workspaceId: "", animatedBG: true, + darkBG: false, workspaceProperties: { name: "undefined", overlayIds: [], @@ -27,6 +28,9 @@ export const workspaceSlice = createSlice({ setAnimatedBG: (state, action: PayloadAction) => { state.animatedBG = action.payload; }, + setDarkBG: (state, action: PayloadAction) => { + state.darkBG = action.payload; + }, updateWorkspace: (state, action: PayloadAction) => { state.workspaceId = action.payload.workspaceId; state.workspaceProperties = action.payload.workspaceProperties; @@ -86,6 +90,7 @@ export const workspaceSlice = createSlice({ export const { setWorkspaceId, setAnimatedBG, + setDarkBG, updateWorkspace, updateAngledFlagCountry, updateAngledFlagTeam, diff --git a/src/public/images/misc/checker-40x40-dark.png b/src/public/images/misc/checker-40x40-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ca3c6982c30d740fdaaafb8c88764ec734604c14 GIT binary patch literal 4353 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 ATmS$7 literal 0 HcmV?d00001 diff --git a/src/public/images/misc/checker-40x40.png b/src/public/images/misc/checker-40x40-light.png similarity index 100% rename from src/public/images/misc/checker-40x40.png rename to src/public/images/misc/checker-40x40-light.png diff --git a/src/types/state.d.ts b/src/types/state.d.ts index b9a1c5e..d242e63 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -22,6 +22,7 @@ export interface Dimensions { width: number; height: number; } export interface Workspace { workspaceId: WorkspaceId; animatedBG: boolean; + darkBG: boolean; workspaceProperties: WorkspaceProperties; prototypeState: PrototypeState; }