From 51a614d97f9db6d9d8a6052d4869fd629535ec69 Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Tue, 1 Apr 2025 23:43:29 -0500 Subject: [PATCH] Finalize non-fuji film icon treatment --- src/film/PhotoFilm.tsx | 3 ++- src/film/PhotoFilmIcon.tsx | 6 +++--- src/platforms/fujifilm/simulation.ts | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/film/PhotoFilm.tsx b/src/film/PhotoFilm.tsx index c28a115d..98d83eab 100644 --- a/src/film/PhotoFilm.tsx +++ b/src/film/PhotoFilm.tsx @@ -6,6 +6,7 @@ import EntityLink, { } from '@/components/primitives/EntityLink'; import clsx from 'clsx/lite'; import { labelForFilm } from '.'; +import { isStringFujifilmSimulation } from '@/platforms/fujifilm/simulation'; export default function PhotoFilm({ film, @@ -41,7 +42,7 @@ export default function PhotoFilm({ badged={badged} contrast={contrast} hoverEntity={countOnHover} - iconWide + iconWide={isStringFujifilmSimulation(film)} /> ); } diff --git a/src/film/PhotoFilmIcon.tsx b/src/film/PhotoFilmIcon.tsx index 684eeb5d..b412f30d 100644 --- a/src/film/PhotoFilmIcon.tsx +++ b/src/film/PhotoFilmIcon.tsx @@ -1,5 +1,5 @@ /* eslint-disable max-len */ -import { CSSProperties, useMemo } from 'react'; +import { CSSProperties } from 'react'; import { labelForFilm } from '.'; const INTRINSIC_WIDTH = 28; @@ -21,7 +21,7 @@ export default function PhotoFilmIcon({ className?: string style?: CSSProperties }) { - const simulationIcon = useMemo(() => { + const simulationIcon = (() => { // Self-calling switch function and non-fragment groups // necessary for ImageResponse compatibility switch (film) { @@ -139,7 +139,7 @@ export default function PhotoFilmIcon({ ; } - }, [film]); + })(); const width = simulationIcon ? INTRINSIC_WIDTH diff --git a/src/platforms/fujifilm/simulation.ts b/src/platforms/fujifilm/simulation.ts index ae6d1026..1778bbee 100644 --- a/src/platforms/fujifilm/simulation.ts +++ b/src/platforms/fujifilm/simulation.ts @@ -223,7 +223,8 @@ const ALL_POSSIBLE_FUJIFILM_SIMULATION_LABELS = Object ]); export const isStringFujifilmSimulation = (film?: string) => - film && Object.keys(FUJIFILM_SIMULATION_LABELS).includes(film); + film !== undefined && + Object.keys(FUJIFILM_SIMULATION_LABELS).includes(film); export const isStringFujifilmSimulationLabel = (film: string) => ALL_POSSIBLE_FUJIFILM_SIMULATION_LABELS.includes(film.toLocaleLowerCase());