@fto-consult/expo-ui 1.4.1 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@expo/html-elements": "^0.2.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.6.6",
+    "@fto-consult/common": "^1.7.3",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.2.0",

package/src/App.js

@@ -7,7 +7,7 @@ import Index from './index';
 import {Portal } from 'react-native-paper';
 import {PreloaderProvider} from "$epreloader";
 import DropdownAlert from '$ecomponents/Dialog/DropdownAlert';
-import {notificationRef} from "$notify";
+import notify, {notificationRef} from "$notify";
 import BottomSheetProvider from "$ecomponents/BottomSheet/Provider";
 import DialogProvider from "$ecomponents/Dialog/Provider";
 import { DialogProvider as FormDataDialogProvider } from '$eform/FormData';
@@ -22,6 +22,10 @@ import StatusBar from "$ecomponents/StatusBar";
 import SimpleSelect from '$ecomponents/SimpleSelect';
 import {Provider as AlertProvider} from '$ecomponents/Dialog/confirm/Alert';
 import APP from "$app";
+import {isMobileNative} from "$cplatform";
+import {setDeviceNameRef} from "$capp";
+import appConfig from "$capp/config";
+import {showPrompt} from "$components/Dialog/confirm";
 
 export default function getIndex(options){
   const {App,onMount,onUnmount,preferences:appPreferences} = defaultObj(options);
@@ -79,4 +83,32 @@ export default function getIndex(options){
       </GestureHandlerRootView>
     );
   }
-};
+};
+
+setDeviceNameRef.current = ()=>{
+  return new Promise((resolve,reject)=>{
+    showPrompt({
+      title : 'ID unique pour l\'appareil',
+      maxLength :  30,
+      defaultValue : appConfig.getDeviceName(),
+      yes : 'Définir',
+      placeholder : isMobileNative()? "":'Entrer une valeur unique sans espace SVP',
+      no : 'Annuler',
+      onSuccess : ({value})=>{
+        let message = null;
+        if(!value || value.contains(" ")){
+          message = "Merci d'entrer une valeur non nulle ne contenant pas d'espace";
+        }
+        if(value.length > 30){
+          message = "la valeur entrée doit avoir au plus 30 caractères";
+        }
+        if(message){
+          notify.error(message);
+          return reject({message})
+        }
+        resolve(value);
+        notify.success("la valeur ["+value+"] a été définie comme identifiant unique pour l'application instalée sur cet appareil");
+      }
+    })
+  })
+}

package/src/components/InlineIndicator/index.js

@@ -101,32 +101,9 @@ export const TextField = TextInput;
 
 WeightUnit.displayName = "WeightUnitInlineIndicatorComponent";
 
-
-
 export const Text = React.forwardRef((props,ref)=>{
-    const [state,setState] = React.useStateIfMounted({
-        children : props.children,
-    });
-    const context = {
-        update : (props)=>{
-            if(React.isValidElement(props,true)){
-                return setState({...state,children:props})
-            } else if(isObj(props)){
-                return setState({...state,...props})
-            }
-        }
-    }
-    React.useEffect(()=>{
-        setState({...state,children:props.children})
-    },[props.children]);
-    React.setRef(ref,context);
-    React.useEffect(()=>{
-        return ()=>{
-            React.setRef(ref,null);
-        }
-    },[]);
-    return <LabelComponent {...props} {...state} style={[styles.text,props.style,state.style]}/>
-})
+    return <LabelComponent.withRef ref={ref} {...props} {...state} style={[styles.text,props.style]}/>
+});
 
 export const Label = Text;
 

package/src/components/Label/index.js

@@ -101,4 +101,33 @@ LabelComponentExported.propTypes = {
     splitText : PropTypes.bool,///si le texte lorsqu'il est long sera splité
 }
 
-export default LabelComponentExported;
+export default LabelComponentExported;
+
+LabelComponentExported.withRef = React.forwardRef((props,ref)=>{
+    const [state,setState] = React.useStateIfMounted({
+        children : props.children,
+    });
+    const context = {
+        update : (props)=>{
+            if(React.isValidElement(props,true)){
+                return setState({...state,children:props})
+            } else if(isObj(props)){
+                return setState({...state,...props})
+            }
+        }
+    }
+    React.useEffect(()=>{
+        setState({...state,children:props.children})
+    },[props.children]);
+    React.setRef(ref,context);
+    React.useEffect(()=>{
+        return ()=>{
+            React.setRef(ref,null);
+        }
+    },[]);
+    return <LabelComponent {...props} {...state} style={[props.style,state.style]}/>
+})
+
+LabelComponentExported.withRef.displayName = "LabelComponent.Dynamic";
+
+LabelComponentExported.WithRef = LabelComponentExported.withRef;

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

@@ -13,9 +13,11 @@ import Icon from "$ecomponents/Icon";
 import {navigate} from "$cnavigation";
 import theme from "$theme";
 import {isMobileNative} from "$cplatform";
-
+import appConfig from "$capp/config";
 const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>{
     let u = defaultObj(Auth.getLoggedUser());
+    const deviceNameRef = React.useRef(null);
+    const deviceName = appConfig.deviceName;
     props = defaultObj(props);
     const closeDrawer = cb => {
         if(drawerRef && drawerRef.current && drawerRef.current.close){
@@ -59,8 +61,16 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                         normal
                         upperCase = {false}
                         disableRipple
+                        title = {"Pressez longtemps pour définir un identifiant unique pour l'appareil"}
                         {...aProps}
                         style = {[styles.container]}
+                        onLongPress = {()=>{
+                            appConfig.setDeviceName().then((r)=>{
+                                if(deviceNameRef.current && deviceNameRef.current.update){
+                                    deviceNameRef.current.update(r);
+                                }
+                            });
+                        }}
                         left={props1 => <Image
                             {...props} 
                             {...props1}
@@ -98,6 +108,9 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                         <Label splitText style={{fontSize:12,color:theme.colors.secondaryOnSurface,marginTop:6}}>
                             {label}
                         </Label>
+                        {deviceName && <Label.withRef textBold splitText title={"Identifiant unique de l'application, installé sur cet appareil"} ref={deviceNameRef} secondary style={{fontSize:11}}>
+                            [{deviceName}]
+                        </Label.withRef> || null}
                     </View>
                     </Button>
             } }