@fto-consult/expo-ui 7.6.26 → 7.6.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fto-consult/expo-ui",
|
|
3
|
-
"version": "7.6.
|
|
3
|
+
"version": "7.6.27",
|
|
4
4
|
"description": "Bibliothèque de composants UI Expo,react-native",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"clear-npx-cache": "npx clear-npx-cache",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@expo/html-elements": "^0.5.1",
|
|
72
72
|
"@expo/vector-icons": "^13.0.0",
|
|
73
73
|
"@faker-js/faker": "^8.0.2",
|
|
74
|
-
"@fto-consult/common": "^3.73.
|
|
74
|
+
"@fto-consult/common": "^3.73.13",
|
|
75
75
|
"@fto-consult/electron": "^1.0.26",
|
|
76
76
|
"@pchmn/expo-material3-theme": "^1.3.1",
|
|
77
77
|
"@react-native-async-storage/async-storage": "1.18.2",
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
} from 'react-native';
|
|
6
6
|
import View from "$ecomponents/View";
|
|
7
7
|
import Tooltip from "$ecomponents/Tooltip";
|
|
8
|
-
import theme,{DISABLED_OPACITY,Colors,cursorNotAllowed,StylePropsTypes} from "$theme";
|
|
8
|
+
import theme,{DISABLED_OPACITY,Colors,colorsAlias,cursorNotAllowed,StylePropsTypes} from "$theme";
|
|
9
9
|
import Icon from "$ecomponents/Icon";
|
|
10
10
|
import {TouchableRipple} from "react-native-paper";
|
|
11
11
|
import ActivityIndicator from "$ecomponents/ActivityIndicator";
|
|
@@ -173,7 +173,6 @@ const ButtonComponent = React.forwardRef((prs,ref) => {
|
|
|
173
173
|
|
|
174
174
|
const elevationRes = disabled || !hasElevation ? 0 : elevation?.__getValue();
|
|
175
175
|
contentStyle = Object.assign({},StyleSheet.flatten([hasElevation ? (icon?styles.elevation2icon:(isAlert?styles.elevationAlert:styles.elevationOnly)):null,contentProps.style,contentStyle]));
|
|
176
|
-
|
|
177
176
|
if(iconPosition == 'top'){
|
|
178
177
|
contentStyle.flexDirection = 'column';
|
|
179
178
|
} else if(iconPosition =='bottom'){
|
|
@@ -368,7 +367,12 @@ const styles = StyleSheet.create({
|
|
|
368
367
|
});
|
|
369
368
|
|
|
370
369
|
ButtonComponent.displayName = "ButtonComponent";
|
|
371
|
-
export default theme.withStyles(ButtonComponent
|
|
370
|
+
export default theme.withStyles(ButtonComponent,{
|
|
371
|
+
shouldForwardProp : (prop)=>{
|
|
372
|
+
if(prop && colorsAlias.includes(prop)) return true;
|
|
373
|
+
return undefined;
|
|
374
|
+
}
|
|
375
|
+
});
|
|
372
376
|
|
|
373
377
|
ButtonComponent.propTypes = {
|
|
374
378
|
left : PropTypes.oneOfType([
|