From b9452ba15ae49056666cda296def279ff7b263a9 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 30 Sep 2024 15:15:13 +0300
Subject: [PATCH] stop auto hiding keyboard, allow scrollview props to handle

---
 src/components/Dialog/index.tsx | 22 +++++++++++++++-------
 src/components/Dialog/types.ts  |  2 ++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/Dialog/index.tsx b/src/components/Dialog/index.tsx
index d5d92048ad..cda31bae73 100644
--- a/src/components/Dialog/index.tsx
+++ b/src/components/Dialog/index.tsx
@@ -1,9 +1,8 @@
 import React, {useImperativeHandle} from 'react'
 import {
-  Dimensions,
-  Keyboard,
   Pressable,
   StyleProp,
+  useWindowDimensions,
   View,
   ViewStyle,
 } from 'react-native'
@@ -96,6 +95,7 @@ export function Outer({
   const insets = useSafeAreaInsets()
   const closeCallbacks = React.useRef<(() => void)[]>([])
   const {setDialogIsOpen} = useDialogStateControlContext()
+  const {height: windowHeight} = useWindowDimensions()
 
   /*
    * Used to manage open/closed, but index is otherwise handled internally by `BottomSheet`
@@ -179,8 +179,7 @@ export function Outer({
             // Android
             importantForAccessibility="yes"
             style={[a.absolute, a.inset_0]}
-            testID={testID}
-            onTouchMove={() => Keyboard.dismiss()}>
+            testID={testID}>
             <BottomSheet
               enableDynamicSizing={!hasSnapPoints}
               enablePanDownToClose
@@ -206,7 +205,7 @@ export function Outer({
                     {
                       borderTopLeftRadius: 40,
                       borderTopRightRadius: 40,
-                      height: Dimensions.get('window').height * 2,
+                      height: windowHeight * 2,
                     },
                   ]}
                 />
@@ -243,11 +242,20 @@ export function Inner({children, style}: DialogInnerProps) {
 export const ScrollableInner = React.forwardRef<
   BottomSheetScrollViewMethods,
   DialogInnerProps
->(function ScrollableInner({children, style}, ref) {
+>(function ScrollableInner(
+  {
+    children,
+    style,
+    keyboardShouldPersistTaps = 'handled',
+    keyboardDismissMode = 'on-drag',
+  },
+  ref,
+) {
   const insets = useSafeAreaInsets()
   return (
     <BottomSheetScrollView
-      keyboardShouldPersistTaps="handled"
+      keyboardShouldPersistTaps={keyboardShouldPersistTaps}
+      keyboardDismissMode={keyboardDismissMode}
       style={[
         a.flex_1, // main diff is this
         a.p_xl,
diff --git a/src/components/Dialog/types.ts b/src/components/Dialog/types.ts
index 1ddab02eea..217b147200 100644
--- a/src/components/Dialog/types.ts
+++ b/src/components/Dialog/types.ts
@@ -66,10 +66,12 @@ export type DialogInnerProps =
       accessibilityLabelledBy: A11yProps['aria-labelledby']
       accessibilityDescribedBy: string
       keyboardDismissMode?: ScrollViewProps['keyboardDismissMode']
+      keyboardShouldPersistTaps?: ScrollViewProps['keyboardShouldPersistTaps']
     }>
   | DialogInnerPropsBase<{
       label: string
       accessibilityLabelledBy?: undefined
       accessibilityDescribedBy?: undefined
       keyboardDismissMode?: ScrollViewProps['keyboardDismissMode']
+      keyboardShouldPersistTaps?: ScrollViewProps['keyboardShouldPersistTaps']
     }>