From 113e70e176a112ecd8d1c842624a2647fb24cb34 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 7 Dec 2023 22:20:06 +0000
Subject: [PATCH] Clean up 1

---
 src/Navigation.tsx                            | 7 ++++++-
 src/view/shell/bottom-bar/BottomBarStyles.tsx | 4 ++++
 src/view/shell/bottom-bar/BottomBarWeb.tsx    | 2 +-
 src/view/shell/index.web.tsx                  | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Navigation.tsx b/src/Navigation.tsx
index ac16f3ac2d..b2d53df9a9 100644
--- a/src/Navigation.tsx
+++ b/src/Navigation.tsx
@@ -30,6 +30,7 @@ import {colors} from 'lib/styles'
 import {isNative} from 'platform/detection'
 import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle'
 import {router} from './routes'
+import {s} from 'lib/styles'
 import {usePalette} from 'lib/hooks/usePalette'
 import {bskyTitle} from 'lib/strings/headings'
 import {JSX} from 'react/jsx-runtime'
@@ -394,7 +395,7 @@ const FlatNavigator = () => {
         fullScreenGestureEnabled: true,
         headerShown: false,
         animationDuration: 250,
-        contentStyle: [pal.view, {flex: 'none'}],
+        contentStyle: [pal.view, styles.webContainer],
       }}>
       <Flat.Screen
         name="Home"
@@ -592,6 +593,10 @@ function handleLink(url: string) {
 }
 
 const styles = StyleSheet.create({
+  webContainer: {
+    // @ts-ignore web-only
+    flex: '',
+  },
   bgDark: {
     backgroundColor: colors.black,
   },
diff --git a/src/view/shell/bottom-bar/BottomBarStyles.tsx b/src/view/shell/bottom-bar/BottomBarStyles.tsx
index ae93814403..f226406f5d 100644
--- a/src/view/shell/bottom-bar/BottomBarStyles.tsx
+++ b/src/view/shell/bottom-bar/BottomBarStyles.tsx
@@ -12,6 +12,10 @@ export const styles = StyleSheet.create({
     paddingLeft: 5,
     paddingRight: 10,
   },
+  bottomBarWeb: {
+    // @ts-ignore web-only
+    position: 'fixed',
+  },
   ctrl: {
     flex: 1,
     paddingTop: 13,
diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx
index 602b07d122..33c9a018be 100644
--- a/src/view/shell/bottom-bar/BottomBarWeb.tsx
+++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx
@@ -33,11 +33,11 @@ export function BottomBarWeb() {
     <Animated.View
       style={[
         styles.bottomBar,
+        styles.bottomBarWeb,
         pal.view,
         pal.border,
         {paddingBottom: clamp(safeAreaInsets.bottom, 15, 30)},
         footerMinimalShellTransform,
-        {position: 'fixed'},
       ]}>
       <NavItem routeName="Home" href="/">
         {({isActive}) => {
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index 3a17b4502b..9d2e2adddb 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -33,7 +33,7 @@ function ShellInner() {
   }, [navigator, closeAllActiveElements])
 
   return (
-    <View style={[s.hContentRegion]}>
+    <View style={s.hContentRegion}>
       <View style={s.hContentRegion}>
         <ErrorBoundary>
           <FlatNavigator />