Skip to content

Versus change number alignment #16614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamieB-gu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Versus change number alignment #16614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 54 additions & 11 deletions dotcom-rendering/src/components/ElectionTrackers/Versus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
headlineMedium20Object,
headlineMedium24Object,
headlineMedium34Object,
space,
textSans12Object,
} from '@guardian/source/foundations';
import { generateImageURL } from '../../lib/image';
Expand Down Expand Up @@ -166,24 +167,19 @@ const GroupComponent = (props: {
: textColour(props.faded)
}
/>
<Value
value={props.group.value}
colour={
props.colour === 'value'
? props.group.colour
: textColour(props.faded)
}
<ValueWithChange
align={props.align}
colour={props.colour}
faded={props.faded}
group={props.group}
/>
{'change' in props.group ? (
<Change change={props.group.change} />
) : (
{'description' in props.group ? (
<Description
description={props.group.description}
align={props.align}
faded={props.faded}
/>
)}
) : null}
</p>
);

Expand Down Expand Up @@ -230,6 +226,53 @@ const Name = ({
</span>
);

const ValueWithChange = (props: {
align: 'left' | 'right';
colour: Props['colour'];
faded: Props['faded'];
group: Group;
}) => {
const value = (
<Value
value={props.group.value}
colour={
props.colour === 'value'
? props.group.colour
: textColour(props.faded)
}
faded={props.faded}
/>
);

const change =
'change' in props.group ? <Change change={props.group.change} /> : null;

if (props.group.image !== undefined) {
return (
<>
{value}
{change}
</>
);
}

return (
<span
css={{
display: 'flex',
alignItems: 'end',
gap: space[1],
}}
style={{
flexDirection: props.align === 'right' ? 'row-reverse' : 'row',
}}
>
{value}
{change}
</span>
);
};

const Value = (props: {
value: Group['value'];
colour: string;
Expand Down
Loading