@fto-consult/expo-ui 7.22.1 → 7.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.22.1",
+  "version": "7.23.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -71,9 +71,9 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.6.1",
-    "@fto-consult/node-utils": "^1.3.4",
-    "@pchmn/expo-material3-theme": "^1.3.1",
+    "@fto-consult/common": "^4.7.2",
+    "@fto-consult/node-utils": "^1.4.5",
+    "@pchmn/expo-material3-theme": "^1.3.2",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",
     "@react-native-community/netinfo": "9.3.10",

package/src/AppEntry/index.js

@@ -70,7 +70,6 @@ function App({init:initApp,initialRouteName:appInitialRouteName,children}) {
      hasCallInitApp : false,
   });
    React.useEffect(() => {
-      console.log(isNeutralino(),window,navigator.userAgent," is neutralino");
       const loadResources = ()=>{
          return new Promise((resolve)=>{
             loadFonts(FontsIconsFilter).catch((e)=>{

package/src/components/AppBar/index.js

@@ -50,6 +50,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
     const params = defaultObj(route.params);
     appBarProps = Object.assign({},appBarProps);
     notificationsProps = {...Object.assign({},notificationsProps),...Object.assign({},appBarProps.notificationsProps)};
+    const notif = React.isComponent(Notifications)? <Notifications {...notificationsProps}/> : React.isValidElement(Notifications)? Notifications : null;
     const getCallAgs = ()=>{
       options = defaultObj(options,useScreenOptions());
       return {navigation,
@@ -115,8 +116,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
     elevation = typeof elevation === 'number'? elevation : undefined;
     const elevStyle = elevation && Elevations[elevation];
     titleProps = defaultObj(titleProps);
-    React.setRef(ref,context);;
-    const notif = React.isComponent(Notifications)? <Notifications {...notificationsProps}/> : React.isValidElement(Notifications)? Notifications : null;
+    React.setRef(ref,context);
     return (
       <Appbar.Header elevation={elevation} {...appBarProps}  testID={testID} style={[styles.header,{backgroundColor},elevStyle,appBarProps.style]} onLayout={onPageResize}>
         {backAction}

package/src/context/hooks.js

@@ -19,6 +19,10 @@ export const useApp = useContext;
 export const ScreenContext = createContext(null);
 
 export const useScreen = x=>useReactContext(ScreenContext);
+export const useIsScreenFocused = x=>{
+    const s = useScreen();
+    return !!(isObj(s) && typeof s.isFocused ==="function" && s.isFocused()) || false
+}
 export const hasScreenContext = x=>!!useScreen();
 
 export const useSWR =  (path,options)=>{

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -54,6 +54,7 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
     testID,
     keyboardAvoidingViewProps,
     backgroundColor,
+    notificationsProps,
     ...rest
   } = props;
   
@@ -62,9 +63,10 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
   containerProps = defaultObj(containerProps);
   backgroundColor = theme.Colors.isValid(backgroundColor)? backgroundColor : theme.colors.background;
   options = defaultObj(options);
-  appBarProps = defaultObj(appBarProps)
+  appBarProps = defaultObj(appBarProps);
   title = defaultVal(title,appBarProps.title);
   subtitle = defaultVal(subtitle,appBarProps.subtitle);
+  notificationsProps = {...Object.assign({},notificationsProps),...Object.assign({},appBarProps.notificationsProps)};
   const appBarRef = createAppBarRef();
   const navigation = useNavigation();
   fabProps = defaultObj(fabProps);
@@ -93,7 +95,7 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
       }
       navigation.setOptions({
         ...options,
-        appBarProps:{...options.appBarProps,...appBarProps,title,subtitle},
+        appBarProps:{...options.appBarProps,...appBarProps,notificationsProps,title,subtitle},
         subtitle :subtitle,
         title : screenTitle,
       });
@@ -112,11 +114,12 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
       <View  testID={testID+"_ScreenContentContainer"} id={portalId} {...containerProps} style={[styles.container,{backgroundColor},modal && styles.modal,containerProps.style]} >
         <KeyboardAvoidingView testID={testID} {...keyboardAvoidingViewProps} style={[styles.keyboardAvoidingView,keyboardAvoidingViewProps.style]}>
             {withStatusBar !== false ? <StatusBar/> : null}
-            {appBar === false ? null : React.isValidElement(appBar)? state.AppBar :  <AppBar 
+            {appBar === false ? null : React.isValidElement(appBar)? AppBar :  <AppBar 
                 testID={testID+'_AppBar'} 
                 {...appBarProps} 
                 backAction = {defaultVal(appBarProps.backAction,backAction)} 
                 elevation={defaultNumber(appBarProps.elevation,elevation)} 
+                notificationsProps = {notificationsProps}
                 withDrawer={withDrawer} options={options} 
                 ref={appBarRef} title={title} 
                 subtitle={subtitle}

package/src/screens/Help/openLibraries.js

@@ -1,8 +1,12 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
-		"version": "7.17.9",
-		"url": "https://github.com/borispipo/expo-ui#readme",
-		"license": "ISC"
+		"name": "@fto-consult/expo-ui",
+		"version": "7.23.1",
+		"repository": {
+			"type": "git",
+			"url": "git+https://github.com/borispipo/expo-ui.git"
+		},
+		"homepage": "https://github.com/borispipo/expo-ui#readme"
 	},
 	"@babel/plugin-proposal-export-namespace-from": {
 		"version": "7.18.9",
@@ -45,16 +49,16 @@ module.exports = {
 		"license": "MIT"
 	},
 	"@fto-consult/common": {
-		"version": "4.6.0",
+		"version": "4.7.2",
 		"url": "https://github.com/borispipo/common#readme",
 		"license": "ISC"
 	},
 	"@fto-consult/node-utils": {
-		"version": "1.3.4",
+		"version": "1.4.5",
 		"license": "MIT"
 	},
 	"@pchmn/expo-material3-theme": {
-		"version": "1.3.1",
+		"version": "1.3.2",
 		"url": "https://github.com/pchmn/expo-material3-theme#readme",
 		"license": "MIT"
 	},