1840 - Fix Safari scroll

openforis · Feb 6, 2024 · 1415e8c · 1415e8c
1 parent 45e04a7
commit 1415e8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/client/store/ui/tablePaginated/actions/getData.ts b/src/client/store/ui/tablePaginated/actions/getData.ts
@@ -18,7 +18,7 @@ type Props = {
   limit: number
 }
 
-type Returned = Array<any>
+type Returned = Array<never>
 
 export const getData = createAsyncThunk<Returned, Props>('tablePaginated/data/get', async (props) => {
   const { assessmentName, cycleName, countryIso, orderBy, page, path, limit: _limit } = props

diff --git a/src/client/styles/style.scss b/src/client/styles/style.scss
@@ -22,28 +22,25 @@
 
 html {
   box-sizing: border-box;
-  height: 100%;
   font-size: $font-m;
+  height: 100%;
 }
 
 body {
   color: $text-body;
+  direction: ltr; // Fallback for safari
   font-family: $font-family-1;
   font-weight: 400;
+  height: 100%;
   line-height: 20px;
   margin: 0;
-  height: 100%;
-  //overflow-x: hidden;
-  //overflow-y: auto;
-  // Fallback for safari
-  direction: ltr;
 }
 
 #main {
-  //  overflow-x: hidden;
-  display: flex;
-  flex-direction: column;
-  min-height: 100vh;
+  display: grid;
+  height: 100%;
+  min-height: 100dvh;
+  overflow-y: auto;
 }
 
 h1,