Merge branch 'main' of github.com:bluesky-social/social-app into main

7 files changed, 37 insertions, 17 deletions

diff --git a/src/locale/helpers.ts b/src/locale/helpers.ts
index 2e6868e6c..ef09e5e68 100644
--- a/src/locale/helpers.ts
+++ b/src/locale/helpers.ts
@@ -119,8 +119,9 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
       // DISABLED until this translation is fixed -prf
       // case 'de':
       //   return AppLanguage.de
-      case 'es':
-        return AppLanguage.es
+      // DISABLED until this translation is more thoroughly reviewed -prf
+      // case 'es':
+      //   return AppLanguage.es
       default:
         continue
     }
diff --git a/src/locale/i18n.ts b/src/locale/i18n.ts
index 9a9407c4c..164fce9fc 100644
--- a/src/locale/i18n.ts
+++ b/src/locale/i18n.ts
@@ -8,7 +8,8 @@ import {messages as messagesJa} from '#/locale/locales/ja/messages'
 import {messages as messagesFr} from '#/locale/locales/fr/messages'
 // DISABLED until this translation is fixed -prf
 // import {messages as messagesDe} from '#/locale/locales/de/messages'
-import {messages as messagesEs} from '#/locale/locales/es/messages'
+// DISABLED until this translation is more thoroughly reviewed -prf
+// import {messages as messagesEs} from '#/locale/locales/es/messages'
 
 import {sanitizeAppLanguageSetting} from '#/locale/helpers'
 import {AppLanguage} from '#/locale/languages'
@@ -35,10 +36,11 @@ export async function dynamicActivate(locale: AppLanguage) {
     //   i18n.loadAndActivate({locale, messages: messagesDe})
     //   break
     // }
-    case AppLanguage.es: {
-      i18n.loadAndActivate({locale, messages: messagesEs})
-      break
-    }
+    // DISABLED until this translation is more thoroughly reviewed -prf
+    // case AppLanguage.es: {
+    //   i18n.loadAndActivate({locale, messages: messagesEs})
+    //   break
+    // }
     default: {
       i18n.loadAndActivate({locale, messages: messagesEn})
       break
diff --git a/src/locale/i18n.web.ts b/src/locale/i18n.web.ts
index 734f6a0de..bf6f6e196 100644
--- a/src/locale/i18n.web.ts
+++ b/src/locale/i18n.web.ts
@@ -29,10 +29,11 @@ export async function dynamicActivate(locale: AppLanguage) {
     //   mod = await import(`./locales/de/messages`)
     //   break
     // }
-    case AppLanguage.es: {
-      mod = await import(`./locales/es/messages`)
-      break
-    }
+    // DISABLED until this translation is more thoroughly reviewed -prf
+    // case AppLanguage.es: {
+    //   mod = await import(`./locales/es/messages`)
+    //   break
+    // }
     default: {
       mod = await import(`./locales/en/messages`)
       break
diff --git a/src/locale/languages.ts b/src/locale/languages.ts
index d9cdbd9d4..d7559b578 100644
--- a/src/locale/languages.ts
+++ b/src/locale/languages.ts
@@ -11,7 +11,8 @@ export enum AppLanguage {
   fr = 'fr',
   // DISABLED until this translation is fixed -prf
   // de = 'de',
-  es = 'es',
+  // DISABLED until this translation is more thoroughly reviewed -prf
+  // es = 'es',
 }
 
 interface AppLanguageConfig {
@@ -26,7 +27,8 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [
   {code2: AppLanguage.fr, name: 'Français'},
   // DISABLED until this translation is fixed -prf
   // {code2: AppLanguage.de, name: 'Deutsch'},
-  {code2: AppLanguage.es, name: 'Español'},
+  // DISABLED until this translation is more thoroughly reviewed -prf
+  // {code2: AppLanguage.es, name: 'Español'},
 ]
 
 export const LANGUAGES: Language[] = [
diff --git a/src/view/com/util/forms/SearchInput.tsx b/src/view/com/util/forms/SearchInput.tsx
index 02b462b55..a88046d4c 100644
--- a/src/view/com/util/forms/SearchInput.tsx
+++ b/src/view/com/util/forms/SearchInput.tsx
@@ -11,6 +11,7 @@ import {
   FontAwesomeIcon,
   FontAwesomeIconStyle,
 } from '@fortawesome/react-native-fontawesome'
+import {HITSLOP_10} from 'lib/constants'
 import {MagnifyingGlassIcon} from 'lib/icons'
 import {useTheme} from 'lib/ThemeContext'
 import {usePalette} from 'lib/hooks/usePalette'
@@ -71,7 +72,8 @@ export function SearchInput({
           onPress={onPressCancelSearchInner}
           accessibilityRole="button"
           accessibilityLabel={_(msg`Clear search query`)}
-          accessibilityHint="">
+          accessibilityHint=""
+          hitSlop={HITSLOP_10}>
           <FontAwesomeIcon
             icon="xmark"
             size={16}
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx
index 20cdf815a..dbdb6d9ca 100644
--- a/src/view/screens/Feeds.tsx
+++ b/src/view/screens/Feeds.tsx
@@ -494,6 +494,8 @@ export function FeedsScreen(_props: Props) {
         // @ts-ignore our .web version only -prf
         desktopFixedHeight
         scrollIndicatorInsets={{right: 1}}
+        keyboardShouldPersistTaps="handled"
+        keyboardDismissMode="on-drag"
       />
 
       {hasSession && (
diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx
index 965ad2b7e..df3c38267 100644
--- a/src/view/screens/Search/Search.tsx
+++ b/src/view/screens/Search/Search.tsx
@@ -162,6 +162,8 @@ function SearchScreenSuggestedFollows() {
       // @ts-ignore web only -prf
       desktopFixedHeight
       contentContainerStyle={{paddingBottom: 1200}}
+      keyboardShouldPersistTaps="handled"
+      keyboardDismissMode="on-drag"
     />
   ) : (
     <CenteredView sideBorders style={[pal.border, s.hContentRegion]}>
@@ -578,7 +580,8 @@ export function SearchScreen(
               onPress={onPressClearQuery}
               accessibilityRole="button"
               accessibilityLabel={_(msg`Clear search query`)}
-              accessibilityHint="">
+              accessibilityHint=""
+              hitSlop={HITSLOP_10}>
               <FontAwesomeIcon
                 icon="xmark"
                 size={16}
@@ -590,7 +593,10 @@ export function SearchScreen(
 
         {query || inputIsFocused ? (
           <View style={styles.headerCancelBtn}>
-            <Pressable onPress={onPressCancelSearch} accessibilityRole="button">
+            <Pressable
+              onPress={onPressCancelSearch}
+              accessibilityRole="button"
+              hitSlop={HITSLOP_10}>
               <Text style={[pal.text]}>
                 <Trans>Cancel</Trans>
               </Text>
@@ -604,7 +610,11 @@ export function SearchScreen(
           {isFetching ? (
             <Loader />
           ) : (
-            <ScrollView style={{height: '100%'}} dataSet={{stableGutters: '1'}}>
+            <ScrollView
+              style={{height: '100%'}}
+              dataSet={{stableGutters: '1'}}
+              keyboardShouldPersistTaps="handled"
+              keyboardDismissMode="on-drag">
               {searchResults.length ? (
                 searchResults.map((item, i) => (
                   <SearchResultCard