@fto-consult/expo-ui 5.7.9 → 5.7.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.7.9",
+  "version": "5.7.11",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

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

@@ -8,10 +8,10 @@ import Form from "../Form";
 import theme,{flattenStyle} from "$theme";
 import PropTypes from "prop-types";
 import {renderActions} from "$ecomponents/Dialog/utils";
-//import {isDocUpdate} from "$database/utils";
 import {handleBeforeSaveCallback} from "./utils";
+import isDbDocEditing,{checkPrimaryKey} from "../utils/isDocEditing";
 import getComponentFromType from "./componentsTypes";
-import { keyboardShortcuts } from "../utils";
+import keyboardShortcuts from "../utils/keyboardShortcuts";
 import appConfig from "$capp/config";
 
 export default class FormDataComponent extends AppComponent{
@@ -84,11 +84,10 @@ export default class FormDataComponent extends AppComponent{
                             return "Impossible d'enregister les données à cause l'erreur suivante : "+errorText;
                         }
                     }
-                    const isDocEditing = this.isDocEditing(args.data);
                     const isUpdated = this.isDocEditing(args.data);
                     const currentIndex = this.getCurrentIndex();
                     const action = typeof this.clickedAction =='string' ? this.clickedAction.toLowerCase() : '';
-                    const savedArgs = {...args,isDocEditing,context:this,action,currentIndex,index:currentIndex,isUpdate:isUpdated,isUpdated,props:this.props,context:this};
+                    const savedArgs = {...args,isUpdated,context:this,action,currentIndex,index:currentIndex,isUpdate:isUpdated,isUpdated,props:this.props,context:this};
                     if(beforeSaveArgumentsMutator){
                         savedArgs = beforeSaveArgumentsMutator(savedArgs);
                         if(!isObj(savedArgs)){
@@ -149,7 +148,9 @@ export default class FormDataComponent extends AppComponent{
         } else if(typeof this.props.isDocUpdate =='function'){
             return this.props.isDocUpdate(data,{context:this}) ? true : false;
         }
-        return false;
+        return isObj(this.formDataPrimaryKeyFields) && Object.size(this.formDataPrimaryKeyFields,true) ? isDbDocEditing(data,this.formDataPrimaryKeyFields,({index:field,data})=>{
+            return checkPrimaryKey(data,field);
+        }) : false;
     }
     canBindResizeEvents(){
         return false;
@@ -180,6 +181,7 @@ export default class FormDataComponent extends AppComponent{
         formProps = defaultObj(formProps);
         const fieldProps = defaultObj(formProps.fieldProps,this.props.fieldProps);
         formProps.style = flattenStyle(formProps.style);
+        this.formDataPrimaryKeyFields = {};
         const content = [];
         const fields = defaultObj(formProps.fields,this.props.fields);
         const data = isObj(formProps.data) ? formProps.data : typeof this.props.data =='object' && this.props.data ? this.props.data : {};
@@ -198,6 +200,9 @@ export default class FormDataComponent extends AppComponent{
                 rest = Object.assign({},rest);
                 delete rest.import;
                 delete rest.export;
+                if(primaryKey === true && name && !field.filter){
+                    this.formDataPrimaryKeyFields[name] = field;
+                }
                 if(form === false || ignore || (isNonNullString(perm) && !Auth.isAllowedFromStr(perm))){
                     return null;
                 }

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

@@ -12,4 +12,6 @@ export {FormData};
 
 export default FormData;
 
-FormData.DialogProvider = Provider;
+FormData.DialogProvider = Provider;
+
+export * from "./utils";

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

@@ -2,7 +2,7 @@ import {isNonNullString,isObj,defaultObj,isPromise,isFunction,defaultStr,isObjOr
 import notify from "$notify";
 import { getFormData } from "../utils/FormsManager";
 import {isMobileBrowser,isMobileNative} from "$cplatform";
-import { keyboardShortcuts as KeyboardShorts } from "../utils";
+import KeyboardShorts from "../utils/keyboardShortcuts";
 
 export const keyboardShortcuts = {};
 Object.map(KeyboardShorts,(st,i)=>{
@@ -100,4 +100,5 @@ export const handleBeforeSaveCallback = (beforeSaveCallback,successCb,arg)=>{
     } 
     successCb(arg);
     return bF;
-} 
+} 
+

package/src/components/Form/utils/index.js

@@ -5,4 +5,6 @@ export {Forms};
 
 export {default as keyboardEvents} from "./keyboardEvents";
 
-export {default as keyboardShortcuts} from "./keyboardShortcuts";
+export {default as isDocEditing} from "./isDocEditing";
+
+export * from "./isDocEditing";

package/src/components/Form/utils/isDocEditing.js

@@ -0,0 +1,44 @@
+import {isObj,defaultStr} from "$cutils";
+export const checkPrimaryKey = (data,f)=>{
+    return !(!(f in data) || (data[f] == null) || (!data[f] && typeof data !=='number'));
+}
+
+/*** vérifie si le document passé en paramètre est éditable
+ * @param {object} data la données à vérifier
+ * @param {object| array} les champs sur lesquels se baser pour vérifier si la donénes est une mise à jour
+ * @param {func} checkPrimaryKey la foncition permettant de vérifier s'il s'agit d'une clé primaire pour la données courante
+ */
+const isDocEditing = (data,fields,checkPrimaryKey)=>{
+    if(!isObj(data) || !isObjOrArray(fields)) return false;
+    let hasPrimaryFields = false;
+    let hasValidated = true;
+    for(let i in fields){
+        const field = fields[i];
+        if(typeof checkPrimaryKey =='function') {
+            hasPrimaryFields = true;
+            if(checkPrimaryKey({field,i,index:i,data}) === false){
+                return false;
+            }
+            continue;
+        }
+        if(!isObj(field)) continue;
+        hasPrimaryFields = true;
+        const f = defaultStr(field.field,i);
+        if(field.primaryKey === true){
+            if(!checkPrimaryKey(data,f)){
+                if(hasPrimaryFields){
+                    return false;
+                }
+                hasValidated = false;
+            }
+        }
+    }
+    if(hasPrimaryFields){
+        return hasValidated;
+    }
+    return false;
+}
+
+export default isDocEditing;
+
+export const isDocUpdate = isDocEditing;

package/src/components/PhoneInput/index.js

@@ -66,10 +66,10 @@ export default function PhoneInputComponent(props){
     contentContainerProps.style = [styles.inputContainer,contentContainerProps.style];
     const ref = React.useRef(null);
     const [state,setState] = React.useState({
-        visible : false,
         ...prepareState({defaultValue,country})
-    })
-    const prevVisible = React.usePrevious(state.visible);
+    });
+    const [visible,setVisible] = React.useState(false);
+    const prevVisible = React.usePrevious(visible);
     label = defaultVal(label,text);
     React.useEffect(()=>{
         React.setRef(ref,ref.current,setRef);
@@ -82,8 +82,8 @@ export default function PhoneInputComponent(props){
         }
     },[defaultValue,country])
     const onPressFlag = (e)=>{
-        if(!state.visible){
-            setState({...state,visible:true})
+        if(!visible){
+            setVisible(true);
         }
     }
     inputProps = defaultObj(inputProps);
@@ -131,12 +131,17 @@ export default function PhoneInputComponent(props){
     return <SelectCountry
         label = {label}
         controlled = {true}
-        visible = {state.visible}
+        visible = {visible}
         defaultValue = {state.country}
         testID = {testID+"_SelectCountry"}
         onDismiss = {({value},force) =>{
-            if(force !== true && value === state.country && state.visible == prevVisible) return;
-            setState({...state,...prepareState({country:value,defaultValue:state.country==value?state.defaultValue:""}),visible:false})
+            if(force !== true && value === state.country && visible == prevVisible) return;
+            if(visible){
+                setVisible(false);
+            }
+        }}
+        onChange = {({value})=>{
+            setState({...state,...prepareState({country:value,defaultValue:state.country==value?state.defaultValue:""})});
         }}
         anchor = {
             <>

package/src/components/SimpleSelect/index.js

@@ -16,13 +16,15 @@ import { matchOperators,getSearchTimeout,canAutoFocusSearchField} from "$ecompon
 import Dialog from "$ecomponents/Dialog";
 
 const  SimpleSelect = React.forwardRef((props,ref)=>{
-    let {style : customStyle,onMount,mode,showSearch,anchorContainerProps,renderText,contentContainerProps,withCheckedIcon,testID,selectionColor,dialogProps,onShow,anchor,onUnmont,controlled,onDismiss,visible:controlledVisible,selectedColor,inputProps,itemProps,itemContainerProps,label,listProps,editable,readOnly,text,filter,renderItem,itemValue,getItemValue,defaultValue,items:menuItems,onPress,onChange,disabled,...rest} = props;
+    let {style : customStyle,onMount,mode,showSearch,anchorContainerProps,renderText,contentContainerProps,withCheckedIcon,testID,selectionColor,dialogProps,onShow,anchor,onUnmont,controlled:cr,onDismiss,visible:controlledVisible,selectedColor,inputProps,itemProps,itemContainerProps,label,listProps,editable,readOnly,text,filter,renderItem,itemValue,getItemValue,defaultValue,items:menuItems,onPress,onChange,disabled,...rest} = props;
     const flattenStyle = StyleSheet.flatten(customStyle) || {};
+    const controlledRef = React.useRef(typeof controlledVisible ==='boolean'? true : false);
+    const controlled = controlledRef.current;
     const [layout,setLayout] = React.useState({
         height: 0,
         width: 0,
     });
-    const [visible,setVisible] = React.useState(controlled?controlledVisible:false)
+    const [visible,setVisible] = controlled ? [controlledVisible] : React.useState(controlled?controlledVisible:false);
     const [value,setValue] = React.useState(defaultValue !== undefined? defaultValue:undefined);
     contentContainerProps = defaultObj(contentContainerProps);
     const prevLayout = React.usePrevious(layout);
@@ -94,13 +96,12 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
         if(update !== true && compare(value,node.value)) return;
         selectedRef.current = node;
         if(update === true){
+            setValue(node.value);
             if(controlled && onDismiss){
                 if(onDismiss({visible,value,items,defaultValue},defaultObj(selectedRef.current)) === false) return;
             }
-            setValue(node.value);
-            const vv = controlled?undefined:false;
-            if(typeof vv =='boolean' && vv !==visible){
-                setVisible(vv);
+            if(!controlled && visible){
+                setVisible(false);
             }
         }
     }

package/src/layouts/Screen/TableData.js

@@ -21,6 +21,7 @@ import theme from "$theme";
 import cActions from "$cactions";
 import APP from "$capp/instance";
 import { generatedColumnsProperties } from "./utils";
+import {isDocEditing,checkPrimaryKey} from "$ecomponents/Form";
 import i18n from "$i18n";
 import fetch from "$capi/fetch";
 
@@ -31,42 +32,6 @@ const DEFAULT_TABS_KEYS = "main-tabs";
 
 const TIMEOUT = 50;
 
-const checkPrimary = (data,f)=>{
-    return !(!(f in data) || (data[f] == null) || (!data[f] && typeof data !=='number'));
-}
-/*** vérifie si le document passé en paramètre est éditable
- * @param {object} data la données à vérifier
- * @param {object| array} les champs sur lesquels se baser pour vérifier si la donénes est une mise à jour
- * @param {func} checkPrimaryKey la foncition permettant de vérifier s'il s'agit d'une clé primaire pour la données courante
- */
-export const isDocEditing = (data,fields,checkPrimaryKey)=>{
-    if(!isObj(data) || !isObjOrArray(fields)) return false;
-    
-            let hasPrimaryFields = false;
-            let hasValidated = true;
-            for(let i in fields){
-                const field = fields[i];
-                if(typeof checkPrimaryKey =='function') {
-                    hasPrimaryFields = true;
-                    if(checkPrimaryKey({field,i,index:i,data}) === false){
-                        return false;
-                    }
-                    continue;
-                }
-                if(!isObj(field)) continue;
-                hasPrimaryFields = true;
-                const f = defaultStr(field.field,i);
-                if(field.primaryKey === true){
-                    if(!checkPrimary(data,f)){
-                        hasValidated = false;
-                    }
-                }
-            }
-            if(hasPrimaryFields){
-                return hasValidated;
-            }
-    return false;
-}
 
 export default class TableDataScreenComponent extends FormDataScreen{
     constructor(props){
@@ -280,6 +245,9 @@ export default class TableDataScreenComponent extends FormDataScreen{
                         currentField.disabled = true;
                     }
                 }
+                if(field.primaryKey ===true){
+                    this.primaryKeyFields[columnField] = true;
+                }
                 const isPrimary = this.primaryKeyFields[columnField] && true || false;
                 const f = prepareCb(cArgs);  
                 if(f === false) {
@@ -536,7 +504,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
         const isDocEditingCb = typeof this.props.isDocEditing =='function'? this.props.isDocEditing : typeof this.props.isDocUpdate =='function'? this.props.isDocUpdate : undefined;
         if(!isDocEditingCb){
             if(isDocEditing(data,this.primaryKeyFields,({index:field,data})=>{
-                return checkPrimary(data,field);
+                return checkPrimaryKey(data,field);
             })) return true;
         } else {
             return isDocEditingCb(data,{context:this});

package/src/layouts/Screen/utils.js

@@ -276,4 +276,5 @@ export const getScreenName = (screenName)=>{
         screenName = defaultStr(screenName.table,screenName.tableName);
     }
     return getTableDataRouteName(screenName);
-}
+}
+