kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-04-29 04:45:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix drawer and bottom tabs not being visible on web. closes #9225

Browse Source
This commit is contained in:
Satyajit Sahoo
2021-01-21 20:05:28 +01:00
parent fd034fea35
commit b735de153c
3 changed files with 93 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
packages/drawer/src/views/ResourceSavingScene.tsx
View File

@@ -39,34 +39,35 @@ export default function ResourceSavingScene({
}
}
return (
<View
// @ts-expect-error: hidden exists on web, but not in React Native
hidden={!isVisible}
style={[
styles.container,
Platform.OS === 'web'
? { display: isVisible ? 'flex' : 'none' }
: { overflow: 'hidden' },
style,
]}
collapsable={false}
removeClippedSubviews={
// On iOS, set removeClippedSubviews to true only when not focused
// This is an workaround for a bug where the clipped view never re-appears
Platform.OS === 'ios' ? !isVisible : true
}
pointerEvents={isVisible ? 'auto' : 'none'}
{...rest}
>
if (Platform.OS === 'web') {
return (
<View
style={
Platform.OS === 'web'
? null
: isVisible
? styles.attached
: styles.detached
// @ts-expect-error: hidden exists on web, but not in React Native
hidden={!isVisible}
style={[
{ display: isVisible ? 'flex' : 'none' },
styles.container,
style,
]}
pointerEvents={isVisible ? 'auto' : 'none'}
{...rest}
>
{children}
</View>
);
}
return (
<View style={[styles.container, style]}>
<View
collapsable={false}
removeClippedSubviews={
// On iOS, set removeClippedSubviews to true only when not focused
// This is an workaround for a bug where the clipped view never re-appears
Platform.OS === 'ios' ? !isVisible : true
}
pointerEvents={isVisible ? 'auto' : 'none'}
style={isVisible ? styles.attached : styles.detached}
>
{children}
</View>