ISSUE-041 - Portraits now working!
Quite happy with the results. Was far less fiddly than I was expecting. One interesting thing I had to do was introduce a new BaseContainer div component so that I could let the portraits overflow the BaseBackground component (by being put in a parent component with no overflow rules).
This commit is contained in:
1 parent
72b6fc60ef
commit
8144622407
3 files changed
+89
-49
No files matched your search
@@ -17,8 +17,12 @@ import {
|
||||
TeamName,
|
||||
TextContainer,
|
||||
FlagContainer,
|
||||
PortraitDiv,
|
||||
BaseContainer,
|
||||
} from "./styles";
|
||||
|
||||
const driverPortraits = require.context("../../../../public/images/drivers/front", true);
|
||||
|
||||
type ChyronDriverProps = {
|
||||
chyronData: BGChyronDriver,
|
||||
subMode: BGChyronSubMode,
|
||||
@@ -28,52 +32,61 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) {
|
||||
: subMode === "large" ? [638, 98]
|
||||
: [0, 0];
|
||||
|
||||
const { car, flagMode, showPosFlag, showDriverNumber } = chyronData;
|
||||
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;
|
||||
|
||||
return (
|
||||
<BaseBackground width={baseWidth} height={baseHeight}>
|
||||
<Spacer width="6px" />
|
||||
{showPosFlag && (
|
||||
<PositionFlag containerHeight={baseHeight}>
|
||||
<PositionNumber containerHeight={baseHeight}>
|
||||
{car.position}
|
||||
</PositionNumber>
|
||||
</PositionFlag>
|
||||
)}
|
||||
<Spacer width="8px" />
|
||||
<TeamColorBar color={theme.colors.teams[car.driver.team.id]} />
|
||||
<Spacer width="8px" />
|
||||
<TextContainer>
|
||||
<NameContainer>
|
||||
<FirstName>{car.driver.firstName}</FirstName>
|
||||
<LastName>{car.driver.lastName}</LastName>
|
||||
{showDriverNumber && (
|
||||
<NumberContainer>
|
||||
<DriverNumber
|
||||
teamId={car.driver.team.id}
|
||||
fontSize="29px"
|
||||
number={car.driver.number}
|
||||
/>
|
||||
</NumberContainer>
|
||||
)}
|
||||
</NameContainer>
|
||||
<TeamName>{car.driver.team.shortName}</TeamName>
|
||||
</TextContainer>
|
||||
<FlagContainer
|
||||
height={baseHeight * 0.9}
|
||||
width={baseHeight * 3}
|
||||
right={-baseHeight * 0.6}
|
||||
>
|
||||
{flagProps != null && (
|
||||
<AngledFlag
|
||||
flagHeight={baseHeight * 0.9}
|
||||
flagProps={flagProps}
|
||||
/>
|
||||
<BaseContainer width={baseWidth} height={baseHeight}>
|
||||
<BaseBackground >
|
||||
<Spacer width="6px" />
|
||||
{showPosFlag && (
|
||||
<PositionFlag containerHeight={baseHeight}>
|
||||
<PositionNumber containerHeight={baseHeight}>
|
||||
{car.position}
|
||||
</PositionNumber>
|
||||
</PositionFlag>
|
||||
)}
|
||||
</FlagContainer>
|
||||
</BaseBackground>
|
||||
<Spacer width="8px" />
|
||||
<TeamColorBar color={theme.colors.teams[car.driver.team.id]} />
|
||||
<Spacer width="8px" />
|
||||
<TextContainer>
|
||||
<NameContainer>
|
||||
<FirstName>{car.driver.firstName}</FirstName>
|
||||
<LastName>{car.driver.lastName}</LastName>
|
||||
{showDriverNumber && (
|
||||
<NumberContainer>
|
||||
<DriverNumber
|
||||
teamId={car.driver.team.id}
|
||||
fontSize="29px"
|
||||
number={car.driver.number}
|
||||
/>
|
||||
</NumberContainer>
|
||||
)}
|
||||
</NameContainer>
|
||||
<TeamName>{car.driver.team.shortName}</TeamName>
|
||||
</TextContainer>
|
||||
<FlagContainer
|
||||
height={baseHeight * 0.9}
|
||||
width={baseHeight * 3}
|
||||
right={-baseHeight * 0.6}
|
||||
>
|
||||
{flagProps != null && (
|
||||
<AngledFlag
|
||||
flagHeight={baseHeight * 0.9}
|
||||
flagProps={flagProps}
|
||||
/>
|
||||
)}
|
||||
</FlagContainer>
|
||||
</BaseBackground>
|
||||
{showPortrait && (
|
||||
<PortraitDiv
|
||||
src={driverPortraits(`./${car.driver.id}.png`)}
|
||||
height={baseHeight * 2.5}
|
||||
rightMargin={-5}
|
||||
/>
|
||||
)}
|
||||
</BaseContainer>
|
||||
);
|
||||
}
|
||||
@@ -1,14 +1,21 @@
|
||||
import styled from "styled-components";
|
||||
import { Px } from "../../../../types/style";
|
||||
|
||||
type BaseBackgroundProps = {
|
||||
type BaseContainerProps = {
|
||||
width: Px,
|
||||
height: Px,
|
||||
};
|
||||
export const BaseBackground = styled.div<BaseBackgroundProps>`
|
||||
export const BaseContainer = styled.div<BaseContainerProps>`
|
||||
position: relative;
|
||||
width: ${({ width }) => `${width}px`};
|
||||
height: ${({ height }) => `${height}px`};
|
||||
`;
|
||||
BaseContainer.displayName = "BaseContainer";
|
||||
|
||||
export const BaseBackground = styled.div`
|
||||
position: relative;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -107,7 +114,6 @@ export const TeamName = styled.div`
|
||||
`;
|
||||
TeamName.displayName = "TeamName";
|
||||
|
||||
|
||||
type SpacerProps = {
|
||||
width?: string,
|
||||
height?: string;
|
||||
@@ -137,3 +143,24 @@ export const FlagContainer = styled.div<FlagContainerProps>`
|
||||
overflow: hidden;
|
||||
`;
|
||||
FlagContainer.displayName = "FlagContainer";
|
||||
|
||||
type PortraitDivProps = {
|
||||
src: string,
|
||||
height: Px,
|
||||
rightMargin: Px,
|
||||
};
|
||||
export const PortraitDiv = styled.div<PortraitDivProps>`
|
||||
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`};
|
||||
`;
|
||||
PortraitDiv.displayName = "PortraitDiv";
|
||||
Reference in new issue
Block a user