@crystaldesign/diva-navigator 26.5.0-beta.8 → 26.5.0-beta.9
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/build/esm/index.js
CHANGED
|
@@ -2447,6 +2447,7 @@ function Scanner(_ref) {
|
|
|
2447
2447
|
var _organization$type, _organization$type$to;
|
|
2448
2448
|
var onResult = _ref.onResult;
|
|
2449
2449
|
var qrCodeReader = useRef();
|
|
2450
|
+
var isScanningRef = useRef(false);
|
|
2450
2451
|
var _useDivaCore = useDivaCore(),
|
|
2451
2452
|
_useDivaCore$actions = _useDivaCore.actions,
|
|
2452
2453
|
closeModal = _useDivaCore$actions.closeModal,
|
|
@@ -2472,10 +2473,8 @@ function Scanner(_ref) {
|
|
|
2472
2473
|
var isWrapperOrg = !(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType) || organizationType === 'SUPPLIER' || organizationType === 'SUPLIER';
|
|
2473
2474
|
var handleResult = function handleResult(result) {
|
|
2474
2475
|
var isSameOrg = !result.organizationId || result.organizationId === organization._id;
|
|
2475
|
-
if (isSameOrg) {
|
|
2476
|
+
if (isSameOrg || !isWrapperOrg) {
|
|
2476
2477
|
openResultInCurrentOrg(result, openComponent, closeModal);
|
|
2477
|
-
} else if (isWrapperOrg) {
|
|
2478
|
-
openResultInTargetOrg(result, openComponent, closeModal);
|
|
2479
2478
|
} else {
|
|
2480
2479
|
onResult(result);
|
|
2481
2480
|
}
|
|
@@ -2572,17 +2571,28 @@ function Scanner(_ref) {
|
|
|
2572
2571
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
2573
2572
|
while (1) switch (_context2.prev = _context2.next) {
|
|
2574
2573
|
case 0:
|
|
2574
|
+
if (!isScanningRef.current) {
|
|
2575
|
+
_context2.next = 2;
|
|
2576
|
+
break;
|
|
2577
|
+
}
|
|
2578
|
+
return _context2.abrupt("return");
|
|
2579
|
+
case 2:
|
|
2580
|
+
isScanningRef.current = true;
|
|
2575
2581
|
LOG.debug("Code matched: ".concat(decodedText), decodedResult);
|
|
2576
2582
|
toggleLoading('scanning-qr-code');
|
|
2577
|
-
_context2.
|
|
2583
|
+
_context2.prev = 5;
|
|
2584
|
+
_context2.next = 8;
|
|
2578
2585
|
return onScanned(decodedText);
|
|
2579
|
-
case
|
|
2586
|
+
case 8:
|
|
2587
|
+
_context2.prev = 8;
|
|
2580
2588
|
toggleLoading('scanning-qr-code');
|
|
2581
|
-
|
|
2589
|
+
isScanningRef.current = false;
|
|
2590
|
+
return _context2.finish(8);
|
|
2591
|
+
case 12:
|
|
2582
2592
|
case "end":
|
|
2583
2593
|
return _context2.stop();
|
|
2584
2594
|
}
|
|
2585
|
-
}, _callee2);
|
|
2595
|
+
}, _callee2, null, [[5,, 8, 12]]);
|
|
2586
2596
|
}));
|
|
2587
2597
|
return function (_x3, _x4) {
|
|
2588
2598
|
return _ref4.apply(this, arguments);
|
|
@@ -2689,7 +2699,6 @@ function ScannerModalContent() {
|
|
|
2689
2699
|
jwt = _useDivaCore$state.jwt,
|
|
2690
2700
|
apiConfig = _useDivaCore$state.apiConfig,
|
|
2691
2701
|
organization = _useDivaCore$state.organization;
|
|
2692
|
-
_useDivaCore.handler.productHandler;
|
|
2693
2702
|
var _React$useState = React.useState(false),
|
|
2694
2703
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
|
2695
2704
|
showScanner = _React$useState2[0],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scanner.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/Scanner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAM7D,OAAO,
|
|
1
|
+
{"version":3,"file":"Scanner.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/Scanner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAM7D,OAAO,EAAE,aAAa,EAA0F,MAAM,SAAS,CAAC;AAIhI,UAAU,YAAY;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,YAAY,qBAqHjD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AA8K1B,MAAM,CAAC,OAAO,gCAyBb"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crystaldesign/diva-navigator",
|
|
3
|
-
"version": "26.5.0-beta.
|
|
3
|
+
"version": "26.5.0-beta.9",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"devDependencies": {
|
|
6
6
|
"@testing-library/jest-dom": "^6.5.0",
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
},
|
|
26
26
|
"module": "build/esm/index.js",
|
|
27
27
|
"types": "./build/types/navigator/src/index.d.ts",
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "12e6c8aec80f048e3ff6cd3c4eada8e5e09864a0"
|
|
29
29
|
}
|