Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(#86): applied offset being rarely removed from incorrect root view (
#113)
- Loading branch information
1 parent
499ab9c
commit c9bd1ec
Showing
8 changed files
with
298 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| import { useFocusEffect } from '@react-navigation/native'; | ||
| import * as React from 'react'; | ||
| import { Image, Modal, ScrollView, StyleSheet, View } from 'react-native'; | ||
| import { AvoidSoftInput } from 'react-native-avoid-softinput'; | ||
| import { SafeAreaView } from 'react-native-safe-area-context'; | ||
|
|
||
| import Button from '../components/Button'; | ||
| import CloseButton from '../components/CloseButton'; | ||
| import SingleInput from '../components/SingleInput'; | ||
| import { styles as commonStyles } from '../consts/styles'; | ||
|
|
||
| const icon = require('../../assets/AppIconTransparent.png'); | ||
|
|
||
| export const ModalFormSheetExample: React.FC = () => { | ||
| const [ formSheetModalVisible, setFormSheetModalVisible ] = React.useState(false); | ||
|
|
||
| const onFocusEffect = React.useCallback(() => { | ||
| AvoidSoftInput.setShouldMimicIOSBehavior(true); | ||
| AvoidSoftInput.setEnabled(true); | ||
| return () => { | ||
| AvoidSoftInput.setEnabled(false); | ||
| AvoidSoftInput.setShouldMimicIOSBehavior(false); | ||
| }; | ||
| }, []); | ||
|
|
||
| useFocusEffect(onFocusEffect); | ||
|
|
||
| function closeFormSheetModal() { | ||
| setFormSheetModalVisible(false); | ||
| } | ||
|
|
||
| function openFormSheetModal() { | ||
| setFormSheetModalVisible(true); | ||
| } | ||
|
|
||
| return <SafeAreaView edges={[ 'left', 'right' ]} style={commonStyles.screenContainer}> | ||
| <Button | ||
| onPress={openFormSheetModal} | ||
| title="Open formsheet modal" | ||
| /> | ||
| <Modal | ||
| animationType="slide" | ||
| onRequestClose={closeFormSheetModal} | ||
| presentationStyle="formSheet" | ||
| statusBarTranslucent={true} | ||
| style={styles.modal} | ||
| supportedOrientations={[ 'landscape', 'portrait' ]} | ||
| visible={formSheetModalVisible}> | ||
| <SafeAreaView edges={[ 'left', 'right', 'bottom' ]} style={styles.modalContent}> | ||
| <View style={styles.container}> | ||
| <View style={styles.closeContainer}> | ||
| <CloseButton onPress={closeFormSheetModal} /> | ||
| </View> | ||
| <ScrollView | ||
| bounces={false} | ||
| contentContainerStyle={commonStyles.scrollContainer} | ||
| contentInsetAdjustmentBehavior="always" | ||
| overScrollMode="always" | ||
| showsVerticalScrollIndicator={true} | ||
| style={commonStyles.stretch} | ||
| > | ||
| <View style={styles.logoContainer}> | ||
| <Image | ||
| resizeMode="contain" | ||
| source={icon} | ||
| style={styles.logo} | ||
| /> | ||
| </View> | ||
| <View style={styles.formContainer}> | ||
| <Button | ||
| onPress={closeFormSheetModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeFormSheetModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeFormSheetModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeFormSheetModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeFormSheetModal} | ||
| title="Submit" | ||
| /> | ||
| </View> | ||
| </ScrollView> | ||
| <SingleInput placeholder="Single line" /> | ||
| </View> | ||
| </SafeAreaView> | ||
| </Modal> | ||
| </SafeAreaView>; | ||
| }; | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| closeContainer: { | ||
| backgroundColor: 'transparent', | ||
| position: 'absolute', | ||
| left: 0, | ||
| top: 0, | ||
| zIndex: 999, | ||
| }, | ||
| container: { | ||
| alignItems: 'center', | ||
| alignSelf: 'stretch', | ||
| backgroundColor: 'white', | ||
| borderColor: 'black', | ||
| borderRadius: 10, | ||
| borderWidth: 1, | ||
| marginBottom: 80, | ||
| marginHorizontal: 10, | ||
| marginTop: 60, | ||
| overflow: 'hidden', | ||
| }, | ||
| formContainer: { | ||
| alignItems: 'center', | ||
| alignSelf: 'stretch', | ||
| justifyContent: 'center', | ||
| marginBottom: 80, | ||
| marginHorizontal: 10, | ||
| }, | ||
| logo: { | ||
| height: 200, | ||
| width: 200, | ||
| }, | ||
| logoContainer: { | ||
| alignItems: 'center', | ||
| alignSelf: 'stretch', | ||
| flex: 1, | ||
| justifyContent: 'center', | ||
| paddingVertical: 100, | ||
| }, | ||
| modal: { | ||
| alignSelf: 'stretch', | ||
| }, | ||
| modalContent: { | ||
| alignSelf: 'stretch', | ||
| backgroundColor: '#00000033', | ||
| flex: 1, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| import { useFocusEffect, useNavigation } from '@react-navigation/native'; | ||
| import * as React from 'react'; | ||
| import { Button, Image, ScrollView, StyleSheet, View } from 'react-native'; | ||
| import { AvoidSoftInput } from 'react-native-avoid-softinput'; | ||
| import { SafeAreaView } from 'react-native-safe-area-context'; | ||
|
|
||
| import CloseButton from '../components/CloseButton'; | ||
| import SingleInput from '../components/SingleInput'; | ||
| import { styles as commonStyles } from '../consts/styles'; | ||
| import type { RootStackNavigationProp } from '../navigation/types'; | ||
|
|
||
| const icon = require('../../assets/AppIconTransparent.png'); | ||
|
|
||
| export const ScreensNativeModalExample: React.FC = () => { | ||
| const navigation = useNavigation<RootStackNavigationProp>(); | ||
|
|
||
| const onFocusEffect = React.useCallback(() => { | ||
| AvoidSoftInput.setEnabled(true); | ||
| AvoidSoftInput.setShouldMimicIOSBehavior(true); | ||
| return () => { | ||
| AvoidSoftInput.setShouldMimicIOSBehavior(false); | ||
| AvoidSoftInput.setEnabled(false); | ||
| }; | ||
| }, []); | ||
|
|
||
| useFocusEffect(onFocusEffect); | ||
|
|
||
| function closeModal() { | ||
| navigation.goBack(); | ||
| } | ||
|
|
||
| return <SafeAreaView edges={[ 'left', 'right', 'bottom' ]} style={styles.modalContent}> | ||
| <View style={styles.container}> | ||
| <View style={styles.closeContainer}> | ||
| <CloseButton onPress={closeModal} /> | ||
| </View> | ||
| <ScrollView | ||
| bounces={false} | ||
| contentContainerStyle={commonStyles.scrollContainer} | ||
| contentInsetAdjustmentBehavior="always" | ||
| overScrollMode="always" | ||
| showsVerticalScrollIndicator={true} | ||
| style={commonStyles.stretch} | ||
| > | ||
| <View style={styles.logoContainer}> | ||
| <Image | ||
| resizeMode="contain" | ||
| source={icon} | ||
| style={styles.logo} | ||
| /> | ||
| </View> | ||
| <View style={styles.formContainer}> | ||
| <Button | ||
| onPress={closeModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeModal} | ||
| title="Submit" | ||
| /> | ||
| <Button | ||
| onPress={closeModal} | ||
| title="Submit" | ||
| /> | ||
| </View> | ||
| </ScrollView> | ||
| <SingleInput placeholder="Single line" /> | ||
| </View> | ||
| </SafeAreaView>; | ||
| }; | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| closeContainer: { | ||
| backgroundColor: 'transparent', | ||
| position: 'absolute', | ||
| left: 0, | ||
| top: 0, | ||
| zIndex: 999, | ||
| }, | ||
| container: { | ||
| alignItems: 'center', | ||
| alignSelf: 'stretch', | ||
| backgroundColor: 'white', | ||
| borderColor: 'black', | ||
| borderRadius: 10, | ||
| borderWidth: 1, | ||
| marginBottom: 80, | ||
| marginHorizontal: 10, | ||
| marginTop: 60, | ||
| overflow: 'hidden', | ||
| }, | ||
| formContainer: { | ||
| alignItems: 'center', | ||
| alignSelf: 'stretch', | ||
| justifyContent: 'center', | ||
| marginBottom: 80, | ||
| marginHorizontal: 10, | ||
| }, | ||
| logo: { | ||
| height: 200, | ||
| width: 200, | ||
| }, | ||
| logoContainer: { | ||
| alignItems: 'center', | ||
| alignSelf: 'stretch', | ||
| flex: 1, | ||
| justifyContent: 'center', | ||
| paddingVertical: 100, | ||
| }, | ||
| modalContent: { | ||
| alignSelf: 'stretch', | ||
| backgroundColor: '#00000033', | ||
| flex: 1, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.