after test on expo snack

easybase · Jun 5, 2021 · 2488072 · 2488072
1 parent a4fe1e5
commit 2488072
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 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#61756dc34c5bdf1a72a4f195bf2b21f2261c0011"
+  "resolved" "git+ssh://git@github.com/easybase/easybase-react.git#a4fe1e5d851802a6919eee4f626751cf76cbcdb2"
   "version" "2.1.15"
   dependencies:
     "easybasejs" "4.2.13"

diff --git a/src/ui/NativeAuth/NativeAuth.tsx b/src/ui/NativeAuth/NativeAuth.tsx
@@ -2,7 +2,7 @@ import React, { useState, lazy, Suspense, Fragment, useEffect } from 'react';
 import { ThemeProvider } from 'styled-components/native';
 import { defaultDictionary } from '../utils';
 import { INativeAuth } from '../uiTypes';
-import { Toast } from './components';
+import { Toast, Container } from './components';
 
 const { useEasybase } = require('easybase-react');
 
@@ -72,7 +72,9 @@ export default function ({ customStyles, children, dictionary, signUpFields }: I
         return (
             <ThemeProvider theme={typeof customStyles === "object" ? customStyles : {}}>
                 <Toast toastMessage={toastMessage} toastOpen={toastOpen} setToastOpen={setToastOpen} />
-                {getCurrentPage()}
+                <Container behavior="padding" enabled>
+                    {getCurrentPage()}
+                </Container>
             </ThemeProvider>
         )
     }

diff --git a/src/ui/NativeAuth/components.tsx b/src/ui/NativeAuth/components.tsx
@@ -11,21 +11,18 @@ export const MainView = styled(View)({
     marginBottom: 60
 });
 
-export const FormContainer = styled.ScrollView((props: any) => ({
-    backgroundColor: '#fff',
+export const Container = styled.KeyboardAvoidingView((props: any) => ({
     flex: 1,
+    backgroundColor: '#fff',
     ...(props.theme.container ? { ...props.theme.container } : {})
 }))
 
-export const KBView = styled.KeyboardAvoidingView((props: any) => ({
+export const FormRoot = styled.ScrollView((props: any) => ({
     flex: 1,
-    justifyContent: 'space-between',
-    alignItems: 'center',
-    width: '100%',
     ...(props.theme.form ? { ...props.theme.form } : {})
 }))
 
-export const Form = (props: any) => <FormContainer
+export const Form = (props: any) => <FormRoot
     keyboardShouldPersistTaps="handled"
     keyboardDismissMode="on-drag"
     contentContainerStyle={{
@@ -39,10 +36,10 @@ export const Form = (props: any) => <FormContainer
     alwaysBounceVertical={false}
     showsVerticalScrollIndicator={false}
 >
-    <KBView behavior="height">
+    <View style={{ flex: 1, justifyContent: 'space-between', alignItems: 'center', width: '100%' }}>
         {props.children}
-    </KBView>
-</FormContainer>
+    </View>
+</FormRoot>
 
 export const HeaderText = styled.Text((props: any) => ({
     fontSize: 37,