@fto-consult/expo-ui 2.35.0 → 2.35.2

package/package.json

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

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

@@ -1651,16 +1651,17 @@ export default class CommonDatagridComponent extends AppComponent {
             })
         }
         return <Menu
-            title = "Type d'affichage"
+            title = {"Type d'affichage ["+activeType.label+"]"}
             items = {m}
             anchor = {(p)=>{
                 return <Pressable {...p} style={[theme.styles.row]}>
                     <Icon
                         {...p}
                         name = {activeType.icon}
+                        color = {theme.colors.primaryOnSurface}
                         title = {"Les données s'affichent actuellement en {0}. Cliquez pour modifier le type d'affichage".sprintf(activeType.label)}
                     />
-                    {this.isDashboard() && <Label textBold>Type d'affichage</Label>||null}
+                    {this.isDashboard() && <Label textBold primaryOnSurface>{activeType.label||"Type d'affichage"}</Label>||null}
                 </Pressable>
             }}
         />
@@ -3241,8 +3242,8 @@ export default class CommonDatagridComponent extends AppComponent {
                  if(!_render) _render = rowData[columnField]
              } else if(arrayValueExists(_type,['switch','checkbox'])){
                  let {checkedLabel,checkedTooltip,uncheckedTooltip,checkedValue,uncheckedLabel,uncheckedValue} = columnDef;
-                 checkedLabel = defaultStr(checkedLabel,checkedTooltip,'Oui')
-                 uncheckedLabel = defaultStr(uncheckedLabel,uncheckedTooltip,'Non')
+                 checkedLabel = defaultStr(checkedLabel,'Oui')
+                 uncheckedLabel = defaultStr(uncheckedLabel,'Non')
                  checkedValue = defaultVal(checkedValue,1); uncheckedValue = defaultVal(uncheckedValue,0)
                  let val = defaultVal(rowData[columnField],columnDef.defaultValue,columnDef.value)
                  if(val === checkedValue){

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

@@ -90,8 +90,8 @@ export const getFilterComponentProps = (_props)=>{
     } else if(type == 'switch' || type =='radio' || type ==='checkbox') {
         type = 'select';
         let {checkedLabel,checkedTooltip,uncheckedTooltip,checkedValue,uncheckedLabel,uncheckedValue,label,text,...pR} = props;
-        checkedLabel = defaultVal(checkedLabel,checkedTooltip,'Inactif/Désélectionné')
-        uncheckedLabel = defaultVal(uncheckedLabel,uncheckedTooltip,'Actif/Sélectionné')
+        checkedLabel = defaultVal(checkedLabel,'Non')
+        uncheckedLabel = defaultVal(uncheckedLabel,'Oui')
         checkedValue = defaultVal(checkedValue,1); uncheckedValue = defaultVal(uncheckedValue,0)
         props = pR;
         props.items = [{code:checkedValue,label:checkedLabel},{code:uncheckedValue,label:uncheckedLabel}];