@fto-consult/expo-ui 6.6.8 → 6.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.6.8",
+  "version": "6.7.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -41,7 +41,7 @@
     "fix-dependencies": "expo-cli doctor --fix-dependencies",
     "delete-node-modules": "rimraf ./**/node_modules",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
-    "update": "npm i @emotion/native@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest  react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest sharp-cli@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
+    "update": "npm i expo @emotion/native@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest  react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest sharp-cli@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
   },
   "bin": "./bin/index.js",
   "repository": {
@@ -62,7 +62,7 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.21.1",
+    "@fto-consult/common": "^3.21.3",
     "@gorhom/portal": "^1.0.14",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
@@ -73,7 +73,7 @@
     "@react-navigation/native-stack": "^6.9.13",
     "@shopify/flash-list": "1.4.3",
     "apexcharts": "^3.41.0",
-    "expo": "^49.0.3",
+    "expo": "^49.0.4",
     "expo-camera": "~13.4.2",
     "expo-clipboard": "~4.3.0",
     "expo-font": "~11.4.0",
@@ -106,7 +106,7 @@
     "react-native-svg": "13.9.0",
     "react-native-web": "~0.19.6",
     "react-native-webview": "13.2.2",
-    "react-virtuoso": "^4.4.0",
+    "react-virtuoso": "^4.4.1",
     "sharp-cli": "^4.1.1",
     "tippy.js": "^6.3.7",
     "websql": "^2.0.3",

package/src/components/Swiper/index.js

@@ -285,7 +285,8 @@ class SwiperComponent extends React.Component {
     testID = defaultStr(testID,'RN_SwiperComponent');
     childrenProps = Array.isArray(childrenProps)? childrenProps : [];
     const isReady = customHeight > 40 ? true : false;
-    const height = !isReady ? WIDTH_HEIGHT : customHeight;
+    const autoHeight = !!this.props.autoHeight;
+    const height = autoHeight ? undefined : !isReady ? WIDTH_HEIGHT : customHeight;
     if(withScrollView){
       wrapperProps.nestedScrollEnabled = typeof wrapperProps.nestedScrollEnabled ==="boolean"? wrapperProps.nestedScrollEnabled : isNative;
       if(typeof wrapperProps.showsVerticalScrollIndicator !=='boolean'){
@@ -313,12 +314,12 @@ class SwiperComponent extends React.Component {
         <View
           testID={testID+"_ContentContainer"}
           {...contentContainerProps}
-          style={[styles.container(positionFixed, x, y, width, height),contentContainerProps.style]}
+          style={[styles.container(positionFixed, x, y, width, height,autoHeight),contentContainerProps.style]}
         >
           <Animated.View
             testID={testID+"_AnimatedContent"}
             style={[
-              styles.swipeArea(vertical, this.count, width, height),
+              styles.swipeArea(vertical, this.count, width, height,autoHeight),
               swipeAreaProps.style,
               {
                 transform: [{ translateX: pan.x }, { translateY: pan.y }],
@@ -339,7 +340,8 @@ class SwiperComponent extends React.Component {
                   style={[
                     childProps.style,
                     contentProps.style,
-                    {width, height,maxHeight:height},
+                    {width},
+                    autoHeight && {height,maxHeight:height},
                   ]}
                 >
                   <W {...wProps}>
@@ -373,6 +375,7 @@ class SwiperComponent extends React.Component {
 SwiperComponent.propTypes = {
   vertical: PropTypes.bool,
   activeIndex: PropTypes.number,
+  autoHeight : PropTypes.bool,//si la valeur de la taille des éléments sera automatiquement réajusté
   loop: PropTypes.bool,
   timeout: PropTypes.number,
   gesturesEnabled: PropTypes.func,
@@ -437,7 +440,7 @@ const styles = {
     backgroundColor: 'transparent',
   },
   // Fix web vertical scaling (like expo v33-34)
-  container: (positionFixed, x, y, width, height) => ({
+  container: (positionFixed, x, y, width, height,autoHeight) => addAutoHeight(({
     backgroundColor: 'transparent',
     // Fix safari vertical bounces
     position: positionFixed ? 'fixed' : 'relative',
@@ -446,18 +449,16 @@ const styles = {
     top: positionFixed ? y : 0,
     left: positionFixed ? x : 0,
     width,
-    height,
     justifyContent: 'flex-start',
     alignItems : 'flex-start',
-  }),
-  swipeArea: (vertical, count, width, height) => ({
+  }),height,autoHeight),
+  swipeArea: (vertical, count, width, height,autoHeight) => addAutoHeight(({
     position: 'relative',
     top: 0,
     left: 0,
     width:vertical ? width : width * count,
-    height:vertical ? height * count : height,
     flexDirection: vertical ? 'column' : 'row',
-  }),
+  }),typeof height ==='number'? (vertical ? height * count : height) : undefiend,autoHeight),
   scrollViewContentContainer : {
     paddingBottom : 40,
     flex : 1,
@@ -470,4 +471,11 @@ const styles = {
   }
 };
 
+const addAutoHeight = (style,height,autoHeight)=>{
+  if(height !== undefined && autoHeight){
+    style.height = height;
+  }
+  return style;
+}
+
 export default SwiperComponent;

package/src/components/Tab/TabItem.js

@@ -42,7 +42,6 @@ const TabItemComponentNotThemed = ({
     icon = null;
   }
   const isIconTop = iconPosition =='top'? true : false;
-  
   return (<TouchableRipple
           role="tab"
           accessibilityState={{ selected: active }}

package/src/components/Tab/index.js

@@ -106,7 +106,7 @@ TabComponent.Item = (props)=>null;
 
 const styles = StyleSheet.create({
     container : {
-        minHeight : 300,
+        minHeight : 150,
         flex : 1,
     },
 })