@sapui5/sap.ndc 1.100.0 → 1.102.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ndc",
-  "version": "1.100.0",
+  "version": "1.102.1",
   "description": "SAPUI5 Library sap.ndc",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ndc/.library

@@ -5,7 +5,7 @@
     <vendor>SAP SE</vendor>
     <copyright>SAPUI5
  * (c) Copyright 2009-2022 SAP SE. All rights reserved.</copyright>
-    <version>1.100.0</version>
+    <version>1.102.1</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 
@@ -30,9 +30,21 @@
             <exclude name="sap.ndc.thirdparty."/>
         </jscoverage>
 
+        <!-- excludes for the default preload files -->
+        <packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0" >
+            <all-in-one>
+                <!-- ===========================================================================
+                     !! ATTENTION !!
+                     The following excludes must be kept in sync with those configured for the
+                     'preload-and-merge' plugin execution in the pom.xml.
+                     =========================================================================== -->
+                <exclude name="sap/ndc/thirdparty/" />
+            </all-in-one>
+        </packaging>
+
         <!-- Thirdparty references -->
         <thirdparty xmlns="http://www.sap.com/ui5/buildext/thirdparty" >
-            <lib name="@zxing/library" displayName="ZXing" version="0.18.3" homepage="https://zxing-js.github.io/library/">
+            <lib name="@zxing/library" displayName="ZXing" version="0.19.1" homepage="https://zxing-js.github.io/library/">
                <license url="https://github.com/zxing-js/library/blob/master/LICENSE" type="MIT" />
                <copyright>2018 ZXing for JS</copyright>
                <pattern>sap/ndc/thirdparty/ZXing.js</pattern>

package/src/sap/ndc/library.js

@@ -15,14 +15,10 @@ sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
 	 * SAPUI5 library with controls with native device capabilities.
 	 *
 	 * @namespace
-	 * @name sap.ndc
+	 * @alias sap.ndc
 	 * @public
 	 */
-
-	// library dependencies
-
-	// delegate further initialization of this library to the Core
-	sap.ui.getCore().initLibrary({
+	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ndc",
 		dependencies : ["sap.ui.core","sap.m"],
 		types: [],
@@ -32,9 +28,9 @@ sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
 		],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.100.0"
+		version: "1.102.1"
 	});
 
-	return sap.ndc;
+	return thisLib;
 
 });

package/src/sap/ndc/thirdparty/ZXing-dbg.js

@@ -3484,6 +3484,10 @@
             const binaryBitmap = this.createBinaryBitmap(element);
             return this.decodeBitmap(binaryBitmap);
         }
+        _isHTMLVideoElement(mediaElement) {
+            const potentialVideo = mediaElement;
+            return potentialVideo.videoWidth !== 0;
+        }
         /**
          * Creates a binaryBitmap based in some image source.
          *
@@ -3491,7 +3495,12 @@
          */
         createBinaryBitmap(mediaElement) {
             const ctx = this.getCaptureCanvasContext(mediaElement);
-            this.drawImageOnCanvas(ctx, mediaElement);
+            if (this._isHTMLVideoElement(mediaElement)) {
+                this.drawFrameOnCanvas(mediaElement);
+            }
+            else {
+                this.drawImageOnCanvas(mediaElement);
+            }
             const canvas = this.getCaptureCanvas(mediaElement);
             const luminanceSource = new HTMLCanvasElementLuminanceSource(canvas);
             const hybridBinarizer = new HybridBinarizer(luminanceSource);
@@ -3518,11 +3527,17 @@
             }
             return this.captureCanvas;
         }
+        /**
+          * Overwriting this allows you to manipulate the next frame in anyway you want before decode.
+          */
+        drawFrameOnCanvas(srcElement, dimensions = { sx: 0, sy: 0, sWidth: srcElement.videoWidth, sHeight: srcElement.videoHeight, dx: 0, dy: 0, dWidth: srcElement.videoWidth, dHeight: srcElement.videoHeight }, canvasElementContext = this.captureCanvasContext) {
+            canvasElementContext.drawImage(srcElement, dimensions.sx, dimensions.sy, dimensions.sWidth, dimensions.sHeight, dimensions.dx, dimensions.dy, dimensions.dWidth, dimensions.dHeight);
+        }
         /**
          * Ovewriting this allows you to manipulate the snapshot image in anyway you want before decode.
          */
