update snapshots

NHSDigital · Sep 22, 2023 · 8e8a850 · 8e8a850
1 parent a00c0b1
commit 8e8a850
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 101 deletions.
diff --git a/src/components/breadcrumb/__tests__/__snapshots__/Breadcrumb.test.tsx.snap b/src/components/breadcrumb/__tests__/__snapshots__/Breadcrumb.test.tsx.snap
@@ -14,9 +14,7 @@ exports[`Breadcrumb base element matches snapshot: BaseBreadcrumbs 1`] = `
 `;
 
 exports[`Breadcrumb renders with children: BreadcrumbWithChildren 1`] = `
-<Breadcrumb
-  aria-label="Breadcrumb"
->
+<Breadcrumb>
   <nav
     aria-label="Breadcrumb"
     className="nhsuk-breadcrumb"

diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx
@@ -21,10 +21,12 @@ export const Button: React.FC<ButtonProps> = ({
   disabled,
   secondary,
   reverse,
+  type = 'submit',
   ...rest
 }) => (
   // eslint-disable-next-line react/button-has-type
   <button
+    type={type}
     className={classNames(
       'nhsuk-button',
       { 'nhsuk-button--disabled': disabled },
@@ -40,13 +42,12 @@ export const Button: React.FC<ButtonProps> = ({
 
 export const ButtonLink: React.FC<ButtonLinkProps> = ({
   className,
-  role,
-  draggable,
+  role = 'button',
+  draggable = false,
   children,
   disabled,
   secondary,
   reverse,
-  type = 'submit',
   ...rest
 }) => (
   <a
@@ -57,7 +58,6 @@ export const ButtonLink: React.FC<ButtonLinkProps> = ({
       { 'nhsuk-button--reverse': reverse },
       className,
     )}
-    type={type}
     role={role}
     aria-disabled={disabled ? 'true' : 'false'}
     draggable={draggable}
@@ -67,26 +67,16 @@ export const ButtonLink: React.FC<ButtonLinkProps> = ({
   </a>
 );
 
-const ButtonWrapper: React.FC<ButtonLinkProps | ButtonProps> = ({
-  href,
-  as,
-  role = 'button',
-  draggable = false,
-  ...rest
-}) => {
+const ButtonWrapper: React.FC<ButtonLinkProps | ButtonProps> = ({ href, as, ...rest }) => {
   const buttonProps = { type: 'submit', ...rest } as ButtonProps;
   if (as === 'a') {
-    return (
-      <ButtonLink role={role} draggable={draggable} href={href} {...(rest as ButtonLinkProps)} />
-    );
+    return <ButtonLink href={href} {...(rest as ButtonLinkProps)} />;
   }
   if (as === 'button') {
     return <Button {...buttonProps} />;
   }
   if (href) {
-    return (
-      <ButtonLink role={role} draggable={draggable} href={href} {...(rest as ButtonLinkProps)} />
-    );
+    return <ButtonLink href={href} {...(rest as ButtonLinkProps)} />;
   }
   return <Button {...buttonProps} />;
 };

diff --git a/src/components/card/Card.tsx b/src/components/card/Card.tsx
@@ -34,7 +34,7 @@ const Card: ICard = ({ className, clickable, children, feature = false, ...rest
     )}
     {...rest}
   >
-    <CardContext.Provider value={{ feature: Boolean(feature) }}>{children}</CardContext.Provider>
+    <CardContext.Provider value={{ feature: feature }}>{children}</CardContext.Provider>
   </div>
 );
 

diff --git a/src/components/card/__tests__/__snapshots__/Card.test.tsx.snap b/src/components/card/__tests__/__snapshots__/Card.test.tsx.snap
@@ -18,19 +18,15 @@ exports[`Card Card.Group matches snapshot 1`] = `
           <div
             className="nhsuk-grid-column-one-half nhsuk-card-group__item"
           >
-            <Card
-              feature={false}
-            >
+            <Card>
               <div
                 className="nhsuk-card"
               >
                 <CardContent>
                   <div
                     className="nhsuk-card__content"
                   >
-                    <CardHeading
-                      headingLevel="h2"
-                    >
+                    <CardHeading>
                       <HeadingLevel
                         className="nhsuk-card__heading"
                         headingLevel="h2"
@@ -66,19 +62,15 @@ exports[`Card Card.Group matches snapshot 1`] = `
           <div
             className="nhsuk-grid-column-one-half nhsuk-card-group__item"
           >
-            <Card
-              feature={false}
-            >
+            <Card>
               <div
                 className="nhsuk-card"
               >
                 <CardContent>
                   <div
                     className="nhsuk-card__content"
                   >
-                    <CardHeading
-                      headingLevel="h2"
-                    >
+                    <CardHeading>
                       <HeadingLevel
                         className="nhsuk-card__heading"
                         headingLevel="h2"
@@ -110,9 +102,7 @@ exports[`Card Card.Group matches snapshot 1`] = `
 `;
 
 exports[`Card matches snapshot 1`] = `
