@scrumble-nl/gatherer-frontend 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,7 +21,7 @@ const GathererContext = /*#__PURE__*/(0, _react.createContext)({
21
21
  savePickGroupData: () => undefined,
22
22
  startPicking: () => new Promise(() => undefined),
23
23
  switchPickItem: () => new Promise(() => undefined),
24
- handleCleanEan: () => ''
24
+ parseEan: () => ''
25
25
  });
26
26
  exports.GathererContext = GathererContext;
27
27
  const GathererContextProvider = props => {
@@ -30,7 +30,7 @@ const GathererContextProvider = props => {
30
30
  instance,
31
31
  onLastPick,
32
32
  language,
33
- handleCleanEan
33
+ parseEan
34
34
  } = props.config;
35
35
  const [pickItem, setPickItem] = (0, _react.useState)(_defaultPickGroupItem.defaultPickGroupItem);
36
36
  const currentPickGroupId = (0, _react.useRef)(0);
@@ -84,11 +84,11 @@ const GathererContextProvider = props => {
84
84
  onLastPick,
85
85
  startPicking,
86
86
  switchPickItem,
87
- handleCleanEan,
87
+ parseEan,
88
88
  savePickGroupData,
89
89
  scanImplementation,
90
90
  currentPickGroupId: currentPickGroupId.current
91
- }), [handleCleanEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
91
+ }), [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
92
92
  return /*#__PURE__*/_react.default.createElement(GathererContext.Provider, {
93
93
  value: context
94
94
  }, /*#__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":"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"}
1
+ {"version":3,"names":["GathererContext","createContext","currentPickGroupId","onLastPick","undefined","instance","axios","create","pickItem","defaultPickGroupItem","savePickGroupData","startPicking","Promise","switchPickItem","parseEan","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 parseEan?: (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 parseEan: () => '',\n});\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);
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","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;MAExCT,WAAW,CAACK,OAAO,CAACO,QAAQ,IAAIH,WAAW,CAAC;IAChD,CAAC,CAAC;EACN,CAAC,EAAE,CAACP,QAAQ,EAAEN,gBAAgB,CAAC,CAAC;EAEhC,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 +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) => string;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
@@ -12,7 +12,7 @@ export const GathererContext = /*#__PURE__*/createContext({
12
12
  savePickGroupData: () => undefined,
13
13
  startPicking: () => new Promise(() => undefined),
14
14
  switchPickItem: () => new Promise(() => undefined),
15
- handleCleanEan: () => ''
15
+ parseEan: () => ''
16
16
  });
17
17
  export const GathererContextProvider = props => {
18
18
  const {
@@ -20,7 +20,7 @@ export const GathererContextProvider = props => {
20
20
  instance,
21
21
  onLastPick,
22
22
  language,
23
- handleCleanEan
23
+ parseEan
24
24
  } = props.config;
25
25
  const [pickItem, setPickItem] = useState(defaultPickGroupItem);
26
26
  const currentPickGroupId = useRef(0);
@@ -74,11 +74,11 @@ export const GathererContextProvider = props => {
74
74
  onLastPick,
75
75
  startPicking,
76
76
  switchPickItem,
77
- handleCleanEan,
77
+ parseEan,
78
78
  savePickGroupData,
79
79
  scanImplementation,
80
80
  currentPickGroupId: currentPickGroupId.current
81
- }), [handleCleanEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
81
+ }), [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
82
82
  return /*#__PURE__*/React.createElement(GathererContext.Provider, {
83
83
  value: context
84
84
  }, /*#__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","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","parseEan","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 parseEan?: (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 parseEan: () => '',\n});\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);
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","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;MAExCL,WAAW,CAACE,OAAO,CAACM,QAAQ,IAAIH,WAAW,CAAC;IAChD,CAAC,CAAC;EACN,CAAC,EAAE,CAACJ,QAAQ,EAAEH,gBAAgB,CAAC,CAAC;EAEhC,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 +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) => string;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
@@ -8,7 +8,7 @@ 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) => string;
12
12
  }
13
13
  interface props {
14
14
  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.2.1",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -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) => string;
19
19
  }
20
20
 
21
21
  interface props {
@@ -31,11 +31,11 @@ export const GathererContext = createContext<IGathererContext<any>>({
31
31
  savePickGroupData: () => undefined,
32
32
  startPicking: () => new Promise(() => undefined),
33
33
  switchPickItem: () => new Promise(() => undefined),
34
- handleCleanEan: () => '',
34
+ parseEan: () => '',
35
35
  });
36
36
 
37
37
  export const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {
38
- const {scanImplementation, instance, onLastPick, language, handleCleanEan} = props.config;
38
+ const {scanImplementation, instance, onLastPick, language, parseEan} = props.config;
39
39
  const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);
40
40
  const currentPickGroupId = useRef<number>(0);
41
41
 
@@ -108,21 +108,12 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
108
108
  onLastPick,
109
109
  startPicking,
110
110
  switchPickItem,
111
- handleCleanEan,
111
+ parseEan,
112
112
  savePickGroupData,
113
113
  scanImplementation,
114
114
  currentPickGroupId: currentPickGroupId.current,
115
115
  }),
116
- [
117
- handleCleanEan,
118
- instance,
119
- onLastPick,
120
- pickItem,
121
- savePickGroupData,
122
- scanImplementation,
123
- startPicking,
124
- switchPickItem,
125
- ],
116
+ [parseEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem],
126
117
  );
127
118
 
128
119
  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);
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();
@@ -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) => string;
12
12
  };
13
13
 
14
14
  type LanguageConfig = 'nl' | 'en';