@fto-consult/expo-ui 6.31.1 → 6.31.2
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 +1 -1
- package/src/components/Chart/appexChart/index.native.js +3 -3
- package/src/components/Datagrid/Common/Common.js +22 -2
- package/src/components/Datagrid/SWRDatagrid.js +3 -2
- package/src/components/Form/FormData/FormData.js +1 -1
- package/src/layouts/Screen/TableData.js +1 -1
- package/src/screens/Help/openLibraries.js +1 -1
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@ export const ChartComponent = React.forwardRef(({chartContext,testID,chartId,id,
|
|
|
15
15
|
webViewRef.current.injectJavaScript(`
|
|
16
16
|
const method = "${method}";
|
|
17
17
|
const chartId = "${chartId}";
|
|
18
|
-
const a = ${typeof a =='string'? '"'+a.replaceAll('"','\"')+'"':typeof a =='boolean'? a : a && typeof a =='object'? JSON.stringify(a):undefined};
|
|
18
|
+
const a = ${typeof a =='string'? '"'+a.replaceAll('"','\"')+'"':typeof a =='boolean' || typeof a =="number" ? a : a && typeof a =='object'? JSON.stringify(a):undefined};
|
|
19
19
|
let element = document.getElementById(chartId);
|
|
20
20
|
if(!element){
|
|
21
21
|
element = document.createElement("div");
|
|
@@ -37,8 +37,8 @@ export const ChartComponent = React.forwardRef(({chartContext,testID,chartId,id,
|
|
|
37
37
|
//@see : https://apexcharts.com/docs/methods/
|
|
38
38
|
methodsNames.map((cb)=>{
|
|
39
39
|
if(cb !=='exec'){
|
|
40
|
-
chartContext.current[cb]=(
|
|
41
|
-
return exec(cb
|
|
40
|
+
chartContext.current[cb]=(...args)=>{
|
|
41
|
+
return exec(cb,...args);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
});
|
|
@@ -1691,7 +1691,7 @@ export default class CommonDatagridComponent extends AppComponent {
|
|
|
1691
1691
|
}
|
|
1692
1692
|
///reoturne les options de menus à appliquer sur le char
|
|
1693
1693
|
getChartMenus(){
|
|
1694
|
-
|
|
1694
|
+
const menus = [
|
|
1695
1695
|
{
|
|
1696
1696
|
text : "Options du graphe",
|
|
1697
1697
|
textBold : true,
|
|
@@ -1702,7 +1702,23 @@ export default class CommonDatagridComponent extends AppComponent {
|
|
|
1702
1702
|
icon : "download",
|
|
1703
1703
|
onPress : this.downloadChart.bind(this),
|
|
1704
1704
|
}
|
|
1705
|
-
]
|
|
1705
|
+
];
|
|
1706
|
+
Object.map(this.props.chartActions,(menu,t)=>{
|
|
1707
|
+
if(!isObj(menu)) return;
|
|
1708
|
+
const {onPress} = menu;
|
|
1709
|
+
menus.push({
|
|
1710
|
+
...menu,
|
|
1711
|
+
onPress : (event)=>{
|
|
1712
|
+
if(!this.chartRef.current) return;
|
|
1713
|
+
const args = React.getOnPressArgs(event);
|
|
1714
|
+
args.chartContext = this.chartRef.current;
|
|
1715
|
+
if(typeof onPress =='function'){
|
|
1716
|
+
onPress(args);
|
|
1717
|
+
}
|
|
1718
|
+
}
|
|
1719
|
+
})
|
|
1720
|
+
})
|
|
1721
|
+
return menus;
|
|
1706
1722
|
}
|
|
1707
1723
|
getExportableFields(){
|
|
1708
1724
|
return {
|
|
@@ -3856,6 +3872,10 @@ CommonDatagridComponent.propTypes = {
|
|
|
3856
3872
|
PropTypes.object,
|
|
3857
3873
|
PropTypes.object,
|
|
3858
3874
|
]),
|
|
3875
|
+
chartActions : PropTypes.oneOfType([
|
|
3876
|
+
PropTypes.object,
|
|
3877
|
+
PropTypes.array, //les actions supplémentaires à passer au graphe chart
|
|
3878
|
+
]),
|
|
3859
3879
|
/*** si l'opérateur or de filtre est accepté */
|
|
3860
3880
|
filterOrOperator : PropTypes.bool,
|
|
3861
3881
|
/*** si l'opérateur and de filtre est accepté */
|
|
@@ -100,6 +100,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
|
|
|
100
100
|
sort,
|
|
101
101
|
defaultSortColumn,
|
|
102
102
|
defaultSortOrder,
|
|
103
|
+
isLoading : customIsLoading,
|
|
103
104
|
...rest
|
|
104
105
|
} = props;
|
|
105
106
|
const {swrConfig} = useContext();
|
|
@@ -204,9 +205,9 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
|
|
|
204
205
|
});
|
|
205
206
|
const dataRef = React.useRef(null);
|
|
206
207
|
const totalRef = React.useRef(0);
|
|
207
|
-
const loading = (isLoading || isValidating);
|
|
208
|
+
const loading = (customIsLoading === true || isLoading || isValidating);
|
|
208
209
|
const {data,total} = React.useMemo(()=>{
|
|
209
|
-
if(loading || !isObjOrArray(result)){
|
|
210
|
+
if((loading && customIsLoading !== false) || !isObjOrArray(result)){
|
|
210
211
|
return {data:dataRef.current,total:totalRef.current};
|
|
211
212
|
}
|
|
212
213
|
let {data,total} = (Array.isArray(result) ? {data:result,total:result.length} : isObj(result)? result : {data:[],total:0});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {getAppBarActionsProps} from "./utils";
|
|
2
|
-
import React, {
|
|
2
|
+
import React, {ObservableComponent as AppComponent} from "$react";
|
|
3
3
|
import {isNonNullString,defaultStr,defaultNumber,defaultObj,extendObj,isObj,isFunction,defaultFunc,uniqid} from "$cutils";
|
|
4
4
|
import {getForm,getFormField} from "../utils";
|
|
5
5
|
import Surface from "$ecomponents/Surface";
|
|
@@ -217,7 +217,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
|
|
|
217
217
|
prepareField,
|
|
218
218
|
prepareComponentProps,
|
|
219
219
|
...rest
|
|
220
|
-
} = this.prepareComponentProps({...props,tableName,fields:extendObj({},true,this.fields,props.fields),isUpdated,isUpdate:isUpdated,data,datas,currentIndex});
|
|
220
|
+
} = this.prepareComponentProps({...props,tableName,context:this,fields:extendObj({},true,this.fields,props.fields),isUpdated,isUpdate:isUpdated,data,datas,currentIndex});
|
|
221
221
|
const sessionName = this.getSessionName();
|
|
222
222
|
const prepareCb = typeof prepareField =='function'? prepareField : x=> x;
|
|
223
223
|
///on effectue une mutator sur le champ en cours de modification
|
|
@@ -1 +1 @@
|
|
|
1
|
-
module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.31.
|
|
1
|
+
module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.31.1","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"19.0.0","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.30.19","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.42.0","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.8","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.2","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.2","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.4","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.3","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.18.20","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.7","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.0","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};
|