@fto-consult/expo-ui 2.7.13 → 2.9.0

package/src/components/Filter/index.js

@@ -2,7 +2,7 @@
 
 import DateLib from "$lib/date";
 import {isNonNullString,defaultStr,isNullOrEmpty,debounce,uniqid} from "$utils";
-import {regexParser,regexActions,getFilterStateValues} from "./utils";
+import {regexParser,regexActions,operators as _operators,actions as _actions,periodActions, inActions as _inActions,getFilterStateValues,getSessionData,setSessionData} from "$cfilters";
 import {parseDecimal} from "$ecomponents/TextField";
 import notify from "$notify";
 import PropTypes from "prop-types";
@@ -15,41 +15,12 @@ import React,{Component as AppComponent} from "$react";
 import theme from "$theme";
 import {isMobileMedia} from "$cplatform/dimensions";
 import { ActivityIndicator } from "react-native-paper";
-import { getSessionData,setSessionData } from "./session";
 import DialogProvider from "$components/Form/FormData/DialogProvider";
 
 const manualRunKey = "manual-run";
 
-export * from "./utils";
+export * from "$cfilters";
 
- const _actions = {
-  '$eq' : 'Egal à',
-  "$ne" : 'Défférent de',
-  '$gt' : 'Supérieur à',
-  '$gte' : 'Supérieur ou égal',
-  '$lt' : 'Inférieur à',
-  '$lte' : 'Inférieur où égal à',
-}
-
-const _inActions = {
-  '$in'  :'Est inc ds la liste', //Array of JSON values	The document field must exist in the list provided.
-  '$nin' : 'N\'est pas inc ds la liste', //Array of JSON values	The document field not must exist in the list provided.
-}
- 
-
-const _operators = {
-   '$and' : 'Et', //Array	Matches if all the selectors in the array match.
-   '$or' : 'Ou', //Array	Matches if any of the selectors in the array match. All selectors must use the same index.
-}
-
-const periodActions = {
-  $yesterday : "Hier",
-  $today:"Aujourd'hui",
-  $prevWeek:"Semaine passée",
-  $week:'Cette semaine',
-  $month:'Ce mois',
-  $period:"Période"
-}
   
 /***** Coposant Filter, pour les filtres de données */
 export default class Filter extends AppComponent {

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

@@ -863,7 +863,7 @@ export default class Field extends AppComponent {
         delete rest.archivable;
 
         this.___formattedField = undefined;
-        let _type = this.type = defaultStr(this.props.type,this.type,"text").trim().toLowerCase();
+        let _type = this.type = defaultStr(this.props.jsType,this.props.type,this.type,"text").trim().toLowerCase();
         format = defaultStr(format).toLowerCase().trim();
         tooltip = defaultVal(tooltip,title);
 
@@ -959,6 +959,7 @@ Field.propTypes = {
         PropTypes.node,
         PropTypes.func,
     ]),
+    jsType : PropTypes.string,
     usePlaceholderWhenEmpty : PropTypes.bool,//si la valeur du placeholder sera utilée, lorsque la valeur du champ de type formatable est nulle ou égale à la valeur vide
     responsive : PropTypes.bool,
     responsiveProps : PropTypes.object,

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

@@ -191,7 +191,7 @@ export default class FormDataComponent extends AppComponent{
                 content.push(<Divider key = {index} style={theme.styles.w100}/>)
             } else if(isObj(field) && field.form !== false) {
                 const name = defaultStr(field.name,field.field,index);
-                const type = defaultStr(field.type,"text").trim().toLowerCase().replaceAll("_","");
+                const type = defaultStr(field.jsType,field.type,"text").trim().toLowerCase().replaceAll("_","");
                 const Component = componentTypes[type] || componentTypes.default;
                 let {defaultValue,useDefaultValueFromData,hidden,renderFormDataField,getMediaQueryStyle,printLabels,queryLimit,selected,value,visible,dataFilesInterest,perm,ignore,form,responsiveProps:customResponsiveProps,...rest} = field;
                 rest = Object.assign({},rest);

package/src/components/Icon/Font.js

@@ -61,12 +61,16 @@ const FontIcon = React.forwardRef(({icon,name,testID,color,iconStyle,backgroundC
         console.warn("Icone non définie pour le composant FontIcon, icon [{0}], merci de spécifier une icone supportée par la liste du module https://github.com/expo/vector-icons/MaterialCommunityIcons".sprintf(icon),props);
         return null;
     }
-    const iconName = icon.ltrim("")
+    const iconName = icon.ltrim("material-")
+                    .ltrim("fa-").ltrim("ant-").ltrim("fontisto-")
+                    .ltrim("foundation-").ltrim("ionic-").ltrim("octicons-")
+                    .ltrim("simple-line-").ltrim("zocial-").trim();
+
     return <Icon {...props} 
         ref = {ref}
         testID = {testID}
         color={color}
-        name = {icon}
+        name = {iconName}
         backgroundColor = {backgroundColor}
     />
 });
@@ -94,7 +98,7 @@ export const isIcon = (name,iconSet)=>{
     if(!isNonNullString(name) || !isNonNullString(iconSet)) return false;
     name = name.toLowerCase();
     iconSet = iconSet.toLowerCase().trim();
-    return name.startsWith(iconSet+"-") || name.startsWith(iconSet+"s"+"-") ? true : false;
+    return name.startsWith(iconSet+"-") /*|| name.startsWith(iconSet+"s"+"-")*/ ? true : false;
 }
 
 export default theme.withStyles(FontIcon,{displayName:FontIcon.displayName,mode:'normal'});

package/src/components/Link/index.js

@@ -1,10 +1,11 @@
 import { Pressable } from "react-native";
 import { navigate } from "$cnavigation";
 import PropTypes from "prop-types";
-import {defaultStr} from "$utils";
+import {defaultStr,defaultNumber} from "$utils";
 import React from "$react";
+
 const LinkComponent= React.forwardRef((props,ref)=>{
-    let {Component,navigation,children,params,stopEventPropagation,source,onPress,routeParams,routeName,routeSource,routeType, ...rest} = props;
+    let {Component,navigation,children,params,stopEventPropagation,timeout,delay,source,onPress,routeParams,routeName,routeSource,routeType, ...rest} = props;
     const onRoutePress = (e)=>{
         if(stopEventPropagation !== false){
             React.stopEventPropagation(e);
@@ -12,7 +13,9 @@ const LinkComponent= React.forwardRef((props,ref)=>{
         if(onPress && onPress(e) === false){
             return;
         }
-        navigate({routeName,previousRoute:undefined,routeParams,params,type:routeType,source:defaultStr(routeSource,source)},navigation);
+        setTimeout(()=>{
+            navigate({routeName,previousRoute:undefined,routeParams,params,type:routeType,source:defaultStr(routeSource,source)},navigation);
+        },defaultNumber(timeout,delay))
     };
     if(typeof children =='function'){
         return children ({...rest,onPress:onRoutePress},ref);
@@ -26,6 +29,8 @@ const LinkComponent= React.forwardRef((props,ref)=>{
 LinkComponent.propTypes = {
     stopEventPropagation : PropTypes.bool, //si la propagation d'évènement sera effective une fois qu'on ait cliqué sur le lien
     onPress : PropTypes.func,
+    timeout : PropTypes.number,
+    delay : PropTypes.number,//le delay d'attente lorsqu'on clique sur l'élément avant de faire la navigation
     routeName : PropTypes.string.isRequired,
     routeParams : PropTypes.object, //les paramètres à passer à la route
     routeType : PropTypes.string, //le type de route : stack ou drawer

package/src/components/Table/index.js

@@ -160,7 +160,7 @@ const TableComponent = React.forwardRef(({containerProps,renderEmpty,isRowSelect
     const scrollContentContainerStyle = {flex:1,width:listWidth,minWidth:totalWidths,height:'100%'};
     const scrollEventThrottle = isMobileNative()?200:50;
     const scrollViewFlexGrow = {flexGrow:0};
-    const maxScrollheight = f.length && fFilters.length ? 170  : f.length || fFilters.length ? 120 : 80;
+    const maxScrollheight = f.length && fFilters.length ? 170  : f.length ?120 :  fFilters.length ? 140 : 80;
     const allScrollViewProps = {
         scrollEventThrottle,
         horizontal : true,

package/src/layouts/Fab/index.js

@@ -16,6 +16,7 @@ const FABContainer = React.forwardRef((props,ref)=>{
   ref = ref || createFabRef(screenName);
   React.useEffect(()=>{
     const onFocusFab = ({sanitizedName})=>{
+        console.log(sanitizedName," is dddddd focused")
         const isFocused = sanitizedName === sScreenName;
         if(isFocused && ref.current && ref.current.show){
             ref.current.show();

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

@@ -28,8 +28,8 @@ export const getItems = (force)=>{
             r.push(item);
         }
     })
-    r.push({divider:true});
     if(handleHelp){
+        r.push({divider:true});
         const dataHelp = {
             key : 'dataHelp',
             label : 'Aide',

package/src/components/Filter/session.js

@@ -1,18 +0,0 @@
-import session from "$session";
-import {getLoggedUserCode} from "$cauth";
-const sKey = "FILTER-ITEM-KEY";
-const sessionKey = ()=> defaultStr(getLoggedUserCode())+"-"+sKey;
-import {defaultObj,defaultStr,isNonNullString} from "$utils";
-
-export const getSessionData = (key)=>{
-  const data = defaultObj(session.get(sessionKey()));
-  return isNonNullString(key)? data [key] : data;
-}
-export const setSessionData = (key,value)=>{
-  const data = getSessionData();
-  if(isNonNullString(key)){
-    data[key] = value;
-    return session.set(sessionKey(),data);
-  }
-  return false;
-}