@fto-consult/expo-ui 6.6.9 → 6.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.6.9",
+  "version": "6.7.2",
   "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": {
@@ -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

@@ -286,7 +286,7 @@ class SwiperComponent extends React.Component {
     childrenProps = Array.isArray(childrenProps)? childrenProps : [];
     const isReady = customHeight > 40 ? true : false;
     const autoHeight = !!this.props.autoHeight;
-    const height = autoHeight ? "100%" : !isReady ? WIDTH_HEIGHT : customHeight;
+    const height = autoHeight ? undefined : !isReady ? WIDTH_HEIGHT : customHeight;
     if(withScrollView){
       wrapperProps.nestedScrollEnabled = typeof wrapperProps.nestedScrollEnabled ==="boolean"? wrapperProps.nestedScrollEnabled : isNative;
       if(typeof wrapperProps.showsVerticalScrollIndicator !=='boolean'){
@@ -440,7 +440,7 @@ const styles = {
     backgroundColor: 'transparent',
   },
   // Fix web vertical scaling (like expo v33-34)
-  container: (positionFixed, x, y, width, height,autoHeight) => ({
+  container: (positionFixed, x, y, width, height,autoHeight) => addAutoHeight(({
     backgroundColor: 'transparent',
     // Fix safari vertical bounces
     position: positionFixed ? 'fixed' : 'relative',
@@ -449,18 +449,16 @@ const styles = {
     top: positionFixed ? y : 0,
     left: positionFixed ? x : 0,
     width,
-    height:!autoHeight ? undefined : height,
     justifyContent: 'flex-start',
     alignItems : 'flex-start',
-  }),
-  swipeArea: (vertical, count, width, height,autoHeight) => ({
+  }),height,autoHeight),
+  swipeArea: (vertical, count, width, height,autoHeight) => addAutoHeight(({
     position: 'relative',
     top: 0,
     left: 0,
     width:vertical ? width : width * count,
-    height:!autoHeight ? undefined : vertical ? height * count : height,
     flexDirection: vertical ? 'column' : 'row',
-  }),
+  }),typeof height ==='number'? (vertical ? height * count : height) : undefiend,autoHeight),
   scrollViewContentContainer : {
     paddingBottom : 40,
     flex : 1,
@@ -473,4 +471,11 @@ const styles = {
   }
 };
 
+const addAutoHeight = (style,height,autoHeight)=>{
+  if(height !== undefined && autoHeight){
+    style.height = height;
+  }
+  return style;
+}
+
 export default SwiperComponent;

package/src/navigation/Drawer/index.js

@@ -12,18 +12,27 @@ import Logo  from "$ecomponents/Logo";
 const DrawerNavigator = React.forwardRef(({content,children,state,...props},ref)=>{
     const drawerRef = React.useRef(null);
     const mergedRefs = React.useMergeRefs(drawerRef,ref);
+    const forceRender = React.useForceRender();
+    const refreshItemsRef = React.useRef(false);
     const items = useGetItems({refresh:()=>{
         if(drawerRef.current && drawerRef.current && drawerRef.current.forceRenderNavigationView){
             return  drawerRef.current.forceRenderNavigationView();
         }
-    }});
+    },force:refreshItemsRef.current});
     React.useEffect(()=>{
         const onLogoutUser = ()=>{
             setIsLoggedIn(false);
         }
+        const refreshItems = ()=>{
+            refreshItemsRef.current = true;
+            forceRender();
+            refreshItemsRef.current = false;
+        };
         APP.on(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
+        APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
         return ()=>{
             APP.off(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
+            APP.off(APP.EVENTS.UPDATE_THEME,refreshItems);
         }
     },[])
     const headerCB = ({isMinimized})=>{

package/src/navigation/Drawer/items/index.js

@@ -29,12 +29,12 @@ const useGetItems = (options)=>{
         APP.on(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
         APP.on(APP.EVENTS.AUTH_LOGIN_USER,refreshItems);
         APP.on(APP.EVENTS.AUTH_LOGOUT_USER,refreshItems);
-        APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
+        //APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
         return ()=>{
             APP.off(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
             APP.off(APP.EVENTS.AUTH_LOGIN_USER,refreshItems);
             APP.off(APP.EVENTS.AUTH_LOGOUT_USER,refreshItems);
-            APP.off(APP.EVENTS.UPDATE_THEME,onLogoutUser);
+            //APP.off(APP.EVENTS.UPDATE_THEME,onLogoutUser);
         }
     },[])
     return useMemo(()=>{