@scrumble-nl/gatherer-frontend 0.0.7 → 0.0.9

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.
@@ -7,7 +7,6 @@ exports.PickList = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
8
  var _reactNative = require("react-native");
9
9
  var _reactI18next = require("react-i18next");
10
- var _reactCustomHooks = require("@scrumble-nl/react-custom-hooks");
11
10
  var _search = require("./partials/search");
12
11
  var _emptyList = require("./partials/empty-list");
13
12
  var _useInstance = require("../hooks/use-instance");
@@ -15,6 +14,8 @@ var _pickGroupItem = require("./partials/pick-group-item");
15
14
  var _apiUrls = require("../shared/api/api-urls");
16
15
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
17
16
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
17
+ // import {useDebounce} from '@scrumble-nl/react-custom-hooks';
18
+
18
19
  const PickList = props => {
19
20
  const {
20
21
  isAfterPickList,
@@ -22,30 +23,26 @@ const PickList = props => {
22
23
  searchParams,
23
24
  onItemPress
24
25
  } = props;
25
- // const [loading, setLoading] = useState<boolean>(true);
26
- // const [pickList, setPickList] = useState<PickGroup[]>([]);
26
+ const [loading, setLoading] = (0, _react.useState)(true);
27
+ const [pickList, setPickList] = (0, _react.useState)([]);
27
28
  const ignoreCurrentRequest = (0, _react.useRef)(false);
28
29
  const {
29
30
  t
30
31
  } = (0, _reactI18next.useTranslation)();
31
32
  const instance = (0, _useInstance.useInstance)();
32
- const searchField = (0, _reactCustomHooks.useDebounce)(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchField, 500);
33
- const searchValue = (0, _reactCustomHooks.useDebounce)(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchValue, 500);
33
+ const searchField = (0, _react.useMemo)(() => searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchField, [searchParams]);
34
+ const searchValue = (0, _react.useMemo)(() => searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchValue, [searchParams]);
34
35
  const getPickList = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
35
36
  const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
36
-
37
- // setLoading(true);
38
-
37
+ setLoading(true);
39
38
  instance.post(url, {
40
39
  searchField: searchFieldParam ?? null,
41
40
  searchValue: searchValueParam ?? null
42
41
  }).then(response => {
43
42
  if (!ignoreCurrentRequest.current) {
44
- console.log('response: ', response);
45
- // setPickList(response.data.pick_groups);
43
+ setPickList(response.data.pick_groups);
46
44
  }
47
- }).catch(error => _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG));
48
- // .finally(() => setLoading(false));
45
+ }).catch(error => _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG)).finally(() => setLoading(false));
49
46
  }, [instance, isAfterPickList]);
