@fto-consult/expo-ui 2.4.6 → 2.4.8

package/package.json

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

package/src/components/Fab/GroupComponent.js

@@ -8,11 +8,10 @@ import {
 } from 'react-native';
 import View from "$ecomponents/View";
 import {FAB,Text,Card,withTheme} from "react-native-paper";
-import color from 'color';
+import colorFn from 'color';
 import PropTypes from "prop-types";
-import { StylePropTypes } from '$theme';
 import Action from "$ecomponents/Form/Action";
-import { disabledStyle,cursorNotAllowed } from '$theme';
+import theme,{ disabledStyle,StylePropTypes,cursorPointer,Colors,cursorNotAllowed } from '$theme';
 import {defaultStr} from "$utils";
 
 
@@ -24,7 +23,6 @@ const FABGroup = ({
   open,
   onPress,
   accessibilityLabel,
-  theme,
   label,
   style,
   screenName,
@@ -90,11 +88,8 @@ const FABGroup = ({
 
   const toggle = () => onStateChange({ open: !open });
 
-  const { colors } = theme;
+  const colors = theme.colors;
 
-  const labelColor = theme.dark
-    ? colors.text
-    : color(colors.text).fade(theme.ALPHA).rgb().string();
   const backdropOpacity = open
     ? backdrop.interpolate({
         inputRange: [0, 0.5, 1],
@@ -139,8 +134,6 @@ const FABGroup = ({
         <View testID={testID+"_ItemsContainer"} style={[styles.itemsContainer]} pointerEvents={open ? 'box-none' : 'none'}>
           {actions.map((it, i) => {
              const itemProps = {
-                labelColor : it.labelTextColor ??  it.labelColor ?? labelColor,
-                backgroundColor : theme.colors.surface,
                 ...it,
                 open,
                 scale:scales[i],
@@ -280,10 +273,13 @@ FABGroup.propTypes = {
 }
 
 
-export const FabItem = function(props){
-  const {children,label,disabled:customDisabled,pointerEvents,open,close,testID:customTestID,labelStyle,labelColor,accessibilityLabel,icon,backgroundColor,scale,opacity,color,style,small,onPress,...rest} = props;
+const _FabItem = function({children,label,disabled:customDisabled,pointerEvents,open,close,testID:customTestID,labelStyle,accessibilityLabel,icon,backgroundColor,scale,opacity,color,style,small,onPress}){
   const disabled = typeof customDisabled =='boolean'? customDisabled : false;
   const testID = defaultStr(customTestID,"RN_FabItemComponent")
+  style = StyleSheet.flatten(style) || {};
+  color = Colors.isValid(color)? color : style.color;
+  backgroundColor = Colors.isValid(backgroundColor)? backgroundColor : style.backgroundColor;
+  const cursorStyle = disabled? cursorNotAllowed : cursorPointer;
   const _onPress = ()=>{
     if(onPress){
       onPress();
@@ -299,11 +295,12 @@ export const FabItem = function(props){
                  style={
                    [
                      styles.label,
+                     labelStyle,
                      {
                        transform: [{ scale }],
                        opacity,
+                       backgroundColor,
                      },
-                     labelStyle,
                    ] 
                  }
                  onPress={_onPress}
@@ -316,7 +313,7 @@ export const FabItem = function(props){
                  accessibilityComponentType="button"
                  accessibilityRole="button"
                >
-                 <Text testID={testID+"_Label"} style={{ color : labelColor }}>
+                 <Text testID={testID+"_Label"} style={StyleSheet.flatten([{ color},cursorStyle])}>
                    {label}
                  </Text>
                </Card>
@@ -330,14 +327,14 @@ export const FabItem = function(props){
              pointerEvents={pointerEvents}
              style={
                [
-                 {
-                   transform: [{ scale}],
-                   opacity,
-                   backgroundColor,
-                 },
                  style,
                  dStyle,
-                 disabled? cursorNotAllowed : null,
+                 cursorStyle,
+                 {
+                  transform: [{ scale}],
+                  opacity,
+                  backgroundColor,
+                },
                ] 
              }
              onPress={_onPress}
@@ -356,6 +353,7 @@ export const FabItem = function(props){
   </>
 }
 
+export const FabItem = theme.withStyles(_FabItem,{displayName:"FabItemComponent",mode:"contained"});
 const styles = StyleSheet.create({
   safeArea: {
     alignItems: 'flex-end',