@scrumble-nl/gatherer-frontend 0.1.7 → 0.2.1

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.
Files changed (60) hide show
  1. package/README.md +2 -3
  2. package/lib/commonjs/context/gatherer-context.js +22 -12
  3. package/lib/commonjs/context/gatherer-context.js.map +1 -1
  4. package/lib/commonjs/context/scan-context.js +2 -1
  5. package/lib/commonjs/context/scan-context.js.map +1 -1
  6. package/lib/commonjs/hooks/use-instance.js +6 -7
  7. package/lib/commonjs/hooks/use-instance.js.map +1 -1
  8. package/lib/commonjs/hooks/use-scanner.js +8 -11
  9. package/lib/commonjs/hooks/use-scanner.js.map +1 -1
  10. package/lib/commonjs/pick-list/pick-list.js +2 -5
  11. package/lib/commonjs/pick-list/pick-list.js.map +1 -1
  12. package/lib/commonjs/picker/partials/modal/pick-quantity-select.js +1 -1
  13. package/lib/commonjs/picker/partials/modal/pick-quantity-select.js.map +1 -1
  14. package/lib/commonjs/picker/partials/pick-amount.js +1 -1
  15. package/lib/commonjs/picker/partials/pick-amount.js.map +1 -1
  16. package/lib/commonjs/picker/picker.js +5 -1
  17. package/lib/commonjs/picker/picker.js.map +1 -1
  18. package/lib/commonjs/types/config/config.d.js.map +1 -1
  19. package/lib/module/context/gatherer-context.js +22 -12
  20. package/lib/module/context/gatherer-context.js.map +1 -1
  21. package/lib/module/context/scan-context.js +2 -1
  22. package/lib/module/context/scan-context.js.map +1 -1
  23. package/lib/module/hooks/use-instance.js +6 -6
  24. package/lib/module/hooks/use-instance.js.map +1 -1
  25. package/lib/module/hooks/use-scanner.js +8 -11
  26. package/lib/module/hooks/use-scanner.js.map +1 -1
  27. package/lib/module/pick-list/pick-list.js +2 -5
  28. package/lib/module/pick-list/pick-list.js.map +1 -1
  29. package/lib/module/picker/partials/modal/pick-quantity-select.js +1 -1
  30. package/lib/module/picker/partials/modal/pick-quantity-select.js.map +1 -1
  31. package/lib/module/picker/partials/pick-amount.js +1 -1
  32. package/lib/module/picker/partials/pick-amount.js.map +1 -1
  33. package/lib/module/picker/picker.js +6 -2
  34. package/lib/module/picker/picker.js.map +1 -1
  35. package/lib/module/types/config/config.d.js.map +1 -1
  36. package/lib/typescript/context/gatherer-context.d.ts +3 -1
  37. package/lib/typescript/context/scan-context.d.ts +10 -2
  38. package/lib/typescript/hooks/use-instance.d.ts +1 -1
  39. package/package.json +3 -3
  40. package/src/context/gatherer-context.tsx +21 -13
  41. package/src/context/scan-context.tsx +14 -3
  42. package/src/hooks/use-instance.tsx +6 -4
  43. package/src/hooks/use-scanner.tsx +7 -11
  44. package/src/pick-list/pick-list.tsx +2 -5
  45. package/src/picker/partials/modal/pick-quantity-select.tsx +1 -1
  46. package/src/picker/partials/pick-amount.tsx +1 -1
  47. package/src/picker/picker.tsx +8 -2
  48. package/src/types/config/config.d.ts +8 -2
  49. package/lib/commonjs/hooks/use-debounce.js +0 -22
  50. package/lib/commonjs/hooks/use-debounce.js.map +0 -1
  51. package/lib/commonjs/hooks/use-non-initial-effect.js +0 -21
  52. package/lib/commonjs/hooks/use-non-initial-effect.js.map +0 -1
  53. package/lib/module/hooks/use-debounce.js +0 -15
  54. package/lib/module/hooks/use-debounce.js.map +0 -1
  55. package/lib/module/hooks/use-non-initial-effect.js +0 -14
  56. package/lib/module/hooks/use-non-initial-effect.js.map +0 -1
  57. package/lib/typescript/hooks/use-debounce.d.ts +0 -1
  58. package/lib/typescript/hooks/use-non-initial-effect.d.ts +0 -2
  59. package/src/hooks/use-debounce.tsx +0 -19
  60. package/src/hooks/use-non-initial-effect.tsx +0 -15
@@ -1,19 +1,19 @@
1
1
  import { ToastAndroid } from 'react-native';
2
- import axios from 'axios';
3
2
  import { useGatherer } from './use-gatherer';
