@fto-consult/expo-ui 6.88.1 → 6.89.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.88.1",
+  "version": "6.89.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {

package/src/components/BottomSheet/Sheet.js

@@ -14,7 +14,7 @@ import KeyboardAvoidingView from "$ecomponents/KeyboardAvoidingView";
 import {Elevations} from "$ecomponents/Surface";
 import {defaultStr} from "$cutils";
 import View from "$ecomponents/View";
-import Portal from "$ecomponents/Portal";
+import {Portal} from "react-native-paper";
 import { ScrollView } from "react-native";
 import BackHandler from "$ecomponents/BackHandler";
 import Reanimated, { useSharedValue,withTiming,useAnimatedStyle} from 'react-native-reanimated';

package/src/components/Datagrid/SWRDatagrid.js

@@ -26,8 +26,7 @@ import PropTypes from "prop-types";
 import {Menu} from "$ecomponents/BottomSheet";
 import session from "$session";
 import { SWR_REFRESH_TIMEOUT } from "$econtext/utils";
-import useContext from "$econtext/hooks";
-import notify from "$cnotify";
+import useContext,{useScreen} from "$econtext/hooks";
 
 export const getSessionKey = ()=>{
     return Auth.getSessionKey("swrDatagrid");
@@ -105,6 +104,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         ...rest
     } = props;
     const {swrConfig} = useContext();
+    const screenContext = useScreen();
     rest = defaultObj(rest);
     rest.exportTableProps = defaultObj(rest.exportTableProps)
     const firstPage = 1;
@@ -305,6 +305,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             accordionProps = {table?.accordionProps}
             {...defaultObj(table?.datagrid)} 
             {...rest}
+            renderProgressBar = {screenContext && screenContext?.isFocused() === false?false : rest.renderProgressBar || table?.datagrid?.renderProgressBar}
             fetchOptions = {customFetchOptions}
             title = {customTitle || title || undefined}
             sort = {sort}

package/src/components/Dialog/DropdownAlert/index.js

@@ -1,10 +1,8 @@
 import React, {Component} from '$react';
 import {isObj,defaultStr} from "$cutils";
 import View from "$ecomponents/View";
-import Portal from "$ecomponents/Portal";
+import { Portal } from 'react-native-paper';
 import theme,{Colors} from "$theme";