50
47
  const handleRefresh = (0, _react.useCallback)(() => {
51
48
  ignoreCurrentRequest.current = false;
@@ -68,17 +65,14 @@ const PickList = props => {
68
65
  ignoreCurrentRequest.current = false;
69
66
  getPickList('', search);
70
67
  }, [getPickList]);
71
- return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList
72
- // refreshing={loading}
73
- , {
68
+ return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
69
+ refreshing: loading,
74
70
  onRefresh: handleRefresh,
75
- data: [],
71
+ data: pickList,
76
72
  renderItem: renderItem ?? renderPickGroupItem,
77
- keyExtractor: pickGroup => pickGroup.id.toString()
78
- // ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
79
- ,
73
+ keyExtractor: pickGroup => pickGroup.id.toString(),
80
74
  ListEmptyComponent: /*#__PURE__*/_react.default.createElement(_emptyList.EmptyList, {
81
- text: t(`pick-list.empty-list.not-found`)
75
+ text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
82
76
  }),
83
77
  ListHeaderComponent: searchParams ? undefined : /*#__PURE__*/_react.default.createElement(_search.Search, {
84
78
  onSearch: handlePickListFromSearch
@@ -1 +1 @@
1
- {"version":3,"names":["PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","ignoreCurrentRequest","useRef","t","useTranslation","instance","useInstance","searchField","useDebounce","searchValue","getPickList","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","post","then","response","current","console","log","catch","error","ToastAndroid","show","data","LONG","handleRefresh","useEffect","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\nimport {useDebounce} from '@scrumble-nl/react-custom-hooks';\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 searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n // const [loading, setLoading] = useState<boolean>(true);\n // const [pickList, setPickList] = useState<PickGroup[]>([]);\n const ignoreCurrentRequest = useRef<boolean>(false);\n const {t} = useTranslation();\n const instance = useInstance();\n const searchField = useDebounce(searchParams?.searchField, 500);\n const searchValue = useDebounce(searchParams?.searchValue, 500);\n\n const getPickList = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n // setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n console.log('response: ', response);\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 [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n }, [getPickList]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList(searchField, searchValue);\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, searchField, searchValue]);\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 ignoreCurrentRequest.current = false;\n\n getPickList('', search);\n },\n [getPickList],\n );\n\n return (\n <FlatList\n // refreshing={loading}\n onRefresh={handleRefresh}\n data={[]}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n // ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.not-found`)} />}\n ListHeaderComponent={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","t","useTranslation","instance","useInstance","searchField","useMemo","searchValue","getPickList","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","post","then","response","current","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","handleRefresh","useEffect","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n// import {useDebounce} from '@scrumble-nl/react-custom-hooks';\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 searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const ignoreCurrentRequest = useRef<boolean>(false);\n const {t} = useTranslation();\n const instance = useInstance();\n const searchField = useMemo(() => searchParams?.searchField, [searchParams]);\n const searchValue = useMemo(() => searchParams?.searchValue, [searchParams]);\n\n const getPickList = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n if (!ignoreCurrentRequest.current) {\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 [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n }, [getPickList]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList(searchField, searchValue);\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, searchField, searchValue]);\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 ignoreCurrentRequest.current = false;\n\n getPickList('', search);\n },\n [getPickList],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={handleRefresh}\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={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
@@ -1,7 +1,8 @@
1
- import React, { useCallback, useEffect, useRef } from 'react';
1
+ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
2
2
  import { FlatList, ToastAndroid } from 'react-native';
3
3
  import { useTranslation } from 'react-i18next';
4
- import { useDebounce } from '@scrumble-nl/react-custom-hooks';
4
+ // import {useDebounce} from '@scrumble-nl/react-custom-hooks';
5
+
5
6
  import { Search } from './partials/search';
6
7
  import { EmptyList } from './partials/empty-list';
7
8
  import { useInstance } from '../hooks/use-instance';
@@ -14,30 +15,26 @@ export const PickList = props => {
14
15
  searchParams,
15
16
  onItemPress
16
17
  } = props;
17
- // const [loading, setLoading] = useState<boolean>(true);
18
- // const [pickList, setPickList] = useState<PickGroup[]>([]);
18
+ const [loading, setLoading] = useState(true);
19
+ const [pickList, setPickList] = useState([]);
19
20
  const ignoreCurrentRequest = useRef(false);
20
21
  const {
21
22
  t
22
23
  } = useTranslation();
23
24
  const instance = useInstance();
24
- const searchField = useDebounce(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchField, 500);
25
- const searchValue = useDebounce(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchValue, 500);
25
+ const searchField = useMemo(() => searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchField, [searchParams]);
26
+ const searchValue = useMemo(() => searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchValue, [searchParams]);
26
27
  const getPickList = useCallback((searchFieldParam, searchValueParam) => {
27
28
  const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
28
-
29
- // setLoading(true);
30
-
29
+ setLoading(true);
31
30
  instance.post(url, {
32
31
  searchField: searchFieldParam ?? null,
33
32
  searchValue: searchValueParam ?? null
34
33
  }).then(response => {
35
34
  if (!ignoreCurrentRequest.current) {
36
- console.log('response: ', response);
37
- // setPickList(response.data.pick_groups);
35
+ setPickList(response.data.pick_groups);
38
36
  }
39
- }).catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG));
40
- // .finally(() => setLoading(false));
37
+ }).catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG)).finally(() => setLoading(false));
41
38
  }, [instance, isAfterPickList]);
