@scrumble-nl/gatherer-frontend 0.1.8 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/README.md +2 -2
  2. package/lib/commonjs/context/gatherer-context.js +19 -14
  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-pick-item-switch.js +2 -3
  7. package/lib/commonjs/hooks/use-pick-item-switch.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/partials/pick-group-item.js +7 -6
  11. package/lib/commonjs/pick-list/partials/pick-group-item.js.map +1 -1
  12. package/lib/commonjs/pick-list/pick-list.js +6 -4
  13. package/lib/commonjs/pick-list/pick-list.js.map +1 -1
  14. package/lib/commonjs/pick-list/styles/pick-group-item-styles.js +4 -0
  15. package/lib/commonjs/pick-list/styles/pick-group-item-styles.js.map +1 -1
  16. package/lib/commonjs/picker/picker.js +4 -0
  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 +19 -14
  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-pick-item-switch.js +2 -3
  24. package/lib/module/hooks/use-pick-item-switch.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/partials/pick-group-item.js +7 -6
  28. package/lib/module/pick-list/partials/pick-group-item.js.map +1 -1
  29. package/lib/module/pick-list/pick-list.js +6 -4
  30. package/lib/module/pick-list/pick-list.js.map +1 -1
  31. package/lib/module/pick-list/styles/pick-group-item-styles.js +5 -1
  32. package/lib/module/pick-list/styles/pick-group-item-styles.js.map +1 -1
  33. package/lib/module/picker/picker.js +5 -1
  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 +2 -2
  37. package/lib/typescript/context/scan-context.d.ts +10 -2
  38. package/lib/typescript/pick-list/partials/pick-group-item.d.ts +4 -4
  39. package/lib/typescript/pick-list/pick-list.d.ts +4 -4
  40. package/lib/typescript/pick-list/styles/pick-group-item-styles.d.ts +4 -0
  41. package/lib/typescript/picker/picker.d.ts +1 -0
  42. package/package.json +1 -1
  43. package/src/context/gatherer-context.tsx +17 -17
  44. package/src/context/scan-context.tsx +14 -3
  45. package/src/hooks/use-pick-item-switch.tsx +1 -3
  46. package/src/hooks/use-scanner.tsx +7 -11
  47. package/src/pick-list/partials/pick-group-item.tsx +7 -11
  48. package/src/pick-list/pick-list.tsx +10 -10
  49. package/src/pick-list/styles/pick-group-item-styles.ts +5 -1
  50. package/src/picker/picker.tsx +8 -1
  51. package/src/types/config/config.d.ts +2 -12
  52. package/lib/commonjs/hooks/use-instance.js +0 -34
  53. package/lib/commonjs/hooks/use-instance.js.map +0 -1
  54. package/lib/module/hooks/use-instance.js +0 -26
  55. package/lib/module/hooks/use-instance.js.map +0 -1
  56. package/lib/typescript/hooks/use-instance.d.ts +0 -2
  57. package/src/hooks/use-instance.tsx +0 -28
