diff --git a/src/components/StarterPack/Wizard/WizardFeedCard.tsx b/src/components/StarterPack/Wizard/WizardFeedCard.tsx index bf01b3bd4c..1004173e84 100644 --- a/src/components/StarterPack/Wizard/WizardFeedCard.tsx +++ b/src/components/StarterPack/Wizard/WizardFeedCard.tsx @@ -1,5 +1,5 @@ import React from 'react' -import {View} from 'react-native' +import {Keyboard, View} from 'react-native' import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -24,6 +24,7 @@ export function WizardFeedCard({ const includesFeed = state.feeds.some(f => f.uri === generator.uri) const onAdd = () => { + Keyboard.dismiss() if (includesFeed) { dispatch({type: 'RemoveFeed', feedUri: generator.uri}) } else { diff --git a/src/components/StarterPack/Wizard/WizardProfileCard.tsx b/src/components/StarterPack/Wizard/WizardProfileCard.tsx index 659de00cb3..52e83b6b53 100644 --- a/src/components/StarterPack/Wizard/WizardProfileCard.tsx +++ b/src/components/StarterPack/Wizard/WizardProfileCard.tsx @@ -1,5 +1,5 @@ import React from 'react' -import {View} from 'react-native' +import {Keyboard, View} from 'react-native' import {AppBskyActorDefs} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -25,8 +25,9 @@ export function WizardProfileCard({ const includesProfile = state.profiles.some(p => p.did === profile.did) const onPressAddRemove = () => { - if (!profile?.did) return + Keyboard.dismiss() + if (!profile?.did) return if (!includesProfile) { dispatch({type: 'AddProfile', profile}) } else { diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx index b184fe825a..64d45d6af5 100644 --- a/src/screens/StarterPack/Wizard/StepFeeds.tsx +++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx @@ -73,6 +73,8 @@ export function StepFeeds() { onEndReached={!query ? () => fetchNextPage() : undefined} onEndReachedThreshold={2} renderScrollComponent={props => } + keyboardShouldPersistTaps="handled" + keyboardDismissMode="on-drag" containWeb={true} sideBorders={false} style={{flex: 1}} diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx index e957cf8df8..e7120e9131 100644 --- a/src/screens/StarterPack/Wizard/StepProfiles.tsx +++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx @@ -62,6 +62,8 @@ export function StepProfiles() { onEndReached={!query ? () => fetchNextPage() : undefined} onEndReachedThreshold={2} renderScrollComponent={props => } + keyboardShouldPersistTaps="handled" + keyboardDismissMode="on-drag" containWeb={true} sideBorders={false} style={[a.flex_1]} diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx index e8b0a35b97..44a7072089 100644 --- a/src/screens/StarterPack/Wizard/index.tsx +++ b/src/screens/StarterPack/Wizard/index.tsx @@ -270,7 +270,9 @@ function Container({children}: {children: React.ReactNode}) { } return ( - + {children} {state.currentStep === 'Details' && (