Fixed useFetch and useUser typing

front/src/hooks/api/useUser.ts

@@ -1,8 +1,8 @@
 import { initialUser } from '../../api/user'
 import { User } from '../../api/user/types'
-import { UseFetchErrored, UseFetchSucced } from '../useFetch'
+import { UseFetchReturn } from '../useFetch'
 
-const useUser = (): UseFetchSucced<User> | UseFetchErrored => (
+const useUser = (): UseFetchReturn<User> => (
     // useFetch(
     //     composeUserUrl(getToken()),
     //     'GET',
@@ -16,6 +16,7 @@ const useUser = (): UseFetchSucced<User> | UseFetchErrored => (
         data: initialUser,
         loading: false,
         error: null,
+        setData: () => {0}
     }
 )
 

front/src/hooks/useFetch.ts

@@ -3,40 +3,31 @@ import { useEffect, useState } from 'react'
 import { SetState } from '../utils/types'
 import useSend from './useSend'
 
-type UseFetchShared = {
+type UseFetchShared<T> = {
     loading: boolean,
     abort?: () => void,
+    setData: SetState<T | undefined>
 }
 
 type UseFetchSucced<T> = {
     error: null,
     data: T,
-} & UseFetchShared
+} & UseFetchShared<T>
 
-type UseFetchErrored = {
+type UseFetchErrored<T> = {
     error: string,
     data: undefined
-} & UseFetchShared
+} & UseFetchShared<T>
 
-const gotError = <T>(res: UseFetchErrored | UseFetchSucced<T>): res is UseFetchErrored => (
+const gotError = <T>(res: UseFetchErrored<T> | UseFetchSucced<T>): res is UseFetchErrored<T> => (
     typeof res.error === 'string'
 )
 
-const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored) => (
+const fallbackError = <T>(res: UseFetchSucced<T> | UseFetchErrored<T>) => (
     gotError(res) ? res.error : res.data
 )
 
-type UseFetchReturn<T> = ({
+type UseFetchReturn<T> = UseFetchSucced<T> | UseFetchErrored<T>
-    error: null,
-    data: T
-} | {
-    error: string,
-    data: undefined
-}) & {
-    loading: boolean,
-    setData: SetState<T | undefined>
-    abort?: (() => void)
-}
 
 function useFetch<R, T>(
     url: string,
@@ -70,7 +61,7 @@ function useFetch<R, T>(
     }
 }
 
-export type { UseFetchErrored, UseFetchSucced }
+export type { UseFetchReturn }
 
 export default useFetch
 

front/src/hooks/useStoryDimensions.ts

@@ -14,12 +14,14 @@ function useStoryDimensions(maxRatio = 16 / 9) {
         function handleResize() {
             setWindowDimensions(getWindowDimensions());
         }
-    
+
         window.addEventListener('resize', handleResize);
         return () => window.removeEventListener('resize', handleResize);
     }, []);
 
-    const height = windowDimensions.height - 56
+    const bottomBarHeight = 56
+
+    const height = windowDimensions.height - bottomBarHeight
 
     const ratio = Math.max(maxRatio, height / windowDimensions.width)