@scrumble-nl/gatherer-frontend 1.2.1 → 1.3.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/context/gatherer-context.js +1 -11
- package/lib/commonjs/context/gatherer-context.js.map +1 -1
- package/lib/commonjs/hooks/use-scanner.js +1 -1
- package/lib/commonjs/hooks/use-scanner.js.map +1 -1
- package/lib/commonjs/picker/picker.js +20 -5
- package/lib/commonjs/picker/picker.js.map +1 -1
- package/lib/commonjs/types/config/config.d.js.map +1 -1
- package/lib/module/context/gatherer-context.js +1 -11
- package/lib/module/context/gatherer-context.js.map +1 -1
- package/lib/module/hooks/use-scanner.js +1 -1
- package/lib/module/hooks/use-scanner.js.map +1 -1
- package/lib/module/picker/picker.js +21 -6
- package/lib/module/picker/picker.js.map +1 -1
- package/lib/module/types/config/config.d.js.map +1 -1
- package/lib/typescript/context/gatherer-context.d.ts +5 -2
- package/package.json +1 -1
- package/src/context/gatherer-context.tsx +3 -12
- package/src/hooks/use-scanner.tsx +1 -1
- package/src/picker/picker.tsx +19 -6
- package/src/types/config/config.d.ts +1 -1
|
@@ -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
|
-
parseEan: () => ''
|
|
25
|
-
});
|
|
15
|
+
const GathererContext = /*#__PURE__*/(0, _react.createContext)({});
|
|
26
16
|
exports.GathererContext = GathererContext;
|
|
27
17
|
const GathererContextProvider = props => {
|
|
28
18
|
const {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["GathererContext","createContext","
|
|
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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"}
|
|
@@ -22,7 +22,7 @@ const useScanner = onScan => {
|
|
|
22
22
|
const startScanner = (0, _react.useCallback)(() => {
|
|
23
23
|
registerListener(event => {
|
|
24
24
|
const trimmedScan = event.data.trim();
|
|
25
|
-
const cleanEan = parseEan === null || parseEan === void 0 ? void 0 : parseEan(trimmedScan);
|
|
25
|
+
const cleanEan = parseEan === null || parseEan === void 0 ? void 0 : parseEan(trimmedScan).barcode;
|
|
26
26
|
callbackRef.current(cleanEan ?? trimmedScan);
|
|
27
27
|
});
|
|
28
28
|
}, [parseEan, registerListener]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","parseEan","useGatherer","useEffect","current","startScanner","useCallback","event","trimmedScan","data","trim","cleanEan","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);\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;
|
|
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,22 @@ const Picker = props => {
|
|
|
43
45
|
closeModal: closeModal
|
|
44
46
|
});
|
|
45
47
|
const handleScan = (0, _react.useCallback)(scan => {
|
|
46
|
-
|
|
48
|
+
console.log('scan: ', scan);
|
|
49
|
+
const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
|
|
50
|
+
const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
|
|
51
|
+
const scannedBatchCode = eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.batchCode;
|
|
52
|
+
metaData.current = scannedBatchCode ? {
|
|
53
|
+
barcodes: [scannedBatchCode]
|
|
54
|
+
} : undefined;
|
|
55
|
+
if (scan !== '' && scannedBarcode === pickItem.barcode) {
|
|
56
|
+
console.log({
|
|
57
|
+
eanCodes,
|
|
58
|
+
scannedBarcode,
|
|
59
|
+
scannedBatchCode,
|
|
60
|
+
metaData: metaData.current
|
|
61
|
+
});
|
|
47
62
|
if (pickItem.quantity === 1) {
|
|
48
|
-
nextPickItem(false, 1);
|
|
63
|
+
nextPickItem(false, 1, metaData.current);
|
|
49
64
|
} else {
|
|
50
65
|
if (props.pickModal) {
|
|
51
66
|
var _props$onMultiQuantit;
|
|
@@ -55,7 +70,7 @@ const Picker = props => {
|
|
|
55
70
|
setPickModalVisible(true);
|
|
56
71
|
}
|
|
57
72
|
}
|
|
58
|
-
}, [pickItem.barcode, pickItem.quantity, nextPickItem, props]);
|
|
73
|
+
}, [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props]);
|
|
59
74
|
const {
|
|
60
75
|
startScanner,
|
|
61
76
|
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 !== '' &&
|
|
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","console","log","eanCodes","scannedBarcode","barcode","scannedBatchCode","batchCode","barcodes","undefined","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 console.log('scan: ', scan);\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 parseEan?: (ean: 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,19 +1,9 @@
|
|
|
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
|
-
parseEan: () => ''
|
|
16
|
-
});
|
|
6
|
+
export const GathererContext = /*#__PURE__*/createContext({});
|
|
17
7
|
export const GathererContextProvider = props => {
|
|
18
8
|
const {
|
|
19
9
|
scanImplementation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","
|
|
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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"}
|
|
@@ -16,7 +16,7 @@ export const useScanner = onScan => {
|
|
|
16
16
|
const startScanner = useCallback(() => {
|
|
17
17
|
registerListener(event => {
|
|
18
18
|
const trimmedScan = event.data.trim();
|
|
19
|
-
const cleanEan = parseEan === null || parseEan === void 0 ? void 0 : parseEan(trimmedScan);
|
|
19
|
+
const cleanEan = parseEan === null || parseEan === void 0 ? void 0 : parseEan(trimmedScan).barcode;
|
|
20
20
|
callbackRef.current(cleanEan ?? trimmedScan);
|
|
21
21
|
});
|
|
22
22
|
}, [parseEan, registerListener]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useContext","useEffect","useRef","useGatherer","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","parseEan","current","startScanner","event","trimmedScan","data","trim","cleanEan","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);\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;
|
|
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,22 @@ const Picker = props => {
|
|
|
35
37
|
closeModal: closeModal
|
|
36
38
|
});
|
|
37
39
|
const handleScan = useCallback(scan => {
|
|
38
|
-
|
|
40
|
+
console.log('scan: ', scan);
|
|
41
|
+
const eanCodes = parseEan === null || parseEan === void 0 ? void 0 : parseEan(scan);
|
|
42
|
+
const scannedBarcode = (eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.barcode) ?? scan;
|
|
43
|
+
const scannedBatchCode = eanCodes === null || eanCodes === void 0 ? void 0 : eanCodes.batchCode;
|
|
44
|
+
metaData.current = scannedBatchCode ? {
|
|
45
|
+
barcodes: [scannedBatchCode]
|
|
46
|
+
} : undefined;
|
|
47
|
+
if (scan !== '' && scannedBarcode === pickItem.barcode) {
|
|
48
|
+
console.log({
|
|
49
|
+
eanCodes,
|
|
50
|
+
scannedBarcode,
|
|
51
|
+
scannedBatchCode,
|
|
52
|
+
metaData: metaData.current
|
|
53
|
+
});
|
|
39
54
|
if (pickItem.quantity === 1) {
|
|
40
|
-
nextPickItem(false, 1);
|
|
55
|
+
nextPickItem(false, 1, metaData.current);
|
|
41
56
|
} else {
|
|
42
57
|
if (props.pickModal) {
|
|
43
58
|
var _props$onMultiQuantit;
|
|
@@ -47,7 +62,7 @@ const Picker = props => {
|
|
|
47
62
|
setPickModalVisible(true);
|
|
48
63
|
}
|
|
49
64
|
}
|
|
50
|
-
}, [pickItem.barcode, pickItem.quantity, nextPickItem, props]);
|
|
65
|
+
}, [parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props]);
|
|
51
66
|
const {
|
|
52
67
|
startScanner,
|
|
53
68
|
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 !== '' &&
|
|
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","console","log","eanCodes","scannedBarcode","barcode","scannedBatchCode","batchCode","barcodes","undefined","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 console.log('scan: ', scan);\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 parseEan?: (ean: 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
|
-
parseEan?: (ean: 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
|
import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';
|
|
2
2
|
|
|
3
|
-
import
|
|
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
|
-
parseEan?: (ean: string) => string;
|
|
18
|
+
parseEan?: (ean: string) => {barcode: string; batchCode: string};
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
interface props {
|
|
@@ -23,16 +23,7 @@ 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
|
-
parseEan: () => '',
|
|
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
29
|
const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;
|
|
@@ -17,7 +17,7 @@ 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 cleanEan = parseEan?.(trimmedScan);
|
|
20
|
+
const cleanEan = parseEan?.(trimmedScan).barcode;
|
|
21
21
|
|
|
22
22
|
callbackRef.current(cleanEan ?? trimmedScan);
|
|
23
23
|
});
|
package/src/picker/picker.tsx
CHANGED
|
@@ -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,21 @@ const Picker = (props: props): JSX.Element => {
|
|
|
43
44
|
|
|
44
45
|
const handleScan = useCallback(
|
|
45
46
|
(scan: string): void => {
|
|
46
|
-
|
|
47
|
+
console.log('scan: ', scan);
|
|
48
|
+
const eanCodes = parseEan?.(scan);
|
|
49
|
+
const scannedBarcode = eanCodes?.barcode ?? scan;
|
|
50
|
+
const scannedBatchCode = eanCodes?.batchCode;
|
|
51
|
+
metaData.current = scannedBatchCode ? {barcodes: [scannedBatchCode]} : undefined;
|
|
52
|
+
|
|
53
|
+
if (scan !== '' && scannedBarcode === pickItem.barcode) {
|
|
54
|
+
console.log({
|
|
55
|
+
eanCodes,
|
|
56
|
+
scannedBarcode,
|
|
57
|
+
scannedBatchCode,
|
|
58
|
+
metaData: metaData.current,
|
|
59
|
+
});
|
|
47
60
|
if (pickItem.quantity === 1) {
|
|
48
|
-
nextPickItem(false, 1);
|
|
61
|
+
nextPickItem(false, 1, metaData.current);
|
|
49
62
|
} else {
|
|
50
63
|
if (props.pickModal) {
|
|
51
64
|
props.onMultiQuantityPick?.();
|
|
@@ -56,7 +69,7 @@ const Picker = (props: props): JSX.Element => {
|
|
|
56
69
|
}
|
|
57
70
|
}
|
|
58
71
|
},
|
|
59
|
-
[pickItem.barcode, pickItem.quantity, nextPickItem, props],
|
|
72
|
+
[parseEan, pickItem.barcode, pickItem.quantity, nextPickItem, props],
|
|
60
73
|
);
|
|
61
74
|
|
|
62
75
|
const {startScanner, stopScanner} = useScanner(handleScan);
|