@fto-consult/expo-ui 2.3.2 → 2.3.3

package/index.js

@@ -1,5 +1,5 @@
 import { registerRootComponent } from "expo";
-import {Platform } from 'react-native';
+import {AppRegistry, Platform } from 'react-native';
 import { createRoot } from 'react-dom/client';
 import appConfig from "$capp/config";
 import { activateKeepAwake } from 'expo-keep-awake';
@@ -17,8 +17,8 @@ export default function ExpoUIApp (options){
     options = options && typeof options =='object' && !Array.isArray(options)? options : {};
     appConfig.current = options.config;
     const App = require('./src/App').default(options);
-    if (Platform.OS === "web") {
-        const root = createRoot(document.getElementById("root") ?? document.getElementById("main"));
+    if (false && Platform.OS === "web") {
+        const root = createRoot(document.getElementById("root") || document.getElementById("main"));
         root.render(<App />);
     } else {
         registerRootComponent(App);

package/package.json

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

package/src/components/Chip/index.js

@@ -27,13 +27,15 @@ const ChipComponent = React.forwardRef(({
   onLongPress,
   onClose,
   closeIcon,
-  textStyle,
+  labelStyle,
+  labelProps,
   style,
   testID,
   selectedColor,
   ellipsizeMode,
   ...rest
 },ref) => {
+  labelProps = Object.assign({},labelProps);
   testID =defaultStr(testID,"RN_ChipComponent");
   const { current: elevation } = React.useRef(
     new Animated.Value(0)
@@ -66,7 +68,7 @@ const ChipComponent = React.forwardRef(({
   const borderColor =
     mode === 'outlined'? (selectedColor !== undefined ? selectedColor : Colors.setAlpha(dark ? white : black,0.29)) : backgroundColor;
   const textColor = Colors.isValid(customColor)?customColor 
-    : Colors.setAlpha(selectedColor !== undefined ? selectedColor : colors.text,0.87);
+    : Colors.setAlpha(selectedColor !== undefined ? selectedColor : theme.colors.text,0.87);
   const iconColor =  Colors.setAlpha(textColor,theme.ALPHA);
         
   const backgroundColorString = typeof backgroundColor === 'string' ? backgroundColor : defaultBackgroundColor;
@@ -173,7 +175,8 @@ const ChipComponent = React.forwardRef(({
             selectable={false}
             numberOfLines={1}
             testID={testID+"_Text"}
-            style={[
+            {...labelProps}
+            style={StyleSheet.flatten([
               styles.text,
               {
                 ...theme.fonts.regular,
@@ -181,8 +184,9 @@ const ChipComponent = React.forwardRef(({
                 marginHorizontal : 4,
                 marginLeft: avatar || icon || selected ? 4 : 8,
               },
-              textStyle,
-            ]}
+              labelProps.style,
+              labelStyle,
+            ])}
             ellipsizeMode={ellipsizeMode}
           >
             {children}
@@ -332,7 +336,7 @@ ChipComponent.propTypes = {
     /**
      * Style of chip's text
      */
-    textStyle: StyleProps,
+    labelStyle: StyleProps,
     style: StyleProps,
   
     /**
@@ -347,4 +351,5 @@ ChipComponent.propTypes = {
      * Ellipsize Mode for the children text
      */
     ellipsizeMode: PropTypes.object,
+    labelProps : PropTypes.object,
   };

package/src/components/Datagrid/Accordion/Row.js

@@ -273,7 +273,7 @@ const styles = StyleSheet.create({
     container : {
         marginVertical : 10,
         paddingVertical : 5,
-        paddingHorizontal : 5,
+        paddingHorizontal : 15,
         marginHorizontal : 5,
         flexWrap : 'nowrap',
         justifyContent : 'center',

package/src/components/Datagrid/Common/Common.js

@@ -1554,7 +1554,7 @@ export default class CommonDatagridComponent extends AppComponent {
                          v1.map((v)=>{
                              for(let i in columnDef.items){
                                  let it = columnDef.items[i];
-                                 if(isObj(it) && defaultStr(it.code,i) == v){
+                                 if(isObj(it) && defaultVal(it.code,i) == v){
                                      _render+=(_render?arrayValueSeparator:"")+defaultStr(it.label,it.text,v);
                                  } else if(isNonNullString(it) && i == v){
                                     _render+=(_render?arrayValueSeparator:"")+it;
@@ -1567,7 +1567,7 @@ export default class CommonDatagridComponent extends AppComponent {
                      } else {
                          for(let i in columnDef.items){
                             let it = columnDef.items[i];
-                            if(isObj(it) && defaultStr(it.code,i) == v1){
+                            if(isObj(it) && defaultVal(it.code,i) == v1){
                                 _render =defaultStr(it.label,it.text,v1);
                                 break;
                             } else if(isNonNullString(it) && i == v1){