@sapui5/sap.ndc 1.84.18 → 1.84.22

package/package.json

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

@@ -6,7 +6,7 @@
     <copyright>SAPUI5
 
 (c) Copyright 2009-2020 SAP SE. All rights reserved</copyright>
-    <version>1.84.18</version>
+    <version>1.84.22</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 

package/src/sap/ndc/BarcodeScanner.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 
@@ -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 * / }
@@ -80,15 +78,10 @@ sap.ui.define([
 		defaultConstraints = {
 			audio: false,
 			video: {
-				height: {
-					min: 480,
-					ideal: 960,
-					max: 1440
-				},
-				aspectRatio: 1.333333333,
 				facingMode: 'environment'
 			}
 		},
+		oPreferFrontCamera,
 
 		oBarcodeScannerUIContainer = null,
 
@@ -228,16 +221,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({
-				text: "{i18n>BARCODE_DIALOG_MSG}",
-				visible: "{/isNoScanner}"
-			})
+			oMSGLabel
 		);
 
-		var oFallbackInput = new Input({
+		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({
@@ -250,7 +246,7 @@ sap.ui.define([
 		oScanDialog.addContent(oFallbackInput);
 
 		oScanDialog.setBeginButton(
-			new Button({
+			new Button(oScanDialog.getId() + '-btn_barcode_ok', {
 				text: "{i18n>BARCODE_DIALOG_OK}",
 				press: function(oEvent) {
 					BarcodeScanner.closeScanDialog();
@@ -283,6 +279,11 @@ sap.ui.define([
 	 */
 	function openBarcodeScannerDialog() {
 		if (navigator.mediaDevices.getUserMedia) {
+			if (oPreferFrontCamera) {
+				defaultConstraints.video.facingMode = 'user';
+			} else {
+				defaultConstraints.video.facingMode = 'environment';
+			}
 			navigator.mediaDevices
 				.getUserMedia(defaultConstraints)
 				.then(
@@ -315,7 +316,7 @@ sap.ui.define([
 
 		if (!oScanDialog || (oScanDialog && oScanDialog.getContent().length === 0)) {
 			oDialogModel = new JSONModel();
-			oScanDialog = new Dialog({
+			oScanDialog = new Dialog('sapNdcBarcodeScannerDialog', {
 				icon: 'sap-icon://bar-code',
 				title: "",
 				stretch: true,
@@ -331,6 +332,7 @@ sap.ui.define([
 					}
 				}),
 				afterClose: function() {
+					closeZXingScanContain();
 					oScanDialog.destroyContent();
 					oScanDialog.destroy();
 					oScanDialog = null;
@@ -352,9 +354,10 @@ sap.ui.define([
 
 		if (typeof sTitle === "string" && sTitle != null && sTitle.trim() != "") {
 			oDialogTitle = sTitle;
+		} else {
+			oDialogTitle = oResourceModel.getProperty("BARCODE_DIALOG_TITLE");
 		}
 
-
 		if (!oCordovaScannerAPI && isUserMediaAccessSupported()) {
 			openBarcodeScannerDialog();
 		} else {
@@ -388,7 +391,7 @@ sap.ui.define([
 					oBarcodeVideoDOM = oBarcodeScannerUIContainer ? oBarcodeScannerUIContainer.getDomRef('video') : undefined;
 				}
 
-				oZXingScannerAPI.decodeFromVideoDevice(null, oBarcodeScannerUIContainer.getId() + '-video', function (result, err) {
+				oZXingScannerAPI.decodeFromConstraints(defaultConstraints, oBarcodeScannerUIContainer.getId() + '-video', function (result, err) {
 					oScanFrame();
 					if (result) {
 						var point, scaleX, scaleY;
@@ -512,6 +515,7 @@ sap.ui.define([
 		if (oZXingScannerAPI) {
 			oZXingScannerAPI.reset();
 			oZXingScannerAPI.stopContinuousDecode();
+			oZXingScannerAPI.reader.reset();
 		}
 	}
 
@@ -523,10 +527,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.
@@ -537,21 +537,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
@@ -562,13 +564,14 @@ sap.ui.define([
 	 * @public
 	 * @static
 	 */
-	BarcodeScanner.scan = function (fnSuccess, fnFail, fnLiveUpdate, dialogTitle) {
+	BarcodeScanner.scan = function (fnSuccess, fnFail, fnLiveUpdate, dialogTitle, preferFrontCamera) {
 		if (!bReady) {
 			Log.error("Barcode scanning is already in progress.");
 			return;
 		}
 
 		bReady = false;
+		oPreferFrontCamera = preferFrontCamera;
 
 		if (oStatusModel.getProperty("/available") == true && oCordovaScannerAPI == null && oZXingScannerAPI == null){
 			//in case we do not have feature vectore we still would like to allow the use
@@ -577,6 +580,12 @@ sap.ui.define([
 		}
 
 		if (oCordovaScannerAPI) {
+			var options;
+			if (oPreferFrontCamera) {
+				options = {
+					preferFrontCamera: true
+				};
+			}
 			oCordovaScannerAPI.scan(
 				function (oResult) {
 					if (oResult.cancelled === "false" || !oResult.cancelled) {
@@ -591,11 +600,17 @@ 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;
-				}
+				},
+				options
 			);
 		} else {
 			getScanDialog(fnSuccess, fnFail, fnLiveUpdate, dialogTitle);

package/src/sap/ndc/BarcodeScannerButton.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ndc.BarcodeScannerButton.
@@ -52,7 +52,12 @@ sap.ui.define(["sap/ui/thirdparty/jquery", './BarcodeScanner', './library', 'sap
 			/**
 			 * Defines the bar code input dialog title. If unset, a predefined title will be used.
 			 */
-			dialogTitle : {type: "string", defaultValue: null}
+			dialogTitle : {type: "string", defaultValue: null},
+
+			/**
+			 * If set to true, the front camera will be used to decode.
+			 */
+			preferFrontCamera : {type : "boolean", defaultValue : false}
 		},
 		aggregations : {
 
@@ -125,7 +130,8 @@ sap.ui.define(["sap/ui/thirdparty/jquery", './BarcodeScanner', './library', 'sap
 			jQuery.proxy(this._onScanSuccess, this),
 			jQuery.proxy(this._onScanFail, this),
 			jQuery.proxy(this._onInputLiveUpdate, this),
-			this.getProperty("dialogTitle")
+			this.getProperty("dialogTitle"),
+			this.getProperty("preferFrontCamera")
 		);
 	};
 

package/src/sap/ndc/BarcodeScannerButtonRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define([],
 	function() {

package/src/sap/ndc/BarcodeScannerUIContainer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([

package/src/sap/ndc/library.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 /**
@@ -32,7 +32,7 @@ sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
 		],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.84.18"
+		version: "1.84.22"
 	});
 
 	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());
             }