@fto-consult/expo-ui 2.27.1 → 2.28.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.27.1",
+  "version": "2.28.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.24.16",
+    "@fto-consult/common": "^1.25.2",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",
@@ -109,7 +109,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
     "@babel/preset-react": "^7.18.6",
-    "@expo/metro-config": "^0.5.1",
+    "@expo/metro-config": "^0.5.2",
     "@expo/webpack-config": "^0.17.3",
     "babel-plugin-inline-dotenv": "^1.7.0",
     "babel-plugin-module-resolver": "^4.1.0",

package/src/components/BottomSheet/Sheet.js

@@ -10,7 +10,7 @@ import {isWeb,isNativeMobile} from "$cplatform";
 import Divider from "$ecomponents/Divider";
 import {isMobileOrTabletMedia} from "$cplatform/dimensions";
 import APP from "$capp/instance";
-import KeyboardAvoidingView from "$ecomponents/Form/KeyboardAvoidingView";
+import KeyboardAvoidingView from "$ecomponents/KeyboardAvoidingView";
 import {Elevations} from "$ecomponents/Surface";
 import {defaultStr} from "$utils";
 import View from "$ecomponents/View";
@@ -258,11 +258,6 @@ const BottomSheetComponent = React.forwardRef((props,ref)=> {
                     activeOpacity={1}
                     onPress={() => (closeOnPressMask && dismissable !== false ? closeModal() : null)}
                 />
-                <KeyboardAvoidingView
-                    behavior="padding"
-                    style={[styles.wrapper]}
-                    testID = {testID+"_KeyboardAvoidingView"}
-                >
                     <Animated.View
                         {...(!dragFromTopOnly && panResponder.panHandlers)}
                         testID = {testID+"_Container"} {...containerProps} 
@@ -289,19 +284,17 @@ const BottomSheetComponent = React.forwardRef((props,ref)=> {
                                 </View>
                                 <Divider testID = {testID+"_Divider"} style={styles.divider}/>
                             </>  : null}
-                            {withScrollView !== false ? <>
+                            {withScrollView !== false ?
                                 <ScrollView testID = {testID+"_ScrollViewContent"}  contentProps = {{style:styles.scrollViewContent}} {...scrollViewProps} style={[styles.scrollView,scrollViewProps.style]} alwaysBounceVertical={false}
-                                contentContainerStyle={[{ flexGrow: 1,margin:0,paddingBottom:30},scrollViewProps.contentContainerStyle]}
+                                    contentContainerStyle={[{ flexGrow: 1,margin:0,paddingBottom:30},scrollViewProps.contentContainerStyle]}
                                 >
-                                    {children}
-                                    </ScrollView>
-                                </> 
+                                    <KeyboardAvoidingView testID={testID+"_KeyboardAvoidingView"}>{children}</KeyboardAvoidingView>
+                                </ScrollView>
                             : <View testID = {testID+"_Children"} {...childrenContainerProps} style={[styles.childrenNotScroll,childrenContainerProps.style]}>
-                                {children}  
+                                <KeyboardAvoidingView testID={testID+"_KeyboardAvoidingView"}>{children}</KeyboardAvoidingView>  
                             </View>}
                         </View>
                     </Animated.View>
-                </KeyboardAvoidingView>
             </View>
         </Portal>
     );