zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Pull upstream bugfixes to bottom-sheet (#1606) 

* Bump bottom-sheet to latest for bugfixes

* Small tweak to the account switcher
zio/stable
Paul Frazee 2023-10-05 15:55:31 -07:00 committed by GitHub
parent 4ec5fabdd1
commit 0168aada37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -35,7 +35,7 @@
"@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-native-fontawesome": "^0.3.0", "@fortawesome/react-native-fontawesome": "^0.3.0",
"@gorhom/bottom-sheet": "^4.4.7", "@gorhom/bottom-sheet": "^4.5.1",
"@mattermost/react-native-paste-input": "^0.6.4", "@mattermost/react-native-paste-input": "^0.6.4",
"@miblanchard/react-native-slider": "^2.3.1", "@miblanchard/react-native-slider": "^2.3.1",
"@react-native-async-storage/async-storage": "1.18.2", "@react-native-async-storage/async-storage": "1.18.2",

15
src/view/com/modals/SwitchAccount.tsx
View File

@ -37,22 +37,18 @@ export function Component({}: {}) {
}, [track, store]) }, [track, store])
return ( return (
<View style={[styles.container, pal.view]}> <BottomSheetScrollView
style={[styles.container, pal.view]}
contentContainerStyle={[styles.innerContainer, pal.view]}>
<Text type="title-xl" style={[styles.title, pal.text]}> <Text type="title-xl" style={[styles.title, pal.text]}>
Switch Account Switch Account
</Text> </Text>
<BottomSheetScrollView
style={styles.container}
contentContainerStyle={[styles.innerContainer, pal.view]}>
{isSwitching ? ( {isSwitching ? (
<View style={[pal.view, styles.linkCard]}> <View style={[pal.view, styles.linkCard]}>
<ActivityIndicator /> <ActivityIndicator />
</View> </View>
) : ( ) : (
<Link <Link href={makeProfileLink(store.me)} title="Your profile" noFeedback>
href={makeProfileLink(store.me)}
title="Your profile"
noFeedback>
<View style={[pal.view, styles.linkCard]}> <View style={[pal.view, styles.linkCard]}>
<View style={styles.avi}> <View style={styles.avi}>
<UserAvatar size={40} avatar={store.me.avatar} /> <UserAvatar size={40} avatar={store.me.avatar} />
@ -104,7 +100,6 @@ export function Component({}: {}) {
</TouchableOpacity> </TouchableOpacity>
))} ))}
</BottomSheetScrollView> </BottomSheetScrollView>
</View>
) )
} }
@ -113,7 +108,7 @@ const styles = StyleSheet.create({
flex: 1, flex: 1,
}, },
innerContainer: { innerContainer: {
paddingBottom: 20, paddingBottom: 40,
}, },
title: { title: {
textAlign: 'center', textAlign: 'center',

8
yarn.lock
View File

@ -2255,10 +2255,10 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
"@gorhom/bottom-sheet@^4.4.7": "@gorhom/bottom-sheet@^4.5.1":
version "4.4.7" version "4.5.1"
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.4.7.tgz#fc80b3f0b7ebab056ce226f3aa3a89b2db8660dd" resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.5.1.tgz#1ac4b234a80e7dff263f0b7ac207f92e41562849"
integrity sha512-ukTuTqDQi2heo68hAJsBpUQeEkdqP9REBcn47OpuvPKhdPuO1RBOOADjqXJNCnZZRcY+HqbnGPMSLFVc31zylQ== integrity sha512-4Qy6hzvN32fXu2hDxDXOIS0IBGBT6huST7J7+K1V5bXemZ08KIx5ZffyLgwhCUl+CnyeG2KG6tqk6iYLkIwi7Q==
dependencies: dependencies:
"@gorhom/portal" "1.0.14" "@gorhom/portal" "1.0.14"
invariant "^2.2.4" invariant "^2.2.4"