tangled
alpha
login
or
join now
stream.place
/
streamplace
Live video on the AT Protocol
74
fork
atom
overview
issues
1
pulls
pipelines
move safearea provider
Natalie Bridgers
4 months ago
abe4dc56
a6bfacd7
+12
-11
2 changed files
expand all
collapse all
unified
split
js
app
components
provider
provider.tsx
components
src
lib
theme
theme.tsx
+6
-3
js/app/components/provider/provider.tsx
···
1
1
import { LinkingOptions } from "@react-navigation/native";
2
2
import { ThemeProvider } from "@streamplace/components";
3
3
import React, { useEffect } from "react";
4
4
+
import { SafeAreaProvider } from "react-native-safe-area-context";
4
5
import SharedProvider from "./provider.shared";
5
6
6
7
export default function Provider({
···
19
20
}
20
21
}, []);
21
22
return (
22
22
-
<ThemeProvider forcedTheme="dark">
23
23
-
<SharedProvider linking={linking}>{children}</SharedProvider>
24
24
-
</ThemeProvider>
23
23
+
<SafeAreaProvider>
24
24
+
<ThemeProvider forcedTheme="dark">
25
25
+
<SharedProvider linking={linking}>{children}</SharedProvider>
26
26
+
</ThemeProvider>
27
27
+
</SafeAreaProvider>
25
28
);
26
29
}
+6
-8
js/components/src/lib/theme/theme.tsx
···
18
18
} from "./tokens";
19
19
20
20
import { GestureHandlerRootView } from "react-native-gesture-handler";
21
21
-
import { SafeAreaProvider } from "react-native-safe-area-context";
22
21
import { ToastProvider } from "../../components/ui";
23
22
24
23
// Import pairify function for generating theme tokens
···
378
377
}
379
378
380
379
// Theme provider component
380
380
+
// Should be surrounded by SafeAreaProvider at the root
381
381
export function ThemeProvider({
382
382
children,
383
383
defaultTheme = "system",
···
473
473
474
474
return (
475
475
<ThemeContext.Provider value={value}>
476
476
-
<SafeAreaProvider>
477
477
-
<GestureHandlerRootView>
478
478
-
{children}
479
479
-
<PortalHost />
480
480
-
<ToastProvider />
481
481
-
</GestureHandlerRootView>
482
482
-
</SafeAreaProvider>
476
476
+
<GestureHandlerRootView>
477
477
+
{children}
478
478
+
<PortalHost />
479
479
+
<ToastProvider />
480
480
+
</GestureHandlerRootView>
483
481
</ThemeContext.Provider>
484
482
);
485
483
}