Update header for NHS.UK frontend v10.0.0

Author: colinrotherham

src/components/navigation/header/Header.tsx

@@ -1,58 +1,33 @@
 'use client';
-import React, { FC, HTMLProps, useContext, useState, useEffect, useMemo, useRef } from 'react';
+import React, { HTMLProps, useState, useEffect, useMemo, useRef, Children } from 'react';
 import classNames from 'classnames';
-import NHSLogo, { NHSLogoNavProps } from './components/NHSLogo';
-import OrganisationalLogo, { OrganisationalLogoProps } from './components/OrganisationalLogo';
+import { Container } from '@components/layout';
+import { childIsOfComponentType } from '@util/types/TypeGuards';
 import HeaderContext, { IHeaderContext } from './HeaderContext';
+import Account from './components/Account';
+import AccountItem from './components/AccountItem';
 import Search from './components/Search';
-import Nav from './components/Nav';
-import NavItem from './components/NavItem';
-import NavDropdownMenu from './components/NavDropdownMenu';
-import { Container } from '@components/layout';
-import Content from './components/Content';
-import TransactionalServiceName from './components/TransactionalServiceName';
+import Navigation from './components/Navigation';
+import NavigationItem from './components/NavigationItem';
+import Service from './components/Service';
 import { Header } from 'nhsuk-frontend';
 
-const HeaderLogo: FC<OrganisationalLogoProps & NHSLogoNavProps> = (props) => {
-  const { orgName } = useContext<IHeaderContext>(HeaderContext);
-  if (orgName) {
-    return <OrganisationalLogo {...props} />;
-  }
-  return <NHSLogo {...props} />;
-};
-
-const HeaderContainer: FC<HTMLProps<HTMLDivElement>> = ({ className, ...rest }) => (
-  <Container className={classNames('nhsuk-header__container', className)} {...rest} />
-);
-
 interface HeaderProps extends HTMLProps<HTMLDivElement> {
-  transactional?: boolean;
-  orgName?: string;
-  orgSplit?: string;
-  orgDescriptor?: string;
-  serviceName?: string;
-  white?: boolean;
+  containerClasses?: string;
+  organisation?: IHeaderContext['organisation'];
 }
 
