@fto-consult/expo-ui 8.63.1 → 8.64.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.63.1",
+  "version": "8.64.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {
@@ -69,7 +69,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.39.8",
+    "@fto-consult/common": "^4.39.11",
     "@fto-consult/node-utils": "^1.7.1",
     "apexcharts": "^3.48.0",
     "file-saver": "^2.0.5",

package/src/components/Date/FormatSelector.js

@@ -81,6 +81,7 @@ export const selectDateFormatFieldProps = ({onAdd:customOnAdd,onAddCustomFormat,
         getItemValue : ({item})=>item.code,
         renderItem : dateFormatSelectorRenderItem,
         showAdd : true,
+        label : "Format de date",
         ...props,
         inputProps : {
             enableCopy:false,...inputProps,

package/src/components/Dialog/Dialog.js

@@ -93,7 +93,7 @@ const DialogComponent = React.forwardRef((props,ref)=>{
     if(isNonNullString(no)){
         no = {label:no};
     }
-    if(isObj(no) && (no.label||no.text)){
+    if(isObj(no)){
         cancelButton = cancelButton ? {...no,...cancelButton} : no;
         backActionProps = {...no,...backActionProps};
     }

package/src/components/Dialog/Provider.js

@@ -60,7 +60,7 @@ const Provider = React.forwardRef((props,innerRef)=>{
         },
     };
     React.setRef(ref,context);        
-    return <Dialog {...props} {...state} visible={visible} controlled onDismiss = {(e)=>{
+    return <Dialog {...props} {...state} isProvider visible={visible} controlled onDismiss = {(e)=>{
         if(visible){
             setVisible(false);
         }

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

@@ -1,7 +1,7 @@
 import selectors from "./sprintfSelectors";
 import {isNonNullString,defaultFunc,isObj,isPromise} from "$cutils";
 
-export default  ({value,val,formatter,cb,success})=>{
+export default  ({value,val,formatter,cb,success,...rest})=>{
     val = defaultStr(value,val)
     if(!isNonNullString(val)){
         return null;
@@ -46,13 +46,13 @@ export default  ({value,val,formatter,cb,success})=>{
             } else {
                 key = keys[index];
                 if(!isNonNullString(key)) {return next();}
-                let indexName = i.toLowerCase();
+                let indexName = key.toLowerCase();
                 let selector = selectors[indexName];
                 if(!selector){
-                    indexName = i.toUpperCase();
+                    indexName = key.toUpperCase();
                     selector = selectors[indexName];
                 }
-                sKeys[i] = indexName;
+                sKeys[key] = indexName;
                 const select = isObj(selector)? selector.select : selector;
                 if(typeof cb =='function'){
                     const v = select({...rest,selector,selectors,indexName,selectorIndex:indexName,selectorName:indexName,results,index:key,keys,key,value:val});

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

@@ -1,7 +1,13 @@
-import Date from "$lib/date";
+import {DateTime,FormatSelector} from "$ecomponents/Date";
 import {defaultObj} from "$cutils";
 import appConfig from "$capp/config";
+import DialogProvider from "$ecomponents/Dialog/Provider";
+import View from "$ecomponents/View";
+import DateLib from "$clib/date";
+import theme from "$theme";
+
 const sprintfSelectors = defaultObj(appConfig.get("sprintfSelectors"));
+
 export default  {
     ...sprintfSelectors,
     "&sdate&" : {
@@ -10,9 +16,47 @@ export default  {
         field : {
               type : 'date',
               text : 'Sélectionner une date',
-              format : Date.defaultDateFormat
+              format : DateLib.defaultDateFormat
         },
         desc : "remplace le motif par la date qui sera sélectionnée par l'utilisateur au format jj/mm/aaaa",
+        select : ()=>{
+            return new Promise((resolve,reject)=>{
+                const valueRef = {current:new Date(),format:DateLib.defaultDateTimeFormat};
+                DialogProvider.open({
+                    title : 'Sélectionner une date',
+                    cancelButton : true,
+                    onCancel : reject,
+                    content : <View testID = {"RN_SprintfSelectorSelectDate"} style={[theme.styles.p1]}>
+                        <DateTime
+                            label = {"Select date"}
+                            defaultValue = {valueRef.current}
+                            onChange = {({value,date})=>{
+                                if(DateLib. isDateObj (date)){
+                                    valueRef.current = date;
+                                } else valueRef.current = new Date(value);
+                            }}
+                        />
+                        <FormatSelector
+                            defaultValue = {valueRef.format}
+                            onChange = {({value})=>{
+                                valueRef.format = value;
+                            }}
+                        />
+                    </View>,
+                    actions : [
+                        {
+                            text : "Sélectionner",
+                            icon : "check",
+                            success : true,
+                            onPress : ()=>{
+                                DialogProvider.close();
+                                resolve(DateLib.format(valueRef.current,valueRef.format));
+                            }
+                        },
+                    ]
+                })
+            })
+        }
      },
     "&date&" : "remplace le motif par la date actuelle au format : jj/mm/aaaa",
     "&heure&" : "remplace le motif par l'heure actuelle au format hh:mm:ss",

package/src/context/Provider.js

@@ -114,7 +114,7 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
     const activeScreenRef = React.useRef('');
     const appStateRef = React.useRef({});
     const swrRefreshTimeout = defaultNumber(swrConfig?.refreshTimeout,SWR_REFRESH_TIMEOUT)
-    swrConfig = extendObj({
+    swrConfig = extendObj({},{
       provider: () => new Map(),
       dedupingInterval : swrRefreshTimeout,
       errorRetryInterval : Math.max(swrRefreshTimeout*2,SWR_REFRESH_TIMEOUT),

package/src/screens/Help/openLibraries.js

@@ -1,6 +1,6 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
-		"version": "8.62.3",
+		"version": "8.64.0",
 		"url": "https://github.com/borispipo/expo-ui#readme",
 		"license": "ISC"
 	},