@fto-consult/expo-ui 6.70.1 → 6.70.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
CHANGED
@@ -81,6 +81,7 @@ const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,scre
|
|
81
81
|
if(canUpdate && typeof getRenderingStyle ==='function'){
|
82
82
|
getRenderingStyle({...cStyle,...restStyle});
|
83
83
|
}
|
84
|
+
return children;
|
84
85
|
return <View ref={layoutRef}
|
85
86
|
onLayout={(a,b,c)=>{
|
86
87
|
if(onLayout && onLayout(a,b,c) === false) return;
|
@@ -213,7 +213,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
|
|
213
213
|
});
|
214
214
|
const dataRef = React.useRef(null);
|
215
215
|
const totalRef = React.useRef(0);
|
216
|
-
const loading = (customIsLoading === true || isLoading || (isValidating && showProgressRef.current));
|
216
|
+
const loading = (customIsLoading === true || isLoading || (false && isValidating && showProgressRef.current));
|
217
217
|
const {data,total} = React.useMemo(()=>{
|
218
218
|
if((loading && customIsLoading !== false) || !isObjOrArray(result)){
|
219
219
|
return {data:dataRef.current,total:totalRef.current};
|
@@ -1,27 +1,9 @@
|
|
1
1
|
import React from '$react';
|
2
2
|
import { ScrollView} from 'react-native';
|
3
3
|
import PropTypes from "prop-types";
|
4
|
-
import {defaultStr,defaultObj} from "$cutils";
|
5
|
-
import {Vertical as AutoSizeVertical} from "$ecomponents/AutoSizer";
|
6
|
-
import {isWeb} from "$cplatform";
|
7
4
|
|
8
5
|
const ScrollViewComponent = React.forwardRef(({withAutoSizer,autoSizerProps,testID,...rest},ref) => {
|
9
6
|
return <ScrollView testID={testID} {...rest} ref={ref}/>
|
10
|
-
testID = defaultStr(testID,'RN_ScrollViewComponent');
|
11
|
-
const autoSize = React.useRef(withAutoSizer).current;
|
12
|
-
if(!autoSize || rest.horizontal === true || rest.vertical === false){
|
13
|
-
return <ScrollView testID={testID} ref={ref} {...rest}/>
|
14
|
-
}
|
15
|
-
autoSizerProps = defaultObj(autoSizerProps);
|
16
|
-
const autoSizerRef = React.useRef(null);
|
17
|
-
return <AutoSizeVertical ref={autoSizerRef} isScrollView {...autoSizerProps} testID={testID+"_ScrollViewContainer"}>
|
18
|
-
<ScrollView
|
19
|
-
ref={ref} {...rest}
|
20
|
-
testID={testID}
|
21
|
-
style = {[{flex:1}]}
|
22
|
-
contentContainerStyle = {[{flex:1,height:'100%'},rest.contentContainerStyle]}
|
23
|
-
/>
|
24
|
-
</AutoSizeVertical>
|
25
7
|
});
|
26
8
|
|
27
9
|
ScrollViewComponent.displayName = "ScrollViewComponent";
|
@@ -6,6 +6,7 @@ import {defaultStr,isObj,defaultObj} from "$cutils";
|
|
6
6
|
const AutoSizeVerticalList = React.forwardRef(({testID,autoSizerProps,...props},ref)=>{
|
7
7
|
testID = defaultStr(testID,"RN_AutoSizeVerticalListComponent")
|
8
8
|
autoSizerProps = defaultObj(autoSizerProps);
|
9
|
+
return <List {...props} style={[props.style]} ref={ref}/>;
|
9
10
|
return <AutoSizeVertical withPadding={false} testID={testID+"_AutoSizerVertical"} {...autoSizerProps} >
|
10
11
|
<List {...props} style={[props.style]} ref={ref}/>
|
11
12
|
</AutoSizeVertical>
|