@sapui5/sap.ndc 1.93.3 → 1.96.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ndc",
-  "version": "1.93.3",
+  "version": "1.96.2",
   "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

@@ -4,9 +4,8 @@
     <name>sap.ndc</name>
     <vendor>SAP SE</vendor>
     <copyright>SAPUI5
-
-(c) Copyright 2009-2021 SAP SE. All rights reserved</copyright>
-    <version>1.93.3</version>
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.</copyright>
+    <version>1.96.2</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 
@@ -30,7 +29,7 @@
         <jscoverage xmlns="http://www.sap.com/ui5/buildext/jscoverage">
             <exclude name="sap.ndc.thirdparty."/>
         </jscoverage>
-        
+
         <!-- 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/">

package/src/sap/ndc/BarcodeScanner.js

@@ -39,13 +39,11 @@ sap.ui.define([
 
 	/**
 	 * @class
-	 * TODO: description
 	 *
-	 * As <code>BarcodeScanner</code> is a static class, a <code>sap.ui.define();</code>
-	 * statement must be explicitly executed before the class can be used. Example:	 *
+	 * Here is an example of how to trigger the scan function of BarcodeScanner:
 	 * <pre>
-	 * sap.ui.define(["sap/ndc/BarcodeScanner"], function(BarcodeScanner) {
-	 * 	sap.ndc.BarcodeScanner.scan(
+	 * sap.ui.require(["sap/ndc/BarcodeScanner"], function(BarcodeScanner) {
+	 * 	BarcodeScanner.scan(
 	 * 		function (oResult) { / * process scan result * / },
 	 * 		function (oError) { / * handle scan error * / },
 	 * 		function (oResult) { / * handle input dialog change * / }
@@ -123,19 +121,26 @@ sap.ui.define([
 	}
 
 	function getZXingAPI() {
-		oZXing = sap.ui.requireSync("sap/ndc/thirdparty/ZXing");
-		if (oZXing) {
-			oZXingScannerAPI = new oZXing.BrowserMultiFormatReader();
-			if (oZXingScannerAPI) {
-				Log.debug("ZXing BrowserMultiFormatReader API is available!");
+		sap.ui.require([
+			"sap/ndc/thirdparty/ZXing"
+		], function (ZXing) {
+			oZXing = ZXing;
+			if (oZXing) {
+				oZXingScannerAPI = new oZXing.BrowserMultiFormatReader();
+				if (oZXingScannerAPI) {
+					Log.debug("ZXing BrowserMultiFormatReader API is available!");
+				} else {
+					oStatusModel.setProperty("/available", false);
+					Log.error("BarcodeScanner: ZXing BrowserMultiFormatReader API is not available");
+				}
 			} else {
 				oStatusModel.setProperty("/available", false);
-				Log.error("BarcodeScanner: ZXing BrowserMultiFormatReader API is not available");
+				Log.error("BarcodeScanner: Scanner API is not available");
 			}
-		} else {
+		}, function (oError) {
 			oStatusModel.setProperty("/available", false);
-			Log.error("BarcodeScanner: Scanner API is not available");
-		}
+			Log.error("BarcodeScanner: ZXing is not available");
+		});
 	}
 
 
@@ -221,16 +226,19 @@ sap.ui.define([
 		oScanDialog.removeStyleClass('sapUiNoContentPadding');
 
 		oScanDialog.setTitle(oDialogTitle);
+
+		var oMSGLabel = new Label(oScanDialog.getId() + '-txt_barcode', {
+			text: "{i18n>BARCODE_DIALOG_MSG}",
+			visible: "{/isNoScanner}"
+		});
 		oScanDialog.addContent(
-			new Label(oScanDialog.getId() + '-txt_barcode', {
-				text: "{i18n>BARCODE_DIALOG_MSG}",
-				visible: "{/isNoScanner}"
-			})
+			oMSGLabel
 		);
 
 		var oFallbackInput = new Input(oScanDialog.getId() + '-inp_barcode', {
 			value: "{/barcode}",
 			valueLiveUpdate: true,
+			ariaLabelledBy: oMSGLabel.getId(),
 			liveChange: function(oEvent) {
 				if (typeof oScanDialogController.onLiveUpdate === "function") {
 					oScanDialogController.onLiveUpdate({
@@ -280,7 +288,12 @@ sap.ui.define([
 				.getUserMedia(defaultConstraints)
 				.then(
 					function(stream) {
-						openBarcodeScannerDialogContains();
+						if (oZXingScannerAPI) {
+							openBarcodeScannerDialogContains();
+						} else {
+							oScanDialog.getModel().setProperty("/isNoScanner", true);
+							openBarcodeInputDialog();
+						}
 					}
 				)
 				.catch(
@@ -319,6 +332,7 @@ sap.ui.define([
 					}
 				}),
 				afterClose: function() {
+					closeZXingScanContain();
 					oScanDialog.destroyContent();
 					oScanDialog.destroy();
 					oScanDialog = null;
@@ -342,15 +356,15 @@ sap.ui.define([
 			oDialogTitle = sTitle;
 		}
 
-
-		if (oCordovaScannerAPI || !oStatusModel.getProperty("/available")) {
-			oScanDialog.getModel().setProperty("/isNoScanner", false);
-			openBarcodeInputDialog();
-		} else if (isUserMediaAccessSupported() && oZXingScannerAPI) {
+		if (!oCordovaScannerAPI && isUserMediaAccessSupported()) {
 			openBarcodeScannerDialog();
 		} else {
-			oScanDialog.getModel().setProperty("/isNoScanner", true);
-			openBarcodeInputDialog('UserMedia is not available');
+			if (oStatusModel.getProperty("/available")) {
+				oScanDialog.getModel().setProperty("/isNoScanner", false);
+			} else {
+				oScanDialog.getModel().setProperty("/isNoScanner", true);
+			}
+			openBarcodeInputDialog();
 		}
 
 		return oScanDialog;
@@ -443,6 +457,7 @@ sap.ui.define([
 						Log.warning("Started continous decode failed.");
 						if (typeof oScanDialogController.onFail === "function") {
 							oScanDialogController.onFail(err);
+							oScanDialog.getModel().setProperty("/isNoScanner", true);
 							openBarcodeInputDialog();
 						}
 					}
@@ -498,6 +513,7 @@ sap.ui.define([
 		if (oZXingScannerAPI) {
 			oZXingScannerAPI.reset();
 			oZXingScannerAPI.stopContinuousDecode();
+			oZXingScannerAPI.reader.reset();
 		}
 	}
 
@@ -509,10 +525,6 @@ sap.ui.define([
 	 * Starts the bar code scanning process either showing the live input from the camera or displaying a dialog
 	 * to enter the value directly if the bar code scanning feature is not available.
 	 *
-	 * <pre>
-	 * sap.ndc.BarcodeScanner.scan(fnSuccess, fnFail, fnLiveUpdate, dialogTitle)
-	 * </pre>
-	 *
 	 * The bar code scanning is done asynchronously. When it is triggered, this function returns without waiting for
 	 * the scanning process to finish. The applications have to provide callback functions to react to the events of
 	 * a successful scanning, an error during scanning, and the live input on the dialog.
@@ -523,21 +535,23 @@ sap.ui.define([
 	 * dialog's input field. An example:
 	 *
 	 * <pre>
-	 * sap.ndc.BarcodeScanner.scan(
-	 *	function (mResult) {
-	 *	   alert("We got a bar code\n" +
-	 *			 "Result: " + mResult.text + "\n" +
-	 *			 "Format: " + mResult.format + "\n" +
-	 *			 "Cancelled: " + mResult.cancelled);
-	 *	},
-	 *	function (Error) {
-	 *	   alert("Scanning failed: " + Error);
-	 *	},
-	 *	function (mParams) {
-	 *	   alert("Value entered: " + mParams.newValue);
-	 *	},
-	 *	"Enter Product Bar Code"
-	 * );
+	 * sap.ui.require(["sap/ndc/BarcodeScanner"], function(BarcodeScanner) {
+	 * 	BarcodeScanner.scan(
+	 *		function (mResult) {
+	 *			alert("We got a bar code\n" +
+	 *			 	"Result: " + mResult.text + "\n" +
+	 *			 	"Format: " + mResult.format + "\n" +
+	 *			 	"Cancelled: " + mResult.cancelled);
+	 *		},
+	 *		function (Error) {
+	 *			alert("Scanning failed: " + Error);
+	 *		},
+	 *		function (mParams) {
+	 *			alert("Value entered: " + mParams.newValue);
+	 *		},
+	 *		"Enter Product Bar Code"
+	 * 	);
+	 * });
 	 * </pre>
 	 *
 	 * @param {function} [fnSuccess] Function to be called when the scanning is done or cancelled
@@ -577,10 +591,15 @@ sap.ui.define([
 				},
 				function (oEvent) {
 					Log.error("Barcode scanning failed.");
+					bReady = true;
 					if (typeof fnFail === "function") {
+						if (typeof oEvent === "string") {
+							var str = oEvent;
+							oEvent = {"text": str};
+							Log.debug("Change the type of oEvent from string to object");
+						}
 						fnFail(oEvent);
 					}
-					bReady = true;
 				}
 			);
 		} else {

package/src/sap/ndc/BarcodeScannerButtonRenderer.js

@@ -30,7 +30,10 @@ sap.ui.define([],
 		oRm.write("<span");
 		oRm.writeControlData(oControl);
 		// we need to change the containing span tag's width instead of the button
-		oRm.write(" style=\"display:inline-block;width:" + oControl.getWidth() + ";\">");
+		oRm.addStyle("display", "inline-block");
+		oRm.addStyle("width", oControl.getWidth());
+		oRm.writeStyles();
+		oRm.write(">");
 		oRm.renderControl(oControl.getAggregation("_btn"));
 		oRm.write("</span>");
 	};

package/src/sap/ndc/library.js

@@ -32,7 +32,7 @@ sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
 		],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.93.3"
+		version: "1.96.2"
 	});
 
 	return sap.ndc;

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

@@ -8839,6 +8839,11 @@
             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());
             }