Fix integration setup

garronej · garronej · commit d6b7908f1daa · 2023-06-03T04:34:46.000+02:00
diff --git a/test/integration/next-pagesdir/pages/_document.tsx b/test/integration/next-pagesdir/pages/_document.tsx
@@ -6,7 +6,13 @@ const { augmentDocumentForDsfr, getColorSchemeHtmlAttributes } = dsfrDocumentApi
 
 export default function Document(props: DocumentProps) {
     return (
-        <Html {...getColorSchemeHtmlAttributes(props)}>
+        <Html
+            {...getColorSchemeHtmlAttributes(props)}
+            style={{
+                "overflow": "-moz-scrollbars-vertical",
+                "overflowY": "scroll"
+            }}
+        >
             <Head />
             <body>
                 <Main />
diff --git a/test/integration/vite/src/main.tsx b/test/integration/vite/src/main.tsx
@@ -8,6 +8,7 @@ import { Footer } from "@codegouvfr/react-dsfr/Footer";
 import { BrowserRouter } from "react-router-dom";
 import { Routes, Route, Link, useLocation } from "react-router-dom";
 import { headerFooterDisplayItem } from "@codegouvfr/react-dsfr/Display";
+import { GlobalStyles } from "tss-react";
 import { fr } from "@codegouvfr/react-dsfr";
 import { GdprStoreProvider } from "@codegouvfr/react-dsfr/gdpr";
 import { ConsentBanner } from '@codegouvfr/react-dsfr/ConsentBanner';
@@ -21,13 +22,22 @@ declare module "@codegouvfr/react-dsfr/spa" {
 }
 
 declare module "@codegouvfr/react-dsfr/gdpr" {
-    interface RegisterGdprServices { 
+    interface RegisterGdprServices {
         matomo: never;
     }
 }
 
 ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
     <React.StrictMode>
+        <GlobalStyles
+            styles={{
+                "html": {
+                    //NOTE: Always show scrollbar to avoid layout shift when modals are opened
+                    "overflow": "-moz-scrollbars-vertical",
+                    "overflowY": "scroll"
+                }
+            }}
+        />
         <BrowserRouter>
             <Root />
         </BrowserRouter>
@@ -36,15 +46,15 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
 
 const brandTop = <>INTITULE<br />OFFICIEL</>;
 
-const homeLinkProps= { "to": "/", "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" };
+const homeLinkProps = { "to": "/", "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" };
 
 function Root() {
 
     const location = useLocation();
 
     return (
         <GdprStoreProvider>
-            <ConsentBanner gdprLinkProps={{to: "/mui"}} siteName='Next Test App' services={[
+            <ConsentBanner gdprLinkProps={{ to: "/mui" }} siteName='Next Test App' services={[
                 {
                     name: "matomo",
                     title: "Matomo",
@@ -116,7 +126,7 @@ function Root() {
                     bottomItems={[headerFooterDisplayItem]}
                 />
             </div>
-    </GdprStoreProvider>
+        </GdprStoreProvider>
     );
 
 }
