fix: ts

th3rdwave · Jun 21, 2023 · 7ed701b · 7ed701b
1 parent def6c1f
commit 7ed701b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/SafeArea.types.ts b/src/SafeArea.types.ts
@@ -5,8 +5,8 @@ import NativeSafeAreaView from './specs/NativeSafeAreaView';
 export type Edge = 'top' | 'right' | 'bottom' | 'left';
 export type EdgeMode = 'off' | 'additive' | 'maximum';
 
-export type EdgeRecord = Partial<Readonly<Record<Edge, EdgeMode>>>;
-export type Edges = readonly Edge[] | EdgeRecord;
+export type EdgeRecord = Partial<Record<Edge, EdgeMode>>;
+export type Edges = readonly Edge[] | Readonly<EdgeRecord>;
 
 export interface EdgeInsets {
   top: number;

diff --git a/src/SafeAreaView.tsx b/src/SafeAreaView.tsx
@@ -28,11 +28,12 @@ export const SafeAreaView = React.forwardRef<
     }
 
     const edgesObj = Array.isArray(edges)
-      ? edges.reduce<EdgeRecord>((acc, edge) => {
+      ? edges.reduce<EdgeRecord>((acc, edge: Edge) => {
           acc[edge] = 'additive';
           return acc;
         }, {})
-      : edges;
+      : // ts has trouble with refining readonly arrays.
+        (edges as EdgeRecord);
 
     // make sure that we always pass all edges, required for fabric
     const requiredEdges: Record<Edge, EdgeMode> = {

diff --git a/src/SafeAreaView.web.tsx b/src/SafeAreaView.web.tsx
@@ -32,9 +32,12 @@ export const SafeAreaView = React.forwardRef<
   const edgeBitmask =
     edges != null
       ? Array.isArray(edges)
-        ? edges.reduce((accum, edge) => accum | edgeBitmaskMap[edge], 0)
+        ? edges.reduce(
+            (acc: number, edge: Edge) => acc | edgeBitmaskMap[edge],
+            0,
+          )
         : Object.keys(edges).reduce(
-            (accum, edge) => accum | edgeBitmaskMap[edge as Edge],
+            (acc, edge) => acc | edgeBitmaskMap[edge as Edge],
             0,
           )
       : ALL;