@sapui5/sap.ndc 1.122.0 → 1.123.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ndc",
-  "version": "1.122.0",
+  "version": "1.123.0",
   "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-2024 SAP SE. All rights reserved.</copyright>
-    <version>1.122.0</version>
+    <version>1.123.0</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 

package/src/sap/ndc/BarcodeScanner.js

@@ -479,11 +479,11 @@ sap.ui.define([
 
 	/**
 	 * Load ZXingCPP scanner Instance.
-	 * @param {function} fnSuccess The callback function if load success
-	 * @param {function} fnFail The callback function if load failed
+	 * @param {function} openScanUI The scan dialog will be opened if load success
+	 * @param {function} errorHandle The error message will be handled if load failed
 	 * @private
 	 */
-	function loadZXingCPPInstance(fnSuccess, fnFail) {
+	function loadZXingCPPInstance(openScanUI, errorHandle) {
 		// since the size of zxing_reader.wasm is about 1M, we need to open a busy dialog to lock the current frame/page
 		var oBusyDialog = new BusyDialog({
 			title: oResourceModel.getProperty("BARCODE_DIALOG_BUSY_TITLE"),
@@ -507,11 +507,11 @@ sap.ui.define([
 			}
 			Log.debug("BarcodeScanner.loadZXingCPPInstance: ZXingCPP API is available!");
 			oBusyDialog.close();
-			fnSuccess();
+			openScanUI();
 		}, function(oError) {
 			loadZXingCPPFailed("BarcodeScanner.loadZXingCPPInstance: can not load wasm lib instance of ZXingCPP.\n" + oError);
 			oBusyDialog.close();
-			fnFail();
+			errorHandle();
 		});
 	}
 
@@ -1637,9 +1637,7 @@ sap.ui.define([
 	 function scanWithZXingCPP() {
 		if (checkScannerAPIStatus("ZXingCPP", oScannerAPIStatus.Initial)) {
 			Log.debug("BarcodeScanner.scanWithZXingCPP: ZXingCPP instances is not loaded, start to load them.");
-			loadZXingCPPInstance(function() {
-				openScanDialog();
-			}, function() {
+			loadZXingCPPInstance(openScanDialog, function() {
 				if (isScannerAPIAvailable("ZebraEnterpriseBrowser")) {
 					setCurrentScannerAPI("ZebraEnterpriseBrowser");
 					Log.debug("BarcodeScanner.scanWithZXingCPP: Zebra is available, set the current scanner API to Zebra.");
@@ -2008,6 +2006,9 @@ sap.ui.define([
 				// Add the symbology identifier of GS1 as prefix into the barcode text of ZXingCPP
 				barcode.text = barcode.symbologyIdentifier + barcode.text;
 			}
+			if (typeof barcode.cancelled !== "boolean") {
+				barcode.cancelled = false;
+			}
 			onFnSuccess(barcode);
 		}
 		BarcodeScanner.closeScanDialog();

package/src/sap/ndc/BarcodeScannerButton.js

@@ -198,6 +198,11 @@ sap.ui.define([
 		return this;
 	};
 
+	BarcodeScannerButton.prototype._setTooltip = function () {
+		var sTooltip = this.getTooltip_AsString();
+		this.getAggregation("_btn").setTooltip(sTooltip);
+	};
+
 	return BarcodeScannerButton;
 
 });

package/src/sap/ndc/BarcodeScannerButtonRenderer.js

@@ -24,6 +24,8 @@ sap.ui.define([],
 	 *            oControl an object representation of the control that should be rendered
 	 */
 	BarcodeScannerButtonRenderer.render = function(oRm, oControl) {
+
+		oControl._setTooltip();
 		//we need this additional wrapping element to be able to control this button from our controller.
 		oRm.openStart("span", oControl);
 		// we need to change the containing span tag's width instead of the button

package/src/sap/ndc/library.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.122.0"
+		version: "1.123.0"
 	});
 
 	return thisLib;