@scrumble-nl/gatherer-frontend 1.2.0 → 1.3.0-beta.0

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.
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.GathererContextProvider = exports.GathererContext = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
- var _axios = _interopRequireDefault(require("axios"));
9
8
  var _i18n = _interopRequireDefault(require("../lang/i18n"));
10
9
  var _scanContext = require("./scan-context");
11
10
  var _defaultPickGroupItem = require("../shared/default-pick-group-item");
@@ -13,16 +12,7 @@ var _apiUrls = require("../shared/api/api-urls");
13
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
13
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
15
14
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
16
- const GathererContext = /*#__PURE__*/(0, _react.createContext)({
17
- currentPickGroupId: 0,
18
- onLastPick: () => undefined,
19
- instance: _axios.default.create(),
20
- pickItem: _defaultPickGroupItem.defaultPickGroupItem,
21
- savePickGroupData: () => undefined,
22
- startPicking: () => new Promise(() => undefined),
23
- switchPickItem: () => new Promise(() => undefined),
24
- handleCleanEan: () => ''
25
- });
15
+ const GathererContext = /*#__PURE__*/(0, _react.createContext)({});
26
16
  exports.GathererContext = GathererContext;
27
17
  const GathererContextProvider = props => {
28
18
  const {
@@ -30,7 +20,7 @@ const GathererContextProvider = props => {
30
20
  instance,
31
21
  onLastPick,
32
22
  language,
33
- handleCleanEan
23
+ parseEan
34
24
  } = props.config;
35
25
  const [pickItem, setPickItem] = (0, _react.useState)(_defaultPickGroupItem.defaultPickGroupItem);
36
26
  const currentPickGroupId = (0, _react.useRef)(0);
@@ -84,11 +74,11 @@ const GathererContextProvider = props => {
84
74
  onLastPick,
85
75
  startPicking,
86
76
  switchPickItem,
87
- handleCleanEan,
77
+ parseEan,
88
78
  savePickGroupData,
89
79
  scanImplementation,
90
80
  currentPickGroupId: currentPickGroupId.current
91
- }), [handleCleanEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
81
+ }), [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
92
82
  return /*#__PURE__*/_react.default.createElement(GathererContext.Provider, {
93
83
  value: context
94
84
  }, /*#__PURE__*/_react.default.createElement(_scanContext.ScanContextProvider, {
@@ -1 +1 @@
1
- {"version":3,"names":["GathererContext","createContext","currentPickGroupId","onLastPick","undefined","instance","axios","create","pickItem","defaultPickGroupItem","savePickGroupData","startPicking","Promise","switchPickItem","handleCleanEan","GathererContextProvider","props","scanImplementation","language","config","setPickItem","useState","useRef","useEffect","registerEventListener","useCallback","data","pickGroupId","resolve","reject","post","START_PICKING_URL","pick_group_id","then","response","current","catch","dir","url","PREV_PICK_ITEM_URL","NEXT_PICK_ITEM_URL","prevState","previous","next","pick_item_id","id","i18n","changeLanguage","context","useMemo","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n handleCleanEan?: (ean: string) => string;\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({\n currentPickGroupId: 0,\n onLastPick: () => undefined,\n instance: axios.create(),\n pickItem: defaultPickGroupItem,\n savePickGroupData: () => undefined,\n startPicking: () => new Promise(() => undefined),\n switchPickItem: () => new Promise(() => undefined),\n handleCleanEan: () => '',\n});\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, handleCleanEan} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n handleCleanEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n handleCleanEan,\n instance,\n onLastPick,\n pickItem,\n savePickGroupData,\n scanImplementation,\n startPicking,\n switchPickItem,\n ],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":";;;;;;AAAA;AAEA;AAEA;AACA;AACA;AACA;AAAiG;AAAA;AAAA;AAkB1F,MAAMA,eAAe,gBAAG,IAAAC,oBAAa,EAAwB;EAChEC,kBAAkB,EAAE,CAAC;EACrBC,UAAU,EAAE,MAAMC,SAAS;EAC3BC,QAAQ,EAAEC,cAAK,CAACC,MAAM,EAAE;EACxBC,QAAQ,EAAEC,0CAAoB;EAC9BC,iBAAiB,EAAE,MAAMN,SAAS;EAClCO,YAAY,EAAE,MAAM,IAAIC,OAAO,CAAC,MAAMR,SAAS,CAAC;EAChDS,cAAc,EAAE,MAAM,IAAID,OAAO,CAAC,MAAMR,SAAS,CAAC;EAClDU,cAAc,EAAE,MAAM;AAC1B,CAAC,CAAC;AAAC;AAEI,MAAMC,uBAAuB,GAA+BC,KAAY,IAAkB;EAC7F,MAAM;IAACC,kBAAkB;IAAEZ,QAAQ;IAAEF,UAAU;IAAEe,QAAQ;IAAEJ;EAAc,CAAC,GAAGE,KAAK,CAACG,MAAM;EACzF,MAAM,CAACX,QAAQ,EAAEY,WAAW,CAAC,GAAG,IAAAC,eAAQ,EAAcZ,0CAAoB,CAAC;EAC3E,MAAMP,kBAAkB,GAAG,IAAAoB,aAAM,EAAS,CAAC,CAAC;EAE5C,IAAAC,gBAAS,EAAC,MAAM;IAAA;IACZ,yBAAAN,kBAAkB,CAACO,qBAAqB,0DAAxC,2BAAAP,kBAAkB,CAA0B;EAChD,CAAC,EAAE,CAACA,kBAAkB,CAAC,CAAC;EAExB,MAAMP,iBAAiB,GAAG,IAAAe,kBAAW,EAAEC,IAAiB,IAAW;IAC/DN,WAAW,CAACM,IAAI,CAAC;EACrB,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMf,YAAY,GAAG,IAAAc,kBAAW,EAC5B,MAAOE,WAAmB,IAA2B;IACjD,OAAO,IAAIf,OAAO,CAAC,CAACgB,OAAO,EAAEC,MAAM,KAAK;MACpCxB,QAAQ,CACHyB,IAAI,CAACC,0BAAiB,EAAE;QAACC,aAAa,EAAEL;MAAW,CAAC,CAAC,CACrDM,IAAI,CAACC,QAAQ,IAAI;QACdhC,kBAAkB,CAACiC,OAAO,GAAGR,WAAW;QACxCjB,iBAAiB,CAACwB,QAAQ,CAACR,IAAI,CAAC;QAChCE,OAAO,CAACM,QAAQ,CAACR,IAAI,CAAC;MAC1B,CAAC,CAAC,CACDU,KAAK,CAACP,MAAM,CAAC;IACtB,CAAC,CAAC;EACN,CAAC,EACD,CAACxB,QAAQ,EAAEK,iBAAiB,CAAC,CAChC;EAED,MAAMG,cAAc,GAAG,IAAAY,kBAAW,EAC9B,MAAOY,GAAe,IAA2B;IAC7C,MAAMC,GAAG,GAAGD,GAAG,KAAK,MAAM,GAAGE,2BAAkB,GAAGC,2BAAkB;IAEpEpB,WAAW,CAACqB,SAAS,IAAI;MACrB,IAAIJ,GAAG,KAAK,MAAM,IAAII,SAAS,CAACC,QAAQ,EAAE;QACtC,OAAOD,SAAS,CAACC,QAAQ;MAC7B;MAEA,IAAIL,GAAG,KAAK,MAAM,IAAII,SAAS,CAACE,IAAI,EAAE;QAClC,OAAOF,SAAS,CAACE,IAAI;MACzB;MAEA,OAAOF,SAAS;IACpB,CAAC,CAAC;IAEF,OAAO,IAAI7B,OAAO,CAAC,CAACgB,OAAO,EAAEC,MAAM,KAAK;MACpCxB,QAAQ,CACHyB,IAAI,CAACQ,GAAG,EAAE;QACPN,aAAa,EAAE9B,kBAAkB,CAACiC,OAAO;QACzCS,YAAY,EAAEpC,QAAQ,CAACA,QAAQ,CAACqC;MACpC,CAAC,CAAC,CACDZ,IAAI,CAACC,QAAQ,IAAI;QACdd,WAAW,CAACc,QAAQ,CAACR,IAAI,CAAC;QAC1BE,OAAO,CAACM,QAAQ,CAACR,IAAI,CAAC;MAC1B,CAAC,CAAC,CACDU,KAAK,CAACP,MAAM,CAAC;IACtB,CAAC,CAAC;EACN,CAAC,EACD,CAACxB,QAAQ,EAAEG,QAAQ,CAACA,QAAQ,CAACqC,EAAE,CAAC,CACnC;EAED,IAAAtB,gBAAS,EAAC,MAAM;IACZ,IAAIL,QAAQ,EAAE;MACV4B,aAAI,CAACC,cAAc,CAAC7B,QAAQ,CAAC;IACjC;EACJ,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEd,MAAM8B,OAAO,GAAG,IAAAC,cAAO,EACnB,OAAO;IACHzC,QAAQ;IACRH,QAAQ;IACRF,UAAU;IACVQ,YAAY;IACZE,cAAc;IACdC,cAAc;IACdJ,iBAAiB;IACjBO,kBAAkB;IAClBf,kBAAkB,EAAEA,kBAAkB,CAACiC;EAC3C,CAAC,CAAC,EACF,CACIrB,cAAc,EACdT,QAAQ,EACRF,UAAU,EACVK,QAAQ,EACRE,iBAAiB,EACjBO,kBAAkB,EAClBN,YAAY,EACZE,cAAc,CACjB,CACJ;EAED,oBACI,6BAAC,eAAe,CAAC,QAAQ;IAAC,KAAK,EAAEmC;EAAQ,gBACrC,6BAAC,gCAAmB;IAAC,OAAO,EAAEhC,KAAK,CAACG,MAAM,CAACF;EAAmB,GAAED,KAAK,CAACkC,QAAQ,CAAuB,CAC9E;AAEnC,CAAC;AAAC"}
1
+ {"version":3,"names":["GathererContext","createContext","GathererContextProvider","props","scanImplementation","instance","onLastPick","language","parseEan","config","pickItem","setPickItem","useState","defaultPickGroupItem","currentPickGroupId","useRef","useEffect","registerEventListener","savePickGroupData","useCallback","data","startPicking","pickGroupId","Promise","resolve","reject","post","START_PICKING_URL","pick_group_id","then","response","current","catch","switchPickItem","dir","url","PREV_PICK_ITEM_URL","NEXT_PICK_ITEM_URL","prevState","previous","next","pick_item_id","id","i18n","changeLanguage","context","useMemo","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport type {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n parseEan?: (ean: string) => {barcode: string; batchCode: string};\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({} as IGathererContext<any>);\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n parseEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"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"}
@@ -14,7 +14,7 @@ const useScanner = onScan => {
14
14
  } = (0, _react.useContext)(_scanContext.ScanContext);
15
15
  const callbackRef = (0, _react.useRef)(onScan);
16
16
  const {
17
- handleCleanEan
17
+ parseEan
18
18
  } = (0, _useGatherer.useGatherer)();
19
19
  (0, _react.useEffect)(() => {
20
20
  callbackRef.current = onScan;
@@ -22,14 +22,10 @@ const useScanner = onScan => {
22
22
  const startScanner = (0, _react.useCallback)(() => {
23
23
  registerListener(event => {
24
24
  const trimmedScan = event.data.trim();
25
- const scan = handleCleanEan === null || handleCleanEan === void 0 ? void 0 : handleCleanEan(trimmedScan);
26
- if (!scan) {
27
- callbackRef.current(trimmedScan);
28
- return;
29
- }
30
- callbackRef.current(scan);
25
+ const cleanEan = parseEan === null || parseEan === void 0 ? void 0 : parseEan(trimmedScan).barcode;
26
+ callbackRef.current(cleanEan ?? trimmedScan);
31
27
  });
32
- }, [handleCleanEan, registerListener]);
28
+ }, [parseEan, registerListener]);
33
29
  const stopScanner = (0, _react.useCallback)(() => {
34
30
  clearEventListeners();
35
31
  }, [clearEventListeners]);
@@ -1 +1 @@
1
- {"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","handleCleanEan","useGatherer","useEffect","current","startScanner","useCallback","event","trimmedScan","data","trim","scan","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {useGatherer} from '../hooks/use-gatherer';\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 const {handleCleanEan} = useGatherer();\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n const scan = handleCleanEan?.(trimmedScan);\n\n if (!scan) {\n callbackRef.current(trimmedScan);\n return;\n }\n\n callbackRef.current(scan);\n });\n }, [handleCleanEan, registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":";;;;;;AAAA;AAEA;AACA;AAIO,MAAMA,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAG,IAAAC,iBAAU,EAAeC,wBAAW,CAAC;EACrF,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAAeN,MAAM,CAAC;EAChD,MAAM;IAACO;EAAc,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAEtC,IAAAC,gBAAS,EAAC,MAAM;IACZJ,WAAW,CAACK,OAAO,GAAGV,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMW,YAAY,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACzCX,gBAAgB,CAACY,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MACrC,MAAMC,IAAI,GAAGV,cAAc,aAAdA,cAAc,uBAAdA,cAAc,CAAGO,WAAW,CAAC;MAE1C,IAAI,CAACG,IAAI,EAAE;QACPZ,WAAW,CAACK,OAAO,CAACI,WAAW,CAAC;QAChC;MACJ;MAEAT,WAAW,CAACK,OAAO,CAACO,IAAI,CAAC;IAC7B,CAAC,CAAC;EACN,CAAC,EAAE,CAACV,cAAc,EAAEN,gBAAgB,CAAC,CAAC;EAEtC,MAAMiB,WAAW,GAAG,IAAAN,kBAAW,EAAC,MAAY;IACxCV,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHS,YAAY;IACZO;EACJ,CAAC;AACL,CAAC;AAAC"}
1
+ {"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","parseEan","useGatherer","useEffect","current","startScanner","useCallback","event","trimmedScan","data","trim","cleanEan","barcode","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {useGatherer} from '../hooks/use-gatherer';\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 const {parseEan} = useGatherer();\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n const cleanEan = parseEan?.(trimmedScan).barcode;\n\n callbackRef.current(cleanEan ?? trimmedScan);\n });\n }, [parseEan, registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":";;;;;;AAAA;AAEA;AACA;AAIO,MAAMA,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAG,IAAAC,iBAAU,EAAeC,wBAAW,CAAC;EACrF,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAAeN,MAAM,CAAC;EAChD,MAAM;IAACO;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAEhC,IAAAC,gBAAS,EAAC,MAAM;IACZJ,WAAW,CAACK,OAAO,GAAGV,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMW,YAAY,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACzCX,gBAAgB,CAACY,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MACrC,MAAMC,QAAQ,GAAGV,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAGO,WAAW,CAAC,CAACI,OAAO;MAEhDb,WAAW,CAACK,OAAO,CAACO,QAAQ,IAAIH,WAAW,CAAC;IAChD,CAAC,CAAC;EACN,CAAC,EAAE,CAACP,QAAQ,EAAEN,gBAAgB,CAAC,CAAC;EAEhC,MAAMkB,WAAW,GAAG,IAAAP,kBAAW,EAAC,MAAY;IACxCV,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHS,YAAY;IACZQ;EACJ,CAAC;AACL,CAAC;AAAC"}
@@ -23,18 +23,20 @@ const {
23
23
  } = _pickerStyles.styles;
24
24
  const Picker = props => {
25
25
  const {
26
- pickItem
26
+ pickItem,
27
+ parseEan
27
28
  } = (0, _useGatherer.useGatherer)();
28
29
  const [pickModalVisible, setPickModalVisible] = (0, _react.useState)(false);
29
30
  const {
30
31
  nextPickItem
31
32
  } = (0, _usePickItemSwitch.usePickItemSwitch)();
33
+ const metaData = (0, _react.useRef)();
32
34
  const closeModal = () => {
33
35
  startScanner();
34
36
  setPickModalVisible(false);
35
37
  };
36
38
  const handleMultiQuantityPick = quantityPicked => {
37
- nextPickItem(false, quantityPicked);
39
+ nextPickItem(false, quantityPicked, metaData.current);
38
40
  closeModal();
39
41
  };
40
42
  const pickModal = props.pickModal ?? /*#__PURE__*/_react.default.createElement(_pickModal.PickModal, {
@@ -43,9 +45,21 @@ const Picker = props => {
43
45
  closeModal: closeModal
44
46
  });
45
47
  const handleScan = (0, _react.useCallback)(scan => {
46
- if (scan !== '' && scan === pickItem.barcode) {
48
+ const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
49
+ const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
50
+ const scannedBatchCode = eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.batchCode;
51
+ metaData.current = scannedBatchCode ? {
52
+ barcodes: [scannedBatchCode]
53
+ } : undefined;
54
+ if (scan !== '' && scannedBarcode === pickItem.barcode) {
55
+ console.log({
56
+ eanCodes,
57
+ scannedBarcode,
58
+ scannedBatchCode,
59
+ metaData: metaData.current
60
+ });
47
61
  if (pickItem.quantity === 1) {
48
- nextPickItem(false, 1);
62
+ nextPickItem(false, 1, metaData.current);
49
63
  } else {
50
64
  if (props.pickModal) {
51
65
  var _props$onMultiQuantit;
@@ -55,7 +69,7 @@ const Picker = props => {
55
69
  setPickModalVisible(true);
56
70
  }
57
71
  }
58
- }, [pickItem.barcode, pickItem.quantity, nextPickItem, props]);
72
+ }, [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props]);
59
73
  const {
60
74
  startScanner,
61
75
  stopScanner
@@ -1 +1 @@
1
- {"version":3,"names":["container","styles","Picker","props","pickItem","useGatherer","pickModalVisible","setPickModalVisible","useState","nextPickItem","usePickItemSwitch","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","pickModal","handleScan","useCallback","scan","barcode","quantity","onMultiQuantityPick","stopScanner","useScanner","useEffect","style","children","Row","Column","Progress","ProgressBar","PickAmount","ProductInfo"],"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 onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\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 handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\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 if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [pickItem.barcode, pickItem.quantity, nextPickItem, props],\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;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAUlE,MAAM;EAACA;AAAS,CAAC,GAAGC,oBAAM;AAE1B,MAAMC,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAChC,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAG,IAAAC,eAAQ,EAAU,KAAK,CAAC;EACxE,MAAM;IAACC;EAAY,CAAC,GAAG,IAAAC,oCAAiB,GAAE;EAE1C,MAAMC,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdL,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMM,uBAAuB,GAAIC,cAAsB,IAAW;IAC9DL,YAAY,CAAC,KAAK,EAAEK,cAAc,CAAC;IACnCH,UAAU,EAAE;EAChB,CAAC;EAED,MAAMI,SAAS,GAAGZ,KAAK,CAACY,SAAS,iBAC7B,6BAAC,oBAAS;IAAC,WAAW,EAAEF,uBAAwB;IAAC,OAAO,EAAEP,gBAAiB;IAAC,UAAU,EAAEK;EAAW,EACtG;EAED,MAAMK,UAAU,GAAG,IAAAC,kBAAW,EACzBC,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKd,QAAQ,CAACe,OAAO,EAAE;MAC1C,IAAIf,QAAQ,CAACgB,QAAQ,KAAK,CAAC,EAAE;QACzBX,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACH,IAAIN,KAAK,CAACY,SAAS,EAAE;UAAA;UACjB,yBAAAZ,KAAK,CAACkB,mBAAmB,0DAAzB,2BAAAlB,KAAK,CAAwB;UAC7B;QACJ;QAEAI,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC,EACD,CAACH,QAAQ,CAACe,OAAO,EAAEf,QAAQ,CAACgB,QAAQ,EAAEX,YAAY,EAAEN,KAAK,CAAC,CAC7D;EAED,MAAM;IAACS,YAAY;IAAEU;EAAW,CAAC,GAAG,IAAAC,sBAAU,EAACP,UAAU,CAAC;EAE1D,IAAAQ,gBAAS,EAAC,MAAM;IACZZ,YAAY,EAAE;IAEd,OAAO,MAAMU,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACV,YAAY,EAAEU,WAAW,CAAC,CAAC;EAE/B,oBACI,6BAAC,iBAAI;IAAC,KAAK,EAAE,CAACtB,SAAS,EAAEG,KAAK,CAACsB,KAAK;EAAE,GACjCV,SAAS,EACTZ,KAAK,CAACuB,QAAQ,CACZ;AAEf,CAAC;AAAC;AAEFxB,MAAM,CAACyB,GAAG,GAAGA,gBAAG;AAChBzB,MAAM,CAAC0B,MAAM,GAAGA,sBAAM;AACtB1B,MAAM,CAAC2B,QAAQ,GAAGC,wBAAW;AAC7B5B,MAAM,CAAC6B,UAAU,GAAGA,sBAAU;AAC9B7B,MAAM,CAAC8B,WAAW,GAAGA,wBAAW"}
1
+ {"version":3,"names":["container","styles","Picker","props","pickItem","parseEan","useGatherer","pickModalVisible","setPickModalVisible","useState","nextPickItem","usePickItemSwitch","metaData","useRef","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","current","pickModal","handleScan","useCallback","scan","eanCodes","scannedBarcode","barcode","scannedBatchCode","batchCode","barcodes","undefined","console","log","quantity","onMultiQuantityPick","stopScanner","useScanner","useEffect","style","children","Row","Column","Progress","ProgressBar","PickAmount","ProductInfo"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useRef, 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 onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem, parseEan} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n const metaData = useRef<{barcodes: string[]}>();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked, metaData.current);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n const eanCodes = parseEan?.(scan);\n const scannedBarcode = eanCodes?.barcode ?? scan;\n const scannedBatchCode = eanCodes?.batchCode;\n metaData.current = scannedBatchCode ? {barcodes: [scannedBatchCode]} : undefined;\n\n if (scan !== '' && scannedBarcode === pickItem.barcode) {\n console.log({\n eanCodes,\n scannedBarcode,\n scannedBatchCode,\n metaData: metaData.current,\n });\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1, metaData.current);\n } else {\n if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props],\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":"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"}
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n handleCleanEan?: (scan: string) => string;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\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: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n parseEan?: (ean: string) => {barcode: string; batchCode: string};\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
@@ -1,26 +1,16 @@
1
1
  import React, { createContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
2
- import axios from 'axios';
3
2
  import i18n from '../lang/i18n';
4
3
  import { ScanContextProvider } from './scan-context';
5
4
  import { defaultPickGroupItem } from '../shared/default-pick-group-item';
6
5
  import { NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL } from '../shared/api/api-urls';
7
- export const GathererContext = /*#__PURE__*/createContext({
8
- currentPickGroupId: 0,
9
- onLastPick: () => undefined,
10
- instance: axios.create(),
11
- pickItem: defaultPickGroupItem,
12
- savePickGroupData: () => undefined,
13
- startPicking: () => new Promise(() => undefined),
14
- switchPickItem: () => new Promise(() => undefined),
15
- handleCleanEan: () => ''
16
- });
6
+ export const GathererContext = /*#__PURE__*/createContext({});
17
7
  export const GathererContextProvider = props => {
18
8
  const {
19
9
  scanImplementation,
20
10
  instance,
21
11
  onLastPick,
22
12
  language,
23
- handleCleanEan
13
+ parseEan
24
14
  } = props.config;
25
15
  const [pickItem, setPickItem] = useState(defaultPickGroupItem);
26
16
  const currentPickGroupId = useRef(0);
@@ -74,11 +64,11 @@ export const GathererContextProvider = props => {
74
64
  onLastPick,
75
65
  startPicking,
76
66
  switchPickItem,
77
- handleCleanEan,
67
+ parseEan,
78
68
  savePickGroupData,
79
69
  scanImplementation,
80
70
  currentPickGroupId: currentPickGroupId.current
81
- }), [handleCleanEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
71
+ }), [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
82
72
  return /*#__PURE__*/React.createElement(GathererContext.Provider, {
83
73
  value: context
84
74
  }, /*#__PURE__*/React.createElement(ScanContextProvider, {
@@ -1 +1 @@
1
- {"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","axios","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","START_PICKING_URL","GathererContext","currentPickGroupId","onLastPick","undefined","instance","create","pickItem","savePickGroupData","startPicking","Promise","switchPickItem","handleCleanEan","GathererContextProvider","props","scanImplementation","language","config","setPickItem","registerEventListener","data","pickGroupId","resolve","reject","post","pick_group_id","then","response","current","catch","dir","url","prevState","previous","next","pick_item_id","id","changeLanguage","context","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n handleCleanEan?: (ean: string) => string;\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({\n currentPickGroupId: 0,\n onLastPick: () => undefined,\n instance: axios.create(),\n pickItem: defaultPickGroupItem,\n savePickGroupData: () => undefined,\n startPicking: () => new Promise(() => undefined),\n switchPickItem: () => new Promise(() => undefined),\n handleCleanEan: () => '',\n});\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, handleCleanEan} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n handleCleanEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n handleCleanEan,\n instance,\n onLastPick,\n pickItem,\n savePickGroupData,\n scanImplementation,\n startPicking,\n switchPickItem,\n ],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","START_PICKING_URL","GathererContext","GathererContextProvider","props","scanImplementation","instance","onLastPick","language","parseEan","config","pickItem","setPickItem","currentPickGroupId","registerEventListener","savePickGroupData","data","startPicking","pickGroupId","Promise","resolve","reject","post","pick_group_id","then","response","current","catch","switchPickItem","dir","url","prevState","previous","next","pick_item_id","id","changeLanguage","context","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport type {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n parseEan?: (ean: string) => {barcode: string; batchCode: string};\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({} as IGathererContext<any>);\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n parseEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"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"}
@@ -8,7 +8,7 @@ export const useScanner = onScan => {
8
8
  } = useContext(ScanContext);
9
9
  const callbackRef = useRef(onScan);
10
10
  const {
11
- handleCleanEan
11
+ parseEan
12
12
  } = useGatherer();
13
13
  useEffect(() => {
14
14
  callbackRef.current = onScan;
@@ -16,14 +16,10 @@ export const useScanner = onScan => {
16
16
  const startScanner = useCallback(() => {
17
17
  registerListener(event => {
18
18
  const trimmedScan = event.data.trim();
19
- const scan = handleCleanEan === null || handleCleanEan === void 0 ? void 0 : handleCleanEan(trimmedScan);
20
- if (!scan) {
21
- callbackRef.current(trimmedScan);
22
- return;
23
- }
24
- callbackRef.current(scan);
19
+ const cleanEan = parseEan === null || parseEan === void 0 ? void 0 : parseEan(trimmedScan).barcode;
20
+ callbackRef.current(cleanEan ?? trimmedScan);
25
21
  });
26
- }, [handleCleanEan, registerListener]);
22
+ }, [parseEan, registerListener]);
27
23
  const stopScanner = useCallback(() => {
28
24
  clearEventListeners();
29
25
  }, [clearEventListeners]);
@@ -1 +1 @@
1
- {"version":3,"names":["useCallback","useContext","useEffect","useRef","useGatherer","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","handleCleanEan","current","startScanner","event","trimmedScan","data","trim","scan","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {useGatherer} from '../hooks/use-gatherer';\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 const {handleCleanEan} = useGatherer();\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n const scan = handleCleanEan?.(trimmedScan);\n\n if (!scan) {\n callbackRef.current(trimmedScan);\n return;\n }\n\n callbackRef.current(scan);\n });\n }, [handleCleanEan, 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,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAGR,UAAU,CAAeI,WAAW,CAAC;EACrF,MAAMK,WAAW,GAAGP,MAAM,CAAeI,MAAM,CAAC;EAChD,MAAM;IAACI;EAAc,CAAC,GAAGP,WAAW,EAAE;EAEtCF,SAAS,CAAC,MAAM;IACZQ,WAAW,CAACE,OAAO,GAAGL,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMM,YAAY,GAAGb,WAAW,CAAC,MAAY;IACzCQ,gBAAgB,CAACM,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MACrC,MAAMC,IAAI,GAAGP,cAAc,aAAdA,cAAc,uBAAdA,cAAc,CAAGI,WAAW,CAAC;MAE1C,IAAI,CAACG,IAAI,EAAE;QACPR,WAAW,CAACE,OAAO,CAACG,WAAW,CAAC;QAChC;MACJ;MAEAL,WAAW,CAACE,OAAO,CAACM,IAAI,CAAC;IAC7B,CAAC,CAAC;EACN,CAAC,EAAE,CAACP,cAAc,EAAEH,gBAAgB,CAAC,CAAC;EAEtC,MAAMW,WAAW,GAAGnB,WAAW,CAAC,MAAY;IACxCS,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHI,YAAY;IACZM;EACJ,CAAC;AACL,CAAC"}
1
+ {"version":3,"names":["useCallback","useContext","useEffect","useRef","useGatherer","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","parseEan","current","startScanner","event","trimmedScan","data","trim","cleanEan","barcode","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {useGatherer} from '../hooks/use-gatherer';\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 const {parseEan} = useGatherer();\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n const cleanEan = parseEan?.(trimmedScan).barcode;\n\n callbackRef.current(cleanEan ?? trimmedScan);\n });\n }, [parseEan, 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,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAGR,UAAU,CAAeI,WAAW,CAAC;EACrF,MAAMK,WAAW,GAAGP,MAAM,CAAeI,MAAM,CAAC;EAChD,MAAM;IAACI;EAAQ,CAAC,GAAGP,WAAW,EAAE;EAEhCF,SAAS,CAAC,MAAM;IACZQ,WAAW,CAACE,OAAO,GAAGL,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMM,YAAY,GAAGb,WAAW,CAAC,MAAY;IACzCQ,gBAAgB,CAACM,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MACrC,MAAMC,QAAQ,GAAGP,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAGI,WAAW,CAAC,CAACI,OAAO;MAEhDT,WAAW,CAACE,OAAO,CAACM,QAAQ,IAAIH,WAAW,CAAC;IAChD,CAAC,CAAC;EACN,CAAC,EAAE,CAACJ,QAAQ,EAAEH,gBAAgB,CAAC,CAAC;EAEhC,MAAMY,WAAW,GAAGpB,WAAW,CAAC,MAAY;IACxCS,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHI,YAAY;IACZO;EACJ,CAAC;AACL,CAAC"}
@@ -1,4 +1,4 @@
1
- import React, { useCallback, useEffect, useState } from 'react';
1
+ import React, { useCallback, useEffect, useRef, 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';
@@ -15,18 +15,20 @@ const {
15
15
  } = styles;
16
16
  const Picker = props => {
17
17
  const {
18
- pickItem
18
+ pickItem,
19
+ parseEan
19
20
  } = useGatherer();
20
21
  const [pickModalVisible, setPickModalVisible] = useState(false);
21
22
  const {
22
23
  nextPickItem
23
24
  } = usePickItemSwitch();
25
+ const metaData = useRef();
24
26
  const closeModal = () => {
25
27
  startScanner();
26
28
  setPickModalVisible(false);
27
29
  };
28
30
  const handleMultiQuantityPick = quantityPicked => {
29
- nextPickItem(false, quantityPicked);
31
+ nextPickItem(false, quantityPicked, metaData.current);
30
32
  closeModal();
31
33
  };
32
34
  const pickModal = props.pickModal ?? /*#__PURE__*/React.createElement(PickModal, {
@@ -35,9 +37,21 @@ const Picker = props => {
35
37
  closeModal: closeModal
36
38
  });
37
39
  const handleScan = useCallback(scan => {
38
- if (scan !== '' && scan === pickItem.barcode) {
40
+ const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
41
+ const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
42
+ const scannedBatchCode = eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.batchCode;
43
+ metaData.current = scannedBatchCode ? {
44
+ barcodes: [scannedBatchCode]
45
+ } : undefined;
46
+ if (scan !== '' && scannedBarcode === pickItem.barcode) {
47
+ console.log({
48
+ eanCodes,
49
+ scannedBarcode,
50
+ scannedBatchCode,
51
+ metaData: metaData.current
52
+ });
39
53
  if (pickItem.quantity === 1) {
40
- nextPickItem(false, 1);
54
+ nextPickItem(false, 1, metaData.current);
41
55
  } else {
42
56
  if (props.pickModal) {
43
57
  var _props$onMultiQuantit;
@@ -47,7 +61,7 @@ const Picker = props => {
47
61
  setPickModalVisible(true);
48
62
  }
49
63
  }
50
- }, [pickItem.barcode, pickItem.quantity, nextPickItem, props]);
64
+ }, [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props]);
51
65
  const {
52
66
  startScanner,
53
67
  stopScanner
@@ -1 +1 @@
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","handleMultiQuantityPick","quantityPicked","pickModal","handleScan","scan","barcode","quantity","onMultiQuantityPick","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 onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\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 handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\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 if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [pickItem.barcode, pickItem.quantity, nextPickItem, props],\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;AAUjE,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,uBAAuB,GAAIC,cAAsB,IAAW;IAC9DJ,YAAY,CAAC,KAAK,EAAEI,cAAc,CAAC;IACnCH,UAAU,EAAE;EAChB,CAAC;EAED,MAAMI,SAAS,GAAGT,KAAK,CAACS,SAAS,iBAC7B,oBAAC,SAAS;IAAC,WAAW,EAAEF,uBAAwB;IAAC,OAAO,EAAEL,gBAAiB;IAAC,UAAU,EAAEG;EAAW,EACtG;EAED,MAAMK,UAAU,GAAG5B,WAAW,CACzB6B,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKV,QAAQ,CAACW,OAAO,EAAE;MAC1C,IAAIX,QAAQ,CAACY,QAAQ,KAAK,CAAC,EAAE;QACzBT,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACH,IAAIJ,KAAK,CAACS,SAAS,EAAE;UAAA;UACjB,yBAAAT,KAAK,CAACc,mBAAmB,0DAAzB,2BAAAd,KAAK,CAAwB;UAC7B;QACJ;QAEAG,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC,EACD,CAACF,QAAQ,CAACW,OAAO,EAAEX,QAAQ,CAACY,QAAQ,EAAET,YAAY,EAAEJ,KAAK,CAAC,CAC7D;EAED,MAAM;IAACM,YAAY;IAAES;EAAW,CAAC,GAAG5B,UAAU,CAACuB,UAAU,CAAC;EAE1D3B,SAAS,CAAC,MAAM;IACZuB,YAAY,EAAE;IAEd,OAAO,MAAMS,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACT,YAAY,EAAES,WAAW,CAAC,CAAC;EAE/B,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAE,CAACjB,SAAS,EAAEE,KAAK,CAACgB,KAAK;EAAE,GACjCP,SAAS,EACTT,KAAK,CAACiB,QAAQ,CACZ;AAEf,CAAC;AAEDlB,MAAM,CAACL,GAAG,GAAGA,GAAG;AAChBK,MAAM,CAACF,MAAM,GAAGA,MAAM;AACtBE,MAAM,CAACmB,QAAQ,GAAG3B,WAAW;AAC7BQ,MAAM,CAACX,UAAU,GAAGA,UAAU;AAC9BW,MAAM,CAACT,WAAW,GAAGA,WAAW;AAEhC,SAAQS,MAAM"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useRef","useState","View","styles","useScanner","PickAmount","useGatherer","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","pickItem","parseEan","pickModalVisible","setPickModalVisible","nextPickItem","metaData","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","current","pickModal","handleScan","scan","eanCodes","scannedBarcode","barcode","scannedBatchCode","batchCode","barcodes","undefined","console","log","quantity","onMultiQuantityPick","stopScanner","style","children","Progress"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useRef, 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 onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem, parseEan} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n const metaData = useRef<{barcodes: string[]}>();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked, metaData.current);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n const eanCodes = parseEan?.(scan);\n const scannedBarcode = eanCodes?.barcode ?? scan;\n const scannedBatchCode = eanCodes?.batchCode;\n metaData.current = scannedBatchCode ? {barcodes: [scannedBatchCode]} : undefined;\n\n if (scan !== '' && scannedBarcode === pickItem.barcode) {\n console.log({\n eanCodes,\n scannedBarcode,\n scannedBatchCode,\n metaData: metaData.current,\n });\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1, metaData.current);\n } else {\n if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props],\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":"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"}
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n handleCleanEan?: (scan: string) => string;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\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: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n parseEan?: (ean: string) => {barcode: string; batchCode: string};\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
@@ -1,5 +1,5 @@
1
1
  import React, { ReactNode } from 'react';
2
- import { AxiosInstance } from 'axios';
2
+ import type { AxiosInstance } from 'axios';
3
3
  export interface IGathererContext<T extends DefaultPickItem> {
4
4
  pickItem: PickItem<T>;
5
5
  currentPickGroupId: number;
@@ -8,7 +8,10 @@ export interface IGathererContext<T extends DefaultPickItem> {
8
8
  savePickGroupData: (data: PickItem<T>) => void;
9
9
  startPicking: (pickGroupId: number) => Promise<PickItem<T>>;
10
10
  switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;
11
- handleCleanEan?: (ean: string) => string;
11
+ parseEan?: (ean: string) => {
12
+ barcode: string;
13
+ batchCode: string;
14
+ };
12
15
  }
13
16
  interface props {
14
17
  children: ReactNode;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "1.2.0",
3
+ "version": "1.3.0-beta.0",
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, {AxiosInstance} from 'axios';
3
+ import type {AxiosInstance} from 'axios';
4
4
 
5
5
  import i18n from '../lang/i18n';
6
6
  import {ScanContextProvider} from './scan-context';
@@ -15,7 +15,7 @@ export interface IGathererContext<T extends DefaultPickItem> {
15
15
  savePickGroupData: (data: PickItem<T>) => void;
16
16
  startPicking: (pickGroupId: number) => Promise<PickItem<T>>;
17
17
  switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;
18
- handleCleanEan?: (ean: string) => string;
18
+ parseEan?: (ean: string) => {barcode: string; batchCode: string};
19
19
  }
20
20
 
21
21
  interface props {
@@ -23,19 +23,10 @@ interface props {
23
23
  config: GathererConfig;
24
24
  }
25
25
 
26
- export const GathererContext = createContext<IGathererContext<any>>({
27
- currentPickGroupId: 0,
28
- onLastPick: () => undefined,
29
- instance: axios.create(),
30
- pickItem: defaultPickGroupItem,
31
- savePickGroupData: () => undefined,
32
- startPicking: () => new Promise(() => undefined),
33
- switchPickItem: () => new Promise(() => undefined),
34
- handleCleanEan: () => '',
35
- });
26
+ export const GathererContext = createContext<IGathererContext<any>>({} as IGathererContext<any>);
36
27
 
37
28
  export const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {
38
- const {scanImplementation, instance, onLastPick, language, handleCleanEan} = props.config;
29
+ const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;
39
30
  const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);
40
31
  const currentPickGroupId = useRef<number>(0);
41
32
 
@@ -108,21 +99,12 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
108
99
  onLastPick,
109
100
  startPicking,
110
101
  switchPickItem,
111
- handleCleanEan,
102
+ parseEan,
112
103
  savePickGroupData,
113
104
  scanImplementation,
114
105
  currentPickGroupId: currentPickGroupId.current,
115
106
  }),
116
- [
117
- handleCleanEan,
118
- instance,
119
- onLastPick,
120
- pickItem,
121
- savePickGroupData,
122
- scanImplementation,
123
- startPicking,
124
- switchPickItem,
125
- ],
107
+ [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem],
126
108
  );
127
109
 
128
110
  return (
@@ -8,7 +8,7 @@ type ScanCallback = (scan: string) => void;
8
8
  export const useScanner = (onScan: ScanCallback): Scanner => {
9
9
  const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);
10
10
  const callbackRef = useRef<ScanCallback>(onScan);
11
- const {handleCleanEan} = useGatherer();
11
+ const {parseEan} = useGatherer();
12
12
 
13
13
  useEffect(() => {
14
14
  callbackRef.current = onScan;
@@ -17,16 +17,11 @@ export const useScanner = (onScan: ScanCallback): Scanner => {
17
17
  const startScanner = useCallback((): void => {
18
18
  registerListener(event => {
19
19
  const trimmedScan = event.data.trim();
20
- const scan = handleCleanEan?.(trimmedScan);
20
+ const cleanEan = parseEan?.(trimmedScan).barcode;
21
21
 
22
- if (!scan) {
23
- callbackRef.current(trimmedScan);
24
- return;
25
- }
26
-
27
- callbackRef.current(scan);
22
+ callbackRef.current(cleanEan ?? trimmedScan);
28
23
  });
29
- }, [handleCleanEan, registerListener]);
24
+ }, [parseEan, registerListener]);
30
25
 
31
26
  const stopScanner = useCallback((): void => {
32
27
  clearEventListeners();
@@ -1,4 +1,4 @@
1
- import React, {ReactNode, useCallback, useEffect, useState} from 'react';
1
+ import React, {ReactNode, useCallback, useEffect, useRef, useState} from 'react';
2
2
  import {View, ViewStyle} from 'react-native';
3
3
 
4
4
  import {styles} from './styles/picker-styles';
@@ -23,9 +23,10 @@ interface props {
23
23
  const {container} = styles;
24
24
 
25
25
  const Picker = (props: props): JSX.Element => {
26
- const {pickItem} = useGatherer();
26
+ const {pickItem, parseEan} = useGatherer();
27
27
  const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);
28
28
  const {nextPickItem} = usePickItemSwitch();
29
+ const metaData = useRef<{barcodes: string[]}>();
29
30
 
30
31
  const closeModal = (): void => {
31
32
  startScanner();
@@ -33,7 +34,7 @@ const Picker = (props: props): JSX.Element => {
33
34
  };
34
35
 
35
36
  const handleMultiQuantityPick = (quantityPicked: number): void => {
36
- nextPickItem(false, quantityPicked);
37
+ nextPickItem(false, quantityPicked, metaData.current);
37
38
  closeModal();
38
39
  };
39
40
 
@@ -43,9 +44,20 @@ const Picker = (props: props): JSX.Element => {
43
44
 
44
45
  const handleScan = useCallback(
45
46
  (scan: string): void => {
46
- if (scan !== '' && scan === pickItem.barcode) {
47
+ const eanCodes = parseEan?.(scan);
48
+ const scannedBarcode = eanCodes?.barcode ?? scan;
49
+ const scannedBatchCode = eanCodes?.batchCode;
50
+ metaData.current = scannedBatchCode ? {barcodes: [scannedBatchCode]} : undefined;
51
+
52
+ if (scan !== '' && scannedBarcode === pickItem.barcode) {
53
+ console.log({
54
+ eanCodes,
55
+ scannedBarcode,
56
+ scannedBatchCode,
57
+ metaData: metaData.current,
58
+ });
47
59
  if (pickItem.quantity === 1) {
48
- nextPickItem(false, 1);
60
+ nextPickItem(false, 1, metaData.current);
49
61
  } else {
50
62
  if (props.pickModal) {
51
63
  props.onMultiQuantityPick?.();
@@ -56,7 +68,7 @@ const Picker = (props: props): JSX.Element => {
56
68
  }
57
69
  }
58
70
  },
59
- [pickItem.barcode, pickItem.quantity, nextPickItem, props],
71
+ [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props],
60
72
  );
61
73
 
62
74
  const {startScanner, stopScanner} = useScanner(handleScan);
@@ -8,7 +8,7 @@ type GathererConfig = {
8
8
  };
9
9
  onLastPick: () => void;
10
10
  language?: LanguageConfig;
11
- handleCleanEan?: (scan: string) => string;
11
+ parseEan?: (ean: string) => {barcode: string; batchCode: string};
12
12
  };
13
13
 
14
14
  type LanguageConfig = 'nl' | 'en';