Merge branch 'master' into feature/tjc-dateInputErrorBehaviour

Author: Tomdango

src/components/header/components/NHSLogo.tsx

@@ -1,7 +1,13 @@
-import React, { useContext, HTMLProps } from 'react';
+import React, { useContext, HTMLProps, SVGProps } from 'react';
 import classNames from 'classnames';
 import HeaderContext, { IHeaderContext } from '../HeaderContext';
 
+interface SVGImageWithSrc extends SVGProps<SVGImageElement> {
+  src: string;
+}
+
+const SVGImageWithSrc: React.FC<SVGImageWithSrc> = props => <image {...props} />;
+
 const NHSLogo: React.FC<HTMLProps<HTMLAnchorElement>> = ({ className, alt, ...rest }) => {
   const { serviceName, hasMenuToggle, hasSearch } = useContext<IHeaderContext>(HeaderContext);
   return (
@@ -21,7 +27,7 @@ const NHSLogo: React.FC<HTMLProps<HTMLAnchorElement>> = ({ className, alt, ...re
         <svg
           className="nhsuk-logo"
           xmlns="http://www.w3.org/2000/svg"
-          role="presentation"
+          role="img"
           focusable="false"
           viewBox="0 0 40 16"
           aria-labelledby="nhsuk-logo_title"
@@ -32,7 +38,7 @@ const NHSLogo: React.FC<HTMLProps<HTMLAnchorElement>> = ({ className, alt, ...re
             className="nhsuk-logo__text"
             d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"
           />
-          <img src="https://assets.nhs.uk/images/nhs-logo.png" alt={alt} />
+          <SVGImageWithSrc src="https://assets.nhs.uk/images/nhs-logo.png" xlinkHref="" />
         </svg>
         {serviceName ? <span className="nhsuk-header__service-name">{serviceName}</span> : null}
       </a>

src/components/header/components/OrganisationalLogo.tsx

@@ -17,10 +17,12 @@ const OrganisationalLogo: React.FC<OrganisationalLogoProps> = ({ logoUrl, alt, .
             <svg
               className="nhsuk-logo"
               xmlns="http://www.w3.org/2000/svg"
-              role="presentation"
+              role="img"
               focusable="false"
               viewBox="0 0 40 16"
+              aria-labelledby="nhsuk-logo_title"
             >
+              <title id="nhsuk-logo_title">{alt}</title>
               <path className="nhsuk-logo__background" d="M0 0h40v16H0z"></path>
               <path
                 className="nhsuk-logo__text"