@fto-consult/expo-ui 8.84.0 → 9.0.1

package/src/components/Datagrid/Accordion/Filters.js

@@ -18,8 +18,8 @@ import { useDatagrid } from "../hooks";
 const MIN_WIDTH = 250;
 let windowWidth = Dimensions.get("window").width;
 
-const FiltersAccordionComponent = React.forwardRef(({children,filters,filteredColumns,context,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,...rest},ref)=>{
-    const testID = defaultStr(testID,"RN_AccordionFilters");
+const FiltersAccordionComponent = React.forwardRef(({children,testID,filters,filteredColumns,context,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,...rest},ref)=>{
+    testID = defaultStr(testID,"RN_AccordionFilters");
     const [visibleColumns,setVisibleColumns] = React.useState(filteredColumns);
     const [visible,setVisible] = React.useState(defaultBool(customVisible,false));
     const valuesRefs = React.useRef({});

package/src/components/Datagrid/Common/Common.js

@@ -1051,7 +1051,7 @@ export default class CommonDatagridComponent extends AppComponent {
     renderDataSourceSelector(){
         const t = !this.props.handleTitle ? null : isNonNullString(this.props.title) || typeof this.props.title ==='number' ? <Label textBold primary style={[theme.styles.fs14]} testID={"RN_DatagridTitleProp"}>{this.props.title}</Label> : React.isValidElement(this.props.title)? this.props.title : null;
         const table = defaultStr(this.props.table,this.props.tableName);
-        const dS = dS === false ? null : typeof this.props.dataSourceSelector ==='function'? this.props.dataSourceSelector({
+        const dS = this.props.dataSourceSelector === false ? null : typeof this.props.dataSourceSelector ==='function'? this.props.dataSourceSelector({
             defaultValue : this.currentDataSources,
             onChange : this.onChangeDataSources.bind(this),
             tableName:table,

package/src/components/Filter/index.js

@@ -481,6 +481,7 @@ export default class Filter extends AppComponent {
       data,
       testID,
       filterContainerProps,
+      responsiveProps,
       ...rest
     } = {...this.props,...this.filterProps};
      const type = this.type;
@@ -646,7 +647,7 @@ export default class Filter extends AppComponent {
      const containerProps = defaultObj(this.props.containerProps,rest.containerProps);
      delete rest.containerProps;
      const Component = isBetweenAction ? FilterBetweenComponent : this.Component;
-     const responsiveProps = Object.assign({},responsiveProps);
+     responsiveProps = Object.assign({},responsiveProps);
      responsiveProps.style = [theme.styles.w100,responsiveProps.style]
      if(ignoreDefaultValue && isPeriodAction) {
         rest.isPeriodAction = true;

package/src/components/Form/FormData/DialogProvider.js

@@ -22,7 +22,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
     const [state,setState] = React.useState({});
     const isMobile = isMobileOrTabletMedia();
     const formRef = React.useRef(null);
-    const {closeAction} = props;
+    let {closeAction} = props;
     const context = {
         open : (props)=>{
             let sData = {};
@@ -68,7 +68,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
             rest.windowWidth = !isMob ? MAX_WIDTH : undefined;
             const no = extendObj({},props.no,state.no);
             rest.actions = Array.isArray(rest.actions)? Object.clone(rest.actions) : isObj(rest.actions)? Object.clone(rest.actions) : null;
-            const closeAction = defaultObj(closeAction);
+            closeAction = defaultObj(closeAction);
             rest.cancelButton = false;
             if(cancelButton !== false && rest.actions && (!isMob || rest.fullScreen === false) && state.no !== false){
                 if(isDesktopMedia() && typeof rest.maxActions !=='number'){

package/src/components/Grid/Cell.js

@@ -74,7 +74,7 @@ const GridCellComponent = React.forwardRef((p,ref)=>{
     const testID = defaultStr(props.testID,"RN_Grid.CellComponent");
     const contentProps = defaultObj(cProps);
     const C = onPress || onLongPress || onPressIn || onPressOut ? Pressable : View;
-    const elevation = typeof elevation == "number"? elevation : withSurface ? 5 : undefined;
+    const elevation = typeof cElev == "number"? cElev : withSurface ? 5 : undefined;
     const elevStyle = typeof elevation =="number" ? Elevations[elevation] || null : null;
     return <View 
         {...props}

package/src/components/Icon/Checkbox.js

@@ -8,9 +8,9 @@ import {CHECKED_ICON,UNCHECKED_ICON} from "$ecomponents/Icon/utils";
 /****** icon de type checkbox variant en fonction de l'environnement ou la plateforme */
 const Checkbox = React.forwardRef((props,ref)=>{
     const {checked:customChecked,color:customColor,primary,secondary,primaryOnCheck,secondaryOnCheck,onChange,checkedIcon:customCheckedIcon,uncheckedIcon:customUncheckedIcon,onPress,...rest} = props; 
-    const checkedIcon = defaultStr(checkedIcon,CHECKED_ICON);
-    const uncheckedIcon = defaultStr(uncheckedIcon,UNCHECKED_ICON);
-    const [checked,setIsChecked] = React.useState(!!checked);
+    const checkedIcon = customCheckedIcon || CHECKED_ICON;
+    const uncheckedIcon = customUncheckedIcon || UNCHECKED_ICON;
+    const [checked,setIsChecked] = React.useState(!!customChecked);
     const isMounted = React.useIsMounted();
     const prevChecked = React.usePrevious(checked);
     const callOnChangeRef = React.useRef(true);

package/src/components/Image/index.js

@@ -7,7 +7,7 @@ let maxWidthDiff = 100, maxHeightDiff = 100;
 import {StyleSheet} from "react-native";
 import React from "$react";
 import PropTypes from "prop-types";
-import {isMobileNative} from "$cplatform";
+import {isMobileNative,isWeb} from "$cplatform";
 import {uniqid} from "$cutils";
 //import Signature from "$ecomponents/Signature";
 import Label from "$ecomponents/Label";
@@ -26,9 +26,12 @@ export const isValidImageSrc = (src)=>{
 export const resolveAssetSource = (source)=>{
     if(!source && !isDecimal(source)) return undefined;
     try {
+        if(isWeb()){
+            return {uri:source};
+        }
         return Image.resolveAssetSource(source);
     } catch(e){
-        console.log(r," triing to resolve image asset from source ",source)
+        console.log(e," triing to resolve image asset from source ",source)
         return undefined;
     }
 }

package/src/components/Table/Header/index.js

@@ -17,8 +17,6 @@ import Filters from "./Filters";
 
 export default function RowHeaderComponent({isFilter,isFooter,isHeader,className,children:cChildren,...rest}){
     const {showHeaders,visibleColsNames,colsWidths,filterable,visibleColsNamesStr,headerContainerProps,footerContainerProps,filtersContainerProps,showFilters,filters,showFooters} = useTable();
-    const canV = showHeaders === false ? false : Array.isArray(children)? !!children.length : true;
-    const visible = canV && (isHeader ?  true : isFilter ? !!showFilters && filterable !== false : isFooter ? !!showFooters: true);
     const containerProps = defaultObj( isHeader ? headerContainerProps : isFooter ? footerContainerProps : filtersContainerProps);
     const style = filters ? styles.filters : isFooter ? styles.footer : null;
     const children = React.useMemo(()=>{    
@@ -26,6 +24,8 @@ export default function RowHeaderComponent({isFilter,isFooter,isHeader,className
             return <CellWrapper width={colsWidths[columnField]} isFilter={isFilter} isFooter={isFooter} key={columnField} columnField={columnField} columIndex={index}/>
         });
     },[visibleColsNamesStr]);
+    const canV = showHeaders === false ? false : Array.isArray(children)? !!children.length : true;
+    const visible = canV && (isHeader ?  true : isFilter ? !!showFilters && filterable !== false : isFooter ? !!showFooters: true);
     if(!visible && !isFilter) return null;
     const rP = isNative ? rest : {className:classNames(className,"table-footer-or-header-row")}
     return <Component {...rP} {...containerProps} style={StyleSheet.flatten([styles.header,style,rest.style,containerProps.style,!visible && hStyle.hidden])}>

package/src/components/Table/index.js

@@ -65,9 +65,7 @@ const TableComponent = React.forwardRef(({containerProps,tableHeadId,fixedHeader
     const hasData = !!Object.size(items,true);
     const emptyData = !hasData && (renderListContent === false ?null : typeof renderEmpty =='function' ? renderEmpty() : null) || null;
     const hasEmptyData = emptyData && React.isValidElement(emptyData);
-    const emptyContent = <View onRender={onComponentRender} testID={testID+"_EmptyData"} style={styles.hasNotData}>
-        {emptyData}
-    </View> 
+    const listWidth = '100%';
     const scrollContentContainerStyle = {flex:1,width:listWidth,minWidth:totalWidths,height:'100%'};
     const scrollEventThrottle = isMobileNative()?200:50;
     const scrollViewFlexGrow = {flexGrow:0};
@@ -80,7 +78,6 @@ const TableComponent = React.forwardRef(({containerProps,tableHeadId,fixedHeader
         scrollViewProps.style],
         contentContainerStyle : [styles.scrollView,scrollViewProps.contentContainerStyle,scrollViewFlexGrow,scrollContentContainerStyle]
     }
-    const listWidth = '100%';
     const footerScrollViewRef = React.useRef(null);
     const context = {
         listRef,
@@ -143,6 +140,9 @@ const TableComponent = React.forwardRef(({containerProps,tableHeadId,fixedHeader
             }
         }
     };
+    const emptyContent = <View onRender={onComponentRender} testID={testID+"_EmptyData"} style={styles.hasNotData}>
+        {emptyData}
+    </View> 
     return <View testID= {testID+"_Container"}  {...containerProps} onLayout={(e)=>{
         layoutRef.current = e.nativeEvent.layout;
         if(containerProps.onLayout){

package/src/context/Provider.js

@@ -1,3 +1,4 @@
+import "@expo/metro-runtime";
 import "$session";
 import React from "$react";
 import appConfig from "$capp/config";

package/src/layouts/Screen/TableData.js

@@ -289,6 +289,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
                         currentField.readOnly = true;
                     }
                 });
+                const isPrimary = this.primaryKeyFields[columnField] && true || false;
                 const cArgs = {...rest,field:currentField,columnField,columnDef:currentField,isUpdate:isUpdated,name:columnField,index:i,counterIndex,isPrimary,fields:preparedFields,contex:this,data:this.getCurrentData(),datas,currentIndex,isUpdated,tableName,table};
                 if(isUpdated){
                     //la props readOnlyOnEditing permet de rendre le champ readOnly en cas de mise à jour de la tableData
@@ -311,7 +312,6 @@ export default class TableDataScreenComponent extends FormDataScreen{
                 if(field.primaryKey ===true){
                     this.primaryKeyFields[columnField] = true;
                 }
-                const isPrimary = this.primaryKeyFields[columnField] && true || false;
                 if(!canRenderActions){
                     currentField.disabled = true;
                 }

package/src/navigation/Drawer/index.js

@@ -14,6 +14,8 @@ const DrawerNavigator = React.forwardRef(({content,children:customChildren,state
     const mergedRefs = React.useMergeRefs(drawerRef,ref);
     const forceRender = React.useForceRender();
     const refreshItemsRef = React.useRef(false);
+    const isAuthLoggedIn = Auth.isLoggedIn();
+    const [isLoggedIn,setIsLoggedIn] = React.useState(isAuthLoggedIn);
     const items = useGetItems({refresh:()=>{
         if(drawerRef.current && drawerRef.current && drawerRef.current.forceRenderNavigationView){
             return  drawerRef.current.forceRenderNavigationView();
@@ -45,8 +47,6 @@ const DrawerNavigator = React.forwardRef(({content,children:customChildren,state
         }
         return <ProfilAvatar ref={uProfileRef} drawerRef={drawerRef}/>;
     };
-    const isAuthLoggedIn = Auth.isLoggedIn();
-    const [isLoggedIn,setIsLoggedIn] = React.useState(isAuthLoggedIn);
     const prevIsLoggedIn = React.usePrevious(isLoggedIn);
     const navigationViewRef = React.useRef(null);
     state = defaultObj(state);

package/src/screens/Auth/PermLines.js

@@ -111,14 +111,6 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
 });
 
 PermLines.displayName = "AuthPermsLinesComponent";
-const PermTextType = PropTypes.shape({
-    text : PropTypes.string,//le texte de la permission
-    label : PropTypes.string,
-    title : PropTypes.string, //le tooltip associé à la permission
-    tooltip : PropTypes.string, //alias à title,
-    actions : PropTypes.objectOf(PermTextType),//les actions supportées par la permission
-    defaultAction : PropTypes.bool,//si les actions par défaut seront associés à la permission en cours
-});
 
 const permsType = PropTypes.oneOfType([
     PropTypes.func,PropTypes.object,

package/bin/create-app/webpack.config.js

@@ -1 +0,0 @@
-module.exports = require("@fto-consult/expo-ui/webpack.config.js");

package/compiler.config.js

@@ -1,33 +0,0 @@
-const path = require("path");
-module.exports = function({config,nodeModulesPath}){
-    const base = process.cwd();
-    const expoUi = path.resolve(require("./expo-ui-path")());
-    nodeModulesPath = Array.isArray(nodeModulesPath)? nodeModulesPath : [];
-    config.resolve.modules = Array.isArray(config.resolve.modules)? config.resolve.modules:[]
-    config.resolve.modules = [path.resolve(base, 'node_modules'),path.resolve(expoUi,"node_modules"),...nodeModulesPath,...config.resolve.modules];
-    config.module.rules.push({
-        test: /\.(js|jsx|ts|tsx)$/,
-        type: "javascript/auto",
-        include: [
-            base,
-            /node_modules\/@fto-consult/,
-            expoUi,
-        ],
-        exclude:[
-            /node_modules[/\\](?!react-native-paper|react-native|react-native-vector-icons|react-native-safe-area-view)/,
-        ],
-        use: {
-          loader: 'babel-loader',
-        },
-    });
-    config.module.rules.push({
-        test: /\.mjs$/,
-        include: /node_modules/,
-        type: 'javascript/auto',
-        resolve: {
-          fullySpecified: false
-        }
-    });
-    config.plugins.push(require("@fto-consult/common/circular-dependencies"));
-    return config;
-}

package/webpack.config.js

@@ -1,82 +0,0 @@
-/**@see : https://www.npmjs.com/package/@expo/webpack-config */
-const isObj = x => x && typeof x =='object' && !Array.isArray(x);
-//const webpack = require("webpack");
-const fs = require("fs");
-const supportedPlatforms = ["web","electron"];
-const mainExtensions = [".js", ".jsx",".ts",".tsx",".mjs"];
-const path = require("path");
-
-// Expo CLI will await this method so you can optionally return a promise.
-module.exports = async function(env, argv,opts) {
-  const isLocalDev = require("./is-local-dev")();//si l'application est en developpement local
-  const nodeModulePath = path.resolve(`${process.cwd()}`,"node_modules");
-  const localNodeEuiP = path.resolve(nodeModulePath,"@expo/webpack-config");
-  const wConfigPath = fs.existsSync(localNodeEuiP) && localNodeEuiP || "@expo/webpack-config";
-  const createExpoWebpackConfigAsync = require(wConfigPath);
-    env = env || {};
-    opts = typeof opts =="object" && opts ? opts : {};
-    const babel = isObj(opts.babel)? opts.babel : {};
-    const isElectron = process.env.isElectron || process.env.platform =="electron" || typeof env.platform =="string" && env.platform.toLowerCase().trim() ==='electron';
-    const isNeutralino = process.env.isNeutralino || process.env.platform =="neutralino";
-    if(isElectron || isNeutralino){
-       env.platform = isElectron ? "electron":"neutralino";
-       env.mode = env.mode =="production" && "production" || "development";
-       env.pwa = false;
-    }
-    const platform = isElectron && "electron" || isNeutralino && "neutralino" || process.env.platform && supportedPlatforms.includes(process.platform) && process.platform || typeof opts.platform =="string" && supportedPlatforms.includes(opts.platform)? opts.platform : "web";
-    const transpileModules = Array.isArray(opts.transpileModules)? opts.transpileModules : [];
-    const projectRoot = opts.projectRoot && typeof opts.projectRoot =="string" && fs.existsSync(opts.projectRoot) && opts.projectRoot || process.cwd();
-    const config = await createExpoWebpackConfigAsync(
-      {
-        ...env,
-        platform,
-        projectRoot,
-        babel: {
-          ...babel,
-          dangerouslyAddModulePathsToTranspile: [
-            // Ensure that all packages starting with @fto-consult are transpiled.
-            '@fto-consult',
-            ...transpileModules,
-          ],
-        },
-      },
-      argv
-    );
-    config.module.rules.push(
-      {
-          test: /.mjs$/,
-          include: /node_modules/,
-          type: "javascript/auto",
-          use: {loader: 'babel-loader'}
-    });
-    config.mode = (config.mode =="development" || config.mode =='production') ? config.mode  : "development";
-    // Maybe you want to turn off compression in dev mode.
-    if (config.mode === 'development') {
-      config.devServer.compress = false;
-    }
-    // Or prevent minimizing the bundle when you build.
-    if (config.mode === 'production') {
-      config.optimization.minimize = true;
-    }
-    config.performance = typeof config.performance =="object" && config.performance ? config.performance : {};
-    config.performance.hints = "hints" in config.performance ? config.performance.hints : false;
-    config.performance.maxEntrypointSize = typeof config.performance.maxEntrypointSize =='number'? config.performance.maxEntrypointSize : 512000;
-    config.performance.maxAssetSize = typeof config.performance.maxAssetSize =='number'? config.performance.maxAssetSize : 512000;
-    config.devtool = (config.mode === 'development') ? 'inline-source-map' : false;
-    require("./compiler.config.js")({config,...opts});
-    const extensions = config.resolve.extensions;
-    if(isElectron || isNeutralino){
-      mainExtensions.map((ex)=>{
-        const nExt =  `.${isElectron?"electron":"neu"}${ex}`;
-        if(!extensions.includes(nExt)){
-          extensions.unshift(nExt);
-        }
-      });
-    }
-    config.resolve.fallback = {
-      ...Object.assign({},config.resolve.fallback),
-      crypto: require.resolve("crypto-browserify"),
-      stream: require.resolve("stream-browserify"),
-    }
-    return config;
-};;