42
39
  const handleRefresh = useCallback(() => {
43
40
  ignoreCurrentRequest.current = false;
@@ -60,17 +57,14 @@ export const PickList = props => {
60
57
  ignoreCurrentRequest.current = false;
61
58
  getPickList('', search);
62
59
  }, [getPickList]);
63
- return /*#__PURE__*/React.createElement(FlatList
64
- // refreshing={loading}
65
- , {
60
+ return /*#__PURE__*/React.createElement(FlatList, {
61
+ refreshing: loading,
66
62
  onRefresh: handleRefresh,
67
- data: [],
63
+ data: pickList,
68
64
  renderItem: renderItem ?? renderPickGroupItem,
69
- keyExtractor: pickGroup => pickGroup.id.toString()
70
- // ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
71
- ,
65
+ keyExtractor: pickGroup => pickGroup.id.toString(),
72
66
  ListEmptyComponent: /*#__PURE__*/React.createElement(EmptyList, {
73
- text: t(`pick-list.empty-list.not-found`)
67
+ text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
74
68
  }),
75
69
  ListHeaderComponent: searchParams ? undefined : /*#__PURE__*/React.createElement(Search, {
76
70
  onSearch: handlePickListFromSearch
@@ -1 +1 @@
1
- {"version":3,"names":["React","useCallback","useEffect","useRef","FlatList","ToastAndroid","useTranslation","useDebounce","Search","EmptyList","useInstance","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","ignoreCurrentRequest","t","instance","searchField","searchValue","getPickList","searchFieldParam","searchValueParam","url","post","then","response","current","console","log","catch","error","show","data","LONG","handleRefresh","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\nimport {useDebounce} from '@scrumble-nl/react-custom-hooks';\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 searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n // const [loading, setLoading] = useState<boolean>(true);\n // const [pickList, setPickList] = useState<PickGroup[]>([]);\n const ignoreCurrentRequest = useRef<boolean>(false);\n const {t} = useTranslation();\n const instance = useInstance();\n const searchField = useDebounce(searchParams?.searchField, 500);\n const searchValue = useDebounce(searchParams?.searchValue, 500);\n\n const getPickList = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n // setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n console.log('response: ', response);\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 [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n }, [getPickList]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList(searchField, searchValue);\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, searchField, searchValue]);\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 ignoreCurrentRequest.current = false;\n\n getPickList('', search);\n },\n [getPickList],\n );\n\n return (\n <FlatList\n // refreshing={loading}\n onRefresh={handleRefresh}\n data={[]}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n // ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.not-found`)} />}\n ListHeaderComponent={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useMemo","useRef","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useInstance","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","t","instance","searchField","searchValue","getPickList","searchFieldParam","searchValueParam","url","post","then","response","current","data","pick_groups","catch","error","show","LONG","finally","handleRefresh","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n// import {useDebounce} from '@scrumble-nl/react-custom-hooks';\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 searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const ignoreCurrentRequest = useRef<boolean>(false);\n const {t} = useTranslation();\n const instance = useInstance();\n const searchField = useMemo(() => searchParams?.searchField, [searchParams]);\n const searchValue = useMemo(() => searchParams?.searchValue, [searchParams]);\n\n const getPickList = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n if (!ignoreCurrentRequest.current) {\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 [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n }, [getPickList]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList(searchField, searchValue);\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, searchField, searchValue]);\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 ignoreCurrentRequest.current = false;\n\n getPickList('', search);\n },\n [getPickList],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={handleRefresh}\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={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "0.0.7",
3
+ "version": "0.0.9",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -46,7 +46,6 @@
46
46
  "registry": "https://registry.npmjs.org/"
47
47
  },
48
48
  "dependencies": {
49
- "@scrumble-nl/react-custom-hooks": "^2.0.0",
50
49
  "axios": "^0.27.2",
51
50
  "i18next": "^22.0.6",
52
51
  "react-i18next": "^12.0.0",
@@ -1,8 +1,8 @@
1
- import React, {useCallback, useEffect, useRef} from 'react';
1
+ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
2
2
  import {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';
3
3
 
4
4
  import {useTranslation} from 'react-i18next';
5
- import {useDebounce} from '@scrumble-nl/react-custom-hooks';
5
+ // import {useDebounce} from '@scrumble-nl/react-custom-hooks';
6
6
 
7
7
  import {Search} from './partials/search';
8
8
  import {EmptyList} from './partials/empty-list';
@@ -19,19 +19,19 @@ interface props {
19
19
 
20
20
  export const PickList = (props: props): JSX.Element => {
21
21
  const {isAfterPickList, renderItem, searchParams, onItemPress} = props;
22
- // const [loading, setLoading] = useState<boolean>(true);
23
- // const [pickList, setPickList] = useState<PickGroup[]>([]);
22
+ const [loading, setLoading] = useState<boolean>(true);
23
+ const [pickList, setPickList] = useState<PickGroup[]>([]);
24
24
  const ignoreCurrentRequest = useRef<boolean>(false);
25
25
  const {t} = useTranslation();
26
26
  const instance = useInstance();
27
- const searchField = useDebounce(searchParams?.searchField, 500);
28
- const searchValue = useDebounce(searchParams?.searchValue, 500);
27
+ const searchField = useMemo(() => searchParams?.searchField, [searchParams]);
28
+ const searchValue = useMemo(() => searchParams?.searchValue, [searchParams]);
29
29
 
30
30
  const getPickList = useCallback(
31
31
  (searchFieldParam?: string, searchValueParam?: string): void => {
32
32
  const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
33
33
 
34
- // setLoading(true);
34
+ setLoading(true);
35
35
 
36
36
  instance
37
37
  .post(url, {
@@ -40,12 +40,11 @@ export const PickList = (props: props): JSX.Element => {
40
40
  })
41
41
  .then(response => {
42
42
  if (!ignoreCurrentRequest.current) {
43
- console.log('response: ', response);
44
- // setPickList(response.data.pick_groups);
43
+ setPickList(response.data.pick_groups);
45
44
  }
46
45
  })
47
- .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG));
48
- // .finally(() => setLoading(false));
46
+ .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))
47
+ .finally(() => setLoading(false));
49
48
  },
50
49
  [instance, isAfterPickList],
51
50
  );
@@ -81,13 +80,12 @@ export const PickList = (props: props): JSX.Element => {
81
80
 
82
81
  return (
83
82
  <FlatList
84
- // refreshing={loading}
83
+ refreshing={loading}
85
84
  onRefresh={handleRefresh}
86
- data={[]}
85
+ data={pickList}
87
86
  renderItem={renderItem ?? renderPickGroupItem}
88
87
  keyExtractor={pickGroup => pickGroup.id.toString()}
89
- // ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
90
- ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.not-found`)} />}
88
+ ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
91
89
  ListHeaderComponent={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}
92
90
  />
93
91
  );