@fto-consult/expo-ui 8.82.3 → 8.82.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.82.3",
+  "version": "8.82.5",
   "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": {

package/src/components/AppBar/index.js

@@ -8,7 +8,7 @@ import BackAction from "./BackAction";
 import {StyleSheet} from "react-native";
 import {goBack as navGoBack,useNavigation,useRoute,useScreenOptions } from "$cnavigation";
 import PropTypes from "prop-types";
-import {View,Pressable} from "react-native";
+import {Pressable} from "react-native";
 import Dimensions from "$cdimensions";
 import Content from "./Content";
 import Icon from "$ecomponents/Icon";

package/src/components/Drawer/DrawerLayout/index.js

@@ -11,7 +11,7 @@ import {
 import { Portal } from 'react-native-paper';
 import PropTypes from "prop-types";
 import View from "$ecomponents/View";
-import {defaultStr,defaultObj} from "$cutils";
+import {defaultStr,defaultObj,extendObj} from "$cutils";
 import theme,{Colors} from "$theme";
 import {isMobileMedia} from "$cplatform/dimensions";
 import Preloader from "$epreloader";
@@ -20,6 +20,7 @@ import {HStack} from "$ecomponents/Stack";
 import Divider from "$ecomponents/Divider";
 import Label from "$ecomponents/Label";
 import Icon from "$ecomponents/Icon";
+import AppBar from '$ecomponents/AppBar';
 
 const MIN_SWIPE_DISTANCE = 3;
 const DEVICE_WIDTH = Math.max(Dimensions.get('window').width,280);
@@ -127,30 +128,21 @@ export default class DrawerLayout extends React.PureComponent {
         return defaultStr(this.state.portalProps.testID,"RN_DrawerLayoutPortal");
     }
     renderPortalTitle(){
-        if(React.isValidElement(this.state.portalProps?.title)) return this.state.portalProps?.title;
+        const titleProps = defaultObj(this.state.portalProps.titleProps);
+        const testID = this.getPortalTestID();
         const title = this.state.portalProps?.title;
         const isPositionRight = this.isPositionRight();
-        if(typeof title == 'string' && title || typeof title =="number"){
-            const titleProps = defaultObj(this.state.portalProps.titleProps);
-            const testID = this.getPortalTestID();
-            const icon = <Icon
-                onPress = {this.closeDrawer.bind(this)}
-                icon = {this.state.portalProps?.closeIcon || !this.isPositionRight() == 'left'? 'chevron-left' : 'chevron-right'}
-                {...defaultObj(this.state.portalProps.closeIconProps)}
-            />;
-            const titleContainerProps = defaultObj(this.state.portalProps?.titleContainerProps);
-            return <>
-                <HStack  testID={testID+"_TitleContainer"} {...titleContainerProps} style={[styles.portalTitle,titleContainerProps.style]}>
-                    {isPositionRight? icon : null}
-                    <Label testID={testID+"_DrawerLayoutTitle"} {...titleProps} style={[styles.portalTitleText,titleProps.style]} >
-                        {title}
-                    </Label>
-                    {!isPositionRight ? icon : null}
-                </HStack>
-                <Divider/>
-            </>;
-        }
-        return null;
+        const titleContainerProps = defaultObj(this.state.portalProps?.titleContainerProps);
+        return <AppBar
+            title={React.isValidElement(title) ? title : title || null}
+            testID={testID+"_TitleContainer"} 
+            onBackActionPress={(...args) =>{
+                this.closeDrawer();
+                return false;
+            }}
+            {...titleContainerProps}
+            backActionProps = {extendObj(true,{},titleContainerProps.backActionProps,{icon:this.state.portalProps?.closeIcon || !isPositionRight == 'left'? 'chevron-left' : 'chevron-right'})}
+        />
     }
     renderPortalChildren(){
         return <>
@@ -573,7 +565,7 @@ DrawerLayout.propTypes = {
     position : posPropType,
     drawerWidth : PropTypes.number,
     titleContainerProps : PropTypes.shape({
-        ...defaultObj(HStack.propTypes),
+        ...defaultObj(AppBar.propTypes),
     }),
   }),
 }

package/src/components/PhoneInput/index.js

@@ -161,7 +161,7 @@ export default function PhoneInputComponent(props){
                     }}
                     testID = {testID}
                     error = {error}
-                    errorText = {errorText}
+                    errorText = {state.errorText || errorText}
                     helperText = {helperText}
                     contentContainerProps = {contentContainerProps}
                     label = {label}
@@ -187,19 +187,18 @@ export default function PhoneInputComponent(props){
                         const {value:nValue} = args;
                         const prevState = state;
                         const nState = updateValue(nValue);
+                        let value = defaultStr(nState.defaultValue).trim();
+                        if(value =="+" || value =="("){
+                            value = "";
+                        }
+                        const prevVal = defaultStr(prevState.defaultValue).trim();
+                        if(prevVal.ltrim(dialCodePrefix) === value.ltrim(dialCodePrefix)) return;
+                        const canChange = value.length < 5 || PhoneNumber.parse(nState.displayValue,nState.countryCode);
+                        nState.errorText = canChange ? undefined : "Veuillez entrer un numéro de téléphone valide";
                         setState({...state,...nState});
                         const dialCodePrefix = getDialCodePrefix(prevState.countryDialCode) || getDialCodePrefix(state.countryDialCode);
-                        if(onChange){
-                            let value = defaultStr(nState.defaultValue).trim();
-                            if(value =="+" || value =="("){
-                                value = "";
-                            }
-                            const prevVal = defaultStr(prevState.defaultValue).trim();
-                            if(prevVal.ltrim(dialCodePrefix) === value.ltrim(dialCodePrefix)) return;
-                            const canChange = value.length < 5 || PhoneNumber.parse(nState.displayValue,nState.countryCode);
-                            if(canChange) {
-                                onChange({...nState,value,country:nState.country,displayValue:nState.displayValue,realValue:nState.defaultValue})
-                            }
+                        if(onChange && canChange){
+                            onChange({...nState,value,country:nState.country,displayValue:nState.displayValue,realValue:nState.defaultValue});
                         }
                     }}
                     ref = {ref}