-        drawImageOnCanvas(canvasElementContext, srcElement) {
-            canvasElementContext.drawImage(srcElement, 0, 0);
+        drawImageOnCanvas(srcElement, dimensions = { sx: 0, sy: 0, sWidth: srcElement.naturalWidth, sHeight: srcElement.naturalHeight, dx: 0, dy: 0, dWidth: srcElement.naturalWidth, dHeight: srcElement.naturalHeight }, canvasElementContext = this.captureCanvasContext) {
+            canvasElementContext.drawImage(srcElement, dimensions.sx, dimensions.sy, dimensions.sWidth, dimensions.sHeight, dimensions.dx, dimensions.dy, dimensions.dWidth, dimensions.dHeight);
         }
         /**
          * Call the encapsulated readers decode
@@ -8826,7 +8841,7 @@
                 if (possibleFormats.indexOf(BarcodeFormat$1.EAN_13) > -1) {
                     readers.push(new EAN13Reader());
                 }
-                else if (possibleFormats.indexOf(BarcodeFormat$1.UPC_A) > -1) {
+                if (possibleFormats.indexOf(BarcodeFormat$1.UPC_A) > -1) {
                     readers.push(new UPCAReader());
                 }
                 if (possibleFormats.indexOf(BarcodeFormat$1.EAN_8) > -1) {
@@ -8838,12 +8853,7 @@
             }
             if (readers.length === 0) {
                 readers.push(new EAN13Reader());
-                // UPC-A is covered by EAN-13
-                // ##### BEGIN: MODIFIED BY SAP
-                // Add UPCAReader() into readers array
-                // see https://github.com/zxing-js/library/pull/304
                 readers.push(new UPCAReader());
-                // ##### END: MODIFIED BY SAP
                 readers.push(new EAN8Reader());
                 readers.push(new UPCEReader());
             }
@@ -8874,7 +8884,7 @@
                     if (ean13MayBeUPCA && canReturnUPCA) {
                         const rawBytes = result.getRawBytes();
                         // Transfer the metadata across
-                        const resultUPCA = new Result(result.getText().substring(1), rawBytes, rawBytes.length, result.getResultPoints(), BarcodeFormat$1.UPC_A);
+                        const resultUPCA = new Result(result.getText().substring(1), rawBytes, (rawBytes ? rawBytes.length : null), result.getResultPoints(), BarcodeFormat$1.UPC_A);
                         resultUPCA.putAllMetadata(result.getResultMetadata());
                         return resultUPCA;
                     }
@@ -10232,6 +10242,7 @@
     // import java.util.List;
     // import java.util.Map;
     // import java.util.Collections;
+    /** @experimental */
     class RSSExpandedReader extends AbstractRSSReader {
         constructor() {
             super(...arguments);
@@ -10250,7 +10261,7 @@
             }
             catch (e) {
                 // OK
-                console.log(e);
+                // console.log(e);
             }
             this.pairs.length = 0;
             this.startFromEven = true;
@@ -11362,6 +11373,7 @@
                     this.readers.push(new RSS14Reader());
                 }
                 if (possibleFormats.includes(BarcodeFormat$1.RSS_EXPANDED)) {
+                    console.warn('RSS Expanded reader IS NOT ready for production yet! use at your own risk.');
                     this.readers.push(new RSSExpandedReader());
                 }
             }
@@ -11374,7 +11386,7 @@
                 this.readers.push(new Code128Reader());
                 this.readers.push(new ITFReader());
                 this.readers.push(new RSS14Reader());
-                this.readers.push(new RSSExpandedReader());
+                // this.readers.push(new RSSExpandedReader());
             }
         }
         // @Override
@@ -18346,6 +18358,9 @@
             return invalidRowCounts;
         }
         adjustRowNumbers(barcodeColumn, codewordsRow, codewords) {
+            if (this.detectionResultColumns[barcodeColumn - 1] == null) {
+                return;
+            }
             let codeword = codewords[codewordsRow];
             let previousColumnCodewords = this.detectionResultColumns[barcodeColumn - 1].getCodewords();
             let nextColumnCodewords = previousColumnCodewords;
@@ -24125,6 +24140,7 @@
         }
     }
 
+    exports.AbstractExpandedDecoder = AbstractExpandedDecoder;
     exports.ArgumentException = ArgumentException;
     exports.ArithmeticException = ArithmeticException;
     exports.AztecCode = AztecCode;
@@ -24223,6 +24239,7 @@
     exports.ZXingStringBuilder = StringBuilder;
     exports.ZXingStringEncoding = StringEncoding;
     exports.ZXingSystem = System;
+    exports.createAbstractExpandedDecoder = createDecoder;
 
     Object.defineProperty(exports, '__esModule', { value: true });