Skip to content

Make RecipeMultiplier Island server safe #9383

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

Merged
mxdvl merged 1 commit into from
Nov 2, 2023
Merged

Make RecipeMultiplier Island server safe #9383

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions dotcom-rendering/src/components/Island.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { LiveBlogEpic } from './LiveBlogEpic.importable';
import { Liveness } from './Liveness.importable';
import { Metrics } from './Metrics.importable';
import { OnwardsUpper } from './OnwardsUpper.importable';
import { RecipeMultiplier } from './RecipeMultiplier.importable';
import { SetABTests } from './SetABTests.importable';
import { SignInGateSelector } from './SignInGateSelector.importable';
import { SlotBodyEnd } from './SlotBodyEnd.importable';
Expand Down Expand Up @@ -220,6 +221,10 @@ describe('Island: server-side rendering', () => {
).not.toThrow();
});

test('RecipeMultiplier', () => {
expect(() => renderToString(<RecipeMultiplier />)).not.toThrow();
});

test('SetABTests', () => {
expect(() =>
renderToString(
Expand Down
50 changes: 30 additions & 20 deletions dotcom-rendering/src/components/RecipeMultiplier.importable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { css } from '@emotion/react';
import { isString, isUndefined, log } from '@guardian/libs';
import { lifestyle, space, textSans } from '@guardian/source-foundations';
import { palette, space, textSans } from '@guardian/source-foundations';
import { Button, SvgMinus, SvgPlus } from '@guardian/source-react-components';
import type { ChangeEventHandler } from 'react';
import { useEffect, useState } from 'react';
import { isServer } from '../lib/isServer';

const colours = `
gu-recipe {
color: ${lifestyle[100]};
background-color: ${lifestyle[800]};
color: ${palette.lifestyle[100]};
background-color: ${palette.lifestyle[800]};
font-weight: bold;
}
`;
Expand All @@ -21,8 +20,8 @@ const styles = css`
display: grid;
grid-template-columns: 6fr repeat(3, 1fr);
top: 0;
color: ${lifestyle[100]};
background-color: ${lifestyle[800]};
color: ${palette.lifestyle[100]};
background-color: ${palette.lifestyle[800]};
padding: ${space[2]}px;
`;

Expand Down Expand Up @@ -96,13 +95,6 @@ const RECIPE_ELEMENTS = new RegExp(
'i',
);

const serves = isServer
? 1
: parseFloat(
document.querySelector<HTMLElement>('gu-recipe[serves]')?.dataset
.value ?? '1',
);

const transform = ({
value,
separator,
Expand All @@ -128,9 +120,22 @@ const transform = ({
};

export const RecipeMultiplier = () => {
const [servesElement, setServesElement] = useState<HTMLElement>();
const [serves, setServes] = useState<number>(1);
const [servings, setServings] = useState<number>(serves);
const [multiplier, setMultiplier] = useState(1);

useEffect(() => {
if (!servesElement) return;

const rawServes = parseFloat(servesElement.dataset.value ?? '1');

if (Number.isNaN(rawServes)) return;

setServes(rawServes);
setServings(rawServes);
}, [servesElement]);

useEffect(() => {
log('dotcom', 'Injecting multiplier');
const style = document.createElement('style');
Expand Down Expand Up @@ -174,6 +179,8 @@ export const RecipeMultiplier = () => {
document.createElement('gu-recipe');
recipeElement.textContent = node.textContent;

setServesElement(recipeElement);

if (isConstant(groups?.unit)) continue;

const attributes = Object.entries(groups ?? {}).map(
Expand Down Expand Up @@ -220,11 +227,9 @@ export const RecipeMultiplier = () => {
}, []);

useEffect(() => {
const element =
document.querySelector<HTMLElement>('gu-recipe[serves]');
if (element) element.innerText = servings.toString();
if (servesElement) servesElement.innerText = servings.toString();
setMultiplier(servings / serves);
}, [servings]);
}, [servesElement, serves, servings]);

useEffect(() => {
for (const element of document.querySelectorAll<HTMLElement>(
Expand Down Expand Up @@ -265,7 +270,7 @@ export const RecipeMultiplier = () => {
size="xsmall"
disabled={servings - 1 < min}
cssOverrides={css`
background-color: ${lifestyle[300]};
background-color: ${palette.lifestyle[300]};
`}
onClick={() => setServings(servings - 1)}
>
Expand All @@ -287,14 +292,19 @@ export const RecipeMultiplier = () => {
size="xsmall"
disabled={servings + 1 > max}
cssOverrides={css`
background-color: ${lifestyle[300]};
background-color: ${palette.lifestyle[300]};
`}
onClick={() => setServings(servings + 1)}
>
add 1 serving
</Button>
</li>
<li css={{ gridColumn: '1 / -1', accentColor: lifestyle[300] }}>
<li
css={{
gridColumn: '1 / -1',
accentColor: palette.lifestyle[300],
}}
>
<input
css={{ width: '100%', margin: 0 }}
type="range"
Expand Down