From 5e86b92ca5de7c5175fac0b1116c8a32767cc7f7 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 4 Feb 2022 09:42:22 -0500 Subject: [PATCH 01/19] ISSUE-045 - Busy-work, relocating and renaming AngledFlagWorkspace (Workspace, not WorkSpace). --- .../AngledFlagWorkspace.tsx} | 10 +++++----- .../CustomWorkSpaces/AngledFlagWorkspace/index.ts | 1 + .../{ => AngledFlagWorkspace}/styles.ts | 2 +- src/components/Workspaces/WorkspacesRoute.tsx | 15 +++++++++++---- 4 files changed, 18 insertions(+), 10 deletions(-) rename src/components/Workspaces/CustomWorkSpaces/{AngledFlagWorkSpace.tsx => AngledFlagWorkspace/AngledFlagWorkspace.tsx} (79%) create mode 100644 src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/index.ts rename src/components/Workspaces/CustomWorkSpaces/{ => AngledFlagWorkspace}/styles.ts (89%) diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx similarity index 79% rename from src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx rename to src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx index cf9244e..a715d82 100644 --- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/AngledFlagWorkspace.tsx @@ -1,15 +1,15 @@ import { useSelector } from "react-redux"; -import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; -import { FlagMode, TeamId } from "../../../types/state"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; +import { FlagMode, TeamId } from "../../../../types/state"; -import { AngledFlag } from "../../BroadcastGraphics/Common/AngledFlag"; +import { AngledFlag } from "../../../BroadcastGraphics/Common/AngledFlag"; import { BasicBlock } from "./styles"; -type AngledFlagWorkSpaceProps = { +type AngledFlagWorkspaceProps = { flagMode: FlagMode, }; -export function AngledFlagWorkSpace({ flagMode }: AngledFlagWorkSpaceProps) { +export function AngledFlagWorkspace({ flagMode }: AngledFlagWorkspaceProps) { const { prototypeState } = useSelector(workspaceSelector); if (flagMode === "none") return null; diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/index.ts b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/index.ts new file mode 100644 index 0000000..57bb47b --- /dev/null +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/index.ts @@ -0,0 +1 @@ +export * from "./AngledFlagWorkspace"; diff --git a/src/components/Workspaces/CustomWorkSpaces/styles.ts b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/styles.ts similarity index 89% rename from src/components/Workspaces/CustomWorkSpaces/styles.ts rename to src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/styles.ts index b57472e..0af3649 100644 --- a/src/components/Workspaces/CustomWorkSpaces/styles.ts +++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkspace/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, diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index af8586d..fcd777b 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -12,7 +12,7 @@ import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled"; import { Workspace } from "./Workspace"; import { ChyronPrototypeControls } from "./PrototypingControls/ChyronPrototype"; -import { AngledFlagWorkSpace } from "./CustomWorkSpaces/AngledFlagWorkSpace"; +import { AngledFlagWorkspace } from "./CustomWorkSpaces/AngledFlagWorkspace"; import { AngledFlagPrototypeControls } from "./PrototypingControls/AngledFlagPrototype"; import { ChyronContainer } from "../BroadcastGraphics/Chyrons/Container"; import { IndexHeading } from "../Common/IndexHeading.styled"; @@ -67,18 +67,25 @@ export default function Workspaces() { } + previewContent={} prototypeControls={} /> } /> } + previewContent={} prototypeControls={} /> } /> - Unknown Workspace} /> + + } /> + Unknown Workspace} /> From e747a7d7c3472a80a21b3142a10c514028f4c0a9 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 4 Feb 2022 09:59:35 -0500 Subject: [PATCH 02/19] ISSUE-045 - Venetian Blinds - Starting work on the "venetian blinds" transition effect. I'll be starting with re-creating this effect on the PositionFlag component. That involves first separating out the PositionFlag into its own common component (it's used on the timing board as well, so it makes sense). Adding new overlays for prototyping work. --- .../Chyrons/Driver/ChyronDriver.tsx | 9 ++---- .../Chyrons/Driver/styles.ts | 27 ---------------- .../Common/PositionFlag/PositionFlag.tsx | 17 ++++++++++ .../Common/PositionFlag/index.ts | 1 + .../Common/PositionFlag/styles.ts | 29 ++++++++++++++++++ src/domain/data/workspaces.ts | 16 ++++++++++ src/public/images/overlays/venetian-pos-1.png | Bin 0 -> 14299 bytes src/public/images/overlays/venetian-pos-2.png | Bin 0 -> 21581 bytes src/public/images/overlays/venetian-pos-3.png | Bin 0 -> 25526 bytes src/public/images/overlays/venetian-pos-4.png | Bin 0 -> 28824 bytes src/public/images/overlays/venetian-pos-5.png | Bin 0 -> 26726 bytes src/public/images/overlays/venetian-pos-6.png | Bin 0 -> 22605 bytes src/public/images/overlays/venetian-pos-7.png | Bin 0 -> 17319 bytes 13 files changed, 65 insertions(+), 34 deletions(-) create mode 100644 src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx create mode 100644 src/components/BroadcastGraphics/Common/PositionFlag/index.ts create mode 100644 src/components/BroadcastGraphics/Common/PositionFlag/styles.ts create mode 100644 src/public/images/overlays/venetian-pos-1.png create mode 100644 src/public/images/overlays/venetian-pos-2.png create mode 100644 src/public/images/overlays/venetian-pos-3.png create mode 100644 src/public/images/overlays/venetian-pos-4.png create mode 100644 src/public/images/overlays/venetian-pos-5.png create mode 100644 src/public/images/overlays/venetian-pos-6.png create mode 100644 src/public/images/overlays/venetian-pos-7.png diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 61b94ba..e83671f 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -4,14 +4,13 @@ import { theme } from "../../../../shared/theme"; import { DriverNumber } from "../../Common/DriverNumber"; import { AngledFlag } from "../../Common/AngledFlag"; +import { PositionFlag } from "../../Common/PositionFlag"; import { BaseBackground, FirstName, - PositionNumber, LastName, NameContainer, NumberContainer, - PositionFlag, Spacer, TeamColorBar, TeamName, @@ -42,11 +41,7 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) { {showPosFlag && ( - - - {car.position} - - + )} diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 97ca527..23e5e3d 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -27,33 +27,6 @@ export const BaseBackground = styled.div` `; BaseBackground.displayName = "BaseBackground"; -type PositionFlagProps = { - containerHeight: Px, -}; -export const PositionFlag = styled.div` - position: relative; - height: ${({ containerHeight }) => `${containerHeight * 0.85}px`}; - width: ${({ containerHeight }) => `${containerHeight * 0.85}px`}; - - border-bottom-right-radius: 9px; - background-color: #f4f3ee; - - display: flex; - align-items: center; - justify-content: center; -`; -PositionFlag.displayName = "PositionFlag"; - -type PositionNumberProps = { - containerHeight: Px, -}; -export const PositionNumber = styled.span` - font-family: ${p => p.theme.fonts.f1Regular}; - font-size: ${({ containerHeight }) => `${containerHeight * 0.85 * 0.64}px`}; - margin-top: 2px; -`; -PositionNumber.displayName = "PositionNumber"; - type TeamColorBarProps = { color: string, }; diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx b/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx new file mode 100644 index 0000000..7903f6a --- /dev/null +++ b/src/components/BroadcastGraphics/Common/PositionFlag/PositionFlag.tsx @@ -0,0 +1,17 @@ +import { Px } from "../../../../types/style"; + +import { PositionFlagBox, PositionNumber } from "./styles"; + +type PositionFlagProps = { + size: Px, + number: number, +}; +export function PositionFlag({ size, number }: PositionFlagProps) { + return ( + + + {number} + + + ); +} diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/index.ts b/src/components/BroadcastGraphics/Common/PositionFlag/index.ts new file mode 100644 index 0000000..68f7fb9 --- /dev/null +++ b/src/components/BroadcastGraphics/Common/PositionFlag/index.ts @@ -0,0 +1 @@ +export * from "./PositionFlag"; diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts b/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts new file mode 100644 index 0000000..d9cfbbe --- /dev/null +++ b/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts @@ -0,0 +1,29 @@ +import styled from "styled-components"; +import { Px } from "../../../../types/style"; + +type PositionFlagBoxProps = { + size: Px, +}; +export const PositionFlagBox = styled.div` + position: relative; + height: ${({ size }) => `${size}px`}; + width: ${({ size }) => `${size}px`}; + + border-bottom-right-radius: 15%; + background-color: #f4f3ee; + + display: flex; + align-items: center; + justify-content: center; +`; +PositionFlagBox.displayName = "PositionFlagBox"; + +type PositionNumberProps = { + size: Px, +}; +export const PositionNumber = styled.span` + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: ${({ size }) => `${size * 0.64}px`}; + margin-top: 2px; +`; +PositionNumber.displayName = "PositionNumber"; diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index 603ae51..88bac92 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -67,4 +67,20 @@ export const workspaces: WorkspaceObject = { height: 500, }, }, + venetianTransitionPosFlag: { + name: "Venetian Transition (Pos Flag)", + overlayIds: [ + "venetian-pos-1.png", + "venetian-pos-2.png", + "venetian-pos-3.png", + "venetian-pos-4.png", + "venetian-pos-5.png", + "venetian-pos-6.png", + "venetian-pos-7.png", + ], + previewWindowDimensions: { + width: 300, + height: 300, + }, + }, }; diff --git a/src/public/images/overlays/venetian-pos-1.png b/src/public/images/overlays/venetian-pos-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ee20be672d42923f940263275c29737c33a1b634 GIT binary patch literal 14299 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 literal 0 HcmV?d00001 diff --git a/src/public/images/overlays/venetian-pos-3.png b/src/public/images/overlays/venetian-pos-3.png new file mode 100644 index 0000000000000000000000000000000000000000..22124eed36edf951733c5b3276c8f86b32c253d8 GIT binary patch literal 25526 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 JPDHLkV1kU15aR#< literal 0 HcmV?d00001 diff --git a/src/public/images/overlays/venetian-pos-4.png b/src/public/images/overlays/venetian-pos-4.png new file mode 100644 index 0000000000000000000000000000000000000000..ea7764f749ea7ba458c5a5ba86327851b25fad4d GIT binary patch literal 28824 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 literal 0 HcmV?d00001 diff --git a/src/public/images/overlays/venetian-pos-5.png b/src/public/images/overlays/venetian-pos-5.png new file mode 100644 index 0000000000000000000000000000000000000000..1205eccbde4a73dd9a15ad9cc74e59892a6dd5a7 GIT binary patch literal 26726 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

N-czYN1x$b?aahwS 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 -EG~J{YZYraU*@d0K7m9ph3Hha>S6wP@_tkp+(j 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 literal 0 HcmV?d00001 diff --git a/src/public/images/overlays/venetian-pos-7.png b/src/public/images/overlays/venetian-pos-7.png new file mode 100644 index 0000000000000000000000000000000000000000..7006a170937c36740904c3b42dbd16dd3afc2dcf GIT binary patch literal 17319 zcmV)8K*qm`P)JOku$`uY~!%w$}Oo++J|!C(k`+H`{@ z><^DOgaf{Tn~>BNz6s9D!(5|ywe44zuk1xI^e>XBE>8muRF_TSOcR7ur-*wVr_+ue zPbsfY$b}tF18I%HVZKK3a#Y-dV7FIvr`|j_#AO(f5giZRMASTdE^K(3m?b$3KK@F@ z%d@}}kqhVG+g9G&CBCdC14`CJR75$DZ+v6{NQm~y#ZsJ2&T zf!R866s-EvdrlvFY7wl2==#KKQ4o=+kwCXyFE8c2&_fd;yAa}yWtzLebmrPRr`dxXBJ|v^qkmPyxE%T#A^{1WU5QI zomragVO!8rUPUK*R|I@tB(Hx=xq>B8Z{#GXB5;{`R)Ga2?n-nDtJ8P!odzbq&+GB$ z!UMJQLLvH7!r)5G#RtqY(X$ol$rXDK;@e8+Jz&XYtGG^kT^9e1&R^A7)tI&wFm2a1 zR~6om5nf|?+pC(Z8sqa;Q>!ty3X&_m3cot$L3=Ip=Rt=pbEM@nHbyctZjJWxrf$pn zZUDTwPV%4VQWyVbQ!ZT>}@B{fzH2vq+~VI)iRu z!{ltQTv@sJNN@dbuJn$dw^p(;Rg~(xDdmHBRhU$c2m_pBSvh@MPkrYT_lrWl@wR6s z=1TV^`mpDM*Q0sys(QQ>M|WQIB#+eF1ilCR<$k~ZmFtD(ck!4lJkQWmg7lrPl;9qm z-_A3lUuri8-;q^>ZY8zrG>V7zixD}QoXys+On9v`b4p_lBh)a0c&^mO9-c^&glvqV zeti?q+)99_zZ$k#q~SNT0j5$tQEgo`z1(}sxB9ZHWjw@ekOTdG&J$h~vY4(H!2-H{ z$m^$S?&iW*&Ff>XO}zRUEtt~^{e}0%6jdlS!b;1a$P+`p`_=2@I!KH2c_Wnkmgw;b znXpr)WeBI4d;)$fD>@QTC@>F}!lq4{sQ#3NK(DgD!}wFu;yyzrd~M>Dq32#i`@zu< zYQFNip{1>?dIW32o`x#u>dsb$&&6z5yv*wIp5lcXBY}w}4U`!mDl9eg!YihdKgk(- zu|wx7tMLlo>nW_W)fUda@%g>A;lpgUN?^$VBF6iu5bt2_G#jMwY6T)mm5vh=YJYp(`YLoy zKUMOCj@h`7u9_{zJ}<;`Z#21SbI*k_yBF`>U;PETx6x=|qtg7&isX(Wta&l4Bjfj=bGw~dFpWY}-m_3Uelwv^XR3p}4a zOs+rGbW9~BC+^nojfozoXKOJ`O1H^j%GB63a0Y@#b&c&SoXOzn^kEO~Fox(*M-dp9 zRH=nCBoZFagcNB3OKL4%);Uc*a)*+6N35uRiO0os1~S=m-I0|jF;{?xKXeqsVD^Pn zCtm%&d{;Hy# zb1RbGMyye4N?=!41tJy2ueV=)y{heA?9)HXyzYEb@R_PFJEtP0U z0g`>22k7)O6WM4jUMV{PUy=_SK^~HDs9sF7-_#{yw8&r)b|_$v7U4}{m%K9Q5&E#t z`Y)2j9W`w4>-W4GY!oYTd)*^aJiPrl{F`edn_vOMZx0&gh;^DPK^$ ztSIY|Q>$@Fl8ad(`e`vo<@9LRnU3glwKnMS=qOvO?cryM6R|$nsFoiNlxWe{s*tE2 zY_dvN^!xMlKkE*T$8F&S4wEu>-OvPcWBxYJ5NUPQbQ6s}Z^jD2zyB2_Jw zsWl^-nUkV`QQC`{bOO$vSv8-qpNb0lYA+U3 ztB=>@&>hv8=nF4-GHA-PvO@8*YAIK}6d~G0vw3z*qx$rbgiYgGq&1R-ZN6tBMc40Fxh<8k2{NFNoK30<6HN)C_mA+k^54RTPQfr>c% zMNkLd3u!NKB%}oFn#E=_kz!eGI2>p@%e^-kz|%o*i081!i5!vqf}9wVAvEHTdNHQe z{q{p2E0lIv6wg$9ky*C!rad)EMa{c~R)%aBFG1HwLdrmAwH6-)NK?EiZFoW{CZQqs z`k#V=wXoX5ikhs2Hvpw4-#*J&Jgju zqMqsp_Z}Tz?OfQ4R}RL+!bHcKttwtUjk5TXmaVjNB-j~5xq?gag}9fZGu_6+c%J)s zA7(7@k1347o5DU&ZM%@Fy0f)-=|F^XX9kCPfZ^Mcnzez2)7BoKtD}mKv9MO58jS_B z7;ss&tL!jheN_VaB0lqTbXd1LA@^c&G7wARt%8mvV$mJ+7z@YK<9_GtF~W3uzTX+| zOiqxk-f3T?3;ER6tYvx~u{CkzrL5ir6LRhshCR(bz6QmGqD(W@Hzu;K-KNUVx}t>A zZl*cw;3aPEUa|KuzSdr(3dF-uk5t3bqGCZ8m)FXqk{QBlkZA3gxV2?ghGZr~aTvX``w5Ap}Fz`@77bzNY0$D0T&8I=N zpH(%AM|jR;3cV$(%H4M?#P_=IwB)&s+0cUfVBVcga6F93*ze5jOp8IkKjqC`gwN@% zYUx%PUt%t-;x+G1MTk9&r+<6e%Sx=`XD=y9)p~gfV^|nhUEPbR%fE(m)<7JCJ5dqX zE{r+}D{MH_0v+C9qVuRIJ>)I%xJaFMq?PUR4Pm)jYp;k(Z7fulSk{416Mq0et$r?1 zwBrd3Q9f$7fP#&Q7n}eYg1jVNPW@GzKhb~TfH&u>_!sJ+X(nF6x3=Qtw*_RY;OtuS z=v4h)p&1kf?Ui^~rJPi`oOmT*axZY(W-c-ftSwCS848<`RfWJ}W`jP1-YJ9PbauKU zhU`T9D-y+&5_ZpVcTI(Hb|UBir~cGPqmvXgF00^3V$LrW(~I9Q)tA=JAq&9e8B^7| zC~!6jc}7>o%l3N}^~_@oqmT?oYv?x|@E^!2c5AoCJlAq1GiaiH*qoo%`~Yx;mNgcY z$a1~V^-tGCvObr{_aypop7}EzoUOH&*i|AYdXL3p#9?4TipUnUYN7-vd{Pi&F-CC_ zn`)qe=He9!ciZvGn2IO3Ts%booQr7}^tik?%dkupf6**?+(99Tba|Bd47S428_Zbp zK&-S^r!}iZmpOEhIruC{6|Hv#=TUDfC5V?vaxof1sB*~IH`eM0?bYi{aYFQZ6J{9- zWVVkgFY}3Z=RjZ#>fkjvcfBNvC7CvIrMNT;daodgu1(QDZAetK)nczSM%Lva5euC=ZNQyz9jeV6?hVhWdP>k( zVsBwk^?7rditrkPFWomi9XqTr{n z(iV{_LtaS;{ODut=J0GPXo@B+QZ+UQ3| zdGq7htI4E$HtnFrYz4w}kAFup6`=v&d5RR@VN&NTk}Dxqqm@{#4;r++?G^RG41){b zTx_{0ogIAiUw--J(+{40G}=X04s@Wj@=IF|YeA8v0cevu?6Lye8wxckkY^y!-O!Q+w;!e0jU!uGW4Tm#^fuYDaKU;a%Rn%T)E`d;>EN$E+Ut3 zP9{?Zdj`wlV0dtF@Z`ypr#tWCrhorHz=9|!y(N~FaL7Y*iy`0)(zwh;(_Tri(ssp4 zfg6j6;_e%0J#sc636NuoSFfe6$X)>)rjw~S8yWLh8R_?qk9QvT7K|9!xd@&aIqOTk zDhLrTA(SzlUDh)(#>MF_#Y+bfJ4*&Ec{a;&+8<0L2e!Oe?=n1Vf9lSrc-679Wm9rc9R@vyA;^wJ-SXYOcKuTUa!8OA`Ul<-1-aso}5D(=~BvmPe&u z2n|A}xx7gEFz;N^N&0gJMM{_VlX}*O~$j`A?-&ig2@(Qbt2o0 z8iiW!rt7jUX>04x$cNNwo_UX;ic{f5$}FP=sARIe0z!Tocps|xA7YwtKzhHmCv$Mw zw5%7uY(0kWdJ)Ah_a+Fp4YOi!Ea*eiAk$coL8`t=kdtE{OazR%9a%}FoetuO8ZAAtS)j}*sLNxXiv9{9Z zrz0hf8BXQ!P^~W3`G^~IW-yuIfa%X4CxoQplL;^zwSx>#Y7%Q}^e zwz4@@8a@sjl4=d+EewfGmrL+nkg*_v_(0B);Z1uF-@x_e!M7Vm0hv6YfGDXX2&#cB zCN`k_npVQ$wc?Nn_$DT@W^NS4zCtzzYT@^5HBN>5ITCRte zq_OR_wv;9Sz8YD0CnD?^OJKeiW}7yS-6>Z!(6;&g<`$2Q*M0rtR>Qu&@K7)5&08(> zlE|%lY-w;5Yg6qWuM+&g*<$%UDl(`y-i_6qIjA)-6f$4S`l zm$D&m8A9|*LA+?4CB32p&-c6J7&L~l`T~mxLpky52kD<_+71c7AV@g`8 zAZHnD?eh{hl`74|9QOh*qOC0tfW%hoXv7#l?IpI=7`zyXX%a8Ad<>SAe2S%%jD6-n zv@!kj`fxq(!;bq(b~;rNm+4O>m;$;{$dneXD1m|{jq+|ANZJU#C~a)mqPVQ~3c6Q$ zl{n@Hax$Z$jA8>ejYSME$chy6%xbHeU1q@e9^)0hA+dYTB=;~r%%<4l(VdUw%PIh( zao}TChr@|FtASjq?*?8=Igpa;nAPbhF-|Vay!GeJ;rHUraImn=)gkahXc7 zj7%Cwu%hRHbDENju-#g1F%_E+$1DIz9SCM!C-h7507zpcAy6blQiLGnzq{B6$XsqZ z9(Tqo#mi-R2;LnIAQduz>m?$>C9|@ki!#E}LmG~=s;&y=ps^4{_WboYFL;j?!BJLw z6`3vXd@9phvUAzif9zr*R10q{qo}kLj)+Ov8SJIrcmn|3~iy+_I+yCH$r@#Hj z-yS?V$cmRqrOleG51AfPzZdkmZX%9Sgj--`0|nNQoFIYu#UA^vo#<@X{MqqrxmZd0 za-#3G!k~4Rm<#dp@Ua##ZQXByWgVoYdpdoNoGqwBl~t!yD|KBZ1O*j-W{RJZ>e!z( zh;J5YY8m)M0fp^{gMqMOUmLx*D?-NPBh7~ZBWA=tzFFr)bXyO_s5(sOaJycOT%n1j zDM>>d*YXdh^n8sX8{)Ew4iYabYz&D$pVHAvC zmHYmtrEVrthT)ItuZJ_tcJTc7>yz=>8LkCP^(MSSY6TBg zSFgv*(vKb;FgSkl$tPPEFZ0%z6F=XBiz+mkIo=Q#bty7a-Qo^PO08n^?@%ZfR+ugtY)Oq!)^TWH@ z8U8EDUtTmRm4K48X9$pEwPs@AKRtN-tEV4sUA(Mpc)`U6#1dU~4~~;{$r_jH!;?+3 zv!M4rK}JJdud1cktuCtNz4t!)=)?U_-XD#I$Gc4O`V55d2_eFvF&vK%U%nh1O~;eT zXf&1$WMgpHc({t235K^W5HAr)G^L8HWHveom<*KSop*y=YE-E&q*5G6(m7+6Xxhlc zs)_b$1mo62eZ8T%pvZ0d^wF*=1?;L&ZYH}bPhDCD&#W^EBx&oWoUSIKrP5_@o{6s> z!wJ6?ciE^XAo8aQECCZhdbmq__qtTM zPrmKVh8#kIVaM)dGxj~FixSkjNB_wtN47f#0hlj#7TtZemKJ~yq3h;=>5uJEVM8Pf z<>(bO89#mfpw++~w28E_Cjmq$|$MtpCSV5YIg{}T`Fas^Zp%kE;vjv|?CcF4BrC6Bc zrHc6s+iEf$OJ!$bfe9E#80iUR16oyFn52m#lcby`!uKWvsWOjM0Ps)}1TaF3MTsaTSat)o+ zMDv<5gXQ(?cFN8ddu?GemOQQSg*p^ES=gWs1G%HQ`kfJ{NQz-DhenAW+{k!X;=mmc zuTp*dgUrQM=X>$uSXbRIRARf&bw9(AQ5&wk*j`Likz1~!k0bTbWJv{MSW&ob*~2!J zu*F~tMBplQ24j;U8=GrIgx-L>{TE$MJ|>5g!aLA&3lT`4z&%xvzbFk6vL! z^VwzfvM}`tu}G(9N{H1TXAwso>60%K7I#2#MH=WFW=w@7iN|#yL{ecH(TZGV8Hbm+ zbq;C#7dHdgNk$pV)DCm4GoMWR91bs0iU-7`i-HqSF{z3sE{G`zTp6-9 z7ir=gDX~J#&UhhVG05aVIA}~skpv0>^s%=yT%I{f-H}m*Fw9?Ci_m&5hB5HU=N&T}Gh z;d&L?%eTRW(Or8+xHFv~S2IqeM!F`GiC0mOhj_t9Hd5lV_JbOXX2jVUjBsajWW%*r zWE%w7uqVAptkRlpWBqf3MF;T`NmoBDsBQ2tO=%?9e8em#Qc($fuZwn58$b^2!sOvU zidJ*e3*Tq|;Z^p#xN=O9^5u{(VA^3|)O7eD^^?%na=U{|=QCWUa7KerCX@<%~k zuggBT$Bz#9#>3;uSe8sUCcW3)>5meO=>yBd`5`IZ%oKYJI-^JnA>(Hy+Miv*NbCk~ z*ZN)*P*ifhhiWfaKI3c;&WjYkAA4!!l_IsTBy%|IUk{fX9LvO;L)m5 zZ)%$9KvPudP5`5U_qdr+Pw~@FIJtR>fFVa{YVQ0OC3imSkJ%?td@G!chU5a(z4g5_ z)tM1wJU&O3IHZs3-Me>exa4Ik8N1yW?MG`9I*XZ2I%j9&uNGgO9G{%MIU@T%@9iG! z@3&mfP2}9ffNYfz_bH~StUJ;V&t=_*wQcE~B4X(O$wa@D*hmwstz>KQTC$Ya7O*LR zps_3HQ1~fMbp5QuPF#k$MQ?~~an1o7JMFYS6DG4GEen-T#tx~#fB)+6==g;FbmMvF z(FY%ncK1h&kXR@>QskXriG-^N(2?v2ZeJLk1kF9d4AgxSB-z%9@le+j863%l_;0rz&&w90u4zmy?Y@-Lvud&3JG;8JG1G? ze)w2tiR_|CpFl*v&5lp{hi9WVV-5)E%{W78wnD_@kc)f^w-B$J&Qw$pI-JQcr=9QY zeD?Y0Vu5w1=jY?&vy%z0rAtSYk1i81bG}QDmc37+(QqSjXCP#!I71ITnEs6gc6PAO zQL%i*4R;y%fw_&BQO?LnV2(#{Hh;Z1mUS~(`;q;rVw8zvl{(Hj4tW3M`0Vs_pqra5 z@5MS+*zW}jG3zRqA4*I{b<`I>2%`|a9WS@W)a0!o+e(D*sl2a1CEk1d!iy!q3g{`CF#KfHQ-B%=c$3o*hb?5W~~tm*7* zIzF3>heLK3^z{84MWQagjnqdbY{ngk&{2*@PENg<9C$JlejgZU zF{nsT=)8e0IFUcS?v(bjY7Yj($B!TXm(lKLzxs@3fS(p`;)UVMqqPcJ?Z+RVBSq*r z#4B;lGg1~vZmrTvHL?JG3}-8Y9SVCU+B{xVP{m7xjQu%0Vt8=~N-^_^kSl*pM!8!6 z*gGX&%yFpL-X5O%z1@kf2eut@jUJ_eWn0fP4AV&wu^;uU@LqdVnFC zv;+dSlB*j?G#yq##LiMK-EC&ndOcl&%slvA{7E^=AjJc(h#6ANON`l1NSB>BBnvL0 z$0c7#O(>R%E0mxlm|)#a@xp+>j>3nsA`E(OBF~yhLgk;ClVt-IK#t zhhKd0xn~;Vgym8w(1;4tLCizl;;=XyqN|x|m{ybeXeGr=5*ciH37@2U>u>0g7uQ~5 zCf|TdSQ9TSQ`V}f9^M4@mG6#r2-CZ$w1Jq=5Ecg`mZR9ReKZtb=7~7MFH^>!fByOO z3$sIZ!>WuoEALpQSp=ZCT7n zFW9Ct9*ra~Y#{?ZQRxvN!s-?YEIjPjHlqi`iAj>#u^kW|zD zRVRw|d)qVY4tVl7L%7yVEvpF;#(rNfTt$*i3*m+6p1j0I zOmJSXPe67HVC>-T$76xdU%tI7z72U{o;a+1!ZO9Gr_)WyO5~|kQ;M;Nc;;EbDx!^++-_IKI0%i#uBsF=d6%o?zGP4DaC<6VJrx){u07X~K1m59wZrd#4_ z6tC^WRp9_lP5(n{nR}v={t&T-1BLcl19)GP<0Pz5DqH467$;IGSskVjrjyVvUcsci zR~fL;j}lFF5s=doI}0|Q^Y>tTW!r)-n0jFr=pjKl0Hcz4d8S=taKw8FPK;mfSRq_D zkjWw%Ho$3MBNV2ZqT4ot5G1Hary*&MQj4I&lHsVFmLtKJG!~>d44a~>1s)h|(99TR z(m3p$&nIW|$@9aXAGB8sK5he)wnII37=a_~FNggU2t<{MEKm zTfC-zqT;gOdXr^7zEZ@&IoHpI$6&I*(6=`IT&5uedEJ#;3zNgHN|!8Y>kjF9JSAB7z&wZ<5a(f$m%WI( z_$S;j1IVlnziGgi3P&8KRY8OFJ}UFuSsr{!j5+)T2Rh>^-vTmkWW*|G+~Y%&W4VA7 zDrg-l3|s^$`TUF6lzgE8vqM}s`Xx{;9jTZt4qqM}efOM7J!r3sFjab;I9At44`6Fy zE>ipr%OjmuxnatPJ(#>{JwH2x%sVVzOZ`)hhvAdc*3T~1K(J3P)dKR%^&nx9mBtXd z69KwiZ-4JWdqv(f{uL%7rtBV5N8*DH^PDr;VhYKU5F75`l4vhe;Kn!}Z6zc)SFCqh zPxY8$SaL#5;9Fp(zSq+u~n zYRE|ry6ng|=s88q6|XS=O)bB< z#zL^FVx&4l%UEZPZH|x|jfojI*PRuwE%6>P5_3Q=gp9D&stD#cb@cQUS#*EzPAj zIr&}9FU%(S{&brQ{>Yzrz3}EqS#d0sjdJKQ?nZ&#L$RJH_>?a((3uAyMGDaiQ;!hr z6xsiT0MCR~kxzJ=&m@ALBKIF-6uAcfDY)d=Wp?wH8;s7n&2=0yoWrg^T z*7r)QwJF&$)pez$Z>X>b@!Ak0AJEisptWgFPm-4~@oQM05^De%ExoHHu8*5ED46{L zP0$Q!apqjdkCky$ic6h&0ge+t2-ya>ux}yjA6kieT_WY`tC_lN%83qGJLNUUbqFq! zPN6BA@i0B6fY(o62*gl*SaVElx=a9xBRhh}-C4JnL3z9L3Pa?qolPuh%iJ@}A8s*I z5DV+7GCR{=o9nN)xRTo^9g*TdLt!AFZSVG4502ZX@JdS%4eo}sG#sQr6KV{D4VtAT zk|vq&5R7!lXehC7g8hXh@v?E${5mD?m$D#w!sy)WJYeS&vE+~g)A7sD^-TeYE(2uq zgG4<>c`4CdrgG%om7~i@)NO8ZzL!u1soa;cDD{S&WyFE@Ig=7F=t-q~LZ&m}?Lqxi zg-N3vA}>{zF+jZd@r)BuesPG5>d?`r!N5rkH)WJ=p(6(#FFtust>CzvWbbXC<#Mbr zr6PEC-qPoHZ(h!C(i;#Hjm-I8~hK*%~^=wp~ z;?-TecZ_$9t0TjfYHRc({E!K)e2%WyAC2}8_V28Cnb1_ZgbrUC91VuiG#dAfW`Dv; zl|?B?2gGVw_b>+SH5?&YqsLF5aNQd5N@Lbio5{xh(q+TFdE?An;M@ol69*xX1hDLx z*F9~ROo*B+ovPu4Rih3iwN8QNs|kC1k2nRGi@kCDoAPZ1^6RQ4HWwrzS}3q33QFW` z`a$$%Jj-j-xSQhhZ2_aDgF%)YY{+N71_$pw`GV_{kNAAftr4%LRj-577aF`(D?mB* zwiFL5!zD&_u*`@NA(dxYST;w7Jl^BWq`o)oee}^spMUn*KYZ~yfjcE$GU|nw?Nk<+ z^~r2e&i0diswyVjmjtLP637v-HSsnp)Jc*Krc9fAvTH$(*}2yjpY`C_B@X-@?(cu` z$){ib>a*W{_T>jppW0AzUszKsG*Iehf# z)2APQ{4uii{`>D|wO24{%z9Czt0fUY{>-|;B}R7U6gI8MkhDIUwp$CtPWZI?CKE&~ zDXu=pE;4)RGj37s$&AnK$eAtNtnRD@Fq_&IG_J zD4FE!DmF$lUy>=O%$H_-#G;3prm1rCm-!JxjFz-KT6^dXhHLh3thC7dU_MhzTKN{@p%x}NfUPMsd6_v&k`%;{ad_oi15U;_EUd0D6In9jL z7h&K_bJDgZUuS$<=k%0A?UxwGdwPT3fK)#H!mGxZ_Ix~yemR|rX)h&Gigmmh_AIQm z23v3<^=Nm`0G4px;YaJ4bXY1*m!?m`F+PO}%d^_+CbNV3B=S@dq$hc)hg3c_#W#UC z*BR|a8sb8vos`Ux(Qv^=G(Lz7%n#rHz#-5DiWoY2b;Q>?cKUt3UG@0!Bg89gdRC`@ z=;f-l`f_qdk1w(DxrRx90%XLotzUFTVgY(F9?HC};@0BjwQ*qR=6p40cV~xBd#G-| z6MOAxTT@`vjpjxh@hO)-{_)?@J<<$|#aOitf+baahM@1`{Jo%u5F zNSIFwpumK=+RqzlFWLZT7-08WPNXEbUkh-7NXkvQ68;opfg)aqNKUjrIX(UJpa1-? z|NCFRefI2J^%f$Pa`{C%!yks!y&XEB#ejq_AAbGgcYpoyI~as{H-u|FzI^O-rRgxm z%j)KDe*NoCclhMJ4?cJwQO8+PP@an3NI*IaLasbUX<=PL6A@6Ju8kDb5Q)4%O2PaO ze&#twYdkRaPG~RB2x^MW^!DAm?|=B=)$uEAB}{enR)Q%6O_GYshl!>6EQY%rnJ|@4 z@Py?g&18Zm+Du<%`Q_y=tesaszo6;&=*Gx^N03%971l_5-4^yxE0h_UhEejIw(cxW zWojqiq~$Wf@~Sn76ta@^5`iRG&Fkh1V*5Z{wBF!!ipN} zQ$yJkvXrvjM~V}Ny%qxhW$bd_;l5MiWsKywaQ#w?RGG%`@{!}TZxJ6(@I)@f8`=~p zE({h#7(egvg>X@Otcb(|Ih=_HGjbR}&1Z-X;FIwRB&p0e0g-2f6T1SpmaMo(dh!Op?fNXpPcp@aAyUs|55T#V^esJ^{3zn2i zk^0wN2JbNRN1Y+xztuT|SoX&2x~!$Ryr0RyTnRcq6f-L#kg|Fl6T+N>J3Eg>kLV!< zQcE12+=BxpX1VY$tFtMupSXx@;7}doRg_B>bJ=1ajC(!8BxSqp0mgf(K<~k2{QKYk z{@JrX{Fe$PIGEGflwfd^UkUf}WKbP%75^GtZOiNYrb?|u2@ zmmhuf;qLApc0Gb+y!P;SDJ&J#sovU34P+Vu)0K6Mqx{Mu2a&#;uSIiX0O-%082b;u z{`LR*mw$Qj(@(w8P#mnHbr;jKbNDjhK*e}@9(nOHjc!mlF?d8qxne%~MeTDpCJl#! zPe1+icVB+~@sk5NNas2(3@^+t*8OZQc^xFwlzG=|1)MIpj8P;9`};VeI3WoS7RrQa z-T3&F@Qial;{|XGGMW|P6iI+Hs#LT@#C*IiWlL|gi}kgSKm2%icXzT_UIU0Acj_0O z_|BQD+rXHuql!6egqgDQ(8gL-^Rlm7dTPO6U}!1XCMB97Tvi4hJy+N^;^(*>?2-X# zF~Z9}=niIG0`GMm1&e?LDm9f)DNR)4)Uig@c!k7VZ4f#sPe(zpi7$0$$l-^>&X7_Z zt11}F5dvI$xzWd{_2;h1^k2*XQg|_kwxGHA6NeLyD0x?hju9{`iM2&+BGTxGj%r1q ztzLUoK{r9k72&`FW8sUYr@SOyga_J=Q(fYfW^wJOlojG-%^Arp;$w{bGGuZ$@iKM= zre&nX=efPp3EfiM?-(?>-e35fwscx+CWf5LDKg>uh%Zk^9vERUqh!a$yU68Hd zGO)RfqqPuB7fG-xh(6tRyMW&OCP9IDi2EHLm_h3|1)1Ioi}1>Io6CC-jrMyea&QTtbWZ9!GdOht)cw5+&c4}$dGueGxwmj zwxYdQmJtnE_%Ck(|GZ_{gj^5LoY8a&LYA|Qn&8aA2v+SFdN1^^%!YNQDCI`~*%C|+ z=ceLAxk|uv%Jfxyafz7wrM))A(+4~&IFMuun5}596=gppHRixl&$nTnd!fDLohDf` z=5Gs=!N!CFh|Y$rzIf?z7@*68<6)@|ZBRbIK5(GS0bQw**RfJ`R(oB{YtOi=M=;RI z__L0c%G!EB&5kvtn3ZIzU=64ydsSb8Uz#PDZA7ih`*z4;lRVE)kEaREC3rb7MZW7s zE8-)bcR9LDnsYIoPkBRNESt6$>UKi0De_{6h{w}5T=SlzaiA;yIeFWYChzS{c;&C( zKV<`xx<9kx)wcMX51$p3n@{>m3ONT*HXYd(gq4unPUNjAUen?QzUR+h>`vuf(|aUd z+h*?7<7W>Gf3zqUnlaG zU~LDZ8$$UCGE{jnCKVRX3gE3KVHqLl-#+{H@YUga2m6%ONW5qg`Udy4;|l<`EorOO zs3LDGG;1qTEn+F=@)(v7HhsjQDEqw77<1NOIPTzVGJbRNj&_A46o#bfpHXNAQd8t@ z-~xV~$%b8n-SPPR{F`r%KqK4G9?rFI!_ONBJD!Xu(+S69oSdA}me$9(%Oz<vtgn zh0b|xoi_lvGsU?lOWIe-;;Sjk{7jSSoC8>nj*bwp2`;b^s;lrc$@+nRr)N8qb@gQp zTgBExOjy@u&dNp;nXxt+9JfQ*1J=uOU@{&bADxy+%mHIGTispnEIWMTR z*FMZTv;+8gE&_^g1<#F4Ok_yan?S607TZh1!Q0fp`rO8vU6m2dV~k~0_*`4Ir9Z4z zRthjJ6sCb3H;gr7uc!7U%-av=>cMK!C z-Sc_p?fLlcKmGLV`HQ3D<9FlnY=3uW6viT67~;xNm?dQk30oJhEzo=)QQ8=dc%h!y z+s)Zy9C`QmzyF>4WIAP!XxezLkT*fJq?ra{hH*iZd~mvctdxN~@AM+8U9t=|=T#i> zA4|~I!UTKR`c*XsK&$ENZ(iqnP3C()WF$l$vk$l5gw~WoD>`fyNOW8@;OnIu=xM9| z`E)uSbY8!E`~B;quYUaQFW-Ip?B^ek87g-M^U+|8aom@$C&>Y0VxI}+o>v#8<>LA3 z<>})1wwBY2$kqzEp@{8Z0kjmy+A$IyzC8TPpa1gJS6{t&@q)w5=y*X#DEZ0dbrUMH zoxxG}Au*TXk5@;yOanOO66(&{{t_1o{Zmd*I5|y(Xn%y2--+PydvRo@oRH=4CxC_l z(=Jur(ELOin|0gqD!D=pKSKhm#nb8e+4<==hlhXr`fvaDKmPdLci$bJopyFc(;=@7 z5Ab`5w$hp!ZJtXx{M(M-j(Ba2Y6Qh3Y-=UlM8tT&`FC=5`s&rux6i)$&%gZVvv0qZ zlVdUFImZY~CBsI%5oiZue9b$5^|n`IJrHm_9d4h=Y|W%Pc2Ops!_$ z!B~>l8Re5NitPeLh#GCd|Khcmr_E05Fgm?0=(VgJJsLD>IJ8`HV6>XqM8>(kBM7qz zPrCDy@%fK$UjOx*zx|)T{0C>o9*)oEyQ9hO&W!R#L)gftwizqsz~viJ`gTOpw+DZQQc@*~btQJNIqaT6T_gJyI6aHI&Zy~}Bv&U6(a82cs! zb~oe}UP8_zs8XbV=~uq%Qg;>5lA6O>m$O-1z^^}ZHzmpqNq#?;HNVl#*HTh}dW4u9 zHBHQPG3GG+#YB#tJ|3Up;`;9Sb55#8ws3UKfOIr?zyyR88$KT}2+VQ1M9SfOV0 z=&{fTZLz@KMIO4Q^*r_B<;$uUMxV1;*fmC?ZQAMahRqR)LYN zQ+C*h5kEOOIeGi)HSW`&4i8_wI(&Zk3kRgXI6t26^rt#EoQ@bDn5yER&y~7F#8p4m zh}Q}dd^^>G$*cdf8O|8aBRb{NeuLrbNzpqaCzrDtZ#Y4S1anL;Lx|*wV0fW1@xoD^ zfIWFdY*}izE?%zS50GEe?tX9)Wm&#V z6`Giu<`_DeC3^y|<_$@fEy1OLZ}Sux10J)**$F%rHk3x2eYqp%D}KEa_jMd`SZ%!6 zKFog4v++6ZhVhwbu<_YBTs@ypAV9j)-p;W&)_58*SWJ{XSjHHvamFf9Rcd1i?SB1? zJD+p8jm&hhrfa9Y@?{h$bh{VNU%cqN7|zDbclP+gxr!IRDgTA&}Nc z90NzVDqaPy6`>7@mzPE_UY>qWMNYhSJH?r<=8is_;63GZYtj1179RQju6z@OgFJan z#zaScXngHX5|n`Ft}ppI!&&j_;=4i_Y1c9Zfi{CuDy8EW(-fkqp`3 zRq+a=Q?8YLxelhQGjvK9PC_+yJ;E{?E_Ouh5G{^bp6FCbAaKfSca>EXCi1j|T)~63 zrV86icEd-h2&r&Zyh@Py2U+b>K{F6hrz~MOcxum+Xr_|#ifv&`HwLNkYunQtf)+uq z?X28t=A81XLi(5*Y~|`C;2KCx^W}O;^UNYI@`U{=FZ0EttO%p|sG9X=T&&CJsZo4q*j@!GQYfJ*Bg;yLm0LziPpb- z^P6|H${yBcTXD({I#p~{R83%fE*jiF)`m+sJwXn-1mok~j1uuOFeHifj5H_0ABG@V zA_|P$rZHqx;L?w9E!;V#v3uwAiYtC)u!#q|T1Ma(>Rryl6M_VE>$bLjD9OjLXY4A1#P(6k8_Q}?3a>WIRMyb90C|C=y99d{b z-xa&F;&ei_;e*tg|1aWz^A^9T?$o%LkhLYhU)iy2t!@+Ita!x=lzxTcsCi2Xl?Sbx zs_sfsj40R|W8{}Xz(1}HXOzp@d`$szjg*Ve?hniq=%rNcs{prz-z%qDOdi1UTFerj z+PvF~Tq9mK&6fQ}%uj+~u@*V8L%esUVjc{13O!~Wk||_)XdsvP$KvH#;92S8t7kOC z-1Wak8);39qKo?8@)?wc9j$@kC9Y(>mL`ljoGG3i<0;%MAfgYXO7eDD z*^Hic+7|(7hPDRE*1to7Q{!qDhiE3EH90pIWosuMpQ)jlxT~6p7gh#5V|14cyeT=I zj{4H5Bju#3FwQaNfiys5b1F5&Vvtf@?Yz0_&wtlEfx@!-^JLeD<9FZ*G)F#Q7cH}#4Ew7|1$Y;GLxLy^N-fT_Kkv zVl4m4R||uKzLb#3|aug4g3Rey0KR3nL*YCC4dt2WP4q{)O0XKg*m^5OG%!Fp?BF9$Jk%`ano zf+#hcA1x9D{mGZBJhoamknIHPJ2}0n{&=^H)InPg(K6X)^cUPIr&k>rmfl*tGW2i~ z0Bu^dak=!;ldme;i!|$TK~L+0pCS6pPM7;=+m;bx5DU}EPE<<3D;~Ty@`BPerCP~3 zpU4glfB9TK{%XQG?d5syDQWJw37Z@<+9fM?^~%(fPzu}3*IL=r%!kZTqK(9>gwH+r zhRIet(;d8~k@weZ3Q(_TU6GX_^9>j0!tM}CUzVrYGQ#L;q{F$HpfAD?$2r?8YXi9| z<|woJnz@o;e=h6B;$`J@>4STo1y+tJVoxGUPm=7$cV5$Fx;QG@ z(8b}RpVvkR%?`2|>^1}P0-6Dg(P%FB(xZGVb(3e6QFT zQHIDoua-b?wRU@G~SSLwJrQm@!5BUWt8M^hK;yJgDO0yO2hKY=jX)TnqC(=Xu1yg!_KsOhCS zP|{xLMn9Y<OX5X}6ns0k9<1iV zwWnIsS~FjUm>?n*6gm7!uu_1meto@ysfh5a3q@?3(6V@u7eX)3g*G%?64uXk+M=rV zx+;byFx6c3F*zZqhu%aiO=*R4m#ek5Tt|einpD?jY-V21JIGjv^&$P%a3JZe&C6Dv z2Uh4{*7v=?@Id7x>@sram0}gYPtB8EO(|%urd4A~{Yfhm%dMIGRI{g;9CXeDlrj?V z)(0<)`lJhlyK`N2RR^Z$YQ$@mlv116$AjRFP_9N4OH`HoVd^QXdhgguhjX#S?IkP^ zj}IKUBnN72uS;UQ=h>@n%ql}l)3a*wg<`7ZHgLJulw|8SH3=@tuh7^#V=l22e9&Gc zc04?6mIG)nXS-x}c-Ff78`2Rin`Q7^{4(6S=iDw?Z&CV9KKXJt)6*JZ@iV7Od$xlv zsi;IVoIE|g?mp~!Y)8nj*VmhI3BYEEX2Y4=0vn6es?Ots31BDE0Zn@y-LN04e#kW25L)+iEDmyFDk9c);Kx$?tgZ0^aE4lQmTL+zfX0h zhL6sMqYlUdtWB7zFN9OTmLQEnPmgbl9N!E{ZWof51f$&iTGhdk57M$@;{O9O$(#h9 S!`e3h0000 Date: Fri, 4 Feb 2022 15:24:55 -0500 Subject: [PATCH 03/19] ISSUE-045 - Venetian Blinds - Working on the basic concept of the blinds filter. Created a new workspace to test this all out in. Offering two differing test subjects: A position flag and a driver portrait. This is useful because the images need to be treated differently compared to simple divs. Figured out a way of tinting both divs and images: Severely offset internal outline styling with semi-opaque colors. Moved DriverPortrait into its own component. Makes sense as portraits appear in various places. Plan to offer prop between front-facing and 3/4 facing photos (I have a collection of both). Created a new "Position" type that can be used, with a special function, to place elements through a common prop. --- .../Chyrons/Driver/ChyronDriver.tsx | 17 +++--- .../Chyrons/Driver/styles.ts | 24 +++------ .../Common/DriverPortrait/DriverPortrait.tsx | 25 +++++++++ .../Common/DriverPortrait/index.ts | 1 + .../Common/DriverPortrait/styles.ts | 29 ++++++++++ .../VenetianBlindsTransition.tsx | 17 ++++++ .../Common/VenetianBlindsTransition/index.ts | 1 + .../Common/VenetianBlindsTransition/styles.ts | 23 ++++++++ .../AngledFlagWorkspace.tsx | 2 +- .../VenetianBlindsWorkspace.tsx | 31 +++++++++++ .../VenetianBlindsWorkspace/index.ts | 1 + .../{AngledFlagWorkspace => }/styles.ts | 3 +- .../VenetianBlindsPrototypeControls.tsx | 53 +++++++++++++++++++ .../VenetianBlindsPrototype/index.ts | 1 + src/components/Workspaces/WorkspacesRoute.tsx | 12 +++-- src/domain/data/workspaces.ts | 8 +-- src/types/state.d.ts | 5 ++ src/types/style.d.ts | 12 ++++- src/utils/styling.ts | 12 +++++ 19 files changed, 240 insertions(+), 37 deletions(-) create mode 100644 src/components/BroadcastGraphics/Common/DriverPortrait/DriverPortrait.tsx create mode 100644 src/components/BroadcastGraphics/Common/DriverPortrait/index.ts create mode 100644 src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts create mode 100644 src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx create mode 100644 src/components/BroadcastGraphics/Common/VenetianBlindsTransition/index.ts create mode 100644 src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts create mode 100644 src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx create mode 100644 src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/index.ts rename src/components/Workspaces/CustomWorkSpaces/{AngledFlagWorkspace => }/styles.ts (83%) create mode 100644 src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx create mode 100644 src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/index.ts create mode 100644 src/utils/styling.ts 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};` : ""} + `; +} From c07d364584479edd7b53402288ebec1c2baca30f Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 7 Feb 2022 12:33:42 -0500 Subject: [PATCH 04/19] ISSUE-045 - Venetian Blinds - After some trial and error I've got a performant and sensible wipe solution using a clip-path mask. Figuring this out of great because these kinds of clip paths are used in other places as well so this is good practice to start with. --- .../VenetianBlindsTransition.tsx | 61 ++++++++++++++++--- src/types/style.d.ts | 5 ++ src/utils/styling.ts | 50 ++++++++++++++- 3 files changed, 105 insertions(+), 11 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 799bfc9..7565987 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,17 +1,58 @@ +import { useState } from "react"; +import { useSpring, animated } from "@react-spring/web"; +import useMeasure from "react-use-measure"; + import { VenetianBlindsFilter } from "./styles"; +import { wipe45DegClip } from "../../../../utils/styling"; type VenetianBlindsTransitionProps = { color: string, }; export const VenetianBlindsTransition = ( { color, children }: React.PropsWithChildren, -) => ( - - {children} - -); +) => { + const [childRef, { + height: childHeight, + width: childWidth, + }] = useMeasure(); + const deg = -45; + + const [state, toggle] = useState(true); + + const { x } = useSpring({ + from: { x: 0 }, + x: state ? 1 : 0, + config: { duration: 300 }, + }); + + return ( +

{ + console.log(!state); + toggle(!state); + }}> + { + const [a1, a2, b1, b2, c1, c2] = wipe45DegClip( + childWidth, + childHeight, + x, + "bottomRight", + ); + return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; + }), + }} + > + + {children} + + +
+ ); +}; diff --git a/src/types/style.d.ts b/src/types/style.d.ts index d1af8a2..42a10b8 100644 --- a/src/types/style.d.ts +++ b/src/types/style.d.ts @@ -8,6 +8,11 @@ export type Px = number; */ export type Percent = number; +/** + * Type to remind you that we're dealing with fraction (0-1). + */ +export type Fraction = number; + /** * Object to cleanly define relative/absolute placement for a styled component. */ diff --git a/src/utils/styling.ts b/src/utils/styling.ts index b316106..a843421 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -1,6 +1,6 @@ import { css }from "styled-components"; -import { Placement } from "../types/style"; +import { Fraction, Placement, Px } from "../types/style"; export function placementStyleRules(pos: Placement) { return css` @@ -10,3 +10,51 @@ export function placementStyleRules(pos: Placement) { ${pos.left ? `left: ${pos.left};` : ""} `; } + + +/** + * Provides the x, y coordinates of a three point polygon for use in a clip-path + * mask. By taking a fraction to indicate the progress through the animation it + * will return the six coordinates that will generate a 45 degree wipe effect. + * @param width element width in pixels + * @param height element height in pixels + * @param progress fraction from 0 to 1 + * @param startingCorner Which corner the wipe originates from + * @returns Array of six numbers representing pixel values of the clip-path + */ +export function wipe45DegClip( + width: Px, + height: Px, + progress: Fraction, + startingCorner: "topLeft" | "topRight" | "bottomRight" | "bottomLeft", +): [Px, Px, Px, Px, Px, Px] { + // Long edge multiplied by 2. + const l = Math.max(width, height) * 2; + + switch(startingCorner) { + case "topLeft": + return [ + 0, 0, + l * progress, 0, + 0, l * progress, + ]; + case "topRight": + return [ + width, 0, + width, l * progress, + width - l * progress, 0, + ]; + case "bottomRight": + return [ + width, height, + width, height - l * progress, + width - l * progress, height, + ]; + case "bottomLeft": + return [ + 0, height, + 0, height - l * progress, + l * progress, height, + ]; + } +} From 14e4c0569dfa8a7764e567b8a771a8de51b80acf Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 7 Feb 2022 16:02:15 -0500 Subject: [PATCH 05/19] =?UTF-8?q?ISSUE-045=20-=20Venetian=20Blinds=20-=20F?= =?UTF-8?q?igured=20out=20some=20trig=20to=20get=20this=20to=20work.=20The?= =?UTF-8?q?=20angle=20of=20the=20wipe=20is=20now=20customizable=20and=20no?= =?UTF-8?q?=20longer=20limited=20to=2045=C2=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VenetianBlindsTransition.tsx | 35 +++++++++++-------- .../VenetianBlindsWorkspace.tsx | 16 +++++++-- src/types/style.d.ts | 5 +++ src/utils/styling.ts | 32 +++++++++-------- 4 files changed, 56 insertions(+), 32 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 7565987..b8cb17b 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,53 +1,60 @@ import { useState } from "react"; -import { useSpring, animated } from "@react-spring/web"; +import { useSpring, animated, config } from "@react-spring/web"; import useMeasure from "react-use-measure"; import { VenetianBlindsFilter } from "./styles"; -import { wipe45DegClip } from "../../../../utils/styling"; +import { wipeCustomDegClip } from "../../../../utils/styling"; +import { Corner } from "../../../../types/style"; type VenetianBlindsTransitionProps = { - color: string, + blindsColor: string, + degrees: number, + duration: number, + wipeStartingCorner: Corner, }; export const VenetianBlindsTransition = ( - { color, children }: React.PropsWithChildren, + { + blindsColor, + degrees, + duration, + wipeStartingCorner, + children, + }: React.PropsWithChildren, ) => { const [childRef, { height: childHeight, width: childWidth, }] = useMeasure(); - const deg = -45; const [state, toggle] = useState(true); const { x } = useSpring({ from: { x: 0 }, x: state ? 1 : 0, - config: { duration: 300 }, + config: { duration }, }); return ( -
{ - console.log(!state); - toggle(!state); - }}> +
toggle(!state)}> { - const [a1, a2, b1, b2, c1, c2] = wipe45DegClip( + const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( childWidth, childHeight, x, - "bottomRight", + wipeStartingCorner, + degrees, ); return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; }), }} > {children} diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 87729bf..15e3c67 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -9,20 +9,30 @@ import { BasicBlock } from "../styles"; export function VenetianBlindsWorkspace() { const { prototypeState } = useSelector(workspaceSelector); - const bgColor = prototypeState?.venetianTransition?.showBG + const bgColor = prototypeState?.venetianTransition?.showBG ?? true ? "black" : "transparent"; return ( {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( - + ) : ( - + )} diff --git a/src/types/style.d.ts b/src/types/style.d.ts index 42a10b8..7fa6fcc 100644 --- a/src/types/style.d.ts +++ b/src/types/style.d.ts @@ -22,3 +22,8 @@ export interface Placement { bottom?: string; left?: string; } + +/** + * Useful to initialize movements from. + */ +export type Corner = "topLeft" | "topRight" | "bottomRight" | "bottomLeft"; diff --git a/src/utils/styling.ts b/src/utils/styling.ts index a843421..d94b93e 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -1,6 +1,7 @@ import { css }from "styled-components"; +import { clamp } from "lodash"; -import { Fraction, Placement, Px } from "../types/style"; +import { Corner, Fraction, Placement, Px } from "../types/style"; export function placementStyleRules(pos: Placement) { return css` @@ -15,46 +16,47 @@ export function placementStyleRules(pos: Placement) { /** * Provides the x, y coordinates of a three point polygon for use in a clip-path * mask. By taking a fraction to indicate the progress through the animation it - * will return the six coordinates that will generate a 45 degree wipe effect. + * will return the six coordinates that will generate a wipe effect. * @param width element width in pixels * @param height element height in pixels * @param progress fraction from 0 to 1 * @param startingCorner Which corner the wipe originates from + * @param degrees The angle in degrees of the wipe * @returns Array of six numbers representing pixel values of the clip-path */ -export function wipe45DegClip( +export function wipeCustomDegClip( width: Px, height: Px, progress: Fraction, - startingCorner: "topLeft" | "topRight" | "bottomRight" | "bottomLeft", + startingCorner: Corner, + degrees: number, ): [Px, Px, Px, Px, Px, Px] { - // Long edge multiplied by 2. - const l = Math.max(width, height) * 2; + const tangent = Math.tan(clamp(degrees, 0.01, 90) * Math.PI / 180); - switch(startingCorner) { + switch (startingCorner) { case "topLeft": return [ 0, 0, - l * progress, 0, - 0, l * progress, + (width + height / tangent) * progress, 0, + 0, (height + width * tangent) * progress , ]; case "topRight": return [ width, 0, - width, l * progress, - width - l * progress, 0, + width, (height + width * tangent) * progress, + width - (width + height / tangent) * progress, 0, ]; case "bottomRight": return [ width, height, - width, height - l * progress, - width - l * progress, height, + width, height - (height + width * tangent) * progress, + width - (width + height / tangent) * progress, height, ]; case "bottomLeft": return [ 0, height, - 0, height - l * progress, - l * progress, height, + 0, height - (height + width * tangent) * progress, + (width + height / tangent) * progress, height, ]; } } From 3ce590d794d3c695b43db21c991f7885baa8e89b Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 7 Feb 2022 16:30:22 -0500 Subject: [PATCH 06/19] ISSUE-045 - Venetian Blinds - Improvements to prototype state management by using partial state updates, which are pretty useful. More props for . --- .../VenetianBlindsTransition.tsx | 28 +++++----- .../VenetianBlindsWorkspace.tsx | 10 ++-- .../AngledFlagPrototypeControls.tsx | 32 ++--------- .../VenetianBlindsPrototypeControls.tsx | 19 +++---- src/features/workspace/workspaceSlice.ts | 56 +++++++++++++++++-- src/types/state.d.ts | 5 +- 6 files changed, 90 insertions(+), 60 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index b8cb17b..2638c2b 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,5 +1,5 @@ import { useState } from "react"; -import { useSpring, animated, config } from "@react-spring/web"; +import { useSpring, animated } from "@react-spring/web"; import useMeasure from "react-use-measure"; import { VenetianBlindsFilter } from "./styles"; @@ -8,15 +8,17 @@ import { Corner } from "../../../../types/style"; type VenetianBlindsTransitionProps = { blindsColor: string, - degrees: number, - duration: number, + blindsAngle: number, + wipeAngle: number, + wipeDuration: number, wipeStartingCorner: Corner, }; export const VenetianBlindsTransition = ( { blindsColor, - degrees, - duration, + blindsAngle, + wipeAngle, + wipeDuration, wipeStartingCorner, children, }: React.PropsWithChildren, @@ -28,30 +30,30 @@ export const VenetianBlindsTransition = ( const [state, toggle] = useState(true); - const { x } = useSpring({ - from: { x: 0 }, - x: state ? 1 : 0, - config: { duration }, + const { wipe } = useSpring({ + from: { wipe: 0 }, + wipe: state ? 1 : 0, + config: { duration: wipeDuration }, }); return (
toggle(!state)}> { + clipPath: wipe.to(wipeProgress => { const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( childWidth, childHeight, - x, + wipeProgress, wipeStartingCorner, - degrees, + wipeAngle, ); return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; }), }} > diff --git a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx index 82c0baf..dbaa0fa 100644 --- a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx @@ -1,9 +1,8 @@ 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 { useDispatch } from "react-redux"; -import { setPrototypeState } from "../../../../features/workspace/workspaceSlice"; +import { updateAngledFlagCountry, updateAngledFlagTeam } from "../../../../features/workspace/workspaceSlice"; import { FlagMode, TeamId } from "../../../../types/state"; import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; @@ -17,41 +16,22 @@ const teams: Array = [ "mclaren", "mercedes", "redBull", "williams", ]; -const DEFAULT_COUNTRY = "GBR"; -const DEFAULT_TEAM: TeamId = "alfaRomeo"; - type AngledFlagPrototypeControlsProps = { flagMode: FlagMode, }; export function AngledFlagPrototypeControls({ flagMode }: AngledFlagPrototypeControlsProps) { const dispatch = useDispatch(); - const { prototypeState } = useSelector(workspaceSelector); const flagList = flagMode === "country" ? countries : flagMode === "team" ? teams : []; const onChange = (flag: "flagA" | "flagB") => (index: number) => { if (flagMode === "country") { - dispatch(setPrototypeState({ - angledFlagCountry: { - flagA: flag === "flagA" - ? countries[index] - : prototypeState?.angledFlagCountry?.flagA ?? DEFAULT_COUNTRY, - flagB: flag === "flagB" - ? countries[index] - : prototypeState?.angledFlagCountry?.flagB ?? DEFAULT_COUNTRY, - }, + dispatch(updateAngledFlagCountry({ + [flag]: countries[index], })); } else if (flagMode === "team") { - dispatch(setPrototypeState({ - angledFlagTeam: { - flagA: flag === "flagA" - ? teams[index] - : prototypeState?.angledFlagTeam?.flagA ?? DEFAULT_TEAM, - flagB: flag === "flagB" - ? teams[index] - : prototypeState?.angledFlagTeam?.flagB ?? DEFAULT_TEAM, - }, + dispatch(updateAngledFlagTeam({ + [flag]: teams[index], })); - } }; return ( diff --git a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx index 51c8379..65e8980 100644 --- a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx @@ -1,8 +1,9 @@ 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 { updateVenetianTransition } from "../../../../features/workspace/workspaceSlice"; import { VenetianTransitionWorkspaceMode } from "../../../../types/state"; import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; @@ -18,20 +19,14 @@ export function VenetianBlindsPrototypeControls() { const { prototypeState } = useSelector(workspaceSelector); const onChange = (index: number) => { - dispatch(setPrototypeState({ - venetianTransition: { - mode: modes[index], - showBG: prototypeState?.venetianTransition?.showBG ?? false, - }, + dispatch(updateVenetianTransition({ + mode: modes[index], })); }; const onToggle = (value: boolean) => { - dispatch(setPrototypeState({ - venetianTransition: { - mode: prototypeState?.venetianTransition?.mode ?? "positionFlag", - showBG: value, - }, + dispatch(updateVenetianTransition({ + showBG: value, })); }; @@ -44,7 +39,7 @@ export function VenetianBlindsPrototypeControls() { slotWidth="200px" /> diff --git a/src/features/workspace/workspaceSlice.ts b/src/features/workspace/workspaceSlice.ts index 417a956..21a24d0 100644 --- a/src/features/workspace/workspaceSlice.ts +++ b/src/features/workspace/workspaceSlice.ts @@ -9,7 +9,7 @@ const initialState: RootState["workspace"] = { overlayIds: [], previewWindowDimensions: { width: 0, height: 0 }, }, - prototypeState: null, + prototypeState: {}, }; export type UpdateWorkspaceAction = { @@ -31,8 +31,54 @@ export const workspaceSlice = createSlice({ state.workspaceId = action.payload.workspaceId; state.workspaceProperties = action.payload.workspaceProperties; }, - setPrototypeState: (state, action: PayloadAction) => { - state.prototypeState = action.payload; + + // Prototype States + updateAngledFlagCountry: ( + state, + action: PayloadAction>, + ) => { + if (state.prototypeState.angledFlagCountry == null) { + state.prototypeState.angledFlagCountry = { + flagA: "GBR", + flagB: "GBR", + }; + } + state.prototypeState.angledFlagCountry = Object.assign( + state.prototypeState.angledFlagCountry, + action.payload, + ); + }, + updateAngledFlagTeam: ( + state, + action: PayloadAction>, + ) => { + if (state.prototypeState.angledFlagTeam == null) { + state.prototypeState.angledFlagTeam = { + flagA: "alfaRomeo", + flagB: "alfaRomeo", + }; + } + state.prototypeState.angledFlagTeam = Object.assign( + state.prototypeState.angledFlagTeam, + action.payload, + ); + }, + updateVenetianTransition: ( + state, + action: PayloadAction>, + ) => { + if (state.prototypeState.venetianTransition == null) { + state.prototypeState.venetianTransition = { + mode: "positionFlag", + showBG: true, + timing: 500, + startingCorner: "topLeft", + }; + } + state.prototypeState.venetianTransition = Object.assign( + state.prototypeState?.venetianTransition, + action.payload, + ); }, }, }); @@ -41,6 +87,8 @@ export const { setWorkspaceId, setAnimatedBG, updateWorkspace, - setPrototypeState, + updateAngledFlagCountry, + updateAngledFlagTeam, + updateVenetianTransition, } = workspaceSlice.actions; export default workspaceSlice.reducer; diff --git a/src/types/state.d.ts b/src/types/state.d.ts index fcab41a..d931dba 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -1,4 +1,5 @@ import { Milliseconds, Optional } from "./util"; +import { Corner } from "./style"; export interface RootState { pageDimensions: PageDimensions; @@ -22,7 +23,7 @@ export interface Workspace { workspaceId: WorkspaceId; animatedBG: boolean; workspaceProperties: WorkspaceProperties; - prototypeState: Optional; + prototypeState: PrototypeState; } export type WorkspaceId = string; @@ -43,6 +44,8 @@ export interface PrototypeState { venetianTransition?: { mode: VenetianTransitionWorkspaceMode; showBG: boolean; + timing: number, + startingCorner: Corner, }; } export type VenetianTransitionWorkspaceMode = "positionFlag" | "driverPortrait"; From 78073b1eb2e2183e14f7d92c6850ec53755c4690 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 8 Feb 2022 11:27:27 -0500 Subject: [PATCH 07/19] ISSUE-045 - Venetian Blinds - Wipe, blinds closing, and blinds color all working. --- .../VenetianBlindsTransition.tsx | 55 +++++++++++++++---- .../Common/VenetianBlindsTransition/styles.ts | 38 ++++++++++--- .../VenetianBlindsWorkspace.tsx | 22 +++++--- src/types/style.d.ts | 5 ++ src/types/util.d.ts | 10 +++- 5 files changed, 102 insertions(+), 28 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 2638c2b..ae01c5d 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -2,21 +2,32 @@ import { useState } from "react"; import { useSpring, animated } from "@react-spring/web"; import useMeasure from "react-use-measure"; -import { VenetianBlindsFilter } from "./styles"; +import { AnimatedVenetianBlindsFilter, VenetianBlindsFilter } from "./styles"; import { wipeCustomDegClip } from "../../../../utils/styling"; -import { Corner } from "../../../../types/style"; +import { Corner, Degrees, Px } from "../../../../types/style"; +import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { blindsColor: string, - blindsAngle: number, - wipeAngle: number, - wipeDuration: number, + blindsColorFadeDuration: Milliseconds, + blindsColorFadeDelay?: Milliseconds, + blindsAngle: Degrees, + blindsOpenDuration: Milliseconds, + blindsOpenDelay?: Milliseconds, + blindsSize: { opaque: Px, transparent: Px }, + wipeAngle: Degrees, + wipeDuration: Milliseconds, wipeStartingCorner: Corner, }; export const VenetianBlindsTransition = ( { blindsColor, + blindsColorFadeDuration, + blindsColorFadeDelay = 0, blindsAngle, + blindsOpenDuration, + blindsOpenDelay = 0, + blindsSize, wipeAngle, wipeDuration, wipeStartingCorner, @@ -31,11 +42,16 @@ export const VenetianBlindsTransition = ( const [state, toggle] = useState(true); const { wipe } = useSpring({ - from: { wipe: 0 }, wipe: state ? 1 : 0, config: { duration: wipeDuration }, }); + const blindsSpring = useSpring({ + opacity: state ? 1 : 0, + config: { duration: blindsOpenDuration }, + delay: blindsOpenDelay, + }); + return (
toggle(!state)}> + + {children} + {children} diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts index d15e123..da5ef57 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts @@ -1,23 +1,43 @@ +import { animated } from "@react-spring/web"; import styled from "styled-components"; -import { Px } from "../../../../types/style"; + +import { Degrees, Px } from "../../../../types/style"; +import { Milliseconds } from "../../../../types/util"; type VenetianBlindsFilterProps = { - deg: number, + blindsAngle: Degrees, transparentWidth: Px, opaqueWidth: Px, - opaqueColor: string, + blindsColor: string, + blindsColorFadeDuration: Milliseconds, + blindsColorFadeDelay?: Milliseconds, + blindsClosed: boolean, + mirror?: boolean, }; export const VenetianBlindsFilter = styled.div` + position: ${({ mirror }) => mirror ? "absolute" : null}; + + --A: ${({ mirror }) => mirror ? "transparent" : "black"}; + --B: ${({ mirror }) => mirror ? "black" : "transparent"}; + mask-image: repeating-linear-gradient( - ${({ deg }) => deg}deg, - black, - black ${({ opaqueWidth }) => opaqueWidth}px, - transparent ${({ opaqueWidth }) => opaqueWidth}px, - transparent ${({ transparentWidth, opaqueWidth }) => transparentWidth + opaqueWidth}px + ${({ blindsAngle }) => blindsAngle}deg, + var(--A), + var(--A) ${({ opaqueWidth }) => opaqueWidth}px, + var(--B) ${({ opaqueWidth }) => opaqueWidth}px, + var(--B) ${({ transparentWidth, opaqueWidth }) => transparentWidth + opaqueWidth}px ); > * { - box-shadow: inset 0 0 0 99999px ${({ opaqueColor }) => opaqueColor}; + box-shadow: inset 0 0 0 99999px ${({ blindsColor, blindsClosed }) => + `${blindsColor}${blindsClosed ? "00" : "cc"}`}; + transition: box-shadow + ${({ blindsColorFadeDuration }) => blindsColorFadeDuration}ms + cubic-bezier(0.88, 0.18, 0.96, 0.75) + ${({ blindsColorFadeDelay = 0 }) => blindsColorFadeDelay}ms; } `; VenetianBlindsFilter.displayName = "VenetianBlindsFilter"; + +export const AnimatedVenetianBlindsFilter = animated(VenetianBlindsFilter); +AnimatedVenetianBlindsFilter.displayName = "AnimatedVenetianBlindsFilter"; diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 1afa237..97aebae 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -16,23 +16,31 @@ export function VenetianBlindsWorkspace() { {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( ) : ( diff --git a/src/types/style.d.ts b/src/types/style.d.ts index 7fa6fcc..8c627c5 100644 --- a/src/types/style.d.ts +++ b/src/types/style.d.ts @@ -13,6 +13,11 @@ export type Percent = number; */ export type Fraction = number; +/** + * Type to remind you that we're dealing with degrees (0-360, etc). + */ +export type Degrees = number; + /** * Object to cleanly define relative/absolute placement for a styled component. */ diff --git a/src/types/util.d.ts b/src/types/util.d.ts index 86126fb..09ccfa6 100644 --- a/src/types/util.d.ts +++ b/src/types/util.d.ts @@ -1,3 +1,11 @@ -export type Optional = TEntity | null; +export type Optional = T | null; + +/** + * Type to remind you that we're dealing with milliseconds. + */ export type Milliseconds = number; + +/** + * Type to remind you that we're dealing with seconds. + */ export type Seconds = number; From 177272df6f0edb6a96e80ca60bf91135c353c268 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 8 Feb 2022 12:19:54 -0500 Subject: [PATCH 08/19] ISSUE-045 - Venetian Blinds - Calibrated portrait example to be more accurate to real example. Added opacity props for the filter to allow for an opacity rule on the entire filter - as is apparent with the real position flag example. --- .../VenetianBlindsTransition.tsx | 15 ++++++++++++++- .../VenetianBlindsWorkspace.tsx | 11 ++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index ae01c5d..1c72082 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -4,7 +4,7 @@ import useMeasure from "react-use-measure"; import { AnimatedVenetianBlindsFilter, VenetianBlindsFilter } from "./styles"; import { wipeCustomDegClip } from "../../../../utils/styling"; -import { Corner, Degrees, Px } from "../../../../types/style"; +import { Corner, Degrees, Fraction, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { @@ -18,6 +18,9 @@ type VenetianBlindsTransitionProps = { wipeAngle: Degrees, wipeDuration: Milliseconds, wipeStartingCorner: Corner, + opacityStart?: Fraction, + opacityDuration?: Milliseconds, + opacityDelay?: Milliseconds, }; export const VenetianBlindsTransition = ( { @@ -31,6 +34,9 @@ export const VenetianBlindsTransition = ( wipeAngle, wipeDuration, wipeStartingCorner, + opacityStart = 1, + opacityDuration = wipeDuration, + opacityDelay = 0, children, }: React.PropsWithChildren, ) => { @@ -46,6 +52,12 @@ export const VenetianBlindsTransition = ( config: { duration: wipeDuration }, }); + const { opacity } = useSpring({ + opacity: state ? 1 : opacityStart, + config: { duration: opacityDuration }, + delay: opacityDelay, + }); + const blindsSpring = useSpring({ opacity: state ? 1 : 0, config: { duration: blindsOpenDuration }, @@ -56,6 +68,7 @@ export const VenetianBlindsTransition = (
toggle(!state)}> { const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( childWidth, diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 97aebae..b54a4dc 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -35,13 +35,18 @@ export function VenetianBlindsWorkspace() { ) : ( From b1b3b62d3a67c461d612ef1ec000f63ebbfdfd6a Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 8 Feb 2022 12:23:32 -0500 Subject: [PATCH 09/19] ISSUE-045 - Venetian Blinds - Added blinking animation for the position number. Activated with a blink duration. I had to consider a manual delay before starting. The animation delay didn't really work as the number would be visible until the animation started. I'm sure there's a solution but I'm a little lazy to figure it out at the moment. Otherwise, for future reference: iirc the delay would be 250ms and the duration would be 400ms. --- .../VenetianBlindsTransition.tsx | 8 +++-- .../Common/VenetianBlindsTransition/styles.ts | 29 ++++++++++++++++--- .../Inputs/ProgressSlider/ProgressSlider.tsx | 4 ++- .../VenetianBlindsWorkspace.tsx | 9 ++++-- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 1c72082..d1ce9ca 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -21,6 +21,7 @@ type VenetianBlindsTransitionProps = { opacityStart?: Fraction, opacityDuration?: Milliseconds, opacityDelay?: Milliseconds, + spanBlinkDuration?: Milliseconds, }; export const VenetianBlindsTransition = ( { @@ -37,6 +38,7 @@ export const VenetianBlindsTransition = ( opacityStart = 1, opacityDuration = wipeDuration, opacityDelay = 0, + spanBlinkDuration, children, }: React.PropsWithChildren, ) => { @@ -90,7 +92,8 @@ export const VenetianBlindsTransition = ( blindsColor={blindsColor} blindsColorFadeDuration={blindsColorFadeDuration} blindsColorFadeDelay={blindsColorFadeDelay} - blindsClosed={!!state} + blindsClosing={!!state} + spanBlinkDuration={spanBlinkDuration} mirror={true} // Mirror version provides the opposite blinds. > {children} @@ -102,7 +105,8 @@ export const VenetianBlindsTransition = ( blindsColor={blindsColor} blindsColorFadeDuration={blindsColorFadeDuration} blindsColorFadeDelay={blindsColorFadeDelay} - blindsClosed={!!state} + blindsClosing={!!state} + spanBlinkDuration={spanBlinkDuration} mirror={false} > {children} diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts index da5ef57..5e4764c 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts @@ -1,9 +1,18 @@ import { animated } from "@react-spring/web"; -import styled from "styled-components"; +import styled, { css, keyframes } from "styled-components"; import { Degrees, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; +const spanBlinkAnimation = keyframes` + 0% { opacity: 0 } + 62% { opacity: 1 } + 72% { opacity: 0 } + 81% { opacity: 1 } + 91% { opacity: 0 } + 100% { opacity: 1 } +`; + type VenetianBlindsFilterProps = { blindsAngle: Degrees, transparentWidth: Px, @@ -11,8 +20,10 @@ type VenetianBlindsFilterProps = { blindsColor: string, blindsColorFadeDuration: Milliseconds, blindsColorFadeDelay?: Milliseconds, - blindsClosed: boolean, + blindsClosing: boolean, mirror?: boolean, + spanBlinkDuration?: Milliseconds, + spanBlinkDelay?: Milliseconds, }; export const VenetianBlindsFilter = styled.div` position: ${({ mirror }) => mirror ? "absolute" : null}; @@ -29,13 +40,23 @@ export const VenetianBlindsFilter = styled.div` ); > * { - box-shadow: inset 0 0 0 99999px ${({ blindsColor, blindsClosed }) => - `${blindsColor}${blindsClosed ? "00" : "cc"}`}; + box-shadow: inset 0 0 0 99999px ${({ blindsColor, blindsClosing }) => + `${blindsColor}${blindsClosing ? "00" : "cc"}`}; transition: box-shadow ${({ blindsColorFadeDuration }) => blindsColorFadeDuration}ms cubic-bezier(0.88, 0.18, 0.96, 0.75) ${({ blindsColorFadeDelay = 0 }) => blindsColorFadeDelay}ms; } + + ${({ blindsClosing, spanBlinkDuration }) => ( + blindsClosing && spanBlinkDuration + ? css` + span { + animation: ${spanBlinkAnimation} ${spanBlinkDuration}ms step-end; + }; + ` + : null) +} `; VenetianBlindsFilter.displayName = "VenetianBlindsFilter"; diff --git a/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx index 691f26a..2a1a221 100644 --- a/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx +++ b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx @@ -3,6 +3,8 @@ import { useDrag } from "@use-gesture/react"; import useMeasure from "react-use-measure"; import { clamp } from "lodash"; +import { Fraction } from "../../../../types/style"; + import { AnimatedProgressSliderBar, ProgressSliderBarHandle, @@ -19,7 +21,7 @@ const MARGIN_WIDTH = 15; const percentage = (value: number) => `${Math.floor(value * 100)}%`; type ProgressSliderProps = { - value: number, // Fraction of 1 (0.0 to 1.0) + value: Fraction, onChange: (value: number) => void, disabled?: boolean, formatter?: (value: number) => string, diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index b54a4dc..67ea085 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -1,10 +1,12 @@ import { useSelector } from "react-redux"; import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; + import { theme } from "../../../../shared/theme"; +import { BasicBlock } from "../styles"; + 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); @@ -35,8 +37,8 @@ export function VenetianBlindsWorkspace() { ) : ( From 9518f934ae87bcccc1ff43e275a6bfd1dfb56a9f Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 8 Feb 2022 12:29:37 -0500 Subject: [PATCH 10/19] ISSUE-045 - Venetian Blinds - Moved visibility state outside of the Transition component and into the workspace. --- .../VenetianBlindsTransition.tsx | 99 +++++++++---------- .../VenetianBlindsWorkspace.tsx | 9 +- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index d1ce9ca..672013f 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,4 +1,3 @@ -import { useState } from "react"; import { useSpring, animated } from "@react-spring/web"; import useMeasure from "react-use-measure"; @@ -8,6 +7,7 @@ import { Corner, Degrees, Fraction, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { + visible: boolean, blindsColor: string, blindsColorFadeDuration: Milliseconds, blindsColorFadeDelay?: Milliseconds, @@ -25,6 +25,7 @@ type VenetianBlindsTransitionProps = { }; export const VenetianBlindsTransition = ( { + visible, blindsColor, blindsColorFadeDuration, blindsColorFadeDelay = 0, @@ -47,71 +48,67 @@ export const VenetianBlindsTransition = ( width: childWidth, }] = useMeasure(); - const [state, toggle] = useState(true); - const { wipe } = useSpring({ - wipe: state ? 1 : 0, + wipe: visible ? 1 : 0, config: { duration: wipeDuration }, }); const { opacity } = useSpring({ - opacity: state ? 1 : opacityStart, + opacity: visible ? 1 : opacityStart, config: { duration: opacityDuration }, delay: opacityDelay, }); const blindsSpring = useSpring({ - opacity: state ? 1 : 0, + opacity: visible ? 1 : 0, config: { duration: blindsOpenDuration }, delay: blindsOpenDelay, }); return ( -
toggle(!state)}> - { - const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( - childWidth, - childHeight, - wipeProgress, - wipeStartingCorner, - wipeAngle, - ); - return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; - }), - }} - ref={childRef} + { + const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( + childWidth, + childHeight, + wipeProgress, + wipeStartingCorner, + wipeAngle, + ); + return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; + }), + }} + ref={childRef} + > + - - {children} - - - {children} - - -
+ {children} + + + {children} + +
); }; diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 67ea085..3bd5512 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -1,6 +1,7 @@ +import { useState } from "react"; import { useSelector } from "react-redux"; -import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { theme } from "../../../../shared/theme"; import { BasicBlock } from "../styles"; @@ -14,10 +15,13 @@ export function VenetianBlindsWorkspace() { const bgColor = prototypeState?.venetianTransition?.showBG ?? true ? "black" : "transparent"; + const [visible, setVisible] = useState(true); + return ( - + setVisible(!visible)} > {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( ) : ( Date: Tue, 8 Feb 2022 15:14:04 -0500 Subject: [PATCH 11/19] ISSUE-045 - Venetian Blinds - Improvements to Venetian Blinds prototype controls. Now you have 10 different options (5 for position flag and 5 for driver portrait) to play with, as well as a slot selector to choose different starting corners. I have to admit that I didn't want to deal with type juggling with DriverId so I do a pretty hacky job. This is just for prototyping purposes so it really shouldn't be much of a focus for me, right? Added an overall delay prop for VenetianBlindsTransition so that I don't need to deal with special timing issues for the DriverChyron animation in the future. --- .../VenetianBlindsTransition.tsx | 9 +++- .../Common/VenetianBlindsTransition/styles.ts | 4 +- .../VenetianBlindsWorkspace.tsx | 22 ++++++--- .../VenetianBlindsPrototypeControls.tsx | 45 ++++++++++++++++--- src/features/workspace/workspaceSlice.ts | 6 +-- src/types/state.d.ts | 7 ++- 6 files changed, 70 insertions(+), 23 deletions(-) diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 672013f..5dd068f 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -8,6 +8,7 @@ import { Milliseconds } from "../../../../types/util"; type VenetianBlindsTransitionProps = { visible: boolean, + delay?: Milliseconds, blindsColor: string, blindsColorFadeDuration: Milliseconds, blindsColorFadeDelay?: Milliseconds, @@ -26,6 +27,7 @@ type VenetianBlindsTransitionProps = { export const VenetianBlindsTransition = ( { visible, + delay = 0, blindsColor, blindsColorFadeDuration, blindsColorFadeDelay = 0, @@ -51,18 +53,19 @@ export const VenetianBlindsTransition = ( const { wipe } = useSpring({ wipe: visible ? 1 : 0, config: { duration: wipeDuration }, + delay: 0 + delay, }); const { opacity } = useSpring({ opacity: visible ? 1 : opacityStart, config: { duration: opacityDuration }, - delay: opacityDelay, + delay: opacityDelay + delay, }); const blindsSpring = useSpring({ opacity: visible ? 1 : 0, config: { duration: blindsOpenDuration }, - delay: blindsOpenDelay, + delay: blindsOpenDelay + delay, }); return ( @@ -92,6 +95,7 @@ export const VenetianBlindsTransition = ( blindsColorFadeDelay={blindsColorFadeDelay} blindsClosing={visible} spanBlinkDuration={spanBlinkDuration} + spanBlinkDelay={delay} mirror={true} // Mirror version provides the opposite blinds. > {children} @@ -105,6 +109,7 @@ export const VenetianBlindsTransition = ( blindsColorFadeDelay={blindsColorFadeDelay} blindsClosing={visible} spanBlinkDuration={spanBlinkDuration} + spanBlinkDelay={delay} mirror={false} > {children} diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts index 5e4764c..73169a7 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts @@ -48,11 +48,11 @@ export const VenetianBlindsFilter = styled.div` ${({ blindsColorFadeDelay = 0 }) => blindsColorFadeDelay}ms; } - ${({ blindsClosing, spanBlinkDuration }) => ( + ${({ blindsClosing, spanBlinkDuration, spanBlinkDelay = 0 }) => ( blindsClosing && spanBlinkDuration ? css` span { - animation: ${spanBlinkAnimation} ${spanBlinkDuration}ms step-end; + animation: ${spanBlinkAnimation} ${spanBlinkDuration}ms step-end ${spanBlinkDelay}ms; }; ` : null) diff --git a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx index 3bd5512..bd129da 100644 --- a/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx +++ b/src/components/Workspaces/CustomWorkSpaces/VenetianBlindsWorkspace/VenetianBlindsWorkspace.tsx @@ -4,6 +4,8 @@ import { useSelector } from "react-redux"; import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { theme } from "../../../../shared/theme"; import { BasicBlock } from "../styles"; +import { DriverId } from "../../../../types/state"; +import { getDriver } from "../../../../utils/dataLookup"; import { DriverPortrait } from "../../../BroadcastGraphics/Common/DriverPortrait"; import { PositionFlag } from "../../../BroadcastGraphics/Common/PositionFlag"; @@ -22,7 +24,11 @@ export function VenetianBlindsWorkspace() { {prototypeState?.venetianTransition?.mode === "driverPortrait" ? ( @@ -46,17 +54,19 @@ export function VenetianBlindsWorkspace() { blindsColorFadeDelay={200} blindsAngle={-45} blindsOpenDuration={100} - blindsOpenDelay={100} + blindsOpenDelay={150} blindsSize={{ transparent: 3, opaque: 6 }} wipeAngle={40} wipeDuration={300} - wipeStartingCorner="bottomRight" + wipeStartingCorner={ + prototypeState?.venetianTransition?.wipeStartingCorner ?? "bottomRight" + } opacityStart={0.1} opacityDuration={200} opacityDelay={100} spanBlinkDuration={500} > - + )} diff --git a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx index 65e8980..787236d 100644 --- a/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx +++ b/src/components/Workspaces/PrototypingControls/VenetianBlindsPrototype/VenetianBlindsPrototypeControls.tsx @@ -1,26 +1,47 @@ import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { PadBox } from "@bedrock-layout/padbox"; +import { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { updateVenetianTransition } from "../../../../features/workspace/workspaceSlice"; -import { VenetianTransitionWorkspaceMode } from "../../../../types/state"; +import { DriverId } from "../../../../types/state"; +import { Corner } from "../../../../types/style"; import { SlotSelector } from "../../../Common/Inputs/SlotSelector"; import { Toggle } from "../../../Common/Inputs/Toggle"; -const modes: Array = [ - "positionFlag", - "driverPortrait", + +// NOTE: This is all hacky and 100% wouldn't fly in production code. +const modes = ["positionFlag", "driverPortrait"]; +const subModes: [string[], DriverId[]] = [ + ["1", "3", "5", "10", "20"], + ["hamilton", "verstappen", "schumacher", "alonso", "leclerc"], ]; +const corners: Corner[] = ["bottomRight", "bottomLeft", "topLeft", "topRight"]; export function VenetianBlindsPrototypeControls() { + const [modeIndex, setModeIndex] = useState(0); + const dispatch = useDispatch(); const { prototypeState } = useSelector(workspaceSelector); - const onChange = (index: number) => { + const changeMode = (index: number) => { + setModeIndex(index); + dispatch(updateVenetianTransition({ mode: modes[index], + subMode: subModes[index][0], + })); + }; + const changeSubMode = (index: number) => { + dispatch(updateVenetianTransition({ + subMode: subModes[modeIndex][index], + })); + }; + const onChangeStartingCorner = (index: number) => { + dispatch(updateVenetianTransition({ + wipeStartingCorner: corners[index], })); }; @@ -34,10 +55,22 @@ export function VenetianBlindsPrototypeControls() { + + { if (state.prototypeState.venetianTransition == null) { state.prototypeState.venetianTransition = { - mode: "positionFlag", + mode: "portraitFlag", + subMode: "1", showBG: true, - timing: 500, - startingCorner: "topLeft", + wipeStartingCorner: "bottomRight", }; } state.prototypeState.venetianTransition = Object.assign( diff --git a/src/types/state.d.ts b/src/types/state.d.ts index d931dba..b9a1c5e 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -42,13 +42,12 @@ export interface PrototypeState { flagB: TeamId; }; venetianTransition?: { - mode: VenetianTransitionWorkspaceMode; + mode: string, + subMode: string, showBG: boolean; - timing: number, - startingCorner: Corner, + wipeStartingCorner: Corner, }; } -export type VenetianTransitionWorkspaceMode = "positionFlag" | "driverPortrait"; // Overlay Tool export interface OverlayTool { From fd18703d1a7917bc37cc0613b68c24336d06a659 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Wed, 9 Feb 2022 13:55:52 -0500 Subject: [PATCH 12/19] ISSUE-045 - Chyron Body - Taking a moment to rename some reducers to be more consistant (verb in front). --- .../Chyrons/ChyronsDirectorControls.tsx | 12 ++++++------ .../GridSelection/GridSelection.tsx | 8 ++++---- .../broadcast/director/broadcastDirectorSlice.ts | 16 ++++++++-------- .../broadcast/graphics/broadcastGraphicsSlice.ts | 16 ++++++++-------- src/features/event/eventSlice.ts | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index 7e1a02e..7e9a981 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -8,9 +8,9 @@ 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, + clearChyrons, + incrementChyronsOpenState, + setChyrons, } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics"; import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, Car, FlagMode } from "../../../../types/state"; @@ -63,16 +63,16 @@ export function ChyronsDirectorControls() { secondary: secondaryCar != null ? buildDriverChyron(secondaryCar) : null, }, }; - dispatch(chyronsSet(newChyrons)); + dispatch(setChyrons(newChyrons)); } }; const onNext = () => { - dispatch(chyronsOpenStateIncrement()); + dispatch(incrementChyronsOpenState()); }; const onClose = () => { - dispatch(chyronsClear()); + dispatch(clearChyrons()); }; const buildDriverChyron = (car: Car): BGChyronDriver => ({ diff --git a/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx b/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx index 9f6b7a7..7b53399 100644 --- a/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx +++ b/src/components/Workspaces/PrototypingControls/GridSelection/GridSelection.tsx @@ -3,7 +3,7 @@ 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 { pushSelectedCars, clearSelectedCars, removeSelectedCars } from "../../../../features/broadcast/director/broadcastDirectorSlice"; import { eventSelector } from "../../../../features/event/eventSelector"; import { Car } from "../../../../types/state"; import { carMatch } from "../../../../utils/comparators"; @@ -21,13 +21,13 @@ export function GridSelection() { const carClick = (car: Car, selected: boolean) => () => { if (selected) { - dispatch(selectedCarsRemove(car)); + dispatch(removeSelectedCars(car)); } else { - dispatch(selectedCarsAdd(car)); + dispatch(pushSelectedCars(car)); } }; const carDoubleClick = (car: Car) => () => { - dispatch(selectedCarsClear(car)); + dispatch(clearSelectedCars(car)); }; return ( diff --git a/src/features/broadcast/director/broadcastDirectorSlice.ts b/src/features/broadcast/director/broadcastDirectorSlice.ts index 5bd72aa..238e42d 100644 --- a/src/features/broadcast/director/broadcastDirectorSlice.ts +++ b/src/features/broadcast/director/broadcastDirectorSlice.ts @@ -13,16 +13,16 @@ export const broadcastDirectorSlice = createSlice({ name: "broadcastDirector", initialState, reducers: { - selectedCarsAdd: (state, action: PayloadAction) => { + pushSelectedCars: (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. + setSelectedCars: (state, action: PayloadAction) => { // Might be removed. state.selectedCars = [action.payload]; }, - selectedCarsRemove: (state, action: PayloadAction) => { + removeSelectedCars: (state, action: PayloadAction) => { const index = typeof action.payload === "number" ? action.payload : findIndex(state.selectedCars, carMatch(action.payload)); @@ -36,7 +36,7 @@ export const broadcastDirectorSlice = createSlice({ * car. * @param action Car (optional) */ - selectedCarsClear: (state, action: PayloadAction>) => { + clearSelectedCars: (state, action: PayloadAction>) => { if (action.payload == null) { state.selectedCars = []; } else { @@ -47,9 +47,9 @@ export const broadcastDirectorSlice = createSlice({ }); export const { - selectedCarsAdd, - selectedCarsSet, - selectedCarsRemove, - selectedCarsClear, + pushSelectedCars, + setSelectedCars, + removeSelectedCars, + clearSelectedCars, } = broadcastDirectorSlice.actions; export default broadcastDirectorSlice.reducer; diff --git a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts index d5acc27..a169905 100644 --- a/src/features/broadcast/graphics/broadcastGraphicsSlice.ts +++ b/src/features/broadcast/graphics/broadcastGraphicsSlice.ts @@ -10,10 +10,10 @@ export const broadcastGraphicsSlice = createSlice({ name: "broadcastGraphics", initialState, reducers: { - chyronsSet: (state, action: PayloadAction) => { + setChyrons: (state, action: PayloadAction) => { state.chyrons = action.payload; }, - chyronsOpenStateSet: (state, action: PayloadAction) => { + setChyronsOpenState: (state, action: PayloadAction) => { if (state.chyrons == null) return; state.chyrons.openState = action.payload; @@ -21,7 +21,7 @@ export const broadcastGraphicsSlice = createSlice({ state.chyrons.openState = action.payload; } }, - chyronsOpenStateIncrement: (state) => { + incrementChyronsOpenState: (state) => { if (state.chyrons == null) return; ++state.chyrons.openState; @@ -29,16 +29,16 @@ export const broadcastGraphicsSlice = createSlice({ ++state.chyrons.openState; } }, - chyronsClear: (state) => { + clearChyrons: (state) => { state.chyrons = null; }, }, }); export const { - chyronsSet, - chyronsOpenStateSet, - chyronsOpenStateIncrement, - chyronsClear, + setChyrons, + setChyronsOpenState, + incrementChyronsOpenState, + clearChyrons, } = broadcastGraphicsSlice.actions; export default broadcastGraphicsSlice.reducer; diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index 108ded2..4ad46cd 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -46,13 +46,13 @@ export const eventSlice = createSlice({ name: "event", initialState, reducers: { - courseFlagSet: (state, action: PayloadAction) => { + setCourseFlag: (state, action: PayloadAction) => { state.courseStatus.courseFlag = action.payload; }, }, }); export const { - courseFlagSet, + setCourseFlag, } = eventSlice.actions; export default eventSlice.reducer; From b545750f70894ad2dbfb2340839ddd955b9a1d1a Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Wed, 9 Feb 2022 18:47:07 -0500 Subject: [PATCH 13/19] ISSUE-045 - Chyron Body - Great progress today! It's starting to look legit! Massive change to the way that Chyrons are built and deployed. Still need to figure out what's wrong with the portrait and the Venetian blinds causing issues. Still need to make the team name flicker. --- .../Chyrons/ChyronsDirectorControls.tsx | 79 ++++++---- .../Chyrons/Container/ChyronContainer.tsx | 2 + .../Chyrons/Driver/ChyronDriver.tsx | 146 ++++++++++++++++-- .../Chyrons/Driver/styles.ts | 95 ++++++++++-- src/types/style.d.ts | 8 + src/utils/styling.ts | 12 +- 6 files changed, 278 insertions(+), 64 deletions(-) diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index 7e9a981..221ec80 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -3,7 +3,7 @@ import { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { Stack } from "@bedrock-layout/stack"; import { Inline } from "@bedrock-layout/inline"; -import { FaPlay, FaStepForward, FaStop } from "react-icons/fa"; +import { FaCheck, FaStepForward, FaTimes } from "react-icons/fa"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector"; @@ -11,6 +11,7 @@ import { clearChyrons, incrementChyronsOpenState, setChyrons, + setChyronsOpenState, } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics"; import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, Car, FlagMode } from "../../../../types/state"; @@ -37,34 +38,29 @@ 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]); - const onOpen = () => { - if (chyronMode === "driver") { - if (selectedCars.length === 0) return; - let primaryCar = selectedCars[0]; - let secondaryCar = selectedCars.length > 1 ? selectedCars[1] : null; + // 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]); - // 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(setChyrons(newChyrons)); - } + + const onOpen = () => { + // dispatch(setChyronsOpenState(1)); + buildDriver(); }; const onNext = () => { @@ -72,7 +68,32 @@ export function ChyronsDirectorControls() { }; const onClose = () => { - dispatch(clearChyrons()); + dispatch(setChyronsOpenState(-1)); + }; + + const buildDriver = () => { + console.log("building 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: 0, + relativePos: { top: "0", right: "0", bottom: "0", left: "0" }, + mode: chyronMode, + subMode: chyronSubMode, + driver: { + primary: buildDriverChyron(primaryCar), + secondary: secondaryCar != null ? buildDriverChyron(secondaryCar) : null, + }, + }; + dispatch(setChyrons(newChyrons)); }; const buildDriverChyron = (car: Car): BGChyronDriver => ({ @@ -136,19 +157,19 @@ export function ChyronsDirectorControls() { onClick={onOpen} disabled={chyrons != null} > - + - + diff --git a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx index 908d367..cf5186e 100644 --- a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx @@ -14,6 +14,7 @@ export function ChyronContainer() { ); if (chyrons.subMode === "medium" && chyrons.driver.secondary) { @@ -23,6 +24,7 @@ export function ChyronContainer() { ); diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index be19b50..c4e61a5 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -1,4 +1,5 @@ -import { BGChyronDriver, BGChyronSubMode } from "../../../../types/state"; +import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state"; +import { useSpring } from "@react-spring/web"; import { theme } from "../../../../shared/theme"; @@ -7,7 +8,11 @@ import { AngledFlag } from "../../Common/AngledFlag"; import { PositionFlag } from "../../Common/PositionFlag"; import { DriverPortrait } from "../../Common/DriverPortrait"; import { - BaseBackground, + AnimatedBaseContainer, + BaseLayout, + BaseOutline, + BaseBlack, + BaseBackgroundColor, FirstName, LastName, NameContainer, @@ -17,15 +22,18 @@ import { TeamName, TextContainer, FlagContainer, - BaseContainer, DriverPortraitContainer, } from "./styles"; +import { useDispatch } from "react-redux"; +import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; +import { VenetianBlindsTransition } from "../../Common/VenetianBlindsTransition"; type ChyronDriverProps = { chyronData: BGChyronDriver, subMode: BGChyronSubMode, + openState: OpenState, }; -export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) { +export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverProps) { const [baseWidth, baseHeight] = subMode === "medium" ? [582, 72] : subMode === "large" ? [638, 98] : [0, 0]; @@ -35,15 +43,98 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) { ? { flagMode, flag: car.driver.nationality } : flagMode === "team" ? { flagMode, flag: car.driver.team.id } : undefined; + const dispatch = useDispatch(); + + const containerFadeAwaySpring = useSpring({ + opacity: openState == -1 ? 0 : 1, + config: { duration: 300 }, + delay: 0, + onRest: () => { + if (openState === -1) { + dispatch(clearChyrons()); + } + }, + }); + + const teamColor = theme.colors.teams[car.driver.team.id]; + return ( - - + + + + + {showPosFlag && ( - + + + )} - + @@ -62,6 +153,12 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) { {car.driver.team.shortName} )} - + {showPortrait && ( - - - + + + + + )} - + ); } diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 537c022..2814542 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -1,42 +1,99 @@ +import { animated } from "@react-spring/web"; import styled from "styled-components"; -import { Placement, Px } from "../../../../types/style"; -import { placementStyleRules } from "../../../../utils/styling"; -type BaseContainerProps = { +import { Placement, Px, TransitionArgs } from "../../../../types/style"; +import { commonTransition, placementStyleRules } from "../../../../utils/styling"; + +type TransitionProps = { + open: boolean, + transitionProps: TransitionArgs[], +}; + +type AnimatedBaseContainerProps = { width: Px, height: Px, }; -export const BaseContainer = styled.div` - position: relative; - width: ${({ width }) => `${width}px`}; - height: ${({ height }) => `${height}px`}; -`; -BaseContainer.displayName = "BaseContainer"; +export const AnimatedBaseContainer = animated( + styled.div` + position: relative; + width: ${({ width }) => `${width}px`}; + height: ${({ height }) => `${height}px`}; + `, +); +AnimatedBaseContainer.displayName = "AnimatedBaseContainer"; -export const BaseBackground = styled.div` - position: relative; +const BaseShape = styled.div` + position: absolute; + height: 100%; + border-bottom-right-radius: 11px; +`; + +export const BaseOutline = styled(BaseShape)` + width: 100%; + opacity: ${({ open }) => open ? 1 : 0}; + outline: ${({ open }) => open + ? "2px solid #ffffff00" + : "5px solid #ffffffff"}; + + ${({ transitionProps }) => commonTransition(transitionProps)}; +`; +BaseOutline.displayName = "BaseOutline"; + +export const BaseBlack = styled(BaseShape)` + opacity: ${({ open }) => open ? 1 : 0.1}; + width: ${({ open }) => open ? 100 : 0}%; + + background-color: black; + + ${({ transitionProps }) => commonTransition(transitionProps)}; +`; +BaseBlack.displayName = "BaseBlack"; + +type BaseBackgroundColorProps = { + teamColor: string, +}; +export const BaseBackgroundColor = styled(BaseShape)` + width: 100%; + + background-color: ${({ teamColor }) => teamColor}; + opacity: ${({ open }) => open ? 0 : 1}; + + ${({ transitionProps }) => commonTransition(transitionProps)}; +`; +BaseBackgroundColor.displayName = "BaseBackgroundColor"; + +export const BaseLayout = styled(BaseShape)` + position: absolute; height: 100%; width: 100%; display: flex; align-items: center; - border-bottom-right-radius: 11px; - background-color: #000; - overflow: hidden; + + clip-path: ${({ open }) => open + ? "polygon(0 0, 100% 0, 100% 100%, 0 100%)" + : "polygon(0 0, 0 0, -50% 100%, -50% 100%)"}; + + ${({ transitionProps }) => commonTransition(transitionProps)}; `; -BaseBackground.displayName = "BaseBackground"; type TeamColorBarProps = { color: string, }; -export const TeamColorBar = styled.div` +export const TeamColorBar = styled.div` position: relative; width: 1%; // 6px; height: 63%; background-color: ${({ color }) => color}; + + clip-path: ${({ open }) => open + ? "polygon(0 0, 100% 0, 100% 100%, 0 100%)" + : "polygon(0 0, 100% 0, 100% 0, 0 0)"}; + + ${({ transitionProps }) => commonTransition(transitionProps)}; `; TeamColorBar.displayName = "TeamColorBar"; @@ -103,7 +160,7 @@ type FlagContainerProps = { width: Px, right: Px, }; -export const FlagContainer = styled.div` +export const FlagContainer = styled.div` position: absolute; right: ${({ right }) => `${right}px`}; @@ -115,6 +172,10 @@ export const FlagContainer = styled.div` width: ${({ width }) => `${width}px`}; overflow: hidden; + + opacity: ${({ open }) => open ? 1 : 0}; + + ${({ transitionProps }) => commonTransition(transitionProps)}; `; FlagContainer.displayName = "FlagContainer"; diff --git a/src/types/style.d.ts b/src/types/style.d.ts index 8c627c5..64e22dd 100644 --- a/src/types/style.d.ts +++ b/src/types/style.d.ts @@ -32,3 +32,11 @@ export interface Placement { * Useful to initialize movements from. */ export type Corner = "topLeft" | "topRight" | "bottomRight" | "bottomLeft"; + + +export interface TransitionArgs { + property?: string, + duration?: Milliseconds, + timing?: string + delay?: Milliseconds, +} diff --git a/src/utils/styling.ts b/src/utils/styling.ts index d94b93e..15f3f60 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -1,7 +1,7 @@ import { css }from "styled-components"; import { clamp } from "lodash"; -import { Corner, Fraction, Placement, Px } from "../types/style"; +import { Corner, Fraction, Placement, Px, TransitionArgs } from "../types/style"; export function placementStyleRules(pos: Placement) { return css` @@ -60,3 +60,13 @@ export function wipeCustomDegClip( ]; } } + +export function commonTransition(propsArray: TransitionArgs[]) { + return ( + "transition: " + + propsArray.map(p => ` + ${p?.property ?? "all"} ${p?.duration ?? 1000}ms ${p?.timing ?? ""} ${p?.delay ?? 0}ms + `).join(", ") + + ";" + ); +} From 9ff77cc88a5066aa7887086b38cb88e8dabb3d98 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 10 Feb 2022 18:33:44 -0500 Subject: [PATCH 14/19] 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; } From 79b098af6caf7cbb913698e3c72fcf89ed8d27c4 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 10 Feb 2022 19:12:06 -0500 Subject: [PATCH 15/19] ISSUE-045 - Chyron Body - Added debugDurationMultiplier value that allows me to slow down animations in certain workspaces. Made TeamName component more customizable with its timing. Now all animations in Chyron are configurable from outside of the styled-component definition. New Debug option for ChyronContainer so that this animation modifier can never accidentally be active in the main broadcast view. --- .../Chyrons/ChyronsDirectorControls.tsx | 2 - .../Chyrons/Container/ChyronContainer.tsx | 9 ++- .../Chyrons/Driver/ChyronDriver.tsx | 76 +++++++++++-------- .../Chyrons/Driver/styles.ts | 11 ++- .../Workspaces/Workspace/Workspace.tsx | 6 +- .../WorkspaceControls/WorkspaceControls.tsx | 23 +++++- src/components/Workspaces/WorkspacesRoute.tsx | 6 +- src/features/workspace/workspaceSlice.ts | 6 ++ src/types/state.d.ts | 3 +- 9 files changed, 97 insertions(+), 45 deletions(-) diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx index eefe809..5c5235e 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/ChyronsDirectorControls.tsx @@ -8,7 +8,6 @@ import { FaCheck, FaStepForward, FaTimes } from "react-icons/fa"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector"; import { - clearChyrons, incrementChyronsOpenState, setChyrons, setChyronsOpenState, @@ -60,7 +59,6 @@ export function ChyronsDirectorControls() { }; const buildDriver = () => { - console.log("building driver"); if (selectedCars.length === 0) return; let primaryCar = selectedCars[0]; let secondaryCar = selectedCars.length > 1 ? selectedCars[1] : null; diff --git a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx index cf5186e..6766c0f 100644 --- a/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Container/ChyronContainer.tsx @@ -1,12 +1,17 @@ import { useSelector } from "react-redux"; import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector"; +import { workspaceSelector } from "../../../../features/workspace/workspaceSelector"; import { ChyronDriver } from "../Driver"; import { DoubleChyronContainer } from "./styles"; -export function ChyronContainer() { +type ChyronContainerProps = { + debug?: boolean, +}; +export function ChyronContainer({ debug = false }: ChyronContainerProps) { const { chyrons } = useSelector(broadcastGraphicsSelector); + const { debugDurationMultiplier } = useSelector(workspaceSelector); if (chyrons == null || chyrons.driver == null) return null; @@ -15,6 +20,7 @@ export function ChyronContainer() { chyronData={chyrons.driver.primary} subMode={chyrons.subMode} openState={chyrons.openState} + debugDurationMultiplier={debug ? debugDurationMultiplier : 1} /> ); if (chyrons.subMode === "medium" && chyrons.driver.secondary) { @@ -25,6 +31,7 @@ export function ChyronContainer() { chyronData={chyrons.driver.secondary} subMode={chyrons.subMode} openState={chyrons.openState} + debugDurationMultiplier={debug ? debugDurationMultiplier : 1} /> ); diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 651a254..59fc111 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -1,6 +1,9 @@ -import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state"; import { useSpring } from "@react-spring/web"; +import { useDispatch } from "react-redux"; +import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/state"; +import { Fraction } from "../../../../types/style"; +import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { theme } from "../../../../shared/theme"; import { DriverNumber } from "../../Common/DriverNumber"; @@ -24,16 +27,20 @@ import { FlagContainer, DriverPortraitContainer, } from "./styles"; -import { useDispatch } from "react-redux"; -import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { VenetianBlindsTransition } from "../../Common/VenetianBlindsTransition"; type ChyronDriverProps = { chyronData: BGChyronDriver, subMode: BGChyronSubMode, openState: OpenState, + debugDurationMultiplier?: Fraction, }; -export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverProps) { +export function ChyronDriver({ + chyronData, + subMode, + openState, + debugDurationMultiplier: DDM = 1.0, +}: ChyronDriverProps) { const [baseWidth, baseHeight] = subMode === "medium" ? [582, 72] : subMode === "large" ? [638, 98] : [0, 0]; @@ -47,7 +54,7 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro const containerFadeAwaySpring = useSpring({ opacity: openState == -1 ? 0 : 1, - config: { duration: 300 }, + config: { duration: 300 * DDM }, delay: 0, onRest: () => { if (openState === -1) { @@ -68,37 +75,36 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro open={openState !== 0} transitionProps={[{ property: "outline", - duration: 1167, + duration: 1167 * DDM, }]} /> @@ -106,21 +112,21 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro {showPosFlag && ( @@ -130,9 +136,9 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro open={openState !== 0} transitionProps={[{ property: "clip-path", - duration: 667, + duration: 667 * DDM, timing: "ease-in-out", - delay: 733, + delay: 733 * DDM, }]} color={teamColor} /> @@ -151,7 +157,11 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro )} - + {car.driver.team.shortName} @@ -159,8 +169,8 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro open={openState !== 0} transitionProps={[{ property: "opacity", - duration: 500, - delay: 1000, + duration: 500 * DDM, + delay: 1000 * DDM, }]} height={baseHeight * 0.9} width={baseHeight * 3} @@ -177,16 +187,16 @@ export function ChyronDriver({ chyronData, subMode, openState }: ChyronDriverPro {showPortrait && ( diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 5009a20..181290e 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -2,6 +2,7 @@ import { animated } from "@react-spring/web"; import styled, { css, keyframes } from "styled-components"; import { Placement, Px, TransitionArgs } from "../../../../types/style"; +import { Milliseconds } from "../../../../types/util"; import { commonTransition, placementStyleRules } from "../../../../utils/styling"; type OpenProps = { @@ -149,14 +150,18 @@ const blinkingAnimation = keyframes` 86% { opacity: 1 } `; -export const TeamName = styled.div` +type TeamNameProps = OpenProps & { + duration: Milliseconds, + delay: Milliseconds, +} +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; + ${({ open, duration, delay }) => open && css` + animation: ${blinkingAnimation} ${duration}ms step-end ${delay}ms; `} `; TeamName.displayName = "TeamName"; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index 5fe0082..98c02cd 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -19,11 +19,13 @@ type WorkspaceProps = { workspaceId: WorkspaceId, previewContent: ReactNode, prototypeControls: ReactNode, + showAnimationSpeedSelector?: boolean, }; export const Workspace = ({ workspaceId, previewContent, prototypeControls, + showAnimationSpeedSelector = false, }: WorkspaceProps) => { const dispatch = useDispatch(); const { animatedBG, darkBG, workspaceProperties } = useSelector(workspaceSelector); @@ -64,7 +66,9 @@ export const Workspace = ({ /> - + {prototypeControls} diff --git a/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx index d06a470..2d8b767 100644 --- a/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx +++ b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx @@ -4,12 +4,21 @@ import { Split } from "@bedrock-layout/split"; import { useDispatch, useSelector } from "react-redux"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; -import { setAnimatedBG, setDarkBG } from "../../../features/workspace/workspaceSlice"; +import { setAnimatedBG, setDarkBG, setDebugDurationMultiplier } from "../../../features/workspace/workspaceSlice"; +import { SlotSelector } from "../../Common/Inputs/SlotSelector"; import { Toggle } from "../../Common/Inputs/Toggle"; import { OverlayControl } from "../../OverlayTool"; -export const WorkspaceControls = () => { +const debugMultipliers = ["1", "1.5", "2", "3", "5", "10"]; + + +type WorkspaceControlsProps = { + showAnimationSpeedSelector?: boolean, +}; +export const WorkspaceControls = ( + { showAnimationSpeedSelector = false }: WorkspaceControlsProps, +) => { const dispatch = useDispatch(); const { animatedBG, darkBG } = useSelector(workspaceSelector); @@ -30,6 +39,16 @@ export const WorkspaceControls = () => { dispatch(setDarkBG(value)); }} /> + {showAnimationSpeedSelector && ( + `x${value}`} + onChange={index => + dispatch(setDebugDurationMultiplier(parseFloat(debugMultipliers[index])))} + slotWidth="4ch" + /> + )} diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index da75648..34e33e5 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -55,15 +55,17 @@ export default function Workspaces() { } + previewContent={} prototypeControls={} + showAnimationSpeedSelector /> } /> } + previewContent={} prototypeControls={} + showAnimationSpeedSelector /> } /> ) => { state.darkBG = action.payload; }, + setDebugDurationMultiplier: (state, action: PayloadAction) => { + state.debugDurationMultiplier = action.payload; + }, updateWorkspace: (state, action: PayloadAction) => { state.workspaceId = action.payload.workspaceId; state.workspaceProperties = action.payload.workspaceProperties; @@ -91,6 +96,7 @@ export const { setWorkspaceId, setAnimatedBG, setDarkBG, + setDebugDurationMultiplier, updateWorkspace, updateAngledFlagCountry, updateAngledFlagTeam, diff --git a/src/types/state.d.ts b/src/types/state.d.ts index d242e63..c01dc92 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -1,5 +1,5 @@ import { Milliseconds, Optional } from "./util"; -import { Corner } from "./style"; +import { Corner, Fraction } from "./style"; export interface RootState { pageDimensions: PageDimensions; @@ -23,6 +23,7 @@ export interface Workspace { workspaceId: WorkspaceId; animatedBG: boolean; darkBG: boolean; + debugDurationMultiplier: Fraction, workspaceProperties: WorkspaceProperties; prototypeState: PrototypeState; } From 462ea4852b12d02697a32e1979d5d7c9556ad83e Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 11 Feb 2022 09:42:04 -0500 Subject: [PATCH 16/19] ISSUE-045 - Chyron Body - Fixed and calibrated driver portrait venetian blinds transition. Slight adjustment to the BaseBackground wipe. Added a new overlay image to help with it. --- .../Chyrons/Driver/ChyronDriver.tsx | 40 +++++++++++------- .../Chyrons/Driver/styles.ts | 19 +++++---- src/domain/data/workspaces.ts | 1 + .../overlays/chyron-driver-medium-op0-ham.png | Bin 0 -> 23495 bytes 4 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 src/public/images/overlays/chyron-driver-medium-op0-ham.png diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 59fc111..905e75d 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -185,28 +185,36 @@ export function ChyronDriver({ {showPortrait && ( - - + - - + + )} ); diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 181290e..b40453a 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -38,7 +38,7 @@ export const BaseOutline = styled(BaseShape)` ? "2px solid #ffffff00" : "5px solid #ffffffff"}; - ${({ transitionProps }) => commonTransition(transitionProps)}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; BaseOutline.displayName = "BaseOutline"; @@ -48,7 +48,7 @@ export const BaseBlack = styled(BaseShape)` background-color: black; - ${({ transitionProps }) => commonTransition(transitionProps)}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; BaseBlack.displayName = "BaseBlack"; @@ -61,7 +61,7 @@ export const BaseBackgroundColor = styled(BaseShape) teamColor}; opacity: ${({ open }) => open ? 0 : 1}; - ${({ transitionProps }) => commonTransition(transitionProps)}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; BaseBackgroundColor.displayName = "BaseBackgroundColor"; @@ -77,9 +77,9 @@ export const BaseLayout = styled(BaseShape)` clip-path: ${({ open }) => open ? "polygon(0 0, 100% 0, 100% 100%, 0 100%)" - : "polygon(0 0, 0 0, -50% 100%, -50% 100%)"}; + : "polygon(0 0, 0 0, -40% 100%, -40% 100%)"}; - ${({ transitionProps }) => commonTransition(transitionProps)}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; type TeamColorBarProps = { @@ -98,7 +98,7 @@ export const TeamColorBar = styled.div` outline: ${({ color }) => color} solid 1px; - ${({ transitionProps }) => commonTransition(transitionProps)}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; TeamColorBar.displayName = "TeamColorBar"; @@ -196,16 +196,19 @@ export const FlagContainer = styled.div` opacity: ${({ open }) => open ? 1 : 0}; - ${({ transitionProps }) => commonTransition(transitionProps)}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; FlagContainer.displayName = "FlagContainer"; -type DriverPortraitContainerProps = { +type DriverPortraitContainerProps = TransitionProps & { placement: Placement, }; export const DriverPortraitContainer = styled.div` position: absolute; ${({ placement }) => placementStyleRules(placement)} + + opacity: ${({ open }) => open ? 1 : 0}; + ${({ transitionProps }) => commonTransition(transitionProps)} `; DriverPortraitContainer.displayName = "DriverPortraitContainer"; diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts index f8eb9ec..4268687 100644 --- a/src/domain/data/workspaces.ts +++ b/src/domain/data/workspaces.ts @@ -13,6 +13,7 @@ export const workspaces: WorkspaceObject = { "chyron-driver-medium-full-vet.png", "chyron-driver-medium-full-per.png", "chyron-driver-medium-full-msc.png", + "chyron-driver-medium-op0-ham.png", "chyron-driver-medium-op1-ham.png", "chyron-driver-medium-op2-ham.png", "chyron-driver-medium-full-ham.png", diff --git a/src/public/images/overlays/chyron-driver-medium-op0-ham.png b/src/public/images/overlays/chyron-driver-medium-op0-ham.png new file mode 100644 index 0000000000000000000000000000000000000000..7cd86d9e09937dff42e39bc1bfca675586e37891 GIT binary patch literal 23495 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 Date: Fri, 11 Feb 2022 12:24:31 -0500 Subject: [PATCH 17/19] ISSUE-045 - Chyron Body - Added the outline to the chyron body. It's not a perfect emulation (it fades out rather than runs out with a tail) but I'm very happy with it. Also updated the wipe animation to take advantage of map(). --- .../Chyrons/Driver/ChyronDriver.tsx | 27 ++++++- .../Chyrons/Driver/styles.ts | 18 +++-- .../VenetianBlindsTransition.tsx | 11 ++- src/utils/styling.ts | 79 ++++++++++++++++--- 4 files changed, 110 insertions(+), 25 deletions(-) diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 905e75d..11cb258 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -5,6 +5,7 @@ import { BGChyronDriver, BGChyronSubMode, OpenState } from "../../../../types/st import { Fraction } from "../../../../types/style"; import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice"; import { theme } from "../../../../shared/theme"; +import { outlineClipPath } from "../../../../utils/styling"; import { DriverNumber } from "../../Common/DriverNumber"; import { AngledFlag } from "../../Common/AngledFlag"; @@ -13,7 +14,7 @@ import { DriverPortrait } from "../../Common/DriverPortrait"; import { AnimatedBaseContainer, BaseLayout, - BaseOutline, + AnimatedBaseOutline, BaseBlack, BaseBackgroundColor, FirstName, @@ -46,6 +47,7 @@ export function ChyronDriver({ : [0, 0]; const { car, flagMode, showPosFlag, showDriverNumber, showPortrait } = chyronData; + const flagProps = flagMode === "country" ? { flagMode, flag: car.driver.nationality } : flagMode === "team" ? { flagMode, flag: car.driver.team.id } : undefined; @@ -63,6 +65,12 @@ export function ChyronDriver({ }, }); + const { outlineClipPathProgress } = useSpring({ + outlineClipPathProgress: openState !== 0 ? 1 : 0, + config: { duration: 500 * DDM }, + delay: 0, + }); + const teamColor = theme.colors.teams[car.driver.team.id]; return ( @@ -71,12 +79,27 @@ export function ChyronDriver({ height={baseHeight} style={containerFadeAwaySpring} > - { + const coordinates = outlineClipPath( + baseWidth, + baseHeight, + progress, + 5, + ); + return `polygon(${coordinates.map(([x, y]) => `${x}px ${y}px`).join(", ")})`; + }), + }} /> ` +type AnimatedBaseOutlineProps = TransitionProps & { + startThickness: Px, + endThickness: Px, + startColor: string, + endColor: string, +}; +export const AnimatedBaseOutline = animated(styled(BaseShape)` width: 100%; opacity: ${({ open }) => open ? 1 : 0}; - outline: ${({ open }) => open - ? "2px solid #ffffff00" - : "5px solid #ffffffff"}; + outline: ${({ open, startThickness, endThickness, startColor, endColor }) => open + ? `${endThickness}px solid ${endColor}` + : `${startThickness}px solid ${startColor}`}; ${({ transitionProps }) => commonTransition(transitionProps)} -`; -BaseOutline.displayName = "BaseOutline"; +`); +AnimatedBaseOutline.displayName = "AnimatedBaseOutline"; export const BaseBlack = styled(BaseShape)` opacity: ${({ open }) => open ? 1 : 0.1}; diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx index 6acd92c..759db5e 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/VenetianBlindsTransition.tsx @@ -1,4 +1,4 @@ -import { useSpring, animated } from "@react-spring/web"; +import { useSpring, animated, easings } from "@react-spring/web"; import useMeasure from "react-use-measure"; import { AnimatedVenetianBlindsFilter, VenetianBlindsFilter } from "./styles"; @@ -52,7 +52,10 @@ export const VenetianBlindsTransition = ( const { wipe } = useSpring({ wipe: visible ? 1 : 0, - config: { duration: wipeDuration }, + config: { + duration: wipeDuration, + easing: easings.easeInOutQuint, + }, delay: 0 + delay, }); @@ -73,14 +76,14 @@ export const VenetianBlindsTransition = ( style={{ opacity, clipPath: wipe.to(wipeProgress => { - const [a1, a2, b1, b2, c1, c2] = wipeCustomDegClip( + const coordinates = wipeCustomDegClip( childWidth, childHeight, wipeProgress, wipeStartingCorner, wipeAngle, ); - return `polygon(${a1}px ${a2}px, ${b1}px ${b2}px, ${c1}px ${c2}px)`; + return `polygon(${coordinates.map(([x, y]) => `${x}px ${y}px`).join(", ")})`; }), }} ref={childRef} diff --git a/src/utils/styling.ts b/src/utils/styling.ts index 15f3f60..8ddfcd3 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -30,33 +30,33 @@ export function wipeCustomDegClip( progress: Fraction, startingCorner: Corner, degrees: number, -): [Px, Px, Px, Px, Px, Px] { +): [[Px, Px], [Px, Px], [Px, Px]] { const tangent = Math.tan(clamp(degrees, 0.01, 90) * Math.PI / 180); switch (startingCorner) { case "topLeft": return [ - 0, 0, - (width + height / tangent) * progress, 0, - 0, (height + width * tangent) * progress , + [0, 0], + [(width + height / tangent) * progress, 0], + [0, (height + width * tangent) * progress ], ]; case "topRight": return [ - width, 0, - width, (height + width * tangent) * progress, - width - (width + height / tangent) * progress, 0, + [width, 0], + [width, (height + width * tangent) * progress], + [width - (width + height / tangent) * progress, 0], ]; case "bottomRight": return [ - width, height, - width, height - (height + width * tangent) * progress, - width - (width + height / tangent) * progress, height, + [width, height], + [width, height - (height + width * tangent) * progress], + [width - (width + height / tangent) * progress, height], ]; case "bottomLeft": return [ - 0, height, - 0, height - (height + width * tangent) * progress, - (width + height / tangent) * progress, height, + [0, height], + [0, height - (height + width * tangent) * progress], + [(width + height / tangent) * progress, height], ]; } } @@ -70,3 +70,56 @@ export function commonTransition(propsArray: TransitionArgs[]) { + ";" ); } + +export function outlineClipPath( + width: Px, + height: Px, + progress: Fraction, + outlineThickness: Px, +): [[Px, Px], [Px, Px], [Px, Px], [Px, Px], [Px, Px], [Px, Px]] { + const travelDistance = width * 2 + height; + const pt1End = width / travelDistance; + const pt2End = (width + height) / travelDistance; + + // Part 1: Reveal the bottom line. + if (progress <= pt1End) { + const x = width * progress / pt1End; + return [ + [0, height], + [0, height], + [0, height], + [x, height], + [x, height + outlineThickness], + [0, height + outlineThickness], + ]; + + // Part 2: Reveal the right line. + } else if (progress > pt1End && progress <= pt2End) { + const y = height - (height + outlineThickness) * ((progress - pt1End) / (pt2End - pt1End)); + return [ + [0, height], + [width - 10, height], + [width, y], + [width + outlineThickness, y], + [width + outlineThickness, height + outlineThickness], + [0, height + outlineThickness], + ]; + + // Part 3: Reveal the top line. + } else { + const x = width - width * ((progress - pt2End) / (1 - pt2End)); + return [ + [0, height], + [x - 10, height], + [x, -outlineThickness], + [width + outlineThickness, -outlineThickness], + [width + outlineThickness, height + outlineThickness], + [0, height + outlineThickness], + ]; + } + + + // return [ + + // ] +} From bab056394c91ddd55611ee2859acce333babb767 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 14 Feb 2022 11:23:34 -0500 Subject: [PATCH 18/19] ISSUE-045 - Chyron Body - Timing improvements. More comments. Small corrections. --- .../Chyrons/Driver/ChyronDriver.tsx | 8 ++++---- .../BroadcastGraphics/Chyrons/Driver/styles.ts | 13 ++++++------- .../WorkspaceControls/WorkspaceControls.tsx | 2 +- src/utils/styling.ts | 10 ++++++++++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 11cb258..0526663 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -219,16 +219,16 @@ export function ChyronDriver({ > ` - position: relative; - width: ${({ width }) => `${width}px`}; - height: ${({ height }) => `${height}px`}; - `, -); +export const AnimatedBaseContainer = animated(styled.div` + position: relative; + width: ${({ width }) => `${width}px`}; + height: ${({ height }) => `${height}px`}; +`); AnimatedBaseContainer.displayName = "AnimatedBaseContainer"; const BaseShape = styled.div` @@ -87,6 +85,7 @@ export const BaseLayout = styled(BaseShape)` ${({ transitionProps }) => commonTransition(transitionProps)} `; +BaseLayout.displayName = "BaseLayout"; type TeamColorBarProps = { color: string, diff --git a/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx index 2d8b767..26062db 100644 --- a/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx +++ b/src/components/Workspaces/WorkspaceControls/WorkspaceControls.tsx @@ -41,7 +41,7 @@ export const WorkspaceControls = ( /> {showAnimationSpeedSelector && ( `x${value}`} onChange={index => diff --git a/src/utils/styling.ts b/src/utils/styling.ts index 8ddfcd3..de184de 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -71,6 +71,16 @@ export function commonTransition(propsArray: TransitionArgs[]) { ); } +/** + * Provides the x, y coordinates of a six point polygon for use in a clip-path + * mask. By taking a fraction to indicate the progress through the animation it + * will return the six coordinates that will generate a wipe effect. + * @param width element width in pixels + * @param height element height in pixels + * @param progress fraction from 0 to 1 + * @param outlineThickness the expected max width of the outline + * @returns + */ export function outlineClipPath( width: Px, height: Px, From 284b0919d638c74a2f7a5ca8f1c48bf2c57b57d0 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 14 Feb 2022 13:59:34 -0500 Subject: [PATCH 19/19] ISSUE-045 - Chyron Body - Done! There ain't no way in hell I'm going to be able to convincingly animate the AngledFlag without spending maybe an entire week on it. I would honestly want to re-do the entire AngledFlag component from scratch before trying to animate it. The combination of rules and styles and all that is just too confusing to attempt right now. So, a basic slide- and fade-in I think is decent enough work. --- .../BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx | 10 ++++++++-- .../BroadcastGraphics/Chyrons/Driver/styles.ts | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx index 0526663..e151d84 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx +++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx @@ -50,7 +50,9 @@ export function ChyronDriver({ const flagProps = flagMode === "country" ? { flagMode, flag: car.driver.nationality } - : flagMode === "team" ? { flagMode, flag: car.driver.team.id } : undefined; + : flagMode === "team" + ? { flagMode, flag: car.driver.team.id } + : undefined; const dispatch = useDispatch(); @@ -192,7 +194,11 @@ export function ChyronDriver({ open={openState !== 0} transitionProps={[{ property: "opacity", - duration: 500 * DDM, + duration: 1200 * DDM, + delay: 1000 * DDM, + }, { + property: "right", + duration: 2000 * DDM, delay: 1000 * DDM, }]} height={baseHeight * 0.9} diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 2856606..eca70e3 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -188,7 +188,8 @@ type FlagContainerProps = { }; export const FlagContainer = styled.div` position: absolute; - right: ${({ right }) => `${right}px`}; + right: ${({ right, open }) => open ? right : right * -3}px; + z-index: -1; display: flex; align-items: center;