FormRoot new pattern

easybase · Jun 4, 2021 · 9ac1774 · 9ac1774
1 parent df4a09c
commit 9ac1774
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/native-example/yarn.lock b/native-example/yarn.lock
@@ -2897,7 +2897,7 @@
   "version" "0.1.2"
 
 "easybase-react@github:easybase/easybase-react#dev":
-  "resolved" "git+ssh://git@github.com/easybase/easybase-react.git#41b50a2b0b9d17159330f8c329eeccad60309ebe"
+  "resolved" "git+ssh://git@github.com/easybase/easybase-react.git#df4a09c29f698aaa3ff076b4e1f959919ece2f19"
   "version" "2.1.15"
   dependencies:
     "easybasejs" "4.2.13"

diff --git a/src/ui/NativeAuth/components.tsx b/src/ui/NativeAuth/components.tsx
@@ -5,9 +5,7 @@ export const View = styled.View({
     width: "100%"
 });
 
-export const Form = styled.ScrollView((props: any) => ({
-    justifyContent: 'space-between',
-    alignItems: 'center',
+export const FormRoot = styled.ScrollView((props: any) => ({
     backgroundColor: '#fff',
     paddingTop: '25%',
     paddingBottom: '25%',
@@ -16,6 +14,8 @@ export const Form = styled.ScrollView((props: any) => ({
     ...(props.theme.form ? { ...props.theme.form } : {})
 }))
 
+export const Form = (props: any) => <FormRoot keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag" contentContainerStyle={{ justifyContent: 'space-between', alignItems: 'center' }} {...props} />
+
 export const Container = styled.KeyboardAvoidingView((props: any) => ({
     flex: 1,
     backgroundColor: '#fff',

diff --git a/src/ui/NativeAuth/pages/ForgotPassword.tsx b/src/ui/NativeAuth/pages/ForgotPassword.tsx
@@ -88,7 +88,7 @@ export default function ({ setCurrentPage, dictionary, toast }: INativePage) {
 
     if (!onConfirm) {
         return (
-            <Form keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+            <Form>
                 <HeaderText>{dictionary.forgotPasswordHeader}</HeaderText>
 
                 <View>

diff --git a/src/ui/NativeAuth/pages/SignIn.tsx b/src/ui/NativeAuth/pages/SignIn.tsx
@@ -27,7 +27,7 @@ export default function ({ setCurrentPage, dictionary, toast }: INativePage) {
     }
 
     return (
-        <Form keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+        <Form>
             <HeaderText>{dictionary.signInHeader}</HeaderText>
 
             <View>

diff --git a/src/ui/NativeAuth/pages/SignUp.tsx b/src/ui/NativeAuth/pages/SignUp.tsx
@@ -68,7 +68,7 @@ export default function ({ setCurrentPage, dictionary, signUpFields, toast }: IS
     }
 
     return (
-        <Form keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+        <Form>
             <HeaderText>{dictionary.signUpHeader}</HeaderText>
 
             <View>
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         return (
-            <Form keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+            <Form>
                 <HeaderText>{dictionary.signInHeader}</HeaderText>
                 <View>
@@ Expand Down @@