-import stableHash from "stable-hash";
-import Dimensions,{isMobileMedia,isTabletMedia,isDesktopMedia} from "$dimensions";
 import {
   StyleSheet,
   Pressable,

package/src/components/Fab/Group.js

@@ -9,6 +9,7 @@ import Group from "./GroupComponent";
 import {Portal} from "react-native-paper";
 import {isAllowedFromStr} from "$cauth/perms";
 import { useIsScreenFocused } from '$enavigation/hooks';
+import { useScreen } from '$econtext/hooks';
 
 export const isValid = (context)=>{
     if(!isObj(context) || !isNonNullString(context.fabId) || typeof context.show !=="function" || context.hide !="function") return false;
@@ -65,10 +66,14 @@ const FabGroupComponent = React.forwardRef((props,innerRef)=>{
     const fabIdRef = React.useRef(defaultStr(fabId,uniqid("fab-id-ref")));
     fabId = fabIdRef.current;
     const isMountedRef = React.useRef(false);
+    const screenContext = useScreen();
     let isFocused = useIsScreenFocused(screenName);
     if(!isNonNullString(screenName)){
         isFocused = true;
     }
+    if(screenContext && screenContext?.isFocused() === false){
+        isFocused = false;
+    }
     const [state, setState] = React.useState({ 
         open: typeof customOpen =='boolean'? customOpen : false,
         display : typeof customDisplay ==='boolean'? customDisplay : true,

package/src/components/Modal/index.js

@@ -10,7 +10,7 @@ import theme,{StyleProp} from "$theme";
 import Animation from "$ecomponents/Animation";
 import { Surface } from "react-native-paper";
 import { Platform } from "react-native";
-import Portal from "$ecomponents/Portal";
+import { Portal } from "react-native-paper";
 import {defaultStr} from "$cutils";
 import {
   getStatusBarHeight,

package/src/context/hooks.js

@@ -16,6 +16,11 @@ export const useContext = useExpoUI;
 
 export const useApp = useContext;
 
+export const ScreenContext = createContext(null);
+
+export const useScreen = x=>useReactContext(ScreenContext);
+export const hasScreenContext = x=>!!useScreen();
+
 export const useSWR =  (path,options)=>{
     const {swrConfig} = useExpoUI();
     const host = `${defaultStr(process.env.API_HOST).trim().rtrim("/")}/${path}`;

package/src/context/utils.js

@@ -1,2 +1,2 @@
 
-export const SWR_REFRESH_TIMEOUT = 2500*60;
+export const SWR_REFRESH_TIMEOUT = 1000*60;

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -12,8 +12,6 @@ import theme,{StyleProp} from "$theme";
 import StatusBar from "$ecomponents/StatusBar";
 import ScrollView from "$ecomponents/ScrollView";
 import KeyboardAvoidingView from "$ecomponents/KeyboardAvoidingView";
-import Animated from 'react-native-reanimated';
-import {sharedElementTransition} from "./transition";
 
 const getDefaultTitle = (nTitle,returnStr)=>{
   let titleStr = React.getTextContent(nTitle);

package/src/screens/ScreenWrapper.js

@@ -7,6 +7,7 @@ import APP from "$capp";
 import {useDrawer} from "$ecomponents/Drawer";
 import {navigationRef,getScreenProps,setRoute,setActiveNavigation,setScreenOptions,goBack} from "$cnavigation";
 import { SCREEN_OPTIONS } from "./utils";
+import {ScreenContext} from "$econtext/hooks";
 
 export default function ScreenWrapperNavComponent(_props){
     const {navigation,route,...props} = getScreenProps(_props);
@@ -64,22 +65,28 @@ export default function ScreenWrapperNavComponent(_props){
     setScreenOptions(options);
     const allowDrawer = typeof options.allowDrawer ==='boolean'? options.allowDrawer : typeof options.withDrawer =='boolean'? options.withDrawer : typeof Screen.allowDrawer =='boolean'? Screen.allowDrawer : typeof Screen.withDrawer =='boolean' ? Screen.withDrawer : Screen.isModalScreen == true ? false : true;
     const withFab = typeof options.withFab ==='boolean' ? options.withFab : typeof Screen.withFab =='boolean'? Screen.withFab : false;
-    return <Screen 
-        withFab = {withFab}
-        groupName = {groupName}
-        {...rest}
-        key = {sanitizedName}
-        authRequired={authRequired === false || Screen.authRequired ===false ? false : authRequired || allowDrawer} 
-        backAction={options.backAction === false || Screen.backAction ===false ? false : isModal} 
-        modal={isModal} 
-        navigation = {navigation}
-        route = {route}
-        allowDrawer={allowDrawer} 
-        withDrawer = {allowDrawer !== false ? true : false} 
-        {...props} 
-        title = {defaultVal(props.title,options.title,rest.title)}
-        subtitle = {defaultVal(props.subtitle,options.subtitle,rest.subtitle)}
-        screenName={sanitizedName} 
-        options={options}
-     />
+    const titleText = defaultVal(props.title,options.title,rest.title);
+    const authRequiredS = authRequired === false || Screen.authRequired ===false ? false : authRequired || allowDrawer;
+    const backActionS = options.backAction === false || Screen.backAction ===false ? false : isModal;
+    return <ScreenContext.Provider
+        value={{navigation,modal:isModal,backAction:backActionS,authRequired:authRequiredS,route,title:titleText,isModal,screenName,sanitizedName,options,isFocused:navigation.isFocused,withFab,allowDrawer}}
+        children={<Screen 
+            withFab = {withFab}
+            groupName = {groupName}
+            {...rest}
+            key = {sanitizedName}
+            authRequired={authRequiredS} 
+            backAction={backActionS} 
+            modal={isModal} 
+            navigation = {navigation}
+            route = {route}
+            allowDrawer={allowDrawer} 
+            withDrawer = {allowDrawer !== false ? true : false} 
+            {...props} 
+            title = {titleText}
+            subtitle = {defaultVal(props.subtitle,options.subtitle,rest.subtitle)}
+            screenName={sanitizedName} 
+            options={options}
+         />}
+    />
 }

package/src/screens/index.js

@@ -3,6 +3,7 @@ import {sanitizeName,GROUP_NAMES} from "./utils";
 import React from "$react";
 import ScreenWrapper from "./ScreenWrapper";
 import { SCREEN_OPTIONS } from "./utils";
+
 export * from "./mainScreens";
 
 export * from "./utils";