Upgrade to Expo 49 (#1331)
* update to expo 49 * update expo-camera to fix console erorrs * run doctor again * fix ts errors * patch @sentry/react-native Getting `cannot read property 'ignoreLogs' of undefined` in this file. Ironically, this may be a cyclical imports problem. LogBox isn't enabled in production, so this patch should only affect dev/test. * fix type error * reinstall newer reanimated * pin expo-dev-client to fix reanimated dev-build issue * fix type errors, fix bad conflict res * Fix to notifications badge z-index on desktop --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
parent
9a3fa512eb
commit
e3e91816d1
21 changed files with 1133 additions and 1768 deletions
|
@ -76,11 +76,13 @@ const styles = StyleSheet.create({
|
|||
borderRadius: 8,
|
||||
marginBottom: 0,
|
||||
borderWidth: 1,
|
||||
// @ts-ignore web only
|
||||
maxHeight: 'calc(100% - (40px * 2))',
|
||||
},
|
||||
containerMobile: {
|
||||
borderRadius: 0,
|
||||
marginBottom: BOTTOM_BAR_HEIGHT,
|
||||
// @ts-ignore web only
|
||||
maxHeight: `calc(100% - ${BOTTOM_BAR_HEIGHT}px)`,
|
||||
},
|
||||
})
|
||||
|
|
|
@ -367,8 +367,10 @@ const styles = StyleSheet.create({
|
|||
leftNav: {
|
||||
position: 'absolute',
|
||||
top: 10,
|
||||
// @ts-ignore web only
|
||||
right: 'calc(50vw + 312px)',
|
||||
width: 220,
|
||||
// @ts-ignore web only
|
||||
maxHeight: 'calc(100vh - 10px)',
|
||||
overflowY: 'auto',
|
||||
},
|
||||
|
@ -413,6 +415,7 @@ const styles = StyleSheet.create({
|
|||
width: 28,
|
||||
height: 28,
|
||||
marginTop: 2,
|
||||
zIndex: 1,
|
||||
},
|
||||
navItemIconWrapperTablet: {
|
||||
width: 40,
|
||||
|
|
|
@ -120,6 +120,7 @@ const styles = StyleSheet.create({
|
|||
rightNav: {
|
||||
position: 'absolute',
|
||||
top: 20,
|
||||
// @ts-ignore web only
|
||||
left: 'calc(50vw + 310px)',
|
||||
width: 304,
|
||||
},
|
||||
|
|
|
@ -1,7 +1,12 @@
|
|||
import React from 'react'
|
||||
import {observer} from 'mobx-react-lite'
|
||||
import {StatusBar} from 'expo-status-bar'
|
||||
import {StyleSheet, useWindowDimensions, View} from 'react-native'
|
||||
import {
|
||||
DimensionValue,
|
||||
StyleSheet,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
} from 'react-native'
|
||||
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
||||
import {Drawer} from 'react-native-drawer-layout'
|
||||
import {useNavigationState} from '@react-navigation/native'
|
||||
|
@ -25,7 +30,7 @@ const ShellInner = observer(() => {
|
|||
const winDim = useWindowDimensions()
|
||||
const safeAreaInsets = useSafeAreaInsets()
|
||||
const containerPadding = React.useMemo(
|
||||
() => ({height: '100%', paddingTop: safeAreaInsets.top}),
|
||||
() => ({height: '100%' as DimensionValue, paddingTop: safeAreaInsets.top}),
|
||||
[safeAreaInsets],
|
||||
)
|
||||
const renderDrawerContent = React.useCallback(() => <DrawerContent />, [])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue