@fto-consult/expo-ui 2.26.8 → 2.26.10

package/babel.config.alias.js

@@ -24,7 +24,7 @@ module.exports = (opts)=>{
     r["$mainScreens"] = r["$mainScreens"] || r["$emainScreens"];
     r["$escreen"] = r["$eScreen"] = path.resolve(expo,"layouts/Screen");
     r["$eTableDataScreen"] = path.resolve(expo,"layouts","Screen","TableData");
-    r["$TableDataScreen"] = r["$TableDataScreen"] || r["$eTableDataScreen"]
+    r["$TableDataScreen"] = r["$tableDataScreen"] = r["$TableDataScreen"] || r["$tableDataScreen"] || r["$eTableDataScreen"]
     r["$eassets"] = path.resolve(dir,"assets");
     r["$ethemeSelectorComponent"] = path.resolve(expo,"auth","ThemeSelector");
     /*** le composant permettant de sélectionner un theme utilisateur */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.26.8",
+  "version": "2.26.10",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.24.15",
+    "@fto-consult/common": "^1.24.16",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/components/Datagrid/SWRDatagrid.js

@@ -14,6 +14,7 @@ import Auth from "$cauth";
 import DateLib from "$lib/date";
 import {getFetchOptions} from "$cutils/filters";
 import {setQueryParams} from "$cutils/uri";
+import {uniqid} from "$utils";
 import { getFetcherOptions } from "$capi/fetch";
 import Icon from "$ecomponents/Icon";
 import Label from "$ecomponents/Label";
@@ -79,6 +80,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         makePhoneCallProps,
         fetchData,
         fetchPath,
+        fetchPathKey,
         fetcher,
         ListFooterComponent,
         testID,
@@ -126,10 +128,14 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     },rest.exportTableProps.pdf);
     const fetchOptionsRef = React.useRef(defaultObj(customFetchOptions));
     const refreshCBRef = React.useRef(null);
+    const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
     fetchPath = defaultStr(fetchPath,table.queryPath,tableName.toLowerCase()).trim();
+    if(fetchPath){
+        fetchPath = setQueryParams(fetchPath,fPathRef.current,fPathRef.current)
+    }
     const innerRef = React.useRef(null);
     const showProgressRef = React.useRef(true);
-    const dataRef = React.useRef(null);
+    const dataRef = React.useRef([]);
     const hasResultRef = React.useRef(false);
     const totalRef = React.useRef(0);
     const isFetchingRef = React.useRef(false);
@@ -160,13 +166,6 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             }
             const fetchCB = ({data,total})=>{
                 totalRef.current = total;
-                /***
-                 * if(pageRef.current ===firstPage){
-                        dataRef.current = data;
-                    } else {
-                        dataRef.current = prevPage != pageRef.current ? (isObj(data)?{...dataRef.current,...data}:[...dataRef.current,...data]) : data;
-                    }
-                 */
                 dataRef.current = data;
                 hasResultRef.current = true;
                 if(onFetchData && typeof onFetchData =='function'){
@@ -205,7 +204,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     },[isValidating,isLoading])
     const doRefresh = (showProgress)=>{
         showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : false;
-        //if(isFetchingRef.current) return;
+        if(isFetchingRef.current) return;
         refreshCBRef.current = ()=>{
             //showProgressRef.current = false;
         };
@@ -248,6 +247,26 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     }
     const loading = (isLoading|| isValidating);
     const pointerEvents = loading ?"node" : "auto";
+    const itLimits = [{
+        text : "Limite nbre elts par page",
+        divider : true,
+    }]
+    getDefaultPaginationRowsPerPageItems().map((item)=>{
+        itLimits.push({
+            text : item.formatNumber(),
+            icon : limitRef.current == item ? 'check' : null,
+            primary : limitRef.current === item ? true : false,
+            onPress : ()=>{
+                if(item == limitRef.current) return;
+                limitRef.current = item;
+                setSessionData("limit",limitRef.current);
+                pageRef.current = firstPage;
+                setTimeout(() => {
+                    doRefresh(true);
+                }, (500));
+            }
+        });
+    });
     return (
         <Datagrid 
             testID = {testID}
@@ -281,22 +300,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                                 </Pressable>
                             }}
                             title = {'Limite du nombre d\'éléments par page'}
-                            items = {getDefaultPaginationRowsPerPageItems().map((item)=>{
-                                return {
-                                    text : item.formatNumber(),
-                                    icon : limitRef.current == item ? 'check' : null,
-                                    primary : limitRef.current === item ? true : false,
-                                    onPress : ()=>{
-                                        if(item == limitRef.current) return;
-                                        limitRef.current = item;
-                                        setSessionData("limit",limitRef.current);
-                                        pageRef.current = firstPage;
-                                        setTimeout(() => {
-                                            doRefresh(true);
-                                        }, (500));
-                                    }
-                                }
-                            })}
+                            items = {itLimits}
                         />
                         <Icon
                             ///firstPage
@@ -327,7 +331,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                         />
                         <View testID={testID+"_PaginationLabel"}>
                             <Label style={{fontSize:15}}>
-                                {page.formatNumber()}-{totalPages.formatNumber()}{" / "}{totalRef.current.formatNumber()}
+                                {(totalRef.current?page:0).formatNumber()}-{totalPages.formatNumber()}{" / "}{totalRef.current.formatNumber()}
                             </Label>
                         </View>
                         <Icon
@@ -420,6 +424,7 @@ SWRDatagridComponent.displayName = "SWRDatagridComponent";
 SWRDatagridComponent.propTypes = {
     ...Datagrid.propTypes,
     fetchPath : PropTypes.string,
+    fetchPathKey : PropTypes.string,//la clé permettant de suffixer l'url fecherPath afin que ce ne soit pas unique pour certaines tables
     fetchData : PropTypes.func,
     table : PropTypes.shape({
         tableName : PropTypes.string,

package/src/components/Form/Fields/Field.js

@@ -19,6 +19,7 @@ import defaultKeyboardEvents from "../utils/keyboardEvents";
 import sprintf from "./sprintf";
 import ErrorMessage from "$ecomponents/ErrorBoundary/ErrorMessage";
 import { UPPER_CASE, LOWER_CASE} from "$common/lib/validator";
+import Label from "$components/Label";
 
 
 export default class Field extends AppComponent {
@@ -904,6 +905,9 @@ export default class Field extends AppComponent {
             const renderRigth = (props)=>{
                 let right = null;
                 let cRight = typeof customRight ==='function'? customRight(props) : customRight;
+                if(typeof cRight ==='number' || typeof cRight =="string"){
+                    cRight = <Label {...props}>{cRight}</Label>
+                }
                 if(!React.isValidElement(cRight)){
                     cRight = null;
                 }

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

@@ -207,7 +207,7 @@ export default class FormDataComponent extends AppComponent{
                     delete rest.filter;
                 }
                 if(name){
-                    rest.defaultValue = useDefaultValueFromData === false ? defaultValue : (name in data && data[name] !== undefined? data[name]: defaultValue);
+                    rest.defaultValue = useDefaultValueFromData === false ? defaultValue : (name in data && data[name] !== undefined && data[name] !== null? data[name]: defaultValue);
                     if((type == 'selecttabledata' || type == 'datafile')){
                         rest._defaultValue = data[rest.name];
                     }

package/src/components/SelectCurrency/index.js

@@ -10,6 +10,7 @@ import {currencies} from "$ccurrency";
 import { Pressable } from "react-native";
 import {styles} from "$theme";
 import appConfig from "$app/config";
+import PropTypes from "prop-types";
 
 const CurrencySelector = React.forwardRef((props,ref)=>{
     return <SimpleSelect ref={ref} {...selectCurrencyFieldProps(props)}/>
@@ -22,10 +23,10 @@ export default CurrencySelector;
 export const currencyFormatRef = React.createRef(null);
 
 /*** onAdd est appelé lorsqu'on ajoute un format personalisé */
-export const selectCurrencyFieldProps = ({right,disabled,readOnly,isFilter,onChange,onBlur,editable,...props})=>{
+export const selectCurrencyFieldProps = ({right,disabled,readOnly,onFormatChange,isFilter,onChange,onBlur,editable,...props})=>{
     const isEditable = disabled !== true && readOnly !== true && editable !== false;
     const currency = appConfig.currency;
-    currencyFormatRef.current = defaultStr(currencyFormatRef.current,appConfig.currencyFormat,"%v%s");
+    currencyFormatRef.current = defaultStr(currencyFormatRef.current,appConfig.currencyFormat,"%v %s");
     const iconSize = 25;
     return {
         items : currencies,
@@ -83,8 +84,11 @@ export const selectCurrencyFieldProps = ({right,disabled,readOnly,isFilter,onCha
                         containerProps = {{
                             width:70,
                         }}
-                        onChange = {({value})=>{
-                            currencyFormatRef.current = value;
+                        onChange = {(args)=>{
+                            currencyFormatRef.current = args.value;
+                            if(typeof onFormatChange =="function"){
+                                onFormatChange(args)
+                            }
                         }}
                     />  
                 </Pressable>
@@ -97,4 +101,5 @@ export const selectCurrencyFieldProps = ({right,disabled,readOnly,isFilter,onCha
 
 CurrencySelector.propTypes = {
     ...SimpleSelect.propTypes,
+    onFormatChange : PropTypes.func,//lorsque le format de la currency change
 }