-<Card
-  feature={false}
->
+<Card>
   <div
     className="nhsuk-card"
   >
@@ -130,9 +120,7 @@ exports[`Card matches snapshot 1`] = `
       <div
         className="nhsuk-card__content"
       >
-        <CardHeading
-          headingLevel="h2"
-        >
+        <CardHeading>
           <HeadingLevel
             className="nhsuk-card__heading"
             headingLevel="h2"

diff --git a/src/components/checkboxes/__tests__/__snapshots__/Checkboxes.test.tsx.snap b/src/components/checkboxes/__tests__/__snapshots__/Checkboxes.test.tsx.snap
@@ -18,7 +18,6 @@ exports[`Checkboxes matches snapshot 1`] = `
         id="example"
       >
         <Box
-          type="checkbox"
           value="animal"
         >
           <div
@@ -54,7 +53,6 @@ exports[`Checkboxes matches snapshot 1`] = `
           </div>
         </Box>
         <Box
-          type="checkbox"
           value="mines"
         >
           <div
@@ -90,7 +88,6 @@ exports[`Checkboxes matches snapshot 1`] = `
           </div>
         </Box>
         <Box
-          type="checkbox"
           value="farm"
         >
           <div
@@ -151,7 +148,6 @@ exports[`Checkboxes matches snapshot with boolean error 1`] = `
         id="example"
       >
         <Box
-          type="checkbox"
           value="animal"
         >
           <div
@@ -187,7 +183,6 @@ exports[`Checkboxes matches snapshot with boolean error 1`] = `
           </div>
         </Box>
         <Box
-          type="checkbox"
           value="mines"
         >
           <div
@@ -223,7 +218,6 @@ exports[`Checkboxes matches snapshot with boolean error 1`] = `
           </div>
         </Box>
         <Box
-          type="checkbox"
           value="farm"
         >
           <div
@@ -281,8 +275,6 @@ exports[`Checkboxes matches snapshot with string error 1`] = `
     >
       <ErrorMessage
         id="example--error-message"
-        role="alert"
-        visuallyHiddenText="Error: "
       >
         <span
           className="nhsuk-error-message"
@@ -302,7 +294,6 @@ exports[`Checkboxes matches snapshot with string error 1`] = `
         id="example"
       >
         <Box
-          type="checkbox"
           value="animal"
         >
           <div
@@ -338,7 +329,6 @@ exports[`Checkboxes matches snapshot with string error 1`] = `
           </div>
         </Box>
         <Box
-          type="checkbox"
           value="mines"
         >
           <div
@@ -374,7 +364,6 @@ exports[`Checkboxes matches snapshot with string error 1`] = `
           </div>
         </Box>
         <Box
-          type="checkbox"
           value="farm"
         >
           <div

diff --git a/src/components/date-input/__tests__/__snapshots__/DateInput.test.tsx.snap b/src/components/date-input/__tests__/__snapshots__/DateInput.test.tsx.snap
@@ -19,10 +19,7 @@ exports[`DateInput matches snapshot 1`] = `
       >
         <DayInput>
           <IndividualDateInput
-            inputMode="numeric"
             inputType="day"
-            pattern="[0-9]*"
-            type="text"
           >
             <div
               className="nhsuk-date-input__item"
@@ -65,10 +62,7 @@ exports[`DateInput matches snapshot 1`] = `
         </DayInput>
         <MonthInput>
           <IndividualDateInput
-            inputMode="numeric"
             inputType="month"
-            pattern="[0-9]*"
-            type="text"
           >
             <div
               className="nhsuk-date-input__item"
@@ -111,10 +105,7 @@ exports[`DateInput matches snapshot 1`] = `
         </MonthInput>
         <YearInput>
           <IndividualDateInput
-            inputMode="numeric"
             inputType="year"
-            pattern="[0-9]*"
-            type="text"
           >
             <div
               className="nhsuk-date-input__item"

diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsx
@@ -42,7 +42,7 @@ interface Footer extends React.FC<FooterProps> {
   Copyright: React.FC<HTMLProps<HTMLParagraphElement>>;
 }
 
-const Footer: Footer = ({ className, children, visuallyHiddenText, ...rest }) => (
+const Footer: Footer = ({ className, children, visuallyHiddenText = 'Support links', ...rest }) => (
   <footer {...rest}>
     <div className={classNames('nhsuk-footer', className)}>
       <Container>

diff --git a/src/components/hero/__tests__/__snapshots__/Hero.test.tsx.snap b/src/components/hero/__tests__/__snapshots__/Hero.test.tsx.snap
@@ -1,9 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Hero Hero.Heading matches snapshot: Hero.Heading 1`] = `
-<HeroHeading
-  headingLevel="h1"
->
+<HeroHeading>
   <HeadingLevel
     className="nhsuk-u-margin-bottom-3"
     headingLevel="h1"