From e6bea4a06ca9a11df37bf4c5d5a90cb2b9b0cfce Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Fri, 16 Feb 2024 11:35:46 -0600
Subject: [PATCH] Text field updates

---
 src/components/forms/TextField.tsx | 61 ++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/components/forms/TextField.tsx b/src/components/forms/TextField.tsx
index ebf2e47506..3b6a8e879c 100644
--- a/src/components/forms/TextField.tsx
+++ b/src/components/forms/TextField.tsx
@@ -5,13 +5,15 @@ import {
   TextInputProps,
   TextStyle,
   ViewStyle,
+  Pressable,
   StyleSheet,
   AccessibilityProps,
 } from 'react-native'
 
 import {HITSLOP_20} from 'lib/constants'
-import {useTheme, atoms as a, web, tokens, android} from '#/alf'
-import {Text} from '#/components/Typography'
+import {isWeb} from '#/platform/detection'
+import {useTheme, atoms as a, web, tokens, android, flatten} from '#/alf'
+import {Text, leading} from '#/components/Typography'
 import {useInteractionState} from '#/components/hooks/useInteractionState'
 import {Props as SVGIconProps} from '#/components/icons/common'
 
@@ -39,6 +41,7 @@ export type RootProps = React.PropsWithChildren<{isInvalid?: boolean}>
 
 export function Root({children, isInvalid = false}: RootProps) {
   const inputRef = React.useRef<TextInput>(null)
+  const rootRef = React.useRef<View>(null)
   const {
     state: hovered,
     onIn: onHoverIn,
@@ -69,17 +72,35 @@ export function Root({children, isInvalid = false}: RootProps) {
     ],
   )
 
+  React.useLayoutEffect(() => {
+    const root = rootRef.current
+    if (!root || !isWeb) return
+    // @ts-ignore web only
+    root.tabIndex = -1
+  }, [])
+
   return (
     <Context.Provider value={context}>
-      <View
-        style={[a.flex_row, a.align_center, a.relative, a.w_full, a.px_md]}
-        {...web({
-          onClick: () => inputRef.current?.focus(),
-          onMouseOver: onHoverIn,
-          onMouseOut: onHoverOut,
-        })}>
+      <Pressable
+        accessibilityRole="button"
+        ref={rootRef}
+        role="none"
+        style={[
+          a.flex_row,
+          a.align_center,
+          a.relative,
+          a.w_full,
+          a.px_md,
+          {
+            paddingVertical: 14,
+          },
+        ]}
+        // onPressIn/out don't work on android web
+        onPress={() => inputRef.current?.focus()}
+        onHoverIn={onHoverIn}
+        onHoverOut={onHoverOut}>
         {children}
-      </View>
+      </Pressable>
     </Context.Provider>
   )
 }
@@ -166,6 +187,7 @@ export function createInput(Component: typeof TextInput) {
         <Component
           accessibilityHint={undefined}
           {...rest}
+          aria-label={label}
           accessibilityLabel={label}
           ref={ctx.inputRef}
           value={value}
@@ -182,17 +204,17 @@ export function createInput(Component: typeof TextInput) {
             a.text_md,
             t.atoms.text,
             a.px_xs,
-            {
-              // paddingVertical doesn't work w/multiline - esb
-              paddingTop: 14,
-              paddingBottom: 14,
-              lineHeight: a.text_md.fontSize * 1.1875,
-              textAlignVertical: rest.multiline ? 'top' : undefined,
-              minHeight: rest.multiline ? 80 : undefined,
-            },
             android({
-              paddingBottom: 16,
+              paddingBottom: 2,
             }),
+            {
+              lineHeight: rest.multiline
+                ? leading(a.text_md, a.leading_normal)
+                : a.text_md.fontSize * 1.1875,
+              textAlignVertical: rest.multiline ? 'top' : undefined,
+              minHeight: rest.multiline ? 60 : undefined,
+            },
+            flatten(rest.style),
           ]}
         />
 
@@ -294,6 +316,7 @@ export function Suffix({
   const ctx = React.useContext(Context)
   return (
     <Text
+      aria-label={label}
       accessibilityLabel={label}
       accessibilityHint={accessibilityHint}
       style={[