@fto-consult/expo-ui 6.28.0 → 6.29.0

package/app.config.json

@@ -1,6 +1,6 @@
 {
 	"name": "@FTO-CONSULT/EXPO-UI",
-	"version": "6.26.8",
+	"version": "6.28.1",
 	"description": "Bibliothèque de composants UI Expo,react-native",
 	"bin": {
 		"expo-ui": "./bin/index.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.28.0",
+  "version": "6.29.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -68,7 +68,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.29.5",
+    "@fto-consult/common": "^3.29.8",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

package/src/components/Datagrid/Test/index.js

@@ -7,7 +7,7 @@ import React from "$react";
 import { faker } from '@faker-js/faker';
 export default function TestDatagridComponent({count,...props}){
     const data = React.useMemo(()=>{
-        count = typeof count =='number' && count > 10 ? count : 100;
+        count = typeof count =='number' && count > 5 ? count : 100;
         return faker.helpers.multiple(createRandomUser, {
             count,
         });

package/src/components/Dialog/Dialog.js

@@ -14,7 +14,6 @@ import DialogTitle from './DialogTitle';
 import {MAX_WIDTH,SCREEN_INDENT,MIN_HEIGHT} from "./utils";
 import {isMobileOrTabletMedia,isMobileMedia} from "$cplatform/dimensions"; 
 import Platform,{isMobileNative} from "$cplatform";
-import Portal from "$ecomponents/Portal";
 import Icon,{BACK_ICON} from "$ecomponents/Icon";
 import {ACTION_ICON_SIZE} from "$ecomponents/AppBar";
 import DialogFooter from "./DialogFooter";
@@ -183,8 +182,7 @@ const DialogComponent = React.forwardRef((props,ref)=>{
             {content}
         </ScrollView>
     }
-    return <Portal>
-            <ModalComponent
+    return <ModalComponent
                 onDismiss={(e)=>{
                     return handleBack(e,false);
                 }}
@@ -272,8 +270,7 @@ const DialogComponent = React.forwardRef((props,ref)=>{
                          /> : null}    
                     </Surface>
                 </DialogContent>
-            </ModalComponent>
-        </Portal>
+    </ModalComponent>
 });
 export default DialogComponent;
 

package/src/components/Drawer/DrawerItems/DrawerSection.js

@@ -3,8 +3,7 @@ import {defaultObj,defaultBool} from "$cutils";
 import Divider from "$ecomponents/Divider";
 import Label from "$ecomponents/Label";
 import theme,{Colors,tinyColor,ALPHA_OPACITY} from "$theme";
-export default function DrawerSection (props){
-    let {children,divider,labelStyle,minimized,labelProps,dividerProps,label,text,...rest} = props;
+export default function DrawerSection ({children,divider,labelStyle,minimized,labelProps,withDivider,dividerProps,label,text,...rest}){
     label = defaultStr(label,text);
     if(!label) return children;
     dividerProps = defaultObj(dividerProps);

package/src/components/Drawer/DrawerItems/index.js

@@ -11,8 +11,11 @@ import { useDrawer } from '../Provider';
 
 export * from "./utils";
 
+let hasDivider = false;
+
 const DrawerItemsComponent = React.forwardRef((props,ref)=> {
   let {items:_items,minimized} = props;
+  hasDivider = false;
   _items = typeof _items ==='function'? _items(props) : _items;
   if(React.isValidElement(_items)){
      return _items;
@@ -23,11 +26,15 @@ const DrawerItemsComponent = React.forwardRef((props,ref)=> {
           if(isNonNullString(item.perm) && !Auth.isAllowedFromStr(item.perm)) return null;
           const {section,items:itx2,...rest} = item;
           if(section){
+            const sDivider = rest.divider !== false && !hasDivider && items.length ? true : false;
+            if(sDivider){
+              hasDivider = true;
+            }
             return <DrawerSection 
                 {...rest}
                 minimized={minimized} 
                 key={key}
-                divider = {rest.divider !== false && items.length ? true : false}
+                divider = {sDivider}
             >
               {items}
             </DrawerSection>
@@ -124,19 +131,22 @@ const getDefaultProps = function(item){
 const renderItem = ({item,minimized,renderExpandableOrSection,index,key})=>{
   key = key||index;
   if(React.isValidElement(item)){
+    hasDivider = false;
     return <React.Fragment key={key}>
         {item}
     </React.Fragment>
   } else {
     if(isNonNullString(item.perm) && !Auth.isAllowedFromStr(item.perm)) return null;
     if(!item.label && !item.text && !item.icon) {
-        if(item.divider === true){
+        if(item.divider === true && !hasDivider){
           const {divider,...rest} = item;
+          hasDivider = true;
           return (<Divider key={key} {...rest}/>)
       }
       return null;
     }
     item = getDefaultProps(item);
+    hasDivider = false;
     if(isObj(item.items) || Array.isArray(item.items)){
        const itx = [];
        Object.map(item.items,(it,i)=>{

package/src/components/Portal/index copy.js

@@ -0,0 +1,13 @@
+/***
+ *  MIT License
+    Copyright (c) 2020 Mo Gorhom
+    @see : https://github.com/gorhom/react-native-portal
+ */
+
+export {default} from "./Portal";
+
+export {default as PortalHost} from "./PortalHost";
+
+export {default as PortalProvider} from "./PortalProvider";
+
+export * from "./hooks";

package/src/components/Portal/index.js

@@ -1,13 +1,4 @@
-/***
- *  MIT License
-    Copyright (c) 2020 Mo Gorhom
-    @see : https://github.com/gorhom/react-native-portal
- */
+import {Portal} from "react-native-paper";
 
-export {default} from "./Portal";
-
-export {default as PortalHost} from "./PortalHost";
-
-export {default as PortalProvider} from "./PortalProvider";
-
-export * from "./hooks";
+export default Portal;
+export const PortalHost = Portal.Host;

package/src/components/SimpleSelect/index.js

@@ -289,7 +289,7 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
         rippleColor={undefined}
         onLayout={onLayout}
     >
-        <>{anchor}</>
+        {anchor}
     </Pressable>
     const getItemLayout = typeof listProps.itemHeight ==='number' && listProps.itemHeight ? (data, index) => (
         {length: listProps.itemHeight, offset: listProps.itemHeight * index, index}

package/src/context/Provider.js

@@ -4,7 +4,7 @@ import {MD3LightTheme,MD3DarkTheme} from "react-native-paper";
 import { useMaterial3Theme } from '@pchmn/expo-material3-theme';
 import {colorsAlias,Colors} from "$theme";
 import {isObj,isNonNullString,defaultStr} from "$cutils";
-import eMainScreens from "$escreens/mainScreens";
+import {getMainScreens} from "$escreens/mainScreens";
 import {ExpoUIContext} from "./hooks";
 import Login from "$eauth/Login";
 import {modes} from "$ecomponents/TextField";
@@ -21,6 +21,7 @@ import { prepareScreens } from "./TableData";
     getStructData : ()=>{object|array}
     tablesData : {object}, la liste des tables de données
     strucsData : {object}, la liste des données de structures
+    handleHelpScreen : {boolean}, //si l'écran d'aide sera pris en compte, l'écran d'aide ainsi que les écrans des termes d'utilisations et autres
     convertFiltersToSQL : {boolean}, si les filtres de datagrid ou filtres seront convertis au format SQL
     components : {
         logo : {
@@ -38,13 +39,14 @@ import { prepareScreens } from "./TableData";
       drawerItems : {object|array|function}, la fonction permettant d'obtenir les items du drawer principal de l'application
     }
 */
-const Provider = ({children,getTableData,navigation,components,convertFiltersToSQL,getStructData,tablesData,structsData,...props})=>{
+const Provider = ({children,getTableData,handleHelpScreen,navigation,components,convertFiltersToSQL,getStructData,tablesData,structsData,...props})=>{
     const {extendAppTheme} = appConfig;
     const { theme : pTheme } = useMaterial3Theme();
     navigation = defaultObj(navigation);
     components = defaultObj(components);
     structsData = isObj(structsData)? structsData : null;
     appConfig.tablesData = tablesData;
+    handleHelpScreen = handleHelpScreen === false ? false : true;
     appConfig.structsData = appConfig.structsData = isObj(structsData)? structsData : null;
     getTableData = appConfig.getTable = appConfig.getTableData = getTableOrStructDataCall(tablesData,getTableData);
     getStructData = appConfig.getStructData = getTableOrStructDataCall(structsData,getStructData);
@@ -118,13 +120,14 @@ const Provider = ({children,getTableData,navigation,components,convertFiltersToS
         tables:tablesData,
         screens,
         TableDataScreen:components.TableDataScreen || components.TableDataScreenItem,
-        TableDataScreenList:components.TableDataScreenList||components.TableDataListScreen
+        TableDataScreenList:components.TableDataScreenList||components.TableDataListScreen,
       });
-      return [...r,...eMainScreens];
+      return [...r,...getMainScreens(handleHelpScreen)];
     },[]);
     return <ExpoUIContext.Provider 
       value={{
         ...props,
+        handleHelpScreen,
         navigation,
         convertFiltersToSQL,
         components : {

package/src/index.js

@@ -27,7 +27,6 @@ import DialogProvider from "$ecomponents/Dialog/Provider";
 import SimpleSelect from '$ecomponents/SimpleSelect';
 import {Provider as AlertProvider} from '$ecomponents/Dialog/confirm/Alert';
 import { DialogProvider as FormDataDialogProvider } from '$eform/FormData';
-import {PortalProvider,CustomPortal} from '$ecomponents/Portal';
 import ErrorBoundaryProvider from "$ecomponents/ErrorBoundary/Provider";
 import notify, {notificationRef} from "$notify";
 import DropdownAlert from '$ecomponents/Dialog/DropdownAlert';
@@ -283,7 +282,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount})
                 },
               }}
             >
-              <PortalProvider>
+              <Portal.Host testID="RN_NativePaperPortalHost">
                 <ErrorBoundaryProvider/>  
                 <PreloaderProvider/>   
                 <DialogProvider responsive testID={"RN_MainAppDialogProvider"}/>
@@ -291,17 +290,15 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount})
                 <FormDataDialogProvider/>  
                 <BottomSheetProvider/>
                 <DropdownAlert ref={notificationRef}/>
-                <Portal.Host testID="RN_NativePaperPortalHost">
-                  <ErrorBoundary>
-                    <StatusBar/>
-                    <SplashScreen isLoaded={isLoaded}>
-                      <PreferencesContext.Provider value={preferences}>
-                        {React.isValidElement(content) && content || child}
-                      </PreferencesContext.Provider>  
-                    </SplashScreen>
-                  </ErrorBoundary>
-                </Portal.Host>
-              </PortalProvider>
+                <ErrorBoundary>
+                  <StatusBar/>
+                  <SplashScreen isLoaded={isLoaded}>
+                    <PreferencesContext.Provider value={preferences}>
+                      {React.isValidElement(content) && content || child}
+                    </PreferencesContext.Provider>  
+                  </SplashScreen>
+                </ErrorBoundary>
+              </Portal.Host>
           </PaperProvider>
         </GestureHandlerRootView>
   </AuthProvider>;

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

@@ -11,13 +11,15 @@ import {useMemo,useEffect,useRef} from "react";
 import { screenName as aboutScreenName} from "$escreens/Help/About";
 import theme from "$theme";
 import APP from "$capp/instance";
+import useExpoUI from "$econtext";
 
 const useGetItems = (options)=>{
     const {navigation:{drawerItems}} = useContext(); 
     options = defaultObj(options);
     const {refresh,force} = options;
     const showProfilOnDrawer = theme.showProfilAvatarOnDrawer;
-    const handleHelp =  appConfig.get("handleHelpScreen") !== false ? true : false;
+    const {handleHelpScreen} = useExpoUI(); 
+    const handleHelp =  handleHelpScreen !== false;
     const refreshItemsRef = useRef(false);
     useEffect(()=>{
         const refreshItems = (...a)=>{

package/src/screens/Help/openLibraries.js

@@ -1 +1 @@
-module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.26.13","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"18.1.2","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.29.2","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.41.1","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.8","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.2","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.2","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.4","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.3","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.18.14","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.7","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.0","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};
+module.exports = {"@FTO-CONSULT/EXPO-UI":{"name":"@FTO-CONSULT/EXPO-UI","version":"6.28.1","homepage":"https://github.com/borispipo/expo-ui#readme"}};

package/src/screens/index.js

@@ -3,7 +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";
 

package/src/screens/mainScreens.js

@@ -3,4 +3,16 @@ import Help  from "./Help";
 export default  [
     ...Auth,
     ...Help,
-]
+]
+
+export const getMainScreens = (handleHelpScreen)=>{
+    const screens = [Auth];
+    if(handleHelpScreen !== false){
+        screens.push(Help);
+    }
+    return screens;
+}
+
+export const screensWithoutHelp = [...Auth];
+
+export {Help};

package/src/test-screens/Home.js

@@ -3,8 +3,6 @@ import Test from "$ecomponents/Datagrid/Test";
 import React  from "$react";
 
 export default function HomeScreen(props){
-    React.useEffect(()=>{
-    },[])
     return <Screen{...props} contentContainerStyle={[{flex:1}]}>
         <Test/>
     </Screen>