From 29a884fd4df96027c4aa75e39e8f0b8b66477432 Mon Sep 17 00:00:00 2001 From: "dong.nguyen" Date: Sun, 18 Oct 2026 23:45:19 +0700 Subject: [PATCH] fix(i18n): resolve bilingual data through a pure field() helper useField and useFieldArray were hooks called from inside .map() callbacks - 11 rules-of-hooks errors. field(lang, value, valueEn) is a plain function, so the same selection is legal in a callback, with lang read once at component top level. One helper covers scalar and array values because both need the same lockstep rule. resolvedTheme is now theme directly: resolveTheme() was an identity helper left behind by the removed system variant. --- src/components/sections/About.tsx | 8 ++++---- src/components/sections/Experience.tsx | 6 +++--- src/components/sections/Expertise.tsx | 4 ++-- src/components/sections/Hero.tsx | 6 +++--- src/components/sections/Projects.tsx | 6 +++--- src/hooks/useTheme.tsx | 6 +----- src/i18n/field.ts | 14 ++++++++++++++ src/i18n/useField.ts | 17 ----------------- src/pages/AboutPage.tsx | 10 +++++----- src/pages/ExperiencePage.tsx | 6 +++--- src/pages/ProjectDetailPage.tsx | 10 +++++----- src/pages/ProjectsListPage.tsx | 6 +++--- 12 files changed, 46 insertions(+), 53 deletions(-) create mode 100644 src/i18n/field.ts delete mode 100644 src/i18n/useField.ts diff --git a/src/components/sections/About.tsx b/src/components/sections/About.tsx index decf508..b1e8c4a 100644 --- a/src/components/sections/About.tsx +++ b/src/components/sections/About.tsx @@ -5,7 +5,7 @@ import { Tag } from '@/components/ui/Tag' import { profile } from '@/data/profile' import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField } from '@/i18n/useField' +import { field } from '@/i18n/field' export function About() { const { lang } = useLanguage() return ( @@ -23,7 +23,7 @@ export function About() { >

- {useField(profile.bio, profile.bioEn)} + {field(lang, profile.bio, profile.bioEn)}

@@ -41,8 +41,8 @@ export function About() { whileHover={{ scale: 1.02, y: -4 }} whileTap={{ scale: 0.98 }} > -

{point.title}

-

{point.description}

+

{field(lang, point.title, point.titleEn)}

+

{field(lang, point.description, point.descriptionEn)}

{point.keywords.map((kw) => ( {kw} diff --git a/src/components/sections/Experience.tsx b/src/components/sections/Experience.tsx index 644edd3..86cc8eb 100644 --- a/src/components/sections/Experience.tsx +++ b/src/components/sections/Experience.tsx @@ -4,7 +4,7 @@ import { experiences } from "@/data/experience" import { InView } from "@/components/ui/InView" import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField, useFieldArray } from '@/i18n/useField' +import { field } from '@/i18n/field' export function Experience() { const { lang } = useLanguage() @@ -36,7 +36,7 @@ export function Experience() {
- {useField(exp.title, exp.titleEn)} + {field(lang, exp.title, exp.titleEn)}
{exp.company}
@@ -47,7 +47,7 @@ export function Experience() {
    - {useFieldArray(exp.responsibilities, exp.responsibilitiesEn).map((r) => ( + {field(lang, exp.responsibilities, exp.responsibilitiesEn).map((r) => (
  • {r}
  • ))}
diff --git a/src/components/sections/Expertise.tsx b/src/components/sections/Expertise.tsx index 3a168cd..3f4ed47 100644 --- a/src/components/sections/Expertise.tsx +++ b/src/components/sections/Expertise.tsx @@ -4,7 +4,7 @@ import { skillGroups } from "@/data/skills" import { InView } from "@/components/ui/InView" import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField } from '@/i18n/useField' +import { field } from '@/i18n/field' export function Expertise() { const { lang } = useLanguage() @@ -34,7 +34,7 @@ export function Expertise() { whileHover={{ scale: 1.02, y: -4 }} whileTap={{ scale: 0.98 }} > -

{useField(group.title, group.titleEn)}

+

{field(lang, group.title, group.titleEn)}

    {group.skills.map((skill) => (
  • diff --git a/src/components/sections/Hero.tsx b/src/components/sections/Hero.tsx index 507121c..1125dc8 100644 --- a/src/components/sections/Hero.tsx +++ b/src/components/sections/Hero.tsx @@ -4,7 +4,7 @@ import {resumeAvailable, resumeLanguages, resumeUrlFor, resumeLanguageLabels} fr import type {Language} from '@/types' import {useLanguage} from '@/hooks/useLanguage' import {strings} from '@/i18n/strings' -import {useField} from '@/i18n/useField' +import { field } from '@/i18n/field' import {DownloadResumeDropdown} from '@/components/sections/DownloadResume' @@ -71,7 +71,7 @@ export function Hero() { viewport={{once: true, amount: 0.2}} transition={{duration: 0.45, ease: "easeOut", delay: 0.08}} > - {useField(profile.name, profile.nameEn)} + {field(lang, profile.name, profile.nameEn)}
    -

    {project.title}

    +

    {field(lang, project.title, project.titleEn)}

    {strings.projects.categories[project.category][lang]}
    -

    {useField(project.summary, project.summaryEn)}

    +

    {field(lang, project.summary, project.summaryEn)}

    {project.technologies.slice(0, 4).map((tech) => ( diff --git a/src/hooks/useTheme.tsx b/src/hooks/useTheme.tsx index c4eb466..1dd2ee7 100644 --- a/src/hooks/useTheme.tsx +++ b/src/hooks/useTheme.tsx @@ -42,15 +42,11 @@ function getInitialPalette(): Palette { return 'red' } -function resolveTheme(theme: Theme): 'dark' | 'light' { - return theme -} - export function ThemeProvider({ children }: { children: React.ReactNode }) { const [theme, setThemeState] = useState(getInitialTheme) const [palette, setPaletteState] = useState(getInitialPalette) - const resolvedTheme = resolveTheme(theme) + const resolvedTheme = theme // Set data-theme during render so it's available before paint document.documentElement.setAttribute('data-theme', resolvedTheme) diff --git a/src/i18n/field.ts b/src/i18n/field.ts new file mode 100644 index 0000000..e0f7610 --- /dev/null +++ b/src/i18n/field.ts @@ -0,0 +1,14 @@ +import type { Language } from '@/types' + +/** + * Select one value from a bilingual pair. Plain function, not a hook: `lang` is + * read once at component top level with `useLanguage()`, so `field` is safe + * inside `.map()` callbacks. + * + * Convention: `value` is the Vietnamese value, `valueEn` the English one. When a + * pair has no English variant yet, `valueEn` is undefined and both languages + * render `value`. + */ +export function field(lang: Language, value: T, valueEn: T | undefined): T { + return lang === 'vi' ? value : (valueEn ?? value) +} diff --git a/src/i18n/useField.ts b/src/i18n/useField.ts deleted file mode 100644 index 37578f5..0000000 --- a/src/i18n/useField.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { useLanguage } from '@/hooks/useLanguage' - -/** - * React hook: select field by language. Must be called at component top level. - */ -export function useField(value: T, valueEn: T | undefined): T { - const { lang } = useLanguage() - return lang === 'vi' ? value : (valueEn ?? value) -} - -/** - * React hook: select array field by language. Must be called at component top level. - */ -export function useFieldArray(value: T[], valueEn: T[] | undefined): T[] { - const { lang } = useLanguage() - return lang === 'vi' ? value : (valueEn ?? value) -} diff --git a/src/pages/AboutPage.tsx b/src/pages/AboutPage.tsx index 22e497d..9e8b4ea 100644 --- a/src/pages/AboutPage.tsx +++ b/src/pages/AboutPage.tsx @@ -6,7 +6,7 @@ import { profile } from '@/data/profile' import { skillGroups } from '@/data/skills' import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField } from '@/i18n/useField' +import { field } from '@/i18n/field' export function AboutPage() { const { lang } = useLanguage() @@ -30,7 +30,7 @@ export function AboutPage() { tag={strings.about.heading[lang]} />

    - {useField(profile.bio, profile.bioEn)} + {field(lang, profile.bio, profile.bioEn)}

    @@ -48,8 +48,8 @@ export function AboutPage() { whileHover={{ scale: 1.02, y: -4 }} whileTap={{ scale: 0.98 }} > -

    {point.title}

    -

    {point.description}

    +

    {field(lang, point.title, point.titleEn)}

    +

    {field(lang, point.description, point.descriptionEn)}

    {point.keywords.map((kw) => ( {kw} @@ -96,7 +96,7 @@ export function AboutPage() { whileHover={{ scale: 1.02, y: -4 }} whileTap={{ scale: 0.98 }} > -

    {useField(group.title, group.titleEn)}

    +

    {field(lang, group.title, group.titleEn)}

      {group.skills.map((skill: string) => (
    • diff --git a/src/pages/ExperiencePage.tsx b/src/pages/ExperiencePage.tsx index 166277b..5e3502c 100644 --- a/src/pages/ExperiencePage.tsx +++ b/src/pages/ExperiencePage.tsx @@ -4,7 +4,7 @@ import { InView } from '@/components/ui/InView' import { experiences } from '@/data/experience' import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField, useFieldArray } from '@/i18n/useField' +import { field } from '@/i18n/field' export function ExperiencePage() { const { lang } = useLanguage() @@ -34,7 +34,7 @@ export function ExperiencePage() { >
      -
      {useField(exp.title, exp.titleEn)}
      +
      {field(lang, exp.title, exp.titleEn)}
      {exp.company}
      {exp.duration} @@ -42,7 +42,7 @@ export function ExperiencePage() {
        - {useFieldArray(exp.responsibilities, exp.responsibilitiesEn).map((r) => ( + {field(lang, exp.responsibilities, exp.responsibilitiesEn).map((r) => (
      • {r}
      • ))}
      diff --git a/src/pages/ProjectDetailPage.tsx b/src/pages/ProjectDetailPage.tsx index 9db36b7..5840d6e 100644 --- a/src/pages/ProjectDetailPage.tsx +++ b/src/pages/ProjectDetailPage.tsx @@ -6,7 +6,7 @@ import { InView } from '@/components/ui/InView' import { projects } from '@/data/projects' import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField } from '@/i18n/useField' +import { field } from '@/i18n/field' const sectionVariants = { hidden: { opacity: 0 }, @@ -64,7 +64,7 @@ export function ProjectDetailPage() { viewport={{ once: true, amount: 0.2 }} transition={itemTransition(0)} > -

      {project.title}

      +

      {field(lang, project.title, project.titleEn)}

      {strings.projects.categories[project.category][lang]} @@ -75,7 +75,7 @@ export function ProjectDetailPage() { viewport={{ once: true, amount: 0.2 }} transition={itemTransition(0.08)} > - {useField(project.summary, project.summaryEn)} + {field(lang, project.summary, project.summaryEn)}
      @@ -140,8 +140,8 @@ export function ProjectDetailPage() { viewport={{ once: true, amount: 0.2 }} transition={itemTransition(0.48 + idx * 0.08)} > -

      {useField(section.title, section.titleEn)}

      -

      {useField(section.content, section.contentEn)}

      +

      {field(lang, section.title, section.titleEn)}

      +

      {field(lang, section.content, section.contentEn)}

      {section.type} ))} diff --git a/src/pages/ProjectsListPage.tsx b/src/pages/ProjectsListPage.tsx index 451f77a..6fa2b31 100644 --- a/src/pages/ProjectsListPage.tsx +++ b/src/pages/ProjectsListPage.tsx @@ -5,7 +5,7 @@ import { InView } from '@/components/ui/InView' import { projects } from '@/data/projects' import { useLanguage } from '@/hooks/useLanguage' import { strings } from '@/i18n/strings' -import { useField } from '@/i18n/useField' +import { field } from '@/i18n/field' import { Link } from 'react-router' @@ -41,12 +41,12 @@ export function ProjectsListPage() { whileTap={{ scale: 0.98 }} >
      -

      {project.title}

      +

      {field(lang, project.title, project.titleEn)}

      {strings.projects.categories[project.category][lang]}
      -

      {useField(project.summary, project.summaryEn)}

      +

      {field(lang, project.summary, project.summaryEn)}

      {project.technologies.slice(0, 4).map((tech) => (