@fto-consult/expo-ui 2.3.2 → 2.3.4

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.4",
   "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){

package/src/components/Date/DateTime.js

@@ -41,16 +41,16 @@ export default function DateTimePickerComponent({left,isPeriodAction,withSeconds
             timeFormat = format[1].trim();
         }
     }
-    const changeDateArgsRef = React.useRef({
+    const changeDateArgsRef = {current:{
         date : dateObj,
-    });
+    }}
     const getTimeValue = (date)=>{
         date = DateLib.isValid(date)? date : new Date();
         const sqlTime = date.toSQLTimeFormat();
         return sqlTime.substring(0,withSeconds ?sqlTime.length :5);
     }
     const timeDefaultValue = getTimeValue(dateObj);
-    const changedTimeArgsRef = React.useRef({...defaultObj(parseTime(timeDefaultValue,withSeconds))});
+    const changedTimeArgsRef = {current:{...defaultObj(parseTime(timeDefaultValue,withSeconds))}};
     withSeconds = defaultBool(timeProps.withSeconds,withSeconds,true);
 
     const maxWidth = 120;//withSeconds ? 120 : 120;

package/src/components/Filter/index.js

@@ -506,7 +506,10 @@ export default class Filter extends AppComponent {
                       style : [styles.bold,styles.noVerticalPadding],
                     }:null],
                      ...Object.mapToArray(actions,(x,j)=>{
-                       let checked = j === action?true : false;
+                      if(ignoreDefaultValue && !periodActions[j]){
+                        return null;
+                      } 
+                      let checked = j === action?true : false;
                        if(checked && (isNumber(defaultValue) || isNonNullString(defaultValue))) {
                          let hasS = false;
                          let act = defaultStr(action).toLowerCase();

package/src/components/Filter/utils.js

@@ -402,6 +402,7 @@ export const prepareFilters = (filtersToPrepare,opts)=>{
             filters[f.operator].push(ob)
         }
     });
+    const f = convertToSQL(filters);
     return convToSQL ? convertToSQL(filters) : filters;
 }
 
@@ -495,4 +496,58 @@ const operatorsMap = {
     $nin : 'NOT IN',
     $eq: '=',
     $regex : "LIKE"
+  }
+
+  /**
+ *
+ * @param {*} operand
+ * @param {*} operator
+ * @param {*} field
+ *
+ * Return the operand in right format
+ */
+export const getTyppedOperand = (operand, operator, field) => {
+    if (typeof operand === 'string') { // wrap strings in double quots
+      return "'" +(operand) + "'"
+    } else if (operator === 'IN' || operator =='NOT IN') { // wrap IN arguments in brackers
+      operand = Array.isArray(operand)? operand.map(op => getTyppedOperand(op, null, null))
+      .join(', '): operand;
+      return '(' + operand + ')'
+    } else if (!isNonNullString(field) && Array.isArray(operand)) { // AND or OR elements
+      // recursively call 'buildWhereElement' for nested elements
+      // join each element with operator AND or OR
+      return operand.reduce((prev, curr) => {
+        return [...prev, buildWhereElement(curr)]
+      }, []).join(' ' + operator + ' ')
+    } else {
+      return operand
+    }
+}
+  
+  /**
+   *
+   * @param {*} elem
+   *
+   * Return element of WHERE clause
+   */
+  export const buildWhereElement = (elem) => {
+    const { field, operator, operand } = elem
+    if (!isNonNullString(field)) { // nested WHERE element
+      return '(' + getTyppedOperand(operand, operator, field) + ')'
+    } else { // simple WHERE element
+      return field + ' ' + operator + ' ' + getTyppedOperand(operand, operator, field)
+    }
+  }
+  
+  /**** construit une requête Where à partir des filtres préparé dans le tableau whereClausePrepared
+   * @see : https://github.com/gordonBusyman/mongo-to-sql-converter
+   * @parm {array} whereClausePrepared, les filtres préparés avec la méthode prepareFilters puis convertis avec la fonction convertToSQL
+     @return {string}, la requête Where correspondante
+  */
+  export const buildWhere = (whereClausePrepared)=>{
+    if(!Array.isArray(whereClausePrepared)) return null;
+    // build WHERE string clause by adding each element of array to it, separated with AND
+    return whereClausePrepared.reduce((prev, curr) => [
+        ...prev, buildWhereElement(curr)
+    ], []).join(' AND ');
   }