4
- import { useMemo } from 'react';
5
3
  export const useInstance = () => {
6
4
  const {
7
- baseURL
5
+ instance,
6
+ logErrors
8
7
  } = useGatherer();
9
- const instance = useMemo(() => axios.create({
10
- baseURL
11
- }), [baseURL]);
12
8
  instance.interceptors.response.use(response => response, error => {
13
9
  var _error$response$data;
14
10
  if ((_error$response$data = error.response.data) !== null && _error$response$data !== void 0 && _error$response$data.error) {
15
11
  ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
16
12
  }
13
+ if (logErrors) {
14
+ console.log(error); // eslint-disable-next-line no-console
15
+ }
16
+
17
17
  return Promise.reject(error);
18
18
  });
19
19
  return instance;
@@ -1 +1 @@
1
- {"version":3,"names":["ToastAndroid","axios","useGatherer","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 {useGatherer} from './use-gatherer';\nimport {useMemo} from 'react';\n\nexport const useInstance = (): AxiosInstance => {\n const {baseURL} = useGatherer();\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,WAAW,QAAO,gBAAgB;AAC1C,SAAQC,OAAO,QAAO,OAAO;AAE7B,OAAO,MAAMC,WAAW,GAAG,MAAqB;EAC5C,MAAM;IAACC;EAAO,CAAC,GAAGH,WAAW,EAAE;EAC/B,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"}
1
+ {"version":3,"names":["ToastAndroid","useGatherer","useInstance","instance","logErrors","interceptors","response","use","error","data","show","LONG","console","log","Promise","reject"],"sources":["use-instance.tsx"],"sourcesContent":["import {ToastAndroid} from 'react-native';\n\nimport type {AxiosInstance} from 'axios';\n\nimport {useGatherer} from './use-gatherer';\n\nexport const useInstance = (): AxiosInstance => {\n const {instance, logErrors} = useGatherer();\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 if (logErrors) {\n console.log(error); // eslint-disable-next-line no-console\n }\n\n return Promise.reject(error);\n },\n );\n\n return instance;\n};\n"],"mappings":"AAAA,SAAQA,YAAY,QAAO,cAAc;AAIzC,SAAQC,WAAW,QAAO,gBAAgB;AAE1C,OAAO,MAAMC,WAAW,GAAG,MAAqB;EAC5C,MAAM;IAACC,QAAQ;IAAEC;EAAS,CAAC,GAAGH,WAAW,EAAE;EAE3CE,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;MAC5BR,YAAY,CAACU,IAAI,CAACF,KAAK,CAACF,QAAQ,CAACG,IAAI,CAACD,KAAK,EAAER,YAAY,CAACW,IAAI,CAAC;IACnE;IAEA,IAAIP,SAAS,EAAE;MACXQ,OAAO,CAACC,GAAG,CAACL,KAAK,CAAC,CAAC,CAAC;IACxB;;IAEA,OAAOM,OAAO,CAACC,MAAM,CAACP,KAAK,CAAC;EAChC,CAAC,CACJ;EAED,OAAOL,QAAQ;AACnB,CAAC"}
@@ -2,24 +2,21 @@ import { useCallback, useContext, useEffect, useRef } from 'react';
2
2
  import { ScanContext } from '../context/scan-context';
3
3
  export const useScanner = onScan => {
4
4
  const {
5
- scanner
5
+ registerListener,
6
+ clearEventListeners
6
7
  } = useContext(ScanContext);
7
8
  const callbackRef = useRef(onScan);
8
9
  useEffect(() => {
9
10
  callbackRef.current = onScan;
10
11
  }, [onScan]);
11
12
  const startScanner = useCallback(() => {
12
- setTimeout(() => {
13
- scanner.startReader().then(() => {
14
- scanner.onBarcodeReadSucccess(event => {
15
- callbackRef.current(event.data.trim());
16
- });
17
- });
18
- }, 100);
19
- }, [scanner]);
13
+ registerListener(event => {
14
+ callbackRef.current(event.data.trim());
15
+ });
16
+ }, [registerListener]);
20
17
  const stopScanner = useCallback(() => {
21
- scanner.stopReader().then(scanner.offBarcodeReadSuccess);
22
- }, [scanner]);
18
+ clearEventListeners();
19
+ }, [clearEventListeners]);
23
20
  return {
24
21
  startScanner,
25
22
  stopScanner
@@ -1 +1 @@
1
- {"version":3,"names":["useCallback","useContext","useEffect","useRef","ScanContext","useScanner","onScan","scanner","callbackRef","current","startScanner","setTimeout","startReader","then","onBarcodeReadSucccess","event","data","trim","stopScanner","stopReader","offBarcodeReadSuccess"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {scanner} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n setTimeout(() => {\n scanner.startReader().then(() => {\n scanner.onBarcodeReadSucccess((event: {data: string}) => {\n callbackRef.current(event.data.trim());\n });\n });\n }, 100);\n }, [scanner]);\n\n const stopScanner = useCallback((): void => {\n scanner.stopReader().then(scanner.offBarcodeReadSuccess);\n }, [scanner]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAO,OAAO;AAEhE,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC;EAAO,CAAC,GAAGN,UAAU,CAAeG,WAAW,CAAC;EACvD,MAAMI,WAAW,GAAGL,MAAM,CAAeG,MAAM,CAAC;EAEhDJ,SAAS,CAAC,MAAM;IACZM,WAAW,CAACC,OAAO,GAAGH,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMI,YAAY,GAAGV,WAAW,CAAC,MAAY;IACzCW,UAAU,CAAC,MAAM;MACbJ,OAAO,CAACK,WAAW,EAAE,CAACC,IAAI,CAAC,MAAM;QAC7BN,OAAO,CAACO,qBAAqB,CAAEC,KAAqB,IAAK;UACrDP,WAAW,CAACC,OAAO,CAACM,KAAK,CAACC,IAAI,CAACC,IAAI,EAAE,CAAC;QAC1C,CAAC,CAAC;MACN,CAAC,CAAC;IACN,CAAC,EAAE,GAAG,CAAC;EACX,CAAC,EAAE,CAACV,OAAO,CAAC,CAAC;EAEb,MAAMW,WAAW,GAAGlB,WAAW,CAAC,MAAY;IACxCO,OAAO,CAACY,UAAU,EAAE,CAACN,IAAI,CAACN,OAAO,CAACa,qBAAqB,CAAC;EAC5D,CAAC,EAAE,CAACb,OAAO,CAAC,CAAC;EAEb,OAAO;IACHG,YAAY;IACZQ;EACJ,CAAC;AACL,CAAC"}
1
+ {"version":3,"names":["useCallback","useContext","useEffect","useRef","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","current","startScanner","event","data","trim","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener((event: {data: string}) => {\n callbackRef.current(event.data.trim());\n });\n }, [registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAO,OAAO;AAEhE,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAGP,UAAU,CAAeG,WAAW,CAAC;EACrF,MAAMK,WAAW,GAAGN,MAAM,CAAeG,MAAM,CAAC;EAEhDJ,SAAS,CAAC,MAAM;IACZO,WAAW,CAACC,OAAO,GAAGJ,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMK,YAAY,GAAGX,WAAW,CAAC,MAAY;IACzCO,gBAAgB,CAAEK,KAAqB,IAAK;MACxCH,WAAW,CAACC,OAAO,CAACE,KAAK,CAACC,IAAI,CAACC,IAAI,EAAE,CAAC;IAC1C,CAAC,CAAC;EACN,CAAC,EAAE,CAACP,gBAAgB,CAAC,CAAC;EAEtB,MAAMQ,WAAW,GAAGf,WAAW,CAAC,MAAY;IACxCQ,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHG,YAAY;IACZI;EACJ,CAAC;AACL,CAAC"}
@@ -29,10 +29,7 @@ export const PickList = props => {
29
29
  useEffect(() => {
30
30
  let ignoreCurrentRequest = false;
31
31
  setLoading(true);
32
- instance.post(GET_PICKLIST_URL, {
33
- searchField: null,
34
- searchValue: null
35
- }).then(response => {
32
+ instance.post(GET_PICKLIST_URL).then(response => {
36
33
  if (!ignoreCurrentRequest) {
37
34
  setPickList(response.data.pick_groups);
38
35
  }
@@ -40,7 +37,7 @@ export const PickList = props => {
40
37
  return () => {
41
38
  ignoreCurrentRequest = true;
42
39
  };
43
- }, []);
40
+ }, [instance]);
44
41
  const renderPickGroupItem = renderProps => {
45
42
  return /*#__PURE__*/React.createElement(PickGroupItem, {
46
43
  onPress: onItemPress,
@@ -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","onItemPress","loading","setLoading","pickList","setPickList","t","instance","getPickListWithSearch","searchFieldParam","searchValueParam","url","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\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => setPickList(response.data.pick_groups))\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\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
+ {"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","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\n instance\n .post(url, {\n searchField: searchFieldParam ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => setPickList(response.data.pick_groups))\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\n instance\n .post(GET_PICKLIST_URL)\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 }, [instance]);\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,10 +2,10 @@ import React, { useEffect, useState } from 'react';
2
2
  import { TouchableHighlight, View, Text, Pressable } from 'react-native';
3
3
  import { useTranslation } from 'react-i18next';
4
4
  import Icon from 'react-native-vector-icons/Ionicons';
5
- import { useGatherer } from '../../../hooks/use-gatherer';
6
5
  import { styles } from '../../styles/pick-modal-styles';
7
6
  import { GREY, WHITE } from '../../../shared/constants';
8
7
  import { useScanner } from '../../../hooks/use-scanner';
8
+ import { useGatherer } from '../../../hooks/use-gatherer';
9
9
  const singlePickThreshold = 10;
10
10
  const {
11
11
  amountSelectRow,
@@ -1 +1 @@
1
- {"version":3,"names":["React","useEffect","useState","TouchableHighlight","View","Text","Pressable","useTranslation","Icon","useGatherer","styles","GREY","WHITE","useScanner","singlePickThreshold","amountSelectRow","button","subtractButton","addButton","amountText","pickButton","pickButtonContainer","PickQuantitySelect","props","onPickItems","visible","selectedQuantity","setSelectedQuantity","error","setError","pickItem","t","quantityToPick","quantity","subtractOneFromQuantity","prevState","addOneToQuantity","handlePick","exitModal","handleScan","scan","barcode","handleSuccessScan","value","startScanner","stopScanner"],"sources":["pick-quantity-select.tsx"],"sourcesContent":["import React, {useEffect, useState} from 'react';\nimport {TouchableHighlight, View, Text, Pressable} from 'react-native';\n\nimport type {TFuncReturn} from 'i18next';\nimport {useTranslation} from 'react-i18next';\nimport Icon from 'react-native-vector-icons/Ionicons';\n\nimport {useGatherer} from '../../../hooks/use-gatherer';\nimport {styles} from '../../styles/pick-modal-styles';\nimport {GREY, WHITE} from '../../../shared/constants';\nimport {useScanner} from '../../../hooks/use-scanner';\n\ninterface props {\n visible: boolean;\n onPickItems: () => void;\n}\n\nconst singlePickThreshold = 10;\nconst {amountSelectRow, button, subtractButton, addButton, amountText, pickButton, pickButtonContainer} = styles;\n\nexport const PickQuantitySelect = (props: props): JSX.Element => {\n const {onPickItems, visible} = props;\n const [selectedQuantity, setSelectedQuantity] = useState<number>(1);\n const [error, setError] = useState<TFuncReturn<string, any, any>>('');\n const {pickItem} = useGatherer();\n const {t} = useTranslation();\n const quantityToPick = pickItem.quantity;\n\n const subtractOneFromQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== 0) {\n prevState--;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const addOneToQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== quantityToPick) {\n prevState++;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const handlePick = (): void => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n setError('');\n } else {\n setError(t('picker.modal.not-enough-pick'));\n }\n };\n\n const handleScan = (scan: string): void => {\n if (quantityToPick >= singlePickThreshold) {\n setError(t('picker.modal.confirm-error'));\n } else if (selectedQuantity >= quantityToPick && pickItem.barcode === scan) {\n exitModal();\n } else if (selectedQuantity !== quantityToPick && pickItem.barcode === scan) {\n handleSuccessScan(selectedQuantity);\n }\n };\n\n const handleSuccessScan = (quantity: number): void => {\n const value = quantity++;\n setSelectedQuantity(value);\n\n if (value + 1 === quantityToPick) {\n exitModal();\n } else {\n addOneToQuantity();\n }\n };\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n if (visible) {\n startScanner();\n setSelectedQuantity(quantityToPick < singlePickThreshold ? 1 : quantityToPick);\n }\n }, [visible, quantityToPick, startScanner]);\n\n const exitModal = (): void => {\n stopScanner();\n onPickItems();\n };\n\n return (\n <View style={amountSelectRow}>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, subtractButton]}\n onPress={subtractOneFromQuantity}\n >\n <Icon name=\"remove-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n <Text style={amountText}>\n {selectedQuantity} / {quantityToPick}\n </Text>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, addButton]}\n onPress={addOneToQuantity}\n >\n <Icon name=\"add-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n <View style={pickButtonContainer}>\n {error !== '' && <Text style={styles.error}>{error}</Text>}\n <Pressable style={pickButton} onPress={handlePick}>\n {t('picker.modal.pick-items')}\n </Pressable>\n </View>\n </View>\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["React","useEffect","useState","TouchableHighlight","View","Text","Pressable","useTranslation","Icon","styles","GREY","WHITE","useScanner","useGatherer","singlePickThreshold","amountSelectRow","button","subtractButton","addButton","amountText","pickButton","pickButtonContainer","PickQuantitySelect","props","onPickItems","visible","selectedQuantity","setSelectedQuantity","error","setError","pickItem","t","quantityToPick","quantity","subtractOneFromQuantity","prevState","addOneToQuantity","handlePick","exitModal","handleScan","scan","barcode","handleSuccessScan","value","startScanner","stopScanner"],"sources":["pick-quantity-select.tsx"],"sourcesContent":["import React, {useEffect, useState} from 'react';\nimport {TouchableHighlight, View, Text, Pressable} from 'react-native';\n\nimport type {TFuncReturn} from 'i18next';\nimport {useTranslation} from 'react-i18next';\nimport Icon from 'react-native-vector-icons/Ionicons';\n\nimport {styles} from '../../styles/pick-modal-styles';\nimport {GREY, WHITE} from '../../../shared/constants';\nimport {useScanner} from '../../../hooks/use-scanner';\nimport {useGatherer} from '../../../hooks/use-gatherer';\n\ninterface props {\n visible: boolean;\n onPickItems: () => void;\n}\n\nconst singlePickThreshold = 10;\nconst {amountSelectRow, button, subtractButton, addButton, amountText, pickButton, pickButtonContainer} = styles;\n\nexport const PickQuantitySelect = (props: props): JSX.Element => {\n const {onPickItems, visible} = props;\n const [selectedQuantity, setSelectedQuantity] = useState<number>(1);\n const [error, setError] = useState<TFuncReturn<string, any, any>>('');\n const {pickItem} = useGatherer();\n const {t} = useTranslation();\n const quantityToPick = pickItem.quantity;\n\n const subtractOneFromQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== 0) {\n prevState--;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const addOneToQuantity = (): void => {\n setSelectedQuantity(prevState => {\n if (prevState !== quantityToPick) {\n prevState++;\n\n return prevState;\n }\n\n return prevState;\n });\n\n setError('');\n };\n\n const handlePick = (): void => {\n if (selectedQuantity === quantityToPick) {\n exitModal();\n setError('');\n } else {\n setError(t('picker.modal.not-enough-pick'));\n }\n };\n\n const handleScan = (scan: string): void => {\n if (quantityToPick >= singlePickThreshold) {\n setError(t('picker.modal.confirm-error'));\n } else if (selectedQuantity >= quantityToPick && pickItem.barcode === scan) {\n exitModal();\n } else if (selectedQuantity !== quantityToPick && pickItem.barcode === scan) {\n handleSuccessScan(selectedQuantity);\n }\n };\n\n const handleSuccessScan = (quantity: number): void => {\n const value = quantity++;\n setSelectedQuantity(value);\n\n if (value + 1 === quantityToPick) {\n exitModal();\n } else {\n addOneToQuantity();\n }\n };\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n if (visible) {\n startScanner();\n setSelectedQuantity(quantityToPick < singlePickThreshold ? 1 : quantityToPick);\n }\n }, [visible, quantityToPick, startScanner]);\n\n const exitModal = (): void => {\n stopScanner();\n onPickItems();\n };\n\n return (\n <View style={amountSelectRow}>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, subtractButton]}\n onPress={subtractOneFromQuantity}\n >\n <Icon name=\"remove-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n <Text style={amountText}>\n {selectedQuantity} / {quantityToPick}\n </Text>\n <TouchableHighlight\n underlayColor={GREY}\n activeOpacity={0.8}\n style={[button, addButton]}\n onPress={addOneToQuantity}\n >\n <Icon name=\"add-outline\" size={25} color={WHITE} />\n </TouchableHighlight>\n <View style={pickButtonContainer}>\n {error !== '' && <Text style={styles.error}>{error}</Text>}\n <Pressable style={pickButton} onPress={handlePick}>\n {t('picker.modal.pick-items')}\n </Pressable>\n </View>\n </View>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAGC,SAAS,EAAEC,QAAQ,QAAO,OAAO;AAChD,SAAQC,kBAAkB,EAAEC,IAAI,EAAEC,IAAI,EAAEC,SAAS,QAAO,cAAc;AAGtE,SAAQC,cAAc,QAAO,eAAe;AAC5C,OAAOC,IAAI,MAAM,oCAAoC;AAErD,SAAQC,MAAM,QAAO,gCAAgC;AACrD,SAAQC,IAAI,EAAEC,KAAK,QAAO,2BAA2B;AACrD,SAAQC,UAAU,QAAO,4BAA4B;AACrD,SAAQC,WAAW,QAAO,6BAA6B;AAOvD,MAAMC,mBAAmB,GAAG,EAAE;AAC9B,MAAM;EAACC,eAAe;EAAEC,MAAM;EAAEC,cAAc;EAAEC,SAAS;EAAEC,UAAU;EAAEC,UAAU;EAAEC;AAAmB,CAAC,GAAGZ,MAAM;AAEhH,OAAO,MAAMa,kBAAkB,GAAIC,KAAY,IAAkB;EAC7D,MAAM;IAACC,WAAW;IAAEC;EAAO,CAAC,GAAGF,KAAK;EACpC,MAAM,CAACG,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGzB,QAAQ,CAAS,CAAC,CAAC;EACnE,MAAM,CAAC0B,KAAK,EAAEC,QAAQ,CAAC,GAAG3B,QAAQ,CAAgC,EAAE,CAAC;EACrE,MAAM;IAAC4B;EAAQ,CAAC,GAAGjB,WAAW,EAAE;EAChC,MAAM;IAACkB;EAAC,CAAC,GAAGxB,cAAc,EAAE;EAC5B,MAAMyB,cAAc,GAAGF,QAAQ,CAACG,QAAQ;EAExC,MAAMC,uBAAuB,GAAG,MAAY;IACxCP,mBAAmB,CAACQ,SAAS,IAAI;MAC7B,IAAIA,SAAS,KAAK,CAAC,EAAE;QACjBA,SAAS,EAAE;QAEX,OAAOA,SAAS;MACpB;MAEA,OAAOA,SAAS;IACpB,CAAC,CAAC;IAEFN,QAAQ,CAAC,EAAE,CAAC;EAChB,CAAC;EAED,MAAMO,gBAAgB,GAAG,MAAY;IACjCT,mBAAmB,CAACQ,SAAS,IAAI;MAC7B,IAAIA,SAAS,KAAKH,cAAc,EAAE;QAC9BG,SAAS,EAAE;QAEX,OAAOA,SAAS;MACpB;MAEA,OAAOA,SAAS;IACpB,CAAC,CAAC;IAEFN,QAAQ,CAAC,EAAE,CAAC;EAChB,CAAC;EAED,MAAMQ,UAAU,GAAG,MAAY;IAC3B,IAAIX,gBAAgB,KAAKM,cAAc,EAAE;MACrCM,SAAS,EAAE;MACXT,QAAQ,CAAC,EAAE,CAAC;IAChB,CAAC,MAAM;MACHA,QAAQ,CAACE,CAAC,CAAC,8BAA8B,CAAC,CAAC;IAC/C;EACJ,CAAC;EAED,MAAMQ,UAAU,GAAIC,IAAY,IAAW;IACvC,IAAIR,cAAc,IAAIlB,mBAAmB,EAAE;MACvCe,QAAQ,CAACE,CAAC,CAAC,4BAA4B,CAAC,CAAC;IAC7C,CAAC,MAAM,IAAIL,gBAAgB,IAAIM,cAAc,IAAIF,QAAQ,CAACW,OAAO,KAAKD,IAAI,EAAE;MACxEF,SAAS,EAAE;IACf,CAAC,MAAM,IAAIZ,gBAAgB,KAAKM,cAAc,IAAIF,QAAQ,CAACW,OAAO,KAAKD,IAAI,EAAE;MACzEE,iBAAiB,CAAChB,gBAAgB,CAAC;IACvC;EACJ,CAAC;EAED,MAAMgB,iBAAiB,GAAIT,QAAgB,IAAW;IAClD,MAAMU,KAAK,GAAGV,QAAQ,EAAE;IACxBN,mBAAmB,CAACgB,KAAK,CAAC;IAE1B,IAAIA,KAAK,GAAG,CAAC,KAAKX,cAAc,EAAE;MAC9BM,SAAS,EAAE;IACf,CAAC,MAAM;MACHF,gBAAgB,EAAE;IACtB;EACJ,CAAC;EAED,MAAM;IAACQ,YAAY;IAAEC;EAAW,CAAC,GAAGjC,UAAU,CAAC2B,UAAU,CAAC;EAE1DtC,SAAS,CAAC,MAAM;IACZ,IAAIwB,OAAO,EAAE;MACTmB,YAAY,EAAE;MACdjB,mBAAmB,CAACK,cAAc,GAAGlB,mBAAmB,GAAG,CAAC,GAAGkB,cAAc,CAAC;IAClF;EACJ,CAAC,EAAE,CAACP,OAAO,EAAEO,cAAc,EAAEY,YAAY,CAAC,CAAC;EAE3C,MAAMN,SAAS,GAAG,MAAY;IAC1BO,WAAW,EAAE;IACbrB,WAAW,EAAE;EACjB,CAAC;EAED,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAET;EAAgB,gBACzB,oBAAC,kBAAkB;IACf,aAAa,EAAEL,IAAK;IACpB,aAAa,EAAE,GAAI;IACnB,KAAK,EAAE,CAACM,MAAM,EAAEC,cAAc,CAAE;IAChC,OAAO,EAAEiB;EAAwB,gBAEjC,oBAAC,IAAI;IAAC,IAAI,EAAC,gBAAgB;IAAC,IAAI,EAAE,EAAG;IAAC,KAAK,EAAEvB;EAAM,EAAG,CACrC,eACrB,oBAAC,IAAI;IAAC,KAAK,EAAEQ;EAAW,GACnBO,gBAAgB,SAAKM,cAAc,CACjC,eACP,oBAAC,kBAAkB;IACf,aAAa,EAAEtB,IAAK;IACpB,aAAa,EAAE,GAAI;IACnB,KAAK,EAAE,CAACM,MAAM,EAAEE,SAAS,CAAE;IAC3B,OAAO,EAAEkB;EAAiB,gBAE1B,oBAAC,IAAI;IAAC,IAAI,EAAC,aAAa;IAAC,IAAI,EAAE,EAAG;IAAC,KAAK,EAAEzB;EAAM,EAAG,CAClC,eACrB,oBAAC,IAAI;IAAC,KAAK,EAAEU;EAAoB,GAC5BO,KAAK,KAAK,EAAE,iBAAI,oBAAC,IAAI;IAAC,KAAK,EAAEnB,MAAM,CAACmB;EAAM,GAAEA,KAAK,CAAQ,eAC1D,oBAAC,SAAS;IAAC,KAAK,EAAER,UAAW;IAAC,OAAO,EAAEiB;EAAW,GAC7CN,CAAC,CAAC,yBAAyB,CAAC,CACrB,CACT,CACJ;AAEf,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import { View, Text } from 'react-native';
3
- import { useGatherer } from '../../hooks/use-gatherer';
4
3
  import { styles } from '../styles/pick-amount-styles';
4
+ import { useGatherer } from '../../hooks/use-gatherer';
5
5
  const {
6
6
  container,
7
7
  pickBoxContainer,
@@ -1 +1 @@
1
- {"version":3,"names":["React","View","Text","useGatherer","styles","container","pickBoxContainer","pickText","PickAmount","pickItem","quantity"],"sources":["pick-amount.tsx"],"sourcesContent":["import React from 'react';\nimport {View, Text} from 'react-native';\n\nimport {useGatherer} from '../../hooks/use-gatherer';\nimport {styles} from '../styles/pick-amount-styles';\n\nconst {container, pickBoxContainer, pickText} = styles;\n\nexport const PickAmount = (): JSX.Element => {\n const {pickItem} = useGatherer();\n\n if (!pickItem.quantity) {\n return <></>;\n }\n\n return (\n <View style={container}>\n <View style={pickBoxContainer}>\n <Text style={pickText}>{pickItem.quantity ?? 1}</Text>\n </View>\n </View>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAQC,IAAI,EAAEC,IAAI,QAAO,cAAc;AAEvC,SAAQC,WAAW,QAAO,0BAA0B;AACpD,SAAQC,MAAM,QAAO,8BAA8B;AAEnD,MAAM;EAACC,SAAS;EAAEC,gBAAgB;EAAEC;AAAQ,CAAC,GAAGH,MAAM;AAEtD,OAAO,MAAMI,UAAU,GAAG,MAAmB;EACzC,MAAM;IAACC;EAAQ,CAAC,GAAGN,WAAW,EAAE;EAEhC,IAAI,CAACM,QAAQ,CAACC,QAAQ,EAAE;IACpB,oBAAO,yCAAK;EAChB;EAEA,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAEL;EAAU,gBACnB,oBAAC,IAAI;IAAC,KAAK,EAAEC;EAAiB,gBAC1B,oBAAC,IAAI;IAAC,KAAK,EAAEC;EAAS,GAAEE,QAAQ,CAACC,QAAQ,IAAI,CAAC,CAAQ,CACnD,CACJ;AAEf,CAAC"}
1
+ {"version":3,"names":["React","View","Text","styles","useGatherer","container","pickBoxContainer","pickText","PickAmount","pickItem","quantity"],"sources":["pick-amount.tsx"],"sourcesContent":["import React from 'react';\nimport {View, Text} from 'react-native';\n\nimport {styles} from '../styles/pick-amount-styles';\nimport {useGatherer} from '../../hooks/use-gatherer';\n\nconst {container, pickBoxContainer, pickText} = styles;\n\nexport const PickAmount = (): JSX.Element => {\n const {pickItem} = useGatherer();\n\n if (!pickItem.quantity) {\n return <></>;\n }\n\n return (\n <View style={container}>\n <View style={pickBoxContainer}>\n <Text style={pickText}>{pickItem.quantity ?? 1}</Text>\n </View>\n </View>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAQC,IAAI,EAAEC,IAAI,QAAO,cAAc;AAEvC,SAAQC,MAAM,QAAO,8BAA8B;AACnD,SAAQC,WAAW,QAAO,0BAA0B;AAEpD,MAAM;EAACC,SAAS;EAAEC,gBAAgB;EAAEC;AAAQ,CAAC,GAAGJ,MAAM;AAEtD,OAAO,MAAMK,UAAU,GAAG,MAAmB;EACzC,MAAM;IAACC;EAAQ,CAAC,GAAGL,WAAW,EAAE;EAEhC,IAAI,CAACK,QAAQ,CAACC,QAAQ,EAAE;IACpB,oBAAO,yCAAK;EAChB;EAEA,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAEL;EAAU,gBACnB,oBAAC,IAAI;IAAC,KAAK,EAAEC;EAAiB,gBAC1B,oBAAC,IAAI;IAAC,KAAK,EAAEC;EAAS,GAAEE,QAAQ,CAACC,QAAQ,IAAI,CAAC,CAAQ,CACnD,CACJ;AAEf,CAAC"}
@@ -1,9 +1,9 @@
1
- import React, { useCallback, useState } from 'react';
1
+ import React, { useCallback, useEffect, useState } from 'react';
2
2
  import { View } from 'react-native';
3
3
  import { styles } from './styles/picker-styles';
4
- import { useGatherer } from '../hooks/use-gatherer';
5
4
  import { useScanner } from '../hooks/use-scanner';
6
5
  import { PickAmount } from './partials/pick-amount';
6
+ import { useGatherer } from '../hooks/use-gatherer';
7
7
  import { ProductInfo } from './partials/product-info';
8
8
  import { ProgressBar } from './partials/progress-bar';
9
9
  import { PickModal } from './partials/modal/pick-modal';
@@ -46,6 +46,10 @@ const Picker = props => {
46
46
  startScanner,
47
47
  stopScanner
48
48
  } = useScanner(handleScan);
49
+ useEffect(() => {
50
+ startScanner();
51
+ return () => stopScanner();
52
+ }, [startScanner, stopScanner]);
49
53
  return /*#__PURE__*/React.createElement(View, {
50
54
  style: [container, props.style]
51
55
  }, pickModal, props.children);
@@ -1 +1 @@
1
- {"version":3,"names":["React","useCallback","useState","View","styles","useGatherer","useScanner","PickAmount","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","pickItem","pickModalVisible","setPickModalVisible","nextPickItem","closeModal","startScanner","pickModal","handleScan","scan","barcode","quantity","stopScanner","style","children","Progress"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const pickModal = props.pickModal ?? <PickModal visible={pickModalVisible} closeModal={closeModal} />;\n\n const handleScan = useCallback(\n (scan: string): void => {\n if (scan !== '' && scan === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1);\n } else {\n stopScanner();\n setPickModalVisible(true);\n }\n }\n },\n // Adding stopScanner here is not possible because of the useScanner hook implementation\n // eslint-disable-next-line react-hooks/exhaustive-deps\n [pickItem.barcode, pickItem.quantity, nextPickItem],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n return (\n <View style={[container, props.style]}>\n {pickModal}\n {props.children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAcC,WAAW,EAAEC,QAAQ,QAAO,OAAO;AAC7D,SAAQC,IAAI,QAAkB,cAAc;AAE5C,SAAQC,MAAM,QAAO,wBAAwB;AAC7C,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAQC,UAAU,QAAO,sBAAsB;AAC/C,SAAQC,UAAU,QAAO,wBAAwB;AACjD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,SAAS,QAAO,6BAA6B;AACrD,SAAQC,OAAO,IAAIC,GAAG,QAAO,2BAA2B;AACxD,SAAQC,iBAAiB,QAAO,+BAA+B;AAC/D,SAAQC,UAAU,IAAIC,MAAM,QAAO,8BAA8B;AAQjE,MAAM;EAACC;AAAS,CAAC,GAAGZ,MAAM;AAE1B,MAAMa,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAGd,WAAW,EAAE;EAChC,MAAM,CAACe,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGnB,QAAQ,CAAU,KAAK,CAAC;EACxE,MAAM;IAACoB;EAAY,CAAC,GAAGT,iBAAiB,EAAE;EAE1C,MAAMU,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdH,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMI,SAAS,GAAGP,KAAK,CAACO,SAAS,iBAAI,oBAAC,SAAS;IAAC,OAAO,EAAEL,gBAAiB;IAAC,UAAU,EAAEG;EAAW,EAAG;EAErG,MAAMG,UAAU,GAAGzB,WAAW,CACzB0B,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKR,QAAQ,CAACS,OAAO,EAAE;MAC1C,IAAIT,QAAQ,CAACU,QAAQ,KAAK,CAAC,EAAE;QACzBP,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACHQ,WAAW,EAAE;QACbT,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC;EACD;EACA;EACA,CAACF,QAAQ,CAACS,OAAO,EAAET,QAAQ,CAACU,QAAQ,EAAEP,YAAY,CAAC,CACtD;EAED,MAAM;IAACE,YAAY;IAAEM;EAAW,CAAC,GAAGxB,UAAU,CAACoB,UAAU,CAAC;EAE1D,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAE,CAACV,SAAS,EAAEE,KAAK,CAACa,KAAK;EAAE,GACjCN,SAAS,EACTP,KAAK,CAACc,QAAQ,CACZ;AAEf,CAAC;AAEDf,MAAM,CAACL,GAAG,GAAGA,GAAG;AAChBK,MAAM,CAACF,MAAM,GAAGA,MAAM;AACtBE,MAAM,CAACgB,QAAQ,GAAGxB,WAAW;AAC7BQ,MAAM,CAACV,UAAU,GAAGA,UAAU;AAC9BU,MAAM,CAACT,WAAW,GAAGA,WAAW;AAEhC,SAAQS,MAAM"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useState","View","styles","useScanner","PickAmount","useGatherer","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","pickItem","pickModalVisible","setPickModalVisible","nextPickItem","closeModal","startScanner","pickModal","handleScan","scan","barcode","quantity","stopScanner","style","children","Progress"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const pickModal = props.pickModal ?? <PickModal visible={pickModalVisible} closeModal={closeModal} />;\n\n const handleScan = useCallback(\n (scan: string): void => {\n if (scan !== '' && scan === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1);\n } else {\n stopScanner();\n setPickModalVisible(true);\n }\n }\n },\n // Adding stopScanner here is not possible because of the useScanner hook implementation\n // eslint-disable-next-line react-hooks/exhaustive-deps\n [pickItem.barcode, pickItem.quantity, nextPickItem],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, props.style]}>\n {pickModal}\n {props.children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAcC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAO,OAAO;AACxE,SAAQC,IAAI,QAAkB,cAAc;AAE5C,SAAQC,MAAM,QAAO,wBAAwB;AAC7C,SAAQC,UAAU,QAAO,sBAAsB;AAC/C,SAAQC,UAAU,QAAO,wBAAwB;AACjD,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,SAAS,QAAO,6BAA6B;AACrD,SAAQC,OAAO,IAAIC,GAAG,QAAO,2BAA2B;AACxD,SAAQC,iBAAiB,QAAO,+BAA+B;AAC/D,SAAQC,UAAU,IAAIC,MAAM,QAAO,8BAA8B;AAQjE,MAAM;EAACC;AAAS,CAAC,GAAGZ,MAAM;AAE1B,MAAMa,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAGZ,WAAW,EAAE;EAChC,MAAM,CAACa,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGnB,QAAQ,CAAU,KAAK,CAAC;EACxE,MAAM;IAACoB;EAAY,CAAC,GAAGT,iBAAiB,EAAE;EAE1C,MAAMU,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdH,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMI,SAAS,GAAGP,KAAK,CAACO,SAAS,iBAAI,oBAAC,SAAS;IAAC,OAAO,EAAEL,gBAAiB;IAAC,UAAU,EAAEG;EAAW,EAAG;EAErG,MAAMG,UAAU,GAAG1B,WAAW,CACzB2B,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKR,QAAQ,CAACS,OAAO,EAAE;MAC1C,IAAIT,QAAQ,CAACU,QAAQ,KAAK,CAAC,EAAE;QACzBP,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACHQ,WAAW,EAAE;QACbT,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC;EACD;EACA;EACA,CAACF,QAAQ,CAACS,OAAO,EAAET,QAAQ,CAACU,QAAQ,EAAEP,YAAY,CAAC,CACtD;EAED,MAAM;IAACE,YAAY;IAAEM;EAAW,CAAC,GAAGzB,UAAU,CAACqB,UAAU,CAAC;EAE1DzB,SAAS,CAAC,MAAM;IACZuB,YAAY,EAAE;IAEd,OAAO,MAAMM,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACN,YAAY,EAAEM,WAAW,CAAC,CAAC;EAE/B,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAE,CAACd,SAAS,EAAEE,KAAK,CAACa,KAAK;EAAE,GACjCN,SAAS,EACTP,KAAK,CAACc,QAAQ,CACZ;AAEf,CAAC;AAEDf,MAAM,CAACL,GAAG,GAAGA,GAAG;AAChBK,MAAM,CAACF,MAAM,GAAGA,MAAM;AACtBE,MAAM,CAACgB,QAAQ,GAAGxB,WAAW;AAC7BQ,MAAM,CAACX,UAAU,GAAGA,UAAU;AAC9BW,MAAM,CAACT,WAAW,GAAGA,WAAW;AAEhC,SAAQS,MAAM"}
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n baseURL: string;\n scanImplementation: any;\n onLastPick: () => void;\n language?: LanguageConfig;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype Translation = {\n [key: string]: string;\n};\n\ntype Translations = {\n en: Translation;\n nl: Translation;\n};\n"],"mappings":""}
1
+ {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: (...args: any[]) => any) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: (...args: any[]) => any) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n shouldLogErrors?: boolean;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype Translation = {\n [key: string]: string;\n};\n\ntype Translations = {\n en: Translation;\n nl: Translation;\n};\n"],"mappings":""}
@@ -1,10 +1,12 @@
1
1
  import React, { ReactNode } from 'react';
2
+ import { AxiosInstance } from 'axios';
2
3
  export interface IGathererContext {
3
- baseURL: string;
4
+ logErrors?: boolean;
4
5
  scanImplementation: any;
5
6
  pickItem: PickGroupItem<any>;
6
7
  currentPickGroupId: number;
7
8
  onLastPick: () => void;
9
+ instance: AxiosInstance;
8
10
  savePickGroupData: (data: PickGroupItem<any>) => void;
9
11
  startPicking: (pickGroupId: number) => Promise<PickGroupItem<DefaultPickItem>>;
10
12
  switchPickItem: (dir: ControlDir) => Promise<PickGroupItem<DefaultPickItem>>;
@@ -1,9 +1,17 @@
1
1
  import React, { ReactNode } from 'react';
2
2
  export type IScanContext = {
3
- scanner: any;
3
+ registerListener: (event: (...args: any[]) => any) => void;
4
+ clearEventListeners: () => void;
5
+ registerEventListener?: () => void;
6
+ onBarcodeReadFail?: (event: (...args: any[]) => any) => void;
4
7
  };
5
8
  interface props {
6
- scanner: any;
9
+ scanner: {
10
+ registerListener: (event: (...args: any[]) => any) => void;
11
+ clearEventListeners: () => void;
12
+ registerEventListener?: () => void;
13
+ onBarcodeReadFail?: (event: (...args: any[]) => any) => void;
14
+ };
7
15
  children: ReactNode;
8
16
  }
9
17
  export declare const ScanContext: React.Context<IScanContext>;
@@ -1,2 +1,2 @@
1
- import { AxiosInstance } from 'axios';
1
+ import type { AxiosInstance } from 'axios';
2
2
  export declare const useInstance: () => AxiosInstance;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "0.1.7",
3
+ "version": "0.2.1",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -70,8 +70,8 @@
70
70
  "jest": "^28.1.1",
71
71
  "pod-install": "^0.1.0",
72
72
  "prettier": "^2.0.5",
73
- "react": "17.0.2",
74
- "react-native": "^0.68.5",
73
+ "react": "18.0.0",
74
+ "react-native": "^0.69.7",
75
75
  "react-native-builder-bob": "^0.18.3",
76
76
  "release-it": "^15.0.0",
77
77
  "typescript": "^4.5.2"
@@ -1,6 +1,6 @@
1
1
  import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';
2
2
 
3
- import axios from 'axios';
3
+ import axios, {AxiosInstance} from 'axios';
4
4
 
5
5
  import i18n from '../lang/i18n';
6
6
  import {ScanContextProvider} from './scan-context';
@@ -8,11 +8,12 @@ import {defaultPickGroupItem} from '../shared/default-pick-group-item';
8
8
  import {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';
9
9
 
10
10
  export interface IGathererContext {
11
- baseURL: string;
11
+ logErrors?: boolean;
12
12
  scanImplementation: any;
13
13
  pickItem: PickGroupItem<any>;
14
14
  currentPickGroupId: number;
15
15
  onLastPick: () => void;
16
+ instance: AxiosInstance;
16
17
  savePickGroupData: (data: PickGroupItem<any>) => void;
17
18
  startPicking: (pickGroupId: number) => Promise<PickGroupItem<DefaultPickItem>>;
18
19
  switchPickItem: (dir: ControlDir) => Promise<PickGroupItem<DefaultPickItem>>;
@@ -24,10 +25,11 @@ interface props {
24
25
  }
25
26
 
26
27
  export const GathererContext = createContext<IGathererContext>({
27
- baseURL: '',
28
+ logErrors: false,
28
29
  scanImplementation: undefined,
29
30
  currentPickGroupId: 0,
30
31
  onLastPick: () => undefined,
32
+ instance: axios.create(),
31
33
  pickItem: defaultPickGroupItem,
32
34
  savePickGroupData: () => undefined,
33
35
  startPicking: () => new Promise(() => undefined),
@@ -35,11 +37,15 @@ export const GathererContext = createContext<IGathererContext>({
35
37
  });
36
38
 
37
39
  export const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {
40
+ const {scanImplementation, instance, onLastPick, language, shouldLogErrors} = props.config;
38
41
  const [pickItem, setPickItem] = useState<PickGroupItem<T>>(defaultPickGroupItem);
39
42
  const prevPickItem = useRef<PickItem<T> | null>(null);
40
43
  const nextPickItem = useRef<PickItem<T> | null>(null);
41
44
  const currentPickGroupId = useRef<number>(0);
42
- const instance = axios.create({baseURL: props.config.baseURL});
45
+
46
+ useEffect(() => {
47
+ scanImplementation.registerEventListener?.();
48
+ }, [scanImplementation]);
43
49
 
44
50
  const savePickGroupData = useCallback((data: PickGroupItem<T>): void => {
45
51
  setPickItem(data);
@@ -84,30 +90,32 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
84
90
  );
85
91
 
86
92
  useEffect(() => {
87
- if (props.config.language) {
88
- i18n.changeLanguage(props.config.language);
93
+ if (language) {
94
+ i18n.changeLanguage(language);
89
95
  }
90
- }, [props.config.language]);
96
+ }, [language]);
91
97
 
92
98
  const context = useMemo(
93
99
  () => ({
94
100
  pickItem,
101
+ instance,
102
+ onLastPick,
95
103
  startPicking,
96
104
  switchPickItem,
97
105
  savePickGroupData,
98
- baseURL: props.config.baseURL,
99
- onLastPick: props.config.onLastPick,
106
+ scanImplementation,
107
+ logErrors: shouldLogErrors,
100
108
  currentPickGroupId: currentPickGroupId.current,
101
- scanImplementation: props.config.scanImplementation,
102
109
  }),
103
110
  [
104
111
  pickItem,
112
+ instance,
113
+ onLastPick,
105
114
  startPicking,
106
115
  switchPickItem,
116
+ shouldLogErrors,
107
117
  savePickGroupData,
108
- props.config.baseURL,
109
- props.config.onLastPick,
110
- props.config.scanImplementation,
118
+ scanImplementation,
111
119
  ],
112
120
  );
113
121
 
@@ -1,15 +1,26 @@
1
1
  import React, {createContext, ReactNode} from 'react';
2
2
 
3
3
  export type IScanContext = {
4
- scanner: any;
4
+ registerListener: (event: (...args: any[]) => any) => void;
5
+ clearEventListeners: () => void;
6
+ registerEventListener?: () => void;
7
+ onBarcodeReadFail?: (event: (...args: any[]) => any) => void;
5
8
  };
6
9
 
7
10
  interface props {
8
- scanner: any;
11
+ scanner: {
12
+ registerListener: (event: (...args: any[]) => any) => void;
13
+ clearEventListeners: () => void;
14
+ registerEventListener?: () => void;
15
+ onBarcodeReadFail?: (event: (...args: any[]) => any) => void;
16
+ };
9
17
  children: ReactNode;
10
18
  }
11
19
 
12
- export const ScanContext = createContext<IScanContext>({scanner: undefined});
20
+ export const ScanContext = createContext<IScanContext>({
21
+ registerListener: () => undefined,
22
+ clearEventListeners: () => undefined,
23
+ });
13
24
 
14
25
  export const ScanContextProvider = (props: props): JSX.Element => {
15
26
  return <ScanContext.Provider value={props.scanner}>{props.children}</ScanContext.Provider>;
@@ -1,13 +1,11 @@
1
1
  import {ToastAndroid} from 'react-native';
2
2
 
3
- import axios, {AxiosInstance} from 'axios';
3
+ import type {AxiosInstance} from 'axios';
4
4
 
5
5
  import {useGatherer} from './use-gatherer';
6
- import {useMemo} from 'react';
7
6
 
8
7
  export const useInstance = (): AxiosInstance => {
9
- const {baseURL} = useGatherer();
10
- const instance = useMemo<AxiosInstance>(() => axios.create({baseURL}), [baseURL]);
8
+ const {instance, logErrors} = useGatherer();
11
9
 
12
10
  instance.interceptors.response.use(
13
11
  response => response,
@@ -16,6 +14,10 @@ export const useInstance = (): AxiosInstance => {
16
14
  ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
17
15
  }
18
16
 
17
+ if (logErrors) {
18
+ console.log(error); // eslint-disable-next-line no-console
19
+ }
20
+
19
21
  return Promise.reject(error);
20
22
  },
21
23
  );
@@ -5,7 +5,7 @@ import {IScanContext, ScanContext} from '../context/scan-context';
5
5
  type ScanCallback = (scan: string) => void;
6
6
 
7
7
  export const useScanner = (onScan: ScanCallback): Scanner => {
8
- const {scanner} = useContext<IScanContext>(ScanContext);
8
+ const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);
9
9
  const callbackRef = useRef<ScanCallback>(onScan);
10
10
 
11
11
  useEffect(() => {
@@ -13,18 +13,14 @@ export const useScanner = (onScan: ScanCallback): Scanner => {
13
13
  }, [onScan]);
14
14
 
15
15
  const startScanner = useCallback((): void => {
16
- setTimeout(() => {
17
- scanner.startReader().then(() => {
18
- scanner.onBarcodeReadSucccess((event: {data: string}) => {
19
- callbackRef.current(event.data.trim());
20
- });
21
- });
22
- }, 100);
23
- }, [scanner]);
16
+ registerListener((event: {data: string}) => {
17
+ callbackRef.current(event.data.trim());
18
+ });
19
+ }, [registerListener]);
24
20
 
25
21
  const stopScanner = useCallback((): void => {
26
- scanner.stopReader().then(scanner.offBarcodeReadSuccess);
27
- }, [scanner]);
22
+ clearEventListeners();
23
+ }, [clearEventListeners]);
28
24
 
29
25
  return {
30
26
  startScanner,
@@ -46,10 +46,7 @@ export const PickList = (props: props): JSX.Element => {
46
46
  setLoading(true);
47
47
 
48
48
  instance
49
- .post(GET_PICKLIST_URL, {
50
- searchField: null,
51
- searchValue: null,
52
- })
49
+ .post(GET_PICKLIST_URL)
53
50
  .then(response => {
54
51
  if (!ignoreCurrentRequest) {
55
52
  setPickList(response.data.pick_groups);
@@ -61,7 +58,7 @@ export const PickList = (props: props): JSX.Element => {
61
58
  return () => {
62
59
  ignoreCurrentRequest = true;
63
60
  };
64
- }, []);
61
+ }, [instance]);
65
62
 
66
63
  const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {
67
64
  return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
@@ -5,10 +5,10 @@ import type {TFuncReturn} from 'i18next';
5
5
  import {useTranslation} from 'react-i18next';
6
6
  import Icon from 'react-native-vector-icons/Ionicons';
7
7
 
8
- import {useGatherer} from '../../../hooks/use-gatherer';
9
8
  import {styles} from '../../styles/pick-modal-styles';
10
9
  import {GREY, WHITE} from '../../../shared/constants';
11
10
  import {useScanner} from '../../../hooks/use-scanner';
11
+ import {useGatherer} from '../../../hooks/use-gatherer';
12
12
 
13
13
  interface props {
14
14
  visible: boolean;
@@ -1,8 +1,8 @@
1
1
  import React from 'react';
2
2
  import {View, Text} from 'react-native';
3
3
 
4
- import {useGatherer} from '../../hooks/use-gatherer';
5
4
  import {styles} from '../styles/pick-amount-styles';
5
+ import {useGatherer} from '../../hooks/use-gatherer';
6
6
 
7
7
  const {container, pickBoxContainer, pickText} = styles;
8
8
 
@@ -1,10 +1,10 @@
1
- import React, {ReactNode, useCallback, useState} from 'react';
1
+ import React, {ReactNode, useCallback, useEffect, useState} from 'react';
2
2
  import {View, ViewStyle} from 'react-native';
3
3
 
4
4
  import {styles} from './styles/picker-styles';
5
- import {useGatherer} from '../hooks/use-gatherer';
6
5
  import {useScanner} from '../hooks/use-scanner';
7
6
  import {PickAmount} from './partials/pick-amount';
7
+ import {useGatherer} from '../hooks/use-gatherer';
8
8
  import {ProductInfo} from './partials/product-info';
9
9
  import {ProgressBar} from './partials/progress-bar';
10
10
  import {PickModal} from './partials/modal/pick-modal';
@@ -50,6 +50,12 @@ const Picker = (props: props): JSX.Element => {
50
50
 
51
51
  const {startScanner, stopScanner} = useScanner(handleScan);
52
52
 
53
+ useEffect(() => {
54
+ startScanner();
55
+
56
+ return () => stopScanner();
57
+ }, [startScanner, stopScanner]);
58
+
53
59
  return (
54
60
  <View style={[container, props.style]}>
55
61
  {pickModal}
@@ -1,8 +1,14 @@
1
1
  type GathererConfig = {
2
- baseURL: string;
3
- scanImplementation: any;
2
+ instance: import('../../../node_modules/axios').AxiosInstance;
3
+ scanImplementation: {
4
+ registerListener: (event: (...args: any[]) => any) => void;
5
+ clearEventListeners: () => void;
6
+ registerEventListener?: () => void;
7
+ onBarcodeReadFail?: (event: (...args: any[]) => any) => void;
8
+ };
4
9
  onLastPick: () => void;
5
10
  language?: LanguageConfig;
11
+ shouldLogErrors?: boolean;
6
12
  };
7
13
 
8
14
  type LanguageConfig = 'nl' | 'en';