@@ -1 +1 @@
1
- {"version":3,"names":["useCallback","useGatherer","useInstance","SET_ITEM_PICKED_URL","usePickItemSwitch","instance","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","retrieveNextPickItem","setItemToPicked","quantityPicked","metaData","patch","quantity_picked","pick_group_id","pick_item_id","id","metadata","then","response","data","content","nextPickItem","isSkip","previousPickItem"],"sources":["use-pick-item-switch.tsx"],"sourcesContent":["import {useCallback} from 'react';\n\nimport {useGatherer} from './use-gatherer';\nimport {useInstance} from './use-instance';\nimport {SET_ITEM_PICKED_URL} from '../shared/api/api-urls';\n\nexport const usePickItemSwitch = (): ProductSwitch => {\n const instance = useInstance();\n const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick} = useGatherer();\n\n const retrieveNextPickItem = useCallback((): void => {\n switchPickItem('next');\n }, [switchPickItem]);\n\n const setItemToPicked = useCallback(\n (quantityPicked?: number, metaData?: any): void => {\n instance\n .patch(SET_ITEM_PICKED_URL, {\n quantity_picked: quantityPicked,\n pick_group_id: currentPickGroupId,\n pick_item_id: pickItem.pickItem.id,\n metadata: metaData,\n })\n .then(response => {\n if (response.data.content === 'Pick group finished') {\n onLastPick();\n } else {\n savePickGroupData(response.data);\n }\n });\n },\n [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData],\n );\n\n const nextPickItem = useCallback(\n (isSkip: boolean, quantityPicked?: number, metaData?: any): void => {\n if (isSkip) {\n retrieveNextPickItem();\n return;\n }\n\n setItemToPicked(quantityPicked, metaData);\n },\n [retrieveNextPickItem, setItemToPicked],\n );\n\n const previousPickItem = useCallback((): void => {\n switchPickItem('prev');\n }, [switchPickItem]);\n\n return {\n nextPickItem,\n previousPickItem,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,QAAO,OAAO;AAEjC,SAAQC,WAAW,QAAO,gBAAgB;AAC1C,SAAQC,WAAW,QAAO,gBAAgB;AAC1C,SAAQC,mBAAmB,QAAO,wBAAwB;AAE1D,OAAO,MAAMC,iBAAiB,GAAG,MAAqB;EAClD,MAAMC,QAAQ,GAAGH,WAAW,EAAE;EAC9B,MAAM;IAACI,QAAQ;IAAEC,kBAAkB;IAAEC,iBAAiB;IAAEC,cAAc;IAAEC;EAAU,CAAC,GAAGT,WAAW,EAAE;EAEnG,MAAMU,oBAAoB,GAAGX,WAAW,CAAC,MAAY;IACjDS,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMG,eAAe,GAAGZ,WAAW,CAC/B,CAACa,cAAuB,EAAEC,QAAc,KAAW;IAC/CT,QAAQ,CACHU,KAAK,CAACZ,mBAAmB,EAAE;MACxBa,eAAe,EAAEH,cAAc;MAC/BI,aAAa,EAAEV,kBAAkB;MACjCW,YAAY,EAAEZ,QAAQ,CAACA,QAAQ,CAACa,EAAE;MAClCC,QAAQ,EAAEN;IACd,CAAC,CAAC,CACDO,IAAI,CAACC,QAAQ,IAAI;MACd,IAAIA,QAAQ,CAACC,IAAI,CAACC,OAAO,KAAK,qBAAqB,EAAE;QACjDd,UAAU,EAAE;MAChB,CAAC,MAAM;QACHF,iBAAiB,CAACc,QAAQ,CAACC,IAAI,CAAC;MACpC;IACJ,CAAC,CAAC;EACV,CAAC,EACD,CAAChB,kBAAkB,EAAEF,QAAQ,EAAEK,UAAU,EAAEJ,QAAQ,CAACA,QAAQ,CAACa,EAAE,EAAEX,iBAAiB,CAAC,CACtF;EAED,MAAMiB,YAAY,GAAGzB,WAAW,CAC5B,CAAC0B,MAAe,EAAEb,cAAuB,EAAEC,QAAc,KAAW;IAChE,IAAIY,MAAM,EAAE;MACRf,oBAAoB,EAAE;MACtB;IACJ;IAEAC,eAAe,CAACC,cAAc,EAAEC,QAAQ,CAAC;EAC7C,CAAC,EACD,CAACH,oBAAoB,EAAEC,eAAe,CAAC,CAC1C;EAED,MAAMe,gBAAgB,GAAG3B,WAAW,CAAC,MAAY;IAC7CS,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,OAAO;IACHgB,YAAY;IACZE;EACJ,CAAC;AACL,CAAC"}
1
+ {"version":3,"names":["useCallback","useGatherer","SET_ITEM_PICKED_URL","usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","retrieveNextPickItem","setItemToPicked","quantityPicked","metaData","patch","quantity_picked","pick_group_id","pick_item_id","id","metadata","then","response","data","content","nextPickItem","isSkip","previousPickItem"],"sources":["use-pick-item-switch.tsx"],"sourcesContent":["import {useCallback} from 'react';\n\nimport {useGatherer} from './use-gatherer';\nimport {SET_ITEM_PICKED_URL} from '../shared/api/api-urls';\n\nexport const usePickItemSwitch = (): ProductSwitch => {\n const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance} = useGatherer();\n\n const retrieveNextPickItem = useCallback((): void => {\n switchPickItem('next');\n }, [switchPickItem]);\n\n const setItemToPicked = useCallback(\n (quantityPicked?: number, metaData?: any): void => {\n instance\n .patch(SET_ITEM_PICKED_URL, {\n quantity_picked: quantityPicked,\n pick_group_id: currentPickGroupId,\n pick_item_id: pickItem.pickItem.id,\n metadata: metaData,\n })\n .then(response => {\n if (response.data.content === 'Pick group finished') {\n onLastPick();\n } else {\n savePickGroupData(response.data);\n }\n });\n },\n [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData],\n );\n\n const nextPickItem = useCallback(\n (isSkip: boolean, quantityPicked?: number, metaData?: any): void => {\n if (isSkip) {\n retrieveNextPickItem();\n return;\n }\n\n setItemToPicked(quantityPicked, metaData);\n },\n [retrieveNextPickItem, setItemToPicked],\n );\n\n const previousPickItem = useCallback((): void => {\n switchPickItem('prev');\n }, [switchPickItem]);\n\n return {\n nextPickItem,\n previousPickItem,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,QAAO,OAAO;AAEjC,SAAQC,WAAW,QAAO,gBAAgB;AAC1C,SAAQC,mBAAmB,QAAO,wBAAwB;AAE1D,OAAO,MAAMC,iBAAiB,GAAG,MAAqB;EAClD,MAAM;IAACC,QAAQ;IAAEC,kBAAkB;IAAEC,iBAAiB;IAAEC,cAAc;IAAEC,UAAU;IAAEC;EAAQ,CAAC,GAAGR,WAAW,EAAE;EAE7G,MAAMS,oBAAoB,GAAGV,WAAW,CAAC,MAAY;IACjDO,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMI,eAAe,GAAGX,WAAW,CAC/B,CAACY,cAAuB,EAAEC,QAAc,KAAW;IAC/CJ,QAAQ,CACHK,KAAK,CAACZ,mBAAmB,EAAE;MACxBa,eAAe,EAAEH,cAAc;MAC/BI,aAAa,EAAEX,kBAAkB;MACjCY,YAAY,EAAEb,QAAQ,CAACA,QAAQ,CAACc,EAAE;MAClCC,QAAQ,EAAEN;IACd,CAAC,CAAC,CACDO,IAAI,CAACC,QAAQ,IAAI;MACd,IAAIA,QAAQ,CAACC,IAAI,CAACC,OAAO,KAAK,qBAAqB,EAAE;QACjDf,UAAU,EAAE;MAChB,CAAC,MAAM;QACHF,iBAAiB,CAACe,QAAQ,CAACC,IAAI,CAAC;MACpC;IACJ,CAAC,CAAC;EACV,CAAC,EACD,CAACjB,kBAAkB,EAAEI,QAAQ,EAAED,UAAU,EAAEJ,QAAQ,CAACA,QAAQ,CAACc,EAAE,EAAEZ,iBAAiB,CAAC,CACtF;EAED,MAAMkB,YAAY,GAAGxB,WAAW,CAC5B,CAACyB,MAAe,EAAEb,cAAuB,EAAEC,QAAc,KAAW;IAChE,IAAIY,MAAM,EAAE;MACRf,oBAAoB,EAAE;MACtB;IACJ;IAEAC,eAAe,CAACC,cAAc,EAAEC,QAAQ,CAAC;EAC7C,CAAC,EACD,CAACH,oBAAoB,EAAEC,eAAe,CAAC,CAC1C;EAED,MAAMe,gBAAgB,GAAG1B,WAAW,CAAC,MAAY;IAC7CO,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,OAAO;IACHiB,YAAY;IACZE;EACJ,CAAC;AACL,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"}
@@ -7,7 +7,8 @@ import { styles } from '../styles/pick-group-item-styles';
7
7
  import { PressButton } from '../../shared/press-button/press-button';
8
8
  const {
9
9
  listItem,
10
- label
10
+ label,
11
+ text
11
12
  } = styles;
12
13
  export const PickGroupItem = props => {
13
14
  const {
@@ -21,10 +22,8 @@ export const PickGroupItem = props => {
21
22
  is_picked
22
23
  } = props.renderProps.item;
23
24
  const handlePress = () => {
24
- if (props.onPress) {
25
- props.onPress(props.renderProps.item);
26
- return;
27
- }
25
+ var _props$onPress;
26
+ (_props$onPress = props.onPress) === null || _props$onPress === void 0 ? void 0 : _props$onPress.call(props, props.renderProps.item);
28
27
  startPicking(props.renderProps.item.id);
29
28
  };
30
29
  return /*#__PURE__*/React.createElement(PressButton, {
@@ -32,7 +31,9 @@ export const PickGroupItem = props => {
32
31
  onPress: handlePress
33
32
  }, /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(Text, {
34
33
  style: label
35
- }, "ID"), /*#__PURE__*/React.createElement(Text, null, id)), /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(Badge, {
34
+ }, "ID"), /*#__PURE__*/React.createElement(Text, {
35
+ style: text
36
+ }, id)), /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(Badge, {
36
37
  variant: is_picked ? 'success' : 'danger'
37
38
  }, t(`pick-list.item.is-picked.${is_picked ? 'true' : 'false'}`))));
38
39
  };
@@ -1 +1 @@
1
- {"version":3,"names":["React","View","Text","useTranslation","Badge","useGatherer","styles","PressButton","listItem","label","PickGroupItem","props","t","startPicking","id","is_picked","renderProps","item","handlePress","onPress"],"sources":["pick-group-item.tsx"],"sourcesContent":["import React from 'react';\nimport {ListRenderItemInfo, View, Text} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {Badge} from '../../shared/badge/badge';\nimport {useGatherer} from '../../hooks/use-gatherer';\nimport {styles} from '../styles/pick-group-item-styles';\nimport {PressButton} from '../../shared/press-button/press-button';\n\nexport interface props {\n renderProps: ListRenderItemInfo<PickGroup>;\n onPress?: (pickGroup: PickGroup) => void;\n}\n\nconst {listItem, label} = styles;\n\nexport const PickGroupItem = (props: props): JSX.Element => {\n const {t} = useTranslation();\n const {startPicking} = useGatherer();\n const {id, is_picked} = props.renderProps.item;\n\n const handlePress = (): void => {\n if (props.onPress) {\n props.onPress(props.renderProps.item);\n return;\n }\n\n startPicking(props.renderProps.item.id);\n };\n\n return (\n <PressButton style={listItem} onPress={handlePress}>\n <View>\n <Text style={label}>ID</Text>\n <Text>{id}</Text>\n </View>\n <View>\n <Badge variant={is_picked ? 'success' : 'danger'}>\n {t(`pick-list.item.is-picked.${is_picked ? 'true' : 'false'}`)}\n </Badge>\n </View>\n </PressButton>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAA4BC,IAAI,EAAEC,IAAI,QAAO,cAAc;AAE3D,SAAQC,cAAc,QAAO,eAAe;AAE5C,SAAQC,KAAK,QAAO,0BAA0B;AAC9C,SAAQC,WAAW,QAAO,0BAA0B;AACpD,SAAQC,MAAM,QAAO,kCAAkC;AACvD,SAAQC,WAAW,QAAO,wCAAwC;AAOlE,MAAM;EAACC,QAAQ;EAAEC;AAAK,CAAC,GAAGH,MAAM;AAEhC,OAAO,MAAMI,aAAa,GAAIC,KAAY,IAAkB;EACxD,MAAM;IAACC;EAAC,CAAC,GAAGT,cAAc,EAAE;EAC5B,MAAM;IAACU;EAAY,CAAC,GAAGR,WAAW,EAAE;EACpC,MAAM;IAACS,EAAE;IAAEC;EAAS,CAAC,GAAGJ,KAAK,CAACK,WAAW,CAACC,IAAI;EAE9C,MAAMC,WAAW,GAAG,MAAY;IAC5B,IAAIP,KAAK,CAACQ,OAAO,EAAE;MACfR,KAAK,CAACQ,OAAO,CAACR,KAAK,CAACK,WAAW,CAACC,IAAI,CAAC;MACrC;IACJ;IAEAJ,YAAY,CAACF,KAAK,CAACK,WAAW,CAACC,IAAI,CAACH,EAAE,CAAC;EAC3C,CAAC;EAED,oBACI,oBAAC,WAAW;IAAC,KAAK,EAAEN,QAAS;IAAC,OAAO,EAAEU;EAAY,gBAC/C,oBAAC,IAAI,qBACD,oBAAC,IAAI;IAAC,KAAK,EAAET;EAAM,QAAU,eAC7B,oBAAC,IAAI,QAAEK,EAAE,CAAQ,CACd,eACP,oBAAC,IAAI,qBACD,oBAAC,KAAK;IAAC,OAAO,EAAEC,SAAS,GAAG,SAAS,GAAG;EAAS,GAC5CH,CAAC,CAAE,4BAA2BG,SAAS,GAAG,MAAM,GAAG,OAAQ,EAAC,CAAC,CAC1D,CACL,CACG;AAEtB,CAAC"}
1
+ {"version":3,"names":["React","View","Text","useTranslation","Badge","useGatherer","styles","PressButton","listItem","label","text","PickGroupItem","props","t","startPicking","id","is_picked","renderProps","item","handlePress","onPress"],"sources":["pick-group-item.tsx"],"sourcesContent":["import React from 'react';\nimport {ListRenderItemInfo, View, Text} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {Badge} from '../../shared/badge/badge';\nimport {useGatherer} from '../../hooks/use-gatherer';\nimport {styles} from '../styles/pick-group-item-styles';\nimport {PressButton} from '../../shared/press-button/press-button';\n\nexport interface props<T> {\n renderProps: ListRenderItemInfo<T>;\n onPress?: (pickGroup: T) => void;\n}\n\nconst {listItem, label, text} = styles;\n\nexport const PickGroupItem = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {t} = useTranslation();\n const {startPicking} = useGatherer();\n const {id, is_picked} = props.renderProps.item;\n\n const handlePress = (): void => {\n props.onPress?.(props.renderProps.item);\n startPicking(props.renderProps.item.id);\n };\n\n return (\n <PressButton style={listItem} onPress={handlePress}>\n <View>\n <Text style={label}>ID</Text>\n <Text style={text}>{id}</Text>\n </View>\n <View>\n <Badge variant={is_picked ? 'success' : 'danger'}>\n {t(`pick-list.item.is-picked.${is_picked ? 'true' : 'false'}`)}\n </Badge>\n </View>\n </PressButton>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAA4BC,IAAI,EAAEC,IAAI,QAAO,cAAc;AAE3D,SAAQC,cAAc,QAAO,eAAe;AAE5C,SAAQC,KAAK,QAAO,0BAA0B;AAC9C,SAAQC,WAAW,QAAO,0BAA0B;AACpD,SAAQC,MAAM,QAAO,kCAAkC;AACvD,SAAQC,WAAW,QAAO,wCAAwC;AAOlE,MAAM;EAACC,QAAQ;EAAEC,KAAK;EAAEC;AAAI,CAAC,GAAGJ,MAAM;AAEtC,OAAO,MAAMK,aAAa,GAAyBC,KAAe,IAAkB;EAChF,MAAM;IAACC;EAAC,CAAC,GAAGV,cAAc,EAAE;EAC5B,MAAM;IAACW;EAAY,CAAC,GAAGT,WAAW,EAAE;EACpC,MAAM;IAACU,EAAE;IAAEC;EAAS,CAAC,GAAGJ,KAAK,CAACK,WAAW,CAACC,IAAI;EAE9C,MAAMC,WAAW,GAAG,MAAY;IAAA;IAC5B,kBAAAP,KAAK,CAACQ,OAAO,mDAAb,oBAAAR,KAAK,EAAWA,KAAK,CAACK,WAAW,CAACC,IAAI,CAAC;IACvCJ,YAAY,CAACF,KAAK,CAACK,WAAW,CAACC,IAAI,CAACH,EAAE,CAAC;EAC3C,CAAC;EAED,oBACI,oBAAC,WAAW;IAAC,KAAK,EAAEP,QAAS;IAAC,OAAO,EAAEW;EAAY,gBAC/C,oBAAC,IAAI,qBACD,oBAAC,IAAI;IAAC,KAAK,EAAEV;EAAM,QAAU,eAC7B,oBAAC,IAAI;IAAC,KAAK,EAAEC;EAAK,GAAEK,EAAE,CAAQ,CAC3B,eACP,oBAAC,IAAI,qBACD,oBAAC,KAAK;IAAC,OAAO,EAAEC,SAAS,GAAG,SAAS,GAAG;EAAS,GAC5CH,CAAC,CAAE,4BAA2BG,SAAS,GAAG,MAAM,GAAG,OAAQ,EAAC,CAAC,CAC1D,CACL,CACG;AAEtB,CAAC"}
@@ -3,7 +3,7 @@ import { FlatList, ToastAndroid } from 'react-native';
3
3
  import { useTranslation } from 'react-i18next';
4
4
  import { Search } from './partials/search';
5
5
  import { EmptyList } from './partials/empty-list';
6
- import { useInstance } from '../hooks/use-instance';
6
+ import { useGatherer } from '../hooks/use-gatherer';
7
7
  import { PickGroupItem } from './partials/pick-group-item';
8
8
  import { GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL } from '../shared/api/api-urls';
9
9
  export const PickList = props => {
@@ -14,16 +14,18 @@ export const PickList = props => {
14
14
  } = props;
15
15
  const [loading, setLoading] = useState(true);
16
16
  const [pickList, setPickList] = useState([]);
17
+ const {
18
+ instance
19
+ } = useGatherer();
17
20
  const {
18
21
  t
19
22
  } = useTranslation();
20
- const instance = useInstance();
21
23
  const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
22
24
  const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
23
25
  setLoading(true);
24
26
  instance.post(url, {
25
- searchField: searchFieldParam ?? null,
26
- searchValue: searchValueParam ?? null
27
+ searchField: searchFieldParam,
28
+ searchValue: searchValueParam
27
29
  }).then(response => setPickList(response.data.pick_groups)).catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG)).finally(() => setLoading(false));
28
30
  }, [instance, isAfterPickList]);
