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
+50
-10
No files matched your search
@@ -17,8 +17,12 @@ import {
|
|||||||
TeamName,
|
TeamName,
|
||||||
TextContainer,
|
TextContainer,
|
||||||
FlagContainer,
|
FlagContainer,
|
||||||
|
PortraitDiv,
|
||||||
|
BaseContainer,
|
||||||
} from "./styles";
|
} from "./styles";
|
||||||
|
|
||||||
|
const driverPortraits = require.context("../../../../public/images/drivers/front", true);
|
||||||
|
|
||||||
type ChyronDriverProps = {
|
type ChyronDriverProps = {
|
||||||
chyronData: BGChyronDriver,
|
chyronData: BGChyronDriver,
|
||||||
subMode: BGChyronSubMode,
|
subMode: BGChyronSubMode,
|
||||||
@@ -28,13 +32,14 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) {
|
|||||||
: subMode === "large" ? [638, 98]
|
: subMode === "large" ? [638, 98]
|
||||||
: [0, 0];
|
: [0, 0];
|
||||||
|
|
||||||
const { car, flagMode, showPosFlag, showDriverNumber } = chyronData;
|
const { car, flagMode, showPosFlag, showDriverNumber, showPortrait } = chyronData;
|
||||||
const flagProps = flagMode === "country"
|
const flagProps = flagMode === "country"
|
||||||
? { flagMode, flag: car.driver.nationality }
|
? { flagMode, flag: car.driver.nationality }
|
||||||
: flagMode === "team" ? { flagMode, flag: car.driver.team.id } : undefined;
|
: flagMode === "team" ? { flagMode, flag: car.driver.team.id } : undefined;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BaseBackground width={baseWidth} height={baseHeight}>
|
<BaseContainer width={baseWidth} height={baseHeight}>
|
||||||
|
<BaseBackground >
|
||||||
<Spacer width="6px" />
|
<Spacer width="6px" />
|
||||||
{showPosFlag && (
|
{showPosFlag && (
|
||||||
<PositionFlag containerHeight={baseHeight}>
|
<PositionFlag containerHeight={baseHeight}>
|
||||||
@@ -75,5 +80,13 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) {
|
|||||||
)}
|
)}
|
||||||
</FlagContainer>
|
</FlagContainer>
|
||||||
</BaseBackground>
|
</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 styled from "styled-components";
|
||||||
import { Px } from "../../../../types/style";
|
import { Px } from "../../../../types/style";
|
||||||
|
|
||||||
type BaseBackgroundProps = {
|
type BaseContainerProps = {
|
||||||
width: Px,
|
width: Px,
|
||||||
height: Px,
|
height: Px,
|
||||||
};
|
};
|
||||||
export const BaseBackground = styled.div<BaseBackgroundProps>`
|
export const BaseContainer = styled.div<BaseContainerProps>`
|
||||||
position: relative;
|
position: relative;
|
||||||
width: ${({ width }) => `${width}px`};
|
width: ${({ width }) => `${width}px`};
|
||||||
height: ${({ height }) => `${height}px`};
|
height: ${({ height }) => `${height}px`};
|
||||||
|
`;
|
||||||
|
BaseContainer.displayName = "BaseContainer";
|
||||||
|
|
||||||
|
export const BaseBackground = styled.div`
|
||||||
|
position: relative;
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -107,7 +114,6 @@ export const TeamName = styled.div`
|
|||||||
`;
|
`;
|
||||||
TeamName.displayName = "TeamName";
|
TeamName.displayName = "TeamName";
|
||||||
|
|
||||||
|
|
||||||
type SpacerProps = {
|
type SpacerProps = {
|
||||||
width?: string,
|
width?: string,
|
||||||
height?: string;
|
height?: string;
|
||||||
@@ -137,3 +143,24 @@ export const FlagContainer = styled.div<FlagContainerProps>`
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
`;
|
`;
|
||||||
FlagContainer.displayName = "FlagContainer";
|
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";
|
||||||
@@ -7,19 +7,19 @@ export const workspaces: WorkspaceObject = {
|
|||||||
chyron: {
|
chyron: {
|
||||||
name: "Chyron",
|
name: "Chyron",
|
||||||
overlayIds: [
|
overlayIds: [
|
||||||
"chyron-driver-portrait-maz.png",
|
|
||||||
"chyron-driver-medium-full-ham.png",
|
|
||||||
"chyron-driver-medium-full-alo.png",
|
"chyron-driver-medium-full-alo.png",
|
||||||
"chyron-driver-medium-full-lec.png",
|
"chyron-driver-medium-full-lec.png",
|
||||||
"chyron-driver-medium-full-rai.png",
|
"chyron-driver-medium-full-rai.png",
|
||||||
"chyron-driver-medium-full-vet.png",
|
"chyron-driver-medium-full-vet.png",
|
||||||
"chyron-driver-medium-full-per.png",
|
"chyron-driver-medium-full-per.png",
|
||||||
"chyron-driver-medium-full-msc.png",
|
"chyron-driver-medium-full-msc.png",
|
||||||
|
"chyron-driver-medium-op1-ham.png",
|
||||||
|
"chyron-driver-medium-op2-ham.png",
|
||||||
|
"chyron-driver-medium-full-ham.png",
|
||||||
|
"chyron-driver-portrait-maz.png",
|
||||||
"chyron-driver-medium-full-gas-weird.png",
|
"chyron-driver-medium-full-gas-weird.png",
|
||||||
"chyron-driver-medium-full-nor-weird.png",
|
"chyron-driver-medium-full-nor-weird.png",
|
||||||
"chyron-driver-medium-full-lat-no-pos.png",
|
"chyron-driver-medium-full-lat-no-pos.png",
|
||||||
"chyron-driver-medium-op1-ham.png",
|
|
||||||
"chyron-driver-medium-op2-ham.png",
|
|
||||||
"chyron-driver-large-np-tsu.png",
|
"chyron-driver-large-np-tsu.png",
|
||||||
"chyron-driver-large-dnf-ver.png",
|
"chyron-driver-large-dnf-ver.png",
|
||||||
],
|
],
|
||||||
@@ -35,7 +35,7 @@ export const workspaces: WorkspaceObject = {
|
|||||||
],
|
],
|
||||||
previewWindowDimensions: {
|
previewWindowDimensions: {
|
||||||
width: 1200,
|
width: 1200,
|
||||||
height: 150,
|
height: 250,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
angledFlagCountry: {
|
angledFlagCountry: {
|
||||||
|
|||||||
Reference in new issue
Block a user