-const HeaderComponent = ({
-  className,
-  children,
-  transactional,
-  orgName,
-  orgSplit,
-  orgDescriptor,
-  role = 'banner',
-  serviceName,
-  white,
-  ...rest
-}: HeaderProps) => {
+const HeaderComponent = ({ className, containerClasses, children, ...rest }: HeaderProps) => {
   const moduleRef = useRef<HTMLDivElement>(null);
 
-  const [hasMenuToggle, setHasMenuToggle] = useState(false);
-  const [hasSearch, setHasSearch] = useState(false);
-  const [hasServiceName, setHasServiceName] = useState(false);
+  const [service, setService] = useState<IHeaderContext['service']>();
+  const [organisation, setOrganisation] = useState<IHeaderContext['organisation']>();
   const [instance, setInstance] = useState<Header>();
-  const [menuOpen, setMenuOpen] = useState(false);
+
+  useEffect(() => {
+    setOrganisation(rest.organisation);
+    return () => setOrganisation(undefined);
+  }, [rest.organisation]);
 
   useEffect(() => {
     if (!moduleRef.current || instance) {
@@ -62,79 +37,50 @@ const HeaderComponent = ({
     setInstance(new Header(moduleRef.current));
   }, [moduleRef, instance]);
 
-  const setMenuToggle = (toggle: boolean): void => {
-    setHasMenuToggle(toggle);
-  };
-
-  const setSearch = (toggle: boolean): void => {
-    setHasSearch(toggle);
-  };
-
-  const toggleMenu = (): void => {
-    setMenuOpen(!menuOpen);
-  };
-
-  const setServiceName = (toggle: boolean): void => {
-    setHasServiceName(toggle);
-  };
-
   const contextValue: IHeaderContext = useMemo(() => {
     return {
-      orgName,
-      orgSplit,
-      orgDescriptor,
-      serviceName,
-      hasSearch,
-      hasMenuToggle,
-      hasServiceName,
-      setMenuToggle,
-      setSearch,
-      setServiceName,
-      toggleMenu,
-      menuOpen,
-      transactional: transactional ?? false,
+      service,
+      organisation,
+      setService,
+      setOrganisation,
     };
-  }, [
-    orgName,
-    orgSplit,
-    orgDescriptor,
-    serviceName,
-    hasSearch,
-    hasMenuToggle,
-    hasServiceName,
-    setMenuToggle,
-    setSearch,
-    setServiceName,
-    toggleMenu,
-    menuOpen,
-    transactional,
-  ]);
+  }, [service, organisation]);
+
+  const items = Children.toArray(children);
+
+  const [childService] = items.filter((child) => childIsOfComponentType(child, Service));
+  const [childSearch] = items.filter((child) => childIsOfComponentType(child, Search));
+  const [childNavigation] = items.filter((child) => childIsOfComponentType(child, Navigation));
+  const [childAccount] = items.filter((child) => childIsOfComponentType(child, Account));
 
   return (
     <header
       className={classNames(
         'nhsuk-header',
-        { 'nhsuk-header__transactional': transactional },
-        { 'nhsuk-header--organisation': orgName },
-        { 'nhsuk-header--white': white },
+        { 'nhsuk-header--organisation': organisation },
         className,
       )}
-      role={role}
+      data-module="nhsuk-header"
+      role="banner"
       ref={moduleRef}
-      {...rest}
     >
-      <HeaderContext.Provider value={contextValue}>{children}</HeaderContext.Provider>
+      <HeaderContext.Provider value={contextValue}>
+        <Container className={classNames('nhsuk-header__container', containerClasses)}>
+          {childService}
+          {childSearch}
+          {childAccount}
+        </Container>
+        {childNavigation}
+      </HeaderContext.Provider>
     </header>
   );
 };
 
-HeaderComponent.Logo = HeaderLogo;
+HeaderComponent.Account = Account;
+HeaderComponent.AccountItem = AccountItem;
 HeaderComponent.Search = Search;
-HeaderComponent.Nav = Nav;
-HeaderComponent.NavItem = NavItem;
-HeaderComponent.NavDropdownMenu = NavDropdownMenu;
-HeaderComponent.Container = HeaderContainer;
-HeaderComponent.Content = Content;
-HeaderComponent.ServiceName = TransactionalServiceName;
+HeaderComponent.Navigation = Navigation;
+HeaderComponent.NavigationItem = NavigationItem;
+HeaderComponent.Service = Service;
 
 export default HeaderComponent;

src/components/navigation/header/HeaderContext.ts

@@ -1,34 +1,28 @@
 import { createContext } from 'react';
 
 export interface IHeaderContext {
-  orgName: string | undefined;
-  serviceName: string | undefined;
-  orgSplit: string | undefined;
-  orgDescriptor: string | undefined;
-  setSearch: (toggle: boolean) => void;
-  setMenuToggle: (toggle: boolean) => void;
-  setServiceName: (toggle: boolean) => void;
-  toggleMenu: () => void;
-  hasSearch: boolean;
-  hasMenuToggle: boolean;
-  hasServiceName: boolean;
-  menuOpen: boolean;
-  transactional: boolean;
+  logo?: {
+    href?: string;
+    src?: string;
+  };
+  service?: {
+    href?: string;
+    text?: string;
+  };
+  organisation?: {
+    name?: string;
+    split?: string;
+    descriptor?: string;
+  };
+  setService: (service: IHeaderContext['service']) => void;
+  setOrganisation: (organisation: IHeaderContext['organisation']) => void;
 }
 
 export default createContext<IHeaderContext>({
   /* eslint-disable @typescript-eslint/no-empty-function */
-  orgName: undefined,
-  serviceName: undefined,
-  orgSplit: undefined,
-  orgDescriptor: undefined,
-  setSearch: () => {},
-  setMenuToggle: () => {},
-  setServiceName: () => {},
-  hasSearch: false,
-  hasMenuToggle: false,
-  hasServiceName: false,
-  toggleMenu: () => {},
-  menuOpen: false,
-  transactional: false,
+  logo: undefined,
+  service: undefined,
+  organisation: undefined,
+  setService: () => {},
+  setOrganisation: () => {},
 });