Fix submit button (#88)

* fix: missing Pressable for Form.Submit * fix: missing Pressable for Form.Submit
FormidableLabs · Mar 29, 2023 · e8b4d96 · e8b4d96
1 parent c0e4f5c
commit e8b4d96
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/lib/components/FormSubmit.tsx b/lib/components/FormSubmit.tsx
@@ -15,25 +15,28 @@ export type FormSubmitProps = React.PropsWithChildren<{
 }>;
 
 export const FormSubmit = (props: FormSubmitProps) => {
+  const { submitForm } = useForm();
   const { isScreenReaderEnabled } = useAMAContext();
 
-  return isScreenReaderEnabled ? (
-    <FormSubmitForScreenReader {...props} />
-  ) : (
-    <>{props.children}</>
+  return (
+    <Pressable accessibilityRole="button" {...props} onPress={submitForm}>
+      {isScreenReaderEnabled ? (
+        <FormSubmitForScreenReader {...props} />
+      ) : (
+        props.children
+      )}
+    </Pressable>
   );
 };
 
-const FormSubmitForScreenReader = ({ children, ...rest }: FormSubmitProps) => {
-  const { submitForm } = useForm();
-
+const FormSubmitForScreenReader = ({
+  children,
+}: React.PropsWithChildren<{}>) => {
   return (
-    <Pressable accessibilityRole="button" {...rest} onPress={submitForm}>
-      <View pointerEvents="none">
-        <HideChildrenFromAccessibilityTree>
-          {children}
-        </HideChildrenFromAccessibilityTree>
-      </View>
-    </Pressable>
+    <View pointerEvents="none">
+      <HideChildrenFromAccessibilityTree>
+        {children}
+      </HideChildrenFromAccessibilityTree>
+    </View>
   );
 };