29
31
  useEffect(() => {
@@ -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 .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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"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useGatherer","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","pickList","setPickList","instance","t","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 {useGatherer} from '../hooks/use-gatherer';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {isAfterPickList, renderItem, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const {instance} = useGatherer();\n const {t} = useTranslation();\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,\n searchValue: searchValueParam,\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<T>): 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,5 +1,5 @@
1
1
  import { StyleSheet } from 'react-native';
2
- import { SMALL_FONT, WHITE } from '../../shared/constants';
2
+ import { SMALL_FONT, TEXT_COLOR, WHITE } from '../../shared/constants';
3
3
  export const styles = StyleSheet.create({
4
4
  listItem: {
5
5
  backgroundColor: WHITE,
@@ -12,6 +12,10 @@ export const styles = StyleSheet.create({
12
12
  },
13
13
  label: {
14
14
  fontSize: SMALL_FONT
15
+ },
16
+ text: {
17
+ fontWeight: 'bold',
18
+ color: TEXT_COLOR
15
19
  }
16
20
  });
17
21
  //# sourceMappingURL=pick-group-item-styles.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["StyleSheet","SMALL_FONT","WHITE","styles","create","listItem","backgroundColor","flexDirection","justifyContent","padding","margin","borderRadius","elevation","label","fontSize"],"sources":["pick-group-item-styles.ts"],"sourcesContent":["import {StyleSheet} from 'react-native';\n\nimport {SMALL_FONT, WHITE} from '../../shared/constants';\n\nexport const styles = StyleSheet.create({\n listItem: {\n backgroundColor: WHITE,\n flexDirection: 'row',\n justifyContent: 'space-between',\n padding: 15,\n margin: 5,\n borderRadius: 5,\n elevation: 1,\n },\n label: {\n fontSize: SMALL_FONT,\n },\n});\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,cAAc;AAEvC,SAAQC,UAAU,EAAEC,KAAK,QAAO,wBAAwB;AAExD,OAAO,MAAMC,MAAM,GAAGH,UAAU,CAACI,MAAM,CAAC;EACpCC,QAAQ,EAAE;IACNC,eAAe,EAAEJ,KAAK;IACtBK,aAAa,EAAE,KAAK;IACpBC,cAAc,EAAE,eAAe;IAC/BC,OAAO,EAAE,EAAE;IACXC,MAAM,EAAE,CAAC;IACTC,YAAY,EAAE,CAAC;IACfC,SAAS,EAAE;EACf,CAAC;EACDC,KAAK,EAAE;IACHC,QAAQ,EAAEb;EACd;AACJ,CAAC,CAAC"}
1
+ {"version":3,"names":["StyleSheet","SMALL_FONT","TEXT_COLOR","WHITE","styles","create","listItem","backgroundColor","flexDirection","justifyContent","padding","margin","borderRadius","elevation","label","fontSize","text","fontWeight","color"],"sources":["pick-group-item-styles.ts"],"sourcesContent":["import {StyleSheet} from 'react-native';\n\nimport {SMALL_FONT, TEXT_COLOR, WHITE} from '../../shared/constants';\n\nexport const styles = StyleSheet.create({\n listItem: {\n backgroundColor: WHITE,\n flexDirection: 'row',\n justifyContent: 'space-between',\n padding: 15,\n margin: 5,\n borderRadius: 5,\n elevation: 1,\n },\n label: {\n fontSize: SMALL_FONT,\n },\n text: {\n fontWeight: 'bold',\n color: TEXT_COLOR,\n },\n});\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,cAAc;AAEvC,SAAQC,UAAU,EAAEC,UAAU,EAAEC,KAAK,QAAO,wBAAwB;AAEpE,OAAO,MAAMC,MAAM,GAAGJ,UAAU,CAACK,MAAM,CAAC;EACpCC,QAAQ,EAAE;IACNC,eAAe,EAAEJ,KAAK;IACtBK,aAAa,EAAE,KAAK;IACpBC,cAAc,EAAE,eAAe;IAC/BC,OAAO,EAAE,EAAE;IACXC,MAAM,EAAE,CAAC;IACTC,YAAY,EAAE,CAAC;IACfC,SAAS,EAAE;EACf,CAAC;EACDC,KAAK,EAAE;IACHC,QAAQ,EAAEd;EACd,CAAC;EACDe,IAAI,EAAE;IACFC,UAAU,EAAE,MAAM;IAClBC,KAAK,EAAEhB;EACX;AACJ,CAAC,CAAC"}
@@ -1,4 +1,4 @@
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
4
  import { useScanner } from '../hooks/use-scanner';
@@ -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","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, 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 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,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,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,GAAGzB,UAAU,CAACqB,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,CAACX,UAAU,GAAGA,UAAU;AAC9BW,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 pickGroupId?: number;\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;AASjE,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: {\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
+ {"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};\n\ntype LanguageConfig = 'nl' | 'en';\n"],"mappings":""}
@@ -1,11 +1,11 @@
1
1
  import React, { ReactNode } from 'react';
2
+ import { AxiosInstance } from 'axios';
2
3
  export interface IGathererContext {
3
- baseURL: string;
4
- logErrors?: boolean;
5
4
  scanImplementation: any;
6
5
  pickItem: PickGroupItem<any>;
7
6
  currentPickGroupId: number;
8
7
  onLastPick: () => void;
8
+ instance: AxiosInstance;
9
9
  savePickGroupData: (data: PickGroupItem<any>) => void;
10
10
  startPicking: (pickGroupId: number) => Promise<PickGroupItem<DefaultPickItem>>;
11
11
  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,6 +1,6 @@
1
1
  import { ListRenderItemInfo } from 'react-native';
2
- export interface props {
3
- renderProps: ListRenderItemInfo<PickGroup>;
4
- onPress?: (pickGroup: PickGroup) => void;
2
+ export interface props<T> {
3
+ renderProps: ListRenderItemInfo<T>;
4
+ onPress?: (pickGroup: T) => void;
5
5
  }
6
- export declare const PickGroupItem: (props: props) => JSX.Element;
6
+ export declare const PickGroupItem: <T extends PickGroup>(props: props<T>) => JSX.Element;
@@ -1,8 +1,8 @@
1
1
  import { ListRenderItem } from 'react-native';
2
- interface props {
2
+ interface props<T> {
3
3
  isAfterPickList?: boolean;
4
- renderItem?: ListRenderItem<PickGroup>;
5
- onItemPress?: (pickGroup: PickGroup) => void;
4
+ renderItem?: ListRenderItem<T>;
5
+ onItemPress?: (pickGroup: T) => void;
6
6
  }
7
- export declare const PickList: (props: props) => JSX.Element;
7
+ export declare const PickList: <T extends PickGroup>(props: props<T>) => JSX.Element;
8
8
  export {};
@@ -11,4 +11,8 @@ export declare const styles: {
11
11
  label: {
12
12
  fontSize: number;
13
13
  };
14
+ text: {
15
+ fontWeight: "bold";
16
+ color: string;
17
+ };
14
18
  };
@@ -4,6 +4,7 @@ interface props {
4
4
  children: ReactNode;
5
5
  style?: ViewStyle;
6
6
  pickModal?: JSX.Element;
7
+ pickGroupId?: number;
7
8
  }
8
9
  declare const Picker: {
9
10
  (props: props): JSX.Element;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "0.1.8",
3
+ "version": "0.2.2",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -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,12 +8,11 @@ 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;
12
- logErrors?: boolean;
13
11
  scanImplementation: any;
14
12
  pickItem: PickGroupItem<any>;
15
13
  currentPickGroupId: number;
16
14
  onLastPick: () => void;
15
+ instance: AxiosInstance;
17
16
  savePickGroupData: (data: PickGroupItem<any>) => void;
18
17
  startPicking: (pickGroupId: number) => Promise<PickGroupItem<DefaultPickItem>>;
19
18
  switchPickItem: (dir: ControlDir) => Promise<PickGroupItem<DefaultPickItem>>;
@@ -25,11 +24,10 @@ interface props {
25
24
  }
26
25
 
27
26
  export const GathererContext = createContext<IGathererContext>({
28
- baseURL: '',
29
- logErrors: false,
30
27
  scanImplementation: undefined,
31
28
  currentPickGroupId: 0,
32
29
  onLastPick: () => undefined,
30
+ instance: axios.create(),
33
31
  pickItem: defaultPickGroupItem,
34
32
  savePickGroupData: () => undefined,
35
33
  startPicking: () => new Promise(() => undefined),
@@ -37,11 +35,15 @@ export const GathererContext = createContext<IGathererContext>({
37
35
  });
38
36
 
39
37
  export const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {
38
+ const {scanImplementation, instance, onLastPick, language} = props.config;
40
39
  const [pickItem, setPickItem] = useState<PickGroupItem<T>>(defaultPickGroupItem);
41
40
  const prevPickItem = useRef<PickItem<T> | null>(null);
42
41
  const nextPickItem = useRef<PickItem<T> | null>(null);
43
42
  const currentPickGroupId = useRef<number>(0);
44
- const instance = axios.create({baseURL: props.config.baseURL});
43
+
44
+ useEffect(() => {
45
+ scanImplementation.registerEventListener?.();
46
+ }, [scanImplementation]);
45
47
 
46
48
  const savePickGroupData = useCallback((data: PickGroupItem<T>): void => {
47
49
  setPickItem(data);
@@ -86,32 +88,30 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
86
88
  );
87
89
 
88
90
  useEffect(() => {
89
- if (props.config.language) {
90
- i18n.changeLanguage(props.config.language);
91
+ if (language) {
92
+ i18n.changeLanguage(language);
91
93
  }
92
- }, [props.config.language]);
94
+ }, [language]);
93
95
 
94
96
  const context = useMemo(
95
97
  () => ({
96
98
  pickItem,
99
+ instance,
100
+ onLastPick,
97
101
  startPicking,
98
102
  switchPickItem,
99
103
  savePickGroupData,
100
- baseURL: props.config.baseURL,
101
- onLastPick: props.config.onLastPick,
102
- logErrors: props.config.shouldLogErrors,
104
+ scanImplementation,
103
105
  currentPickGroupId: currentPickGroupId.current,
104
- scanImplementation: props.config.scanImplementation,
105
106
  }),
106
107
  [
107
108
  pickItem,
109
+ instance,
110
+ onLastPick,
108
111
  startPicking,
109
112
  switchPickItem,
110
113
  savePickGroupData,
111
- props.config.baseURL,
112
- props.config.onLastPick,
113
- props.config.shouldLogErrors,
114
- props.config.scanImplementation,
114
+ scanImplementation,
115
115
  ],
116
116
  );
117
117
 
@@ -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,12 +1,10 @@
1
1
  import {useCallback} from 'react';
2
2
 
3
3
  import {useGatherer} from './use-gatherer';
4
- import {useInstance} from './use-instance';
5
4
  import {SET_ITEM_PICKED_URL} from '../shared/api/api-urls';
6
5
 
7
6
  export const usePickItemSwitch = (): ProductSwitch => {
8
- const instance = useInstance();
9
- const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick} = useGatherer();
7
+ const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance} = useGatherer();
10
8
 
11
9
  const retrieveNextPickItem = useCallback((): void => {
12
10
  switchPickItem('next');
@@ -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,
@@ -8,24 +8,20 @@ import {useGatherer} from '../../hooks/use-gatherer';
8
8
  import {styles} from '../styles/pick-group-item-styles';
9
9
  import {PressButton} from '../../shared/press-button/press-button';
10
10
 
11
- export interface props {
12
- renderProps: ListRenderItemInfo<PickGroup>;
13
- onPress?: (pickGroup: PickGroup) => void;
11
+ export interface props<T> {
12
+ renderProps: ListRenderItemInfo<T>;
13
+ onPress?: (pickGroup: T) => void;
14
14
  }
15
15
 
16
- const {listItem, label} = styles;
16
+ const {listItem, label, text} = styles;
17
17
 
18
- export const PickGroupItem = (props: props): JSX.Element => {
18
+ export const PickGroupItem = <T extends PickGroup>(props: props<T>): JSX.Element => {
19
19
  const {t} = useTranslation();
20
20
  const {startPicking} = useGatherer();
21
21
  const {id, is_picked} = props.renderProps.item;
22
22
 
23
23
  const handlePress = (): void => {
24
- if (props.onPress) {
25
- props.onPress(props.renderProps.item);
26
- return;
27
- }
28
-
24
+ props.onPress?.(props.renderProps.item);
29
25
  startPicking(props.renderProps.item.id);
30
26
  };
31
27
 
@@ -33,7 +29,7 @@ export const PickGroupItem = (props: props): JSX.Element => {
33
29
  <PressButton style={listItem} onPress={handlePress}>
34
30
  <View>
35
31
  <Text style={label}>ID</Text>
36
- <Text>{id}</Text>
32
+ <Text style={text}>{id}</Text>
37
33
  </View>
38
34
  <View>
39
35
  <Badge variant={is_picked ? 'success' : 'danger'}>
@@ -5,22 +5,22 @@ import {useTranslation} from 'react-i18next';
5
5
 
6
6
  import {Search} from './partials/search';
7
7
  import {EmptyList} from './partials/empty-list';
8
- import {useInstance} from '../hooks/use-instance';
8
+ import {useGatherer} from '../hooks/use-gatherer';
9
9
  import {PickGroupItem} from './partials/pick-group-item';
10
10
  import {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';
11
11
 
12
- interface props {
12
+ interface props<T> {
13
13
  isAfterPickList?: boolean;
14
- renderItem?: ListRenderItem<PickGroup>;
15
- onItemPress?: (pickGroup: PickGroup) => void;
14
+ renderItem?: ListRenderItem<T>;
15
+ onItemPress?: (pickGroup: T) => void;
16
16
  }
17
17
 
18
- export const PickList = (props: props): JSX.Element => {
18
+ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
19
19
  const {isAfterPickList, renderItem, onItemPress} = props;
20
20
  const [loading, setLoading] = useState<boolean>(true);
21
- const [pickList, setPickList] = useState<PickGroup[]>([]);
21
+ const [pickList, setPickList] = useState<T[]>([]);
22
+ const {instance} = useGatherer();
22
23
  const {t} = useTranslation();
23
- const instance = useInstance();
24
24
 
25
25
  const getPickListWithSearch = useCallback(
26
26
  (searchFieldParam?: string, searchValueParam?: string): void => {
@@ -30,8 +30,8 @@ export const PickList = (props: props): JSX.Element => {
30
30
 
31
31
  instance
32
32
  .post(url, {
33
- searchField: searchFieldParam ?? null,
34
- searchValue: searchValueParam ?? null,
33
+ searchField: searchFieldParam,
34
+ searchValue: searchValueParam,
35
35
  })
36
36
  .then(response => setPickList(response.data.pick_groups))
37
37
  .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))
@@ -60,7 +60,7 @@ export const PickList = (props: props): JSX.Element => {
60
60
  };
61
61
  }, [instance]);
62
62
 
63
- const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {
63
+ const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {
64
64
  return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
65
65
  };
66
66