@scrumble-nl/gatherer-frontend 0.1.1 → 0.1.3
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/lib/commonjs/hooks/use-instance.js +3 -2
- package/lib/commonjs/hooks/use-instance.js.map +1 -1
- package/lib/commonjs/pick-list/pick-list.js +5 -7
- package/lib/commonjs/pick-list/pick-list.js.map +1 -1
- package/lib/module/hooks/use-instance.js +3 -2
- package/lib/module/hooks/use-instance.js.map +1 -1
- package/lib/module/pick-list/pick-list.js +5 -7
- package/lib/module/pick-list/pick-list.js.map +1 -1
- package/lib/typescript/pick-list/pick-list.d.ts +0 -1
- package/package.json +1 -1
- package/src/hooks/use-instance.tsx +2 -1
- package/src/pick-list/pick-list.tsx +6 -9
|
@@ -7,14 +7,15 @@ exports.useInstance = void 0;
|
|
|
7
7
|
var _reactNative = require("react-native");
|
|
8
8
|
var _axios = _interopRequireDefault(require("axios"));
|
|
9
9
|
var _usePicker = require("./use-picker");
|
|
10
|
+
var _react = require("react");
|
|
10
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
12
|
const useInstance = () => {
|
|
12
13
|
const {
|
|
13
14
|
baseURL
|
|
14
15
|
} = (0, _usePicker.usePicker)();
|
|
15
|
-
const instance = _axios.default.create({
|
|
16
|
+
const instance = (0, _react.useMemo)(() => _axios.default.create({
|
|
16
17
|
baseURL
|
|
17
|
-
});
|
|
18
|
+
}), [baseURL]);
|
|
18
19
|
instance.interceptors.response.use(response => response, error => {
|
|
19
20
|
var _error$response$data;
|
|
20
21
|
if ((_error$response$data = error.response.data) !== null && _error$response$data !== void 0 && _error$response$data.error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useInstance","baseURL","usePicker","instance","axios","create","interceptors","response","use","error","data","ToastAndroid","show","LONG","Promise","reject"],"sources":["use-instance.tsx"],"sourcesContent":["import {ToastAndroid} from 'react-native';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport {usePicker} from './use-picker';\n\nexport const useInstance = (): AxiosInstance => {\n const {baseURL} = usePicker();\n const instance = axios.create({baseURL});\n\n instance.interceptors.response.use(\n response => response,\n error => {\n if (error.response.data?.error) {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n }\n\n return Promise.reject(error);\n },\n );\n\n return instance;\n};\n"],"mappings":";;;;;;AAAA;AAEA;AAEA;
|
|
1
|
+
{"version":3,"names":["useInstance","baseURL","usePicker","instance","useMemo","axios","create","interceptors","response","use","error","data","ToastAndroid","show","LONG","Promise","reject"],"sources":["use-instance.tsx"],"sourcesContent":["import {ToastAndroid} from 'react-native';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport {usePicker} from './use-picker';\nimport {useMemo} from 'react';\n\nexport const useInstance = (): AxiosInstance => {\n const {baseURL} = usePicker();\n const instance = useMemo<AxiosInstance>(() => axios.create({baseURL}), [baseURL]);\n\n instance.interceptors.response.use(\n response => response,\n error => {\n if (error.response.data?.error) {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n }\n\n return Promise.reject(error);\n },\n );\n\n return instance;\n};\n"],"mappings":";;;;;;AAAA;AAEA;AAEA;AACA;AAA8B;AAEvB,MAAMA,WAAW,GAAG,MAAqB;EAC5C,MAAM;IAACC;EAAO,CAAC,GAAG,IAAAC,oBAAS,GAAE;EAC7B,MAAMC,QAAQ,GAAG,IAAAC,cAAO,EAAgB,MAAMC,cAAK,CAACC,MAAM,CAAC;IAACL;EAAO,CAAC,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;EAEjFE,QAAQ,CAACI,YAAY,CAACC,QAAQ,CAACC,GAAG,CAC9BD,QAAQ,IAAIA,QAAQ,EACpBE,KAAK,IAAI;IAAA;IACL,4BAAIA,KAAK,CAACF,QAAQ,CAACG,IAAI,iDAAnB,qBAAqBD,KAAK,EAAE;MAC5BE,yBAAY,CAACC,IAAI,CAACH,KAAK,CAACF,QAAQ,CAACG,IAAI,CAACD,KAAK,EAAEE,yBAAY,CAACE,IAAI,CAAC;IACnE;IAEA,OAAOC,OAAO,CAACC,MAAM,CAACN,KAAK,CAAC;EAChC,CAAC,CACJ;EAED,OAAOP,QAAQ;AACnB,CAAC;AAAC"}
|
|
@@ -18,7 +18,6 @@ const PickList = props => {
|
|
|
18
18
|
const {
|
|
19
19
|
isAfterPickList,
|
|
20
20
|
renderItem,
|
|
21
|
-
searchParams,
|
|
22
21
|
onItemPress
|
|
23
22
|
} = props;
|
|
24
23
|
const [loading, setLoading] = (0, _react.useState)(true);
|
|
@@ -30,6 +29,7 @@ const PickList = props => {
|
|
|
30
29
|
const getPickListWithSearch = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
|
|
31
30
|
const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
|
|
32
31
|
setLoading(true);
|
|
32
|
+
console.log(2);
|
|
33
33
|
instance.post(url, {
|
|
34
34
|
searchField: searchFieldParam ?? null,
|
|
35
35
|
searchValue: searchValueParam ?? null
|
|
@@ -37,12 +37,10 @@ const PickList = props => {
|
|
|
37
37
|
setPickList(response.data.pick_groups);
|
|
38
38
|
}).catch(error => _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG)).finally(() => setLoading(false));
|
|
39
39
|
}, [instance, isAfterPickList]);
|
|
40
|
-
const handleRefresh = (0, _react.useCallback)(() => {
|
|
41
|
-
getPickListWithSearch();
|
|
42
|
-
}, [getPickListWithSearch]);
|
|
43
40
|
(0, _react.useEffect)(() => {
|
|
44
41
|
let ignoreCurrentRequest = false;
|
|
45
42
|
setLoading(true);
|
|
43
|
+
console.log(1);
|
|
46
44
|
instance.post(_apiUrls.GET_PICKLIST_URL, {
|
|
47
45
|
searchField: null,
|
|
48
46
|
searchValue: null
|
|
@@ -54,7 +52,7 @@ const PickList = props => {
|
|
|
54
52
|
return () => {
|
|
55
53
|
ignoreCurrentRequest = true;
|
|
56
54
|
};
|
|
57
|
-
}, [
|
|
55
|
+
}, []);
|
|
58
56
|
const renderPickGroupItem = renderProps => {
|
|
59
57
|
return /*#__PURE__*/_react.default.createElement(_pickGroupItem.PickGroupItem, {
|
|
60
58
|
onPress: onItemPress,
|
|
@@ -66,14 +64,14 @@ const PickList = props => {
|
|
|
66
64
|
}, [getPickListWithSearch]);
|
|
67
65
|
return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
|
|
68
66
|
refreshing: loading,
|
|
69
|
-
onRefresh:
|
|
67
|
+
onRefresh: getPickListWithSearch,
|
|
70
68
|
data: pickList,
|
|
71
69
|
renderItem: renderItem ?? renderPickGroupItem,
|
|
72
70
|
keyExtractor: pickGroup => pickGroup.id.toString(),
|
|
73
71
|
ListEmptyComponent: /*#__PURE__*/_react.default.createElement(_emptyList.EmptyList, {
|
|
74
72
|
text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
|
|
75
73
|
}),
|
|
76
|
-
ListHeaderComponent:
|
|
74
|
+
ListHeaderComponent: /*#__PURE__*/_react.default.createElement(_search.Search, {
|
|
77
75
|
onSearch: handlePickListFromSearch
|
|
78
76
|
})
|
|
79
77
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PickList","props","isAfterPickList","renderItem","
|
|
1
|
+
{"version":3,"names":["PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","t","useTranslation","instance","useInstance","getPickListWithSearch","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","console","log","post","searchField","searchValue","then","response","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","useEffect","ignoreCurrentRequest","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {Search} from './partials/search';\nimport {EmptyList} from './partials/empty-list';\nimport {useInstance} from '../hooks/use-instance';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<PickGroup>;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const {t} = useTranslation();\n const instance = useInstance();\n\n const getPickListWithSearch = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n console.log(2);\n\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n setPickList(response.data.pick_groups);\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n useEffect(() => {\n let ignoreCurrentRequest = false;\n\n setLoading(true);\n console.log(1);\n\n instance\n .post(GET_PICKLIST_URL, {\n searchField: null,\n searchValue: null,\n })\n .then(response => {\n if (!ignoreCurrentRequest) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n\n return () => {\n ignoreCurrentRequest = true;\n };\n }, []);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickListWithSearch}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { ToastAndroid } from 'react-native';
|
|
2
2
|
import axios from 'axios';
|
|
3
3
|
import { usePicker } from './use-picker';
|
|
4
|
+
import { useMemo } from 'react';
|
|
4
5
|
export const useInstance = () => {
|
|
5
6
|
const {
|
|
6
7
|
baseURL
|
|
7
8
|
} = usePicker();
|
|
8
|
-
const instance = axios.create({
|
|
9
|
+
const instance = useMemo(() => axios.create({
|
|
9
10
|
baseURL
|
|
10
|
-
});
|
|
11
|
+
}), [baseURL]);
|
|
11
12
|
instance.interceptors.response.use(response => response, error => {
|
|
12
13
|
var _error$response$data;
|
|
13
14
|
if ((_error$response$data = error.response.data) !== null && _error$response$data !== void 0 && _error$response$data.error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["ToastAndroid","axios","usePicker","useInstance","baseURL","instance","create","interceptors","response","use","error","data","show","LONG","Promise","reject"],"sources":["use-instance.tsx"],"sourcesContent":["import {ToastAndroid} from 'react-native';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport {usePicker} from './use-picker';\n\nexport const useInstance = (): AxiosInstance => {\n const {baseURL} = usePicker();\n const instance = axios.create({baseURL});\n\n instance.interceptors.response.use(\n response => response,\n error => {\n if (error.response.data?.error) {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n }\n\n return Promise.reject(error);\n },\n );\n\n return instance;\n};\n"],"mappings":"AAAA,SAAQA,YAAY,QAAO,cAAc;AAEzC,OAAOC,KAAK,MAAuB,OAAO;AAE1C,SAAQC,SAAS,QAAO,cAAc;
|
|
1
|
+
{"version":3,"names":["ToastAndroid","axios","usePicker","useMemo","useInstance","baseURL","instance","create","interceptors","response","use","error","data","show","LONG","Promise","reject"],"sources":["use-instance.tsx"],"sourcesContent":["import {ToastAndroid} from 'react-native';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport {usePicker} from './use-picker';\nimport {useMemo} from 'react';\n\nexport const useInstance = (): AxiosInstance => {\n const {baseURL} = usePicker();\n const instance = useMemo<AxiosInstance>(() => axios.create({baseURL}), [baseURL]);\n\n instance.interceptors.response.use(\n response => response,\n error => {\n if (error.response.data?.error) {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n }\n\n return Promise.reject(error);\n },\n );\n\n return instance;\n};\n"],"mappings":"AAAA,SAAQA,YAAY,QAAO,cAAc;AAEzC,OAAOC,KAAK,MAAuB,OAAO;AAE1C,SAAQC,SAAS,QAAO,cAAc;AACtC,SAAQC,OAAO,QAAO,OAAO;AAE7B,OAAO,MAAMC,WAAW,GAAG,MAAqB;EAC5C,MAAM;IAACC;EAAO,CAAC,GAAGH,SAAS,EAAE;EAC7B,MAAMI,QAAQ,GAAGH,OAAO,CAAgB,MAAMF,KAAK,CAACM,MAAM,CAAC;IAACF;EAAO,CAAC,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;EAEjFC,QAAQ,CAACE,YAAY,CAACC,QAAQ,CAACC,GAAG,CAC9BD,QAAQ,IAAIA,QAAQ,EACpBE,KAAK,IAAI;IAAA;IACL,4BAAIA,KAAK,CAACF,QAAQ,CAACG,IAAI,iDAAnB,qBAAqBD,KAAK,EAAE;MAC5BX,YAAY,CAACa,IAAI,CAACF,KAAK,CAACF,QAAQ,CAACG,IAAI,CAACD,KAAK,EAAEX,YAAY,CAACc,IAAI,CAAC;IACnE;IAEA,OAAOC,OAAO,CAACC,MAAM,CAACL,KAAK,CAAC;EAChC,CAAC,CACJ;EAED,OAAOL,QAAQ;AACnB,CAAC"}
|
|
@@ -10,7 +10,6 @@ export const PickList = props => {
|
|
|
10
10
|
const {
|
|
11
11
|
isAfterPickList,
|
|
12
12
|
renderItem,
|
|
13
|
-
searchParams,
|
|
14
13
|
onItemPress
|
|
15
14
|
} = props;
|
|
16
15
|
const [loading, setLoading] = useState(true);
|
|
@@ -22,6 +21,7 @@ export const PickList = props => {
|
|
|
22
21
|
const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
|
|
23
22
|
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
24
23
|
setLoading(true);
|
|
24
|
+
console.log(2);
|
|
25
25
|
instance.post(url, {
|
|
26
26
|
searchField: searchFieldParam ?? null,
|
|
27
27
|
searchValue: searchValueParam ?? null
|
|
@@ -29,12 +29,10 @@ export const PickList = props => {
|
|
|
29
29
|
setPickList(response.data.pick_groups);
|
|
30
30
|
}).catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG)).finally(() => setLoading(false));
|
|
31
31
|
}, [instance, isAfterPickList]);
|
|
32
|
-
const handleRefresh = useCallback(() => {
|
|
33
|
-
getPickListWithSearch();
|
|
34
|
-
}, [getPickListWithSearch]);
|
|
35
32
|
useEffect(() => {
|
|
36
33
|
let ignoreCurrentRequest = false;
|
|
37
34
|
setLoading(true);
|
|
35
|
+
console.log(1);
|
|
38
36
|
instance.post(GET_PICKLIST_URL, {
|
|
39
37
|
searchField: null,
|
|
40
38
|
searchValue: null
|
|
@@ -46,7 +44,7 @@ export const PickList = props => {
|
|
|
46
44
|
return () => {
|
|
47
45
|
ignoreCurrentRequest = true;
|
|
48
46
|
};
|
|
49
|
-
}, [
|
|
47
|
+
}, []);
|
|
50
48
|
const renderPickGroupItem = renderProps => {
|
|
51
49
|
return /*#__PURE__*/React.createElement(PickGroupItem, {
|
|
52
50
|
onPress: onItemPress,
|
|
@@ -58,14 +56,14 @@ export const PickList = props => {
|
|
|
58
56
|
}, [getPickListWithSearch]);
|
|
59
57
|
return /*#__PURE__*/React.createElement(FlatList, {
|
|
60
58
|
refreshing: loading,
|
|
61
|
-
onRefresh:
|
|
59
|
+
onRefresh: getPickListWithSearch,
|
|
62
60
|
data: pickList,
|
|
63
61
|
renderItem: renderItem ?? renderPickGroupItem,
|
|
64
62
|
keyExtractor: pickGroup => pickGroup.id.toString(),
|
|
65
63
|
ListEmptyComponent: /*#__PURE__*/React.createElement(EmptyList, {
|
|
66
64
|
text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
|
|
67
65
|
}),
|
|
68
|
-
ListHeaderComponent:
|
|
66
|
+
ListHeaderComponent: /*#__PURE__*/React.createElement(Search, {
|
|
69
67
|
onSearch: handlePickListFromSearch
|
|
70
68
|
})
|
|
71
69
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useInstance","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useInstance","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","pickList","setPickList","t","instance","getPickListWithSearch","searchFieldParam","searchValueParam","url","console","log","post","searchField","searchValue","then","response","data","pick_groups","catch","error","show","LONG","finally","ignoreCurrentRequest","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {Search} from './partials/search';\nimport {EmptyList} from './partials/empty-list';\nimport {useInstance} from '../hooks/use-instance';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<PickGroup>;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const {t} = useTranslation();\n const instance = useInstance();\n\n const getPickListWithSearch = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n console.log(2);\n\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n setPickList(response.data.pick_groups);\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n useEffect(() => {\n let ignoreCurrentRequest = false;\n\n setLoading(true);\n console.log(1);\n\n instance\n .post(GET_PICKLIST_URL, {\n searchField: null,\n searchValue: null,\n })\n .then(response => {\n if (!ignoreCurrentRequest) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n\n return () => {\n ignoreCurrentRequest = true;\n };\n }, []);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickListWithSearch}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import { ListRenderItem } from 'react-native';
|
|
|
2
2
|
interface props {
|
|
3
3
|
isAfterPickList?: boolean;
|
|
4
4
|
renderItem?: ListRenderItem<PickGroup>;
|
|
5
|
-
searchParams?: SearchParams;
|
|
6
5
|
onItemPress?: (pickGroup: PickGroup) => void;
|
|
7
6
|
}
|
|
8
7
|
export declare const PickList: (props: props) => JSX.Element;
|
package/package.json
CHANGED
|
@@ -3,10 +3,11 @@ import {ToastAndroid} from 'react-native';
|
|
|
3
3
|
import axios, {AxiosInstance} from 'axios';
|
|
4
4
|
|
|
5
5
|
import {usePicker} from './use-picker';
|
|
6
|
+
import {useMemo} from 'react';
|
|
6
7
|
|
|
7
8
|
export const useInstance = (): AxiosInstance => {
|
|
8
9
|
const {baseURL} = usePicker();
|
|
9
|
-
const instance = axios.create({baseURL});
|
|
10
|
+
const instance = useMemo<AxiosInstance>(() => axios.create({baseURL}), [baseURL]);
|
|
10
11
|
|
|
11
12
|
instance.interceptors.response.use(
|
|
12
13
|
response => response,
|
|
@@ -12,12 +12,11 @@ import {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';
|
|
|
12
12
|
interface props {
|
|
13
13
|
isAfterPickList?: boolean;
|
|
14
14
|
renderItem?: ListRenderItem<PickGroup>;
|
|
15
|
-
searchParams?: SearchParams;
|
|
16
15
|
onItemPress?: (pickGroup: PickGroup) => void;
|
|
17
16
|
}
|
|
18
17
|
|
|
19
18
|
export const PickList = (props: props): JSX.Element => {
|
|
20
|
-
const {isAfterPickList, renderItem,
|
|
19
|
+
const {isAfterPickList, renderItem, onItemPress} = props;
|
|
21
20
|
const [loading, setLoading] = useState<boolean>(true);
|
|
22
21
|
const [pickList, setPickList] = useState<PickGroup[]>([]);
|
|
23
22
|
const {t} = useTranslation();
|
|
@@ -28,6 +27,7 @@ export const PickList = (props: props): JSX.Element => {
|
|
|
28
27
|
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
29
28
|
|
|
30
29
|
setLoading(true);
|
|
30
|
+
console.log(2);
|
|
31
31
|
|
|
32
32
|
instance
|
|
33
33
|
.post(url, {
|
|
@@ -43,14 +43,11 @@ export const PickList = (props: props): JSX.Element => {
|
|
|
43
43
|
[instance, isAfterPickList],
|
|
44
44
|
);
|
|
45
45
|
|
|
46
|
-
const handleRefresh = useCallback(() => {
|
|
47
|
-
getPickListWithSearch();
|
|
48
|
-
}, [getPickListWithSearch]);
|
|
49
|
-
|
|
50
46
|
useEffect(() => {
|
|
51
47
|
let ignoreCurrentRequest = false;
|
|
52
48
|
|
|
53
49
|
setLoading(true);
|
|
50
|
+
console.log(1);
|
|
54
51
|
|
|
55
52
|
instance
|
|
56
53
|
.post(GET_PICKLIST_URL, {
|
|
@@ -68,7 +65,7 @@ export const PickList = (props: props): JSX.Element => {
|
|
|
68
65
|
return () => {
|
|
69
66
|
ignoreCurrentRequest = true;
|
|
70
67
|
};
|
|
71
|
-
}, [
|
|
68
|
+
}, []);
|
|
72
69
|
|
|
73
70
|
const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {
|
|
74
71
|
return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
|
|
@@ -84,12 +81,12 @@ export const PickList = (props: props): JSX.Element => {
|
|
|
84
81
|
return (
|
|
85
82
|
<FlatList
|
|
86
83
|
refreshing={loading}
|
|
87
|
-
onRefresh={
|
|
84
|
+
onRefresh={getPickListWithSearch}
|
|
88
85
|
data={pickList}
|
|
89
86
|
renderItem={renderItem ?? renderPickGroupItem}
|
|
90
87
|
keyExtractor={pickGroup => pickGroup.id.toString()}
|
|
91
88
|
ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
|
|
92
|
-
ListHeaderComponent={
|
|
89
|
+
ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
93
90
|
/>
|
|
94
91
|
);
|
|
95
92
|
};
|