Update layouts

garronej · garronej · commit 784cfcd5119d · 2023-06-12T00:52:09.000+02:00
diff --git a/test/integration/cra/src/index.tsx b/test/integration/cra/src/index.tsx
@@ -55,7 +55,7 @@ function Root() {
                     }
                 ]} />
                 <div style={{
-                    "height": "100vh",
+                    "minHeight": "100vh",
                     "display": "flex",
                     "flexDirection": "column",
                 }}>
diff --git a/test/integration/next-appdir/app/layout.tsx b/test/integration/next-appdir/app/layout.tsx
@@ -55,7 +55,7 @@ export default function RootLayout({ children }: { children: JSX.Element; }) {
 			</head>
 			<body
 				style={{
-					"height": "100vh",
+					"minHeight": "100vh",
 					"display": "flex",
 					"flexDirection": "column"
 				}}
diff --git a/test/integration/next-pagesdir/pages/_app.tsx b/test/integration/next-pagesdir/pages/_app.tsx
@@ -18,7 +18,7 @@ declare module "@codegouvfr/react-dsfr/next-pagesdir" {
 }
 
 declare module "@codegouvfr/react-dsfr/gdpr" {
-    interface RegisterGdprServices { 
+    interface RegisterGdprServices {
         matomo: never;
     }
 }
@@ -49,10 +49,6 @@ const { augmentDocumentWithEmotionCache, withAppEmotionCache } = createEmotionSs
 
 export { dsfrDocumentApi, augmentDocumentWithEmotionCache };
 
-const brandTop = <>INTITULE<br />OFFICIEL</>;
-
-const homeLinkProps = { "href": "/", "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" };
-
 function App({ Component, pageProps }: AppProps) {
 
     const { css } = useStyles();
@@ -61,24 +57,29 @@ function App({ Component, pageProps }: AppProps) {
 
     return (
         <>
-            <ConsentBanner gdprLinkProps={{href: "/mui"}} siteName='Next Test App' services={[
-                    {
-                        name: "matomo",
-                        title: "Matomo",
-                        description: "User tracking",
-                    }
-                ]} />
+            <ConsentBanner gdprLinkProps={{ href: "/mui" }} siteName='Next Test App' services={[
+                {
+                    name: "matomo",
+                    title: "Matomo",
+                    description: "User tracking",
+                }
+            ]} />
             <div
                 style={{
-                    "height": "100vh",
+                    "minHeight": "100vh",
                     "display": "flex",
                     "flexDirection": "column"
                 }}
             >
                 <Header
-                    brandTop={brandTop}
+                    brandTop={
+                        <>INTITULE<br />OFFICIEL</>
+                    }
                     serviceTitle="Nom du site / service"
-                    homeLinkProps={homeLinkProps}
+                    homeLinkProps={{ 
+                        "href": "/", 
+                        "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" 
+                    }}
                     navigation={[
                         {
                             "text": "Home",
@@ -123,7 +124,6 @@ function App({ Component, pageProps }: AppProps) {
                     <Component {...pageProps} />
                 </div>
                 <Footer
-                    brandTop={brandTop}
                     accessibility="fully compliant"
                     contentDescription={`
                         Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor 
@@ -132,7 +132,6 @@ function App({ Component, pageProps }: AppProps) {
                         Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore 
                         eu fugiat nulla pariatur. 
                     `}
-                    homeLinkProps={homeLinkProps}
                     bottomItems={[headerFooterDisplayItem]}
                 />
             </div>
diff --git a/test/integration/vite/src/main.tsx b/test/integration/vite/src/main.tsx
@@ -44,9 +44,8 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
     </React.StrictMode>
 );
 
-const brandTop = <>INTITULE<br />OFFICIEL</>;
 
-const homeLinkProps = { "to": "/", "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" };
+
 
 function Root() {
 
@@ -61,11 +60,14 @@ function Root() {
                     description: "User tracking",
                 }
             ]} />
-            <div style={{ "height": "100vh", "display": "flex", "flexDirection": "column" }}>
+            <div style={{ "minHeight": "100vh", "display": "flex", "flexDirection": "column" }}>
                 <Header
-                    brandTop={brandTop}
+                    brandTop={<>INTITULE<br />OFFICIEL</>}
                     serviceTitle="Nom du site / service"
-                    homeLinkProps={homeLinkProps}
+                    homeLinkProps={{ 
+                        "to": "/", 
+                        "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" 
+                    }}
                     quickAccessItems={[
                         headerFooterDisplayItem,
                         {
@@ -113,7 +115,6 @@ function Root() {
                     </Routes>
                 </div>
                 <Footer
-                    brandTop={brandTop}
                     accessibility="fully compliant"
                     contentDescription={`
                         Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor 
@@ -122,7 +123,6 @@ function Root() {
                         Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore 
                         eu fugiat nulla pariatur. 
                     `}
-                    homeLinkProps={homeLinkProps}
                     bottomItems={[headerFooterDisplayItem]}
                 />
             </div>

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function Root() {`
`55`	`55`	`}`
`56`	`56`	`]} />`
`57`	`57`	`<div style={{`
`58`		`- "height": "100vh",`
	`58`	`+ "minHeight": "100vh",`
`59`	`59`	`"display": "flex",`
`60`	`60`	`"flexDirection": "column",`
`61`	`61`	`}}>`