@codeleap/mobile 5.8.10 → 5.8.12
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/dist/components/Grid/index.js +9 -5
- package/dist/components/Grid/index.js.map +1 -1
- package/dist/components/List/index.js +5 -5
- package/dist/components/List/index.js.map +1 -1
- package/dist/components/Sections/index.js +16 -11
- package/dist/components/Sections/index.js.map +1 -1
- package/package.json +17 -17
- package/package.json.bak +1 -1
- package/src/components/Grid/index.tsx +9 -5
- package/src/components/List/index.tsx +6 -6
- package/src/components/Sections/index.tsx +19 -21
|
@@ -6,20 +6,21 @@ import { List } from '../List';
|
|
|
6
6
|
import { useTheme } from '@codeleap/styles';
|
|
7
7
|
import { MobileStyleRegistry } from '../../Registry';
|
|
8
8
|
import { useStylesFor } from '../../hooks';
|
|
9
|
+
import { TypeGuards } from '@codeleap/types';
|
|
9
10
|
export * from './styles';
|
|
10
11
|
export * from './types';
|
|
11
12
|
const RenderSeparator = (props) => {
|
|
12
13
|
return <View style={props.separatorStyles}/>;
|
|
13
14
|
};
|
|
14
15
|
export const Grid = forwardRef((flatGridProps, ref) => {
|
|
15
|
-
const { style, onRefresh, refreshing, placeholder, refreshControlProps = {}, spacing, numColumns, renderItem:
|
|
16
|
+
const { style, onRefresh, refreshing, placeholder, refreshControlProps = {}, spacing, numColumns, renderItem: providedRenderItem, ...props } = {
|
|
16
17
|
...Grid.defaultProps,
|
|
17
18
|
...flatGridProps,
|
|
18
19
|
};
|
|
19
20
|
const themeSpacing = useTheme(store => store.theme?.spacing);
|
|
20
21
|
const styles = useStylesFor(Grid.styleRegistryName, style);
|
|
21
22
|
const renderItem = useCallback((data) => {
|
|
22
|
-
if (!
|
|
23
|
+
if (!providedRenderItem)
|
|
23
24
|
return null;
|
|
24
25
|
const listLength = props?.data?.length || 0;
|
|
25
26
|
const isFirst = data.index === 0;
|
|
@@ -36,12 +37,15 @@ export const Grid = forwardRef((flatGridProps, ref) => {
|
|
|
36
37
|
gap = themeSpacing?.marginHorizontal?.(spacing / 2);
|
|
37
38
|
const _itemProps = { isFirst, isLast, isOnly, isFirstInRow, isLastInRow, isOnlyInRow };
|
|
38
39
|
return (<View style={[styles.itemWrapper, gap]}>
|
|
39
|
-
|
|
40
|
+
{providedRenderItem({
|
|
41
|
+
...data,
|
|
42
|
+
..._itemProps
|
|
43
|
+
})}
|
|
40
44
|
</View>);
|
|
41
|
-
}, [
|
|
45
|
+
}, [providedRenderItem, props?.data?.length]);
|
|
42
46
|
const separatorStyles = { height: themeSpacing?.value?.(spacing), ...styles.separator };
|
|
43
47
|
const separator = props?.separators || (!!spacing ? <RenderSeparator separatorStyles={separatorStyles}/> : null);
|
|
44
|
-
const refreshControl =
|
|
48
|
+
const refreshControl = TypeGuards.isFunction(onRefresh) ? <RefreshControl refreshing={refreshing} onRefresh={onRefresh} {...refreshControlProps}/> : null;
|
|
45
49
|
return (<List
|
|
46
50
|
// @ts-expect-error
|
|
47
51
|
ref={ref} {...props} ListEmptyComponent={<EmptyPlaceholder {...placeholder}/>} ListHeaderComponentStyle={styles.header} ListFooterComponentStyle={styles.footer} ItemSeparatorComponent={separator} refreshControl={refreshControl} style={styles.wrapper} contentContainerStyle={[styles.content, props?.contentContainerStyle]} showsVerticalScrollIndicator={false} numColumns={numColumns} renderItem={renderItem}/>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Grid/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAiB,MAAM,OAAO,CAAA;AAErE,OAAO,EAAE,IAAI,EAAa,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAA;AAExC,OAAO,EAAmE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Grid/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const RenderSeparator = (props) => {
|
|
|
14
14
|
return <View style={props.separatorStyles}/>;
|
|
15
15
|
};
|
|
16
16
|
export const List = forwardRef((flatListProps, ref) => {
|
|
17
|
-
const { style, onRefresh, refreshing, placeholder, refreshControlProps, loading, keyboardAware, fakeEmpty = loading, contentContainerStyle, renderItem:
|
|
17
|
+
const { style, onRefresh, refreshing, placeholder, refreshControlProps, loading, keyboardAware, fakeEmpty = loading, contentContainerStyle, renderItem: providedRenderItem, data, ...props } = {
|
|
18
18
|
...List.defaultProps,
|
|
19
19
|
...flatListProps,
|
|
20
20
|
};
|
|
@@ -22,7 +22,7 @@ export const List = forwardRef((flatListProps, ref) => {
|
|
|
22
22
|
const separator = props?.separators && <RenderSeparator separatorStyles={styles.separator}/>;
|
|
23
23
|
const dataLength = data?.length || 0;
|
|
24
24
|
const renderItem = useCallback((data) => {
|
|
25
|
-
if (!
|
|
25
|
+
if (!providedRenderItem)
|
|
26
26
|
return null;
|
|
27
27
|
const isFirst = data.index === 0;
|
|
28
28
|
const isLast = data.index === dataLength - 1;
|
|
@@ -33,8 +33,8 @@ export const List = forwardRef((flatListProps, ref) => {
|
|
|
33
33
|
isLast,
|
|
34
34
|
isOnly,
|
|
35
35
|
};
|
|
36
|
-
return
|
|
37
|
-
}, [dataLength,
|
|
36
|
+
return providedRenderItem(itemProps);
|
|
37
|
+
}, [dataLength, providedRenderItem]);
|
|
38
38
|
const isEmpty = !data || !data?.length;
|
|
39
39
|
const _placeholder = {
|
|
40
40
|
...placeholder,
|
|
@@ -47,7 +47,7 @@ export const List = forwardRef((flatListProps, ref) => {
|
|
|
47
47
|
loading && styles['content:loading'],
|
|
48
48
|
], keyboardAware && !props.horizontal);
|
|
49
49
|
const wrapperStyle = [styles.wrapper, isEmpty && styles['wrapper:empty'], loading && styles['wrapper:loading']];
|
|
50
|
-
return (<FlatList ItemSeparatorComponent={separator} refreshControl={
|
|
50
|
+
return (<FlatList ItemSeparatorComponent={separator} refreshControl={TypeGuards.isFunction(onRefresh) ? (<RefreshControl refreshing={refreshing} onRefresh={onRefresh} {...refreshControlProps}/>) : null} ListEmptyComponent={<EmptyPlaceholder {..._placeholder}/>} showsVerticalScrollIndicator={false} showsHorizontalScrollIndicator={false} {...props} ListHeaderComponentStyle={styles.header} style={wrapperStyle} contentContainerStyle={keyboardStyle} data={fakeEmpty ? [] : data} ref={ref} renderItem={renderItem}/>);
|
|
51
51
|
});
|
|
52
52
|
List.styleRegistryName = 'List';
|
|
53
53
|
List.elements = ['wrapper', 'content', 'separator', 'header', 'refreshControl'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/List/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAsB,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAa,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAGrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AAEvB,MAAM,eAAe,GAAG,CAAC,KAA8C,EAAE,EAAE;IACzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,EAAG,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,UAAU,CAA0B,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE;IAC7E,MAAM,EACJ,KAAK,EACL,SAAS,EACT,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,aAAa,EACb,SAAS,GAAG,OAAO,EACnB,qBAAqB,EACrB,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/List/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const RenderSeparator = (props) => {
|
|
|
14
14
|
return <View style={props.separatorStyles}/>;
|
|
15
15
|
};
|
|
16
16
|
export function Sections(sectionsProps) {
|
|
17
|
-
const { style, onRefresh, refreshing, placeholder, refreshControlProps, loading, keyboardAware, fakeEmpty = loading, contentContainerStyle, refreshControl, renderItem:
|
|
17
|
+
const { style, onRefresh, refreshing, placeholder, refreshControlProps, loading, keyboardAware, fakeEmpty = loading, contentContainerStyle, refreshControl, renderItem: providedRenderItem, sections: data, renderSectionHeader: providedRenderSectionHeader, renderSectionFooter: providedRenderSectionFooter, ...props } = {
|
|
18
18
|
...Sections.defaultProps,
|
|
19
19
|
...sectionsProps,
|
|
20
20
|
};
|
|
@@ -40,26 +40,31 @@ export function Sections(sectionsProps) {
|
|
|
40
40
|
return { isFirst, isLast, isOnly, title, index };
|
|
41
41
|
};
|
|
42
42
|
const renderSectionHeader = useCallback((data) => {
|
|
43
|
-
if (!
|
|
43
|
+
if (!providedRenderSectionHeader)
|
|
44
44
|
return null;
|
|
45
45
|
const positionProps = getSectionProps(data);
|
|
46
|
-
return
|
|
47
|
-
}, [
|
|
46
|
+
return providedRenderSectionHeader({ ...data.section, ...positionProps });
|
|
47
|
+
}, [providedRenderSectionHeader, sections?.length]);
|
|
48
48
|
const renderSectionFooter = useCallback((data) => {
|
|
49
|
-
if (!
|
|
49
|
+
if (!providedRenderSectionFooter)
|
|
50
50
|
return null;
|
|
51
51
|
const positionProps = getSectionProps(data);
|
|
52
|
-
return
|
|
53
|
-
}, [
|
|
52
|
+
return providedRenderSectionFooter({ ...data.section, ...positionProps });
|
|
53
|
+
}, [providedRenderSectionFooter, sections?.length]);
|
|
54
54
|
const renderItem = useCallback((data) => {
|
|
55
|
-
if (!
|
|
55
|
+
if (!providedRenderItem)
|
|
56
56
|
return null;
|
|
57
57
|
const listLength = data?.section?.data?.length || 0;
|
|
58
58
|
const isFirst = data?.index === 0;
|
|
59
59
|
const isLast = data?.index === listLength - 1;
|
|
60
60
|
const isOnly = isFirst && isLast;
|
|
61
|
-
return (
|
|
62
|
-
|
|
61
|
+
return providedRenderItem({
|
|
62
|
+
...data,
|
|
63
|
+
isFirst,
|
|
64
|
+
isLast,
|
|
65
|
+
isOnly,
|
|
66
|
+
});
|
|
67
|
+
}, [providedRenderItem]);
|
|
63
68
|
const isEmpty = !sections || !sections?.length;
|
|
64
69
|
const _placeholder = {
|
|
65
70
|
...placeholder,
|
|
@@ -72,7 +77,7 @@ export function Sections(sectionsProps) {
|
|
|
72
77
|
loading && styles['content:loading'],
|
|
73
78
|
], keyboardAware && !props.horizontal);
|
|
74
79
|
const wrapperStyle = [styles.wrapper, isEmpty && styles['wrapper:empty'], loading && styles['wrapper:loading']];
|
|
75
|
-
return (<SectionList ItemSeparatorComponent={separator} refreshControl={
|
|
80
|
+
return (<SectionList ItemSeparatorComponent={separator} refreshControl={TypeGuards.isFunction(onRefresh) ? (<RefreshControl refreshing={refreshing} onRefresh={onRefresh} {...refreshControlProps}/>) : null} ListEmptyComponent={<EmptyPlaceholder {..._placeholder}/>} showsVerticalScrollIndicator={false} showsHorizontalScrollIndicator={false} {...props} ListHeaderComponentStyle={styles.header} ListFooterComponentStyle={styles.footer} style={wrapperStyle} contentContainerStyle={keyboardStyle} sections={sections} renderItem={renderItem} renderSectionHeader={renderSectionHeader} renderSectionFooter={renderSectionFooter}/>);
|
|
76
81
|
}
|
|
77
82
|
Sections.styleRegistryName = 'Sections';
|
|
78
83
|
Sections.elements = ['wrapper', 'content', 'separator', 'header', 'footer', 'refreshControl'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Sections/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAsC,MAAM,cAAc,CAAA;AAC9E,OAAO,EAAE,IAAI,EAAa,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAGrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAEtD,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AAEvB,MAAM,eAAe,GAAG,CAAC,KAA8C,EAAE,EAAE;IACzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,EAAG,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,UAAU,QAAQ,CAAI,aAA8B;IACxD,MAAM,EACJ,KAAK,EACL,SAAS,EACT,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,aAAa,EACb,SAAS,GAAG,OAAO,EACnB,qBAAqB,EACrB,cAAc,EACd,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Sections/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codeleap/mobile",
|
|
3
|
-
"version": "5.8.
|
|
3
|
+
"version": "5.8.12",
|
|
4
4
|
"main": "src/index.ts",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"repository": {
|
|
@@ -9,28 +9,28 @@
|
|
|
9
9
|
"directory": "packages/mobile"
|
|
10
10
|
},
|
|
11
11
|
"devDependencies": {
|
|
12
|
-
"@codeleap/types": "5.8.
|
|
13
|
-
"@codeleap/utils": "5.8.
|
|
14
|
-
"@codeleap/hooks": "5.8.
|
|
15
|
-
"@codeleap/form": "5.8.
|
|
16
|
-
"@codeleap/query": "5.8.
|
|
17
|
-
"@codeleap/logger": "5.8.
|
|
18
|
-
"@codeleap/config": "5.8.
|
|
19
|
-
"@codeleap/modals": "5.8.
|
|
12
|
+
"@codeleap/types": "5.8.12",
|
|
13
|
+
"@codeleap/utils": "5.8.12",
|
|
14
|
+
"@codeleap/hooks": "5.8.12",
|
|
15
|
+
"@codeleap/form": "5.8.12",
|
|
16
|
+
"@codeleap/query": "5.8.12",
|
|
17
|
+
"@codeleap/logger": "5.8.12",
|
|
18
|
+
"@codeleap/config": "5.8.12",
|
|
19
|
+
"@codeleap/modals": "5.8.12"
|
|
20
20
|
},
|
|
21
21
|
"scripts": {
|
|
22
22
|
"build": "tsc --build",
|
|
23
23
|
"lint": "eslint -c .eslintrc.js --fix \"./src/**/*.{ts,tsx,js,jsx}\""
|
|
24
24
|
},
|
|
25
25
|
"peerDependencies": {
|
|
26
|
-
"@codeleap/types": "5.8.
|
|
27
|
-
"@codeleap/utils": "5.8.
|
|
28
|
-
"@codeleap/hooks": "5.8.
|
|
29
|
-
"@codeleap/form": "5.8.
|
|
30
|
-
"@codeleap/query": "5.8.
|
|
31
|
-
"@codeleap/logger": "5.8.
|
|
32
|
-
"@codeleap/styles": "5.8.
|
|
33
|
-
"@codeleap/modals": "5.8.
|
|
26
|
+
"@codeleap/types": "5.8.12",
|
|
27
|
+
"@codeleap/utils": "5.8.12",
|
|
28
|
+
"@codeleap/hooks": "5.8.12",
|
|
29
|
+
"@codeleap/form": "5.8.12",
|
|
30
|
+
"@codeleap/query": "5.8.12",
|
|
31
|
+
"@codeleap/logger": "5.8.12",
|
|
32
|
+
"@codeleap/styles": "5.8.12",
|
|
33
|
+
"@codeleap/modals": "5.8.12",
|
|
34
34
|
"@d11/react-native-fast-image": "8.9.2",
|
|
35
35
|
"@react-native-firebase/messaging": "21.12.0",
|
|
36
36
|
"@react-navigation/bottom-tabs": "7.3.10",
|
package/package.json.bak
CHANGED
|
@@ -8,6 +8,7 @@ import { GridProps } from './types'
|
|
|
8
8
|
import { AnyRecord, IJSX, StyledComponentProps, StyledComponentWithProps, useTheme } from '@codeleap/styles'
|
|
9
9
|
import { MobileStyleRegistry } from '../../Registry'
|
|
10
10
|
import { useStylesFor } from '../../hooks'
|
|
11
|
+
import { TypeGuards } from '@codeleap/types'
|
|
11
12
|
|
|
12
13
|
export * from './styles'
|
|
13
14
|
export * from './types'
|
|
@@ -25,7 +26,7 @@ export const Grid = forwardRef<FlatList, GridProps>((flatGridProps, ref) => {
|
|
|
25
26
|
refreshControlProps = {},
|
|
26
27
|
spacing,
|
|
27
28
|
numColumns,
|
|
28
|
-
renderItem:
|
|
29
|
+
renderItem: providedRenderItem,
|
|
29
30
|
...props
|
|
30
31
|
} = {
|
|
31
32
|
...Grid.defaultProps,
|
|
@@ -37,7 +38,7 @@ export const Grid = forwardRef<FlatList, GridProps>((flatGridProps, ref) => {
|
|
|
37
38
|
const styles = useStylesFor(Grid.styleRegistryName, style)
|
|
38
39
|
|
|
39
40
|
const renderItem = useCallback((data: ListRenderItemInfo<any>) => {
|
|
40
|
-
if (!
|
|
41
|
+
if (!providedRenderItem) return null
|
|
41
42
|
|
|
42
43
|
const listLength = props?.data?.length || 0
|
|
43
44
|
|
|
@@ -58,14 +59,17 @@ export const Grid = forwardRef<FlatList, GridProps>((flatGridProps, ref) => {
|
|
|
58
59
|
|
|
59
60
|
return (
|
|
60
61
|
<View style={[styles.itemWrapper, gap]}>
|
|
61
|
-
|
|
62
|
+
{providedRenderItem({
|
|
63
|
+
...data,
|
|
64
|
+
..._itemProps
|
|
65
|
+
})}
|
|
62
66
|
</View>
|
|
63
67
|
)
|
|
64
|
-
}, [
|
|
68
|
+
}, [providedRenderItem, props?.data?.length])
|
|
65
69
|
|
|
66
70
|
const separatorStyles = { height: themeSpacing?.value?.(spacing), ...styles.separator }
|
|
67
71
|
const separator = props?.separators || (!!spacing ? <RenderSeparator separatorStyles={separatorStyles} /> : null)
|
|
68
|
-
const refreshControl =
|
|
72
|
+
const refreshControl = TypeGuards.isFunction(onRefresh) ? <RefreshControl refreshing={refreshing} onRefresh={onRefresh} {...refreshControlProps} /> : null
|
|
69
73
|
|
|
70
74
|
return (
|
|
71
75
|
<List
|
|
@@ -29,7 +29,7 @@ export const List = forwardRef<FlatList, FlatListProps>((flatListProps, ref) =>
|
|
|
29
29
|
keyboardAware,
|
|
30
30
|
fakeEmpty = loading,
|
|
31
31
|
contentContainerStyle,
|
|
32
|
-
renderItem:
|
|
32
|
+
renderItem: providedRenderItem,
|
|
33
33
|
data,
|
|
34
34
|
...props
|
|
35
35
|
} = {
|
|
@@ -44,7 +44,7 @@ export const List = forwardRef<FlatList, FlatListProps>((flatListProps, ref) =>
|
|
|
44
44
|
const dataLength = data?.length || 0
|
|
45
45
|
|
|
46
46
|
const renderItem = useCallback((data: ListRenderItemInfo<any>) => {
|
|
47
|
-
if (!
|
|
47
|
+
if (!providedRenderItem) return null
|
|
48
48
|
|
|
49
49
|
const isFirst = data.index === 0
|
|
50
50
|
const isLast = data.index === dataLength - 1
|
|
@@ -58,8 +58,8 @@ export const List = forwardRef<FlatList, FlatListProps>((flatListProps, ref) =>
|
|
|
58
58
|
isOnly,
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
return
|
|
62
|
-
}, [dataLength,
|
|
61
|
+
return providedRenderItem(itemProps)
|
|
62
|
+
}, [dataLength, providedRenderItem])
|
|
63
63
|
|
|
64
64
|
const isEmpty = !data || !data?.length
|
|
65
65
|
|
|
@@ -80,13 +80,13 @@ export const List = forwardRef<FlatList, FlatListProps>((flatListProps, ref) =>
|
|
|
80
80
|
return (
|
|
81
81
|
<FlatList
|
|
82
82
|
ItemSeparatorComponent={separator as unknown as React.ComponentType}
|
|
83
|
-
refreshControl={
|
|
83
|
+
refreshControl={TypeGuards.isFunction(onRefresh) ? (
|
|
84
84
|
<RefreshControl
|
|
85
85
|
refreshing={refreshing}
|
|
86
86
|
onRefresh={onRefresh}
|
|
87
87
|
{...refreshControlProps}
|
|
88
88
|
/>
|
|
89
|
-
)}
|
|
89
|
+
) : null}
|
|
90
90
|
ListEmptyComponent={<EmptyPlaceholder {..._placeholder} />}
|
|
91
91
|
showsVerticalScrollIndicator={false}
|
|
92
92
|
showsHorizontalScrollIndicator={false}
|
|
@@ -30,10 +30,10 @@ export function Sections<T>(sectionsProps: SectionProps<T>) {
|
|
|
30
30
|
fakeEmpty = loading,
|
|
31
31
|
contentContainerStyle,
|
|
32
32
|
refreshControl,
|
|
33
|
-
renderItem:
|
|
33
|
+
renderItem: providedRenderItem,
|
|
34
34
|
sections: data,
|
|
35
|
-
renderSectionHeader:
|
|
36
|
-
renderSectionFooter:
|
|
35
|
+
renderSectionHeader: providedRenderSectionHeader,
|
|
36
|
+
renderSectionFooter: providedRenderSectionFooter,
|
|
37
37
|
...props
|
|
38
38
|
} = {
|
|
39
39
|
...Sections.defaultProps,
|
|
@@ -67,23 +67,23 @@ export function Sections<T>(sectionsProps: SectionProps<T>) {
|
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
const renderSectionHeader = useCallback((data: SectionRenderComponentProps<T>) => {
|
|
70
|
-
if (!
|
|
70
|
+
if (!providedRenderSectionHeader) return null
|
|
71
71
|
|
|
72
72
|
const positionProps = getSectionProps(data)
|
|
73
73
|
|
|
74
|
-
return
|
|
75
|
-
}, [
|
|
74
|
+
return providedRenderSectionHeader({ ...data.section, ...positionProps })
|
|
75
|
+
}, [providedRenderSectionHeader, sections?.length])
|
|
76
76
|
|
|
77
77
|
const renderSectionFooter = useCallback((data: SectionRenderComponentProps<T>) => {
|
|
78
|
-
if (!
|
|
78
|
+
if (!providedRenderSectionFooter) return null
|
|
79
79
|
|
|
80
80
|
const positionProps = getSectionProps(data)
|
|
81
81
|
|
|
82
|
-
return
|
|
83
|
-
}, [
|
|
82
|
+
return providedRenderSectionFooter({ ...data.section, ...positionProps })
|
|
83
|
+
}, [providedRenderSectionFooter, sections?.length])
|
|
84
84
|
|
|
85
85
|
const renderItem = useCallback((data: AugmentedSectionRenderItemInfo<T>) => {
|
|
86
|
-
if (!
|
|
86
|
+
if (!providedRenderItem) return null
|
|
87
87
|
|
|
88
88
|
const listLength = data?.section?.data?.length || 0
|
|
89
89
|
|
|
@@ -91,15 +91,13 @@ export function Sections<T>(sectionsProps: SectionProps<T>) {
|
|
|
91
91
|
const isLast = data?.index === listLength - 1
|
|
92
92
|
const isOnly = isFirst && isLast
|
|
93
93
|
|
|
94
|
-
return (
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
)
|
|
102
|
-
}, [RenderItem])
|
|
94
|
+
return providedRenderItem({
|
|
95
|
+
...data,
|
|
96
|
+
isFirst,
|
|
97
|
+
isLast,
|
|
98
|
+
isOnly,
|
|
99
|
+
})
|
|
100
|
+
}, [providedRenderItem])
|
|
103
101
|
|
|
104
102
|
const isEmpty = !sections || !sections?.length
|
|
105
103
|
|
|
@@ -120,13 +118,13 @@ export function Sections<T>(sectionsProps: SectionProps<T>) {
|
|
|
120
118
|
return (
|
|
121
119
|
<SectionList
|
|
122
120
|
ItemSeparatorComponent={separator}
|
|
123
|
-
refreshControl={
|
|
121
|
+
refreshControl={TypeGuards.isFunction(onRefresh) ? (
|
|
124
122
|
<RefreshControl
|
|
125
123
|
refreshing={refreshing}
|
|
126
124
|
onRefresh={onRefresh}
|
|
127
125
|
{...refreshControlProps}
|
|
128
126
|
/>
|
|
129
|
-
)}
|
|
127
|
+
) : null}
|
|
130
128
|
ListEmptyComponent={<EmptyPlaceholder {..._placeholder} />}
|
|
131
129
|
showsVerticalScrollIndicator={false}
|
|
132
130
|
showsHorizontalScrollIndicator={false}
|