@sapui5/sap.ndc 1.126.1 → 1.127.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ndc",
-  "version": "1.126.1",
+  "version": "1.127.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.126.1</version>
+    <version>1.127.0</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 

package/src/sap/ndc/BarcodeScanner.js

@@ -97,6 +97,7 @@ sap.ui.define([
 		oBarcodeImageDOM,
 		oBarcodeImageCanvasDOM,
 		oBarcodeOverlayDOM,
+		oFocusedInstance,
 		oScannerAPIStatus = {
 			Initial: "Initial",
 			Loading: "Loading",
@@ -1436,6 +1437,12 @@ sap.ui.define([
 						oScanDialog.destroy();
 					}
 					oScanDialog = null;
+
+					//refocused related element
+					if (typeof oFocusedInstance === 'object') {
+						jQuery(oFocusedInstance).focus();
+						jQuery(oFocusedInstance).on("blur", customBlurHandler);
+					}
 				}
 			});
 			oScanDialog.setEscapeHandler(function(promise) {
@@ -2598,6 +2605,14 @@ sap.ui.define([
 		oModel.setProperty("/apis/BluetoothScanner/", oBluetoothScanner);
 	}
 
+	function customBlurHandler() {
+		Log.debug("The custom Blur handler is called");
+		if (typeof oFocusedInstance === "object") {
+			oFocusedInstance.focus();
+			jQuery(oFocusedInstance).off("blur", customBlurHandler);
+		}
+	}
+
 	/* =========================================================== */
 	/* API methods												 */
 	/* =========================================================== */
@@ -3039,6 +3054,28 @@ sap.ui.define([
 		setScannerAPIUnAvailable("BluetoothScanner", true);
 	};
 
+	/**
+	 * Set the sId of the element to be focused, which will then be used to retrieve the instance of the focused SAP UI5 element.
+	 *
+	 * @param {string} [sId] Defines the sId for the focused element.
+	 * @returns {boolean} Return True if set success.
+	 *
+	 * @public
+	 * @static
+	 */
+	BarcodeScanner.setFocusedInstanceId = function (sId) {
+		var oState = false;
+		oFocusedInstance = jQuery.sap.byId(sId);
+		if (oFocusedInstance[0]) {
+			oState = true;
+			Log.debug("The sId has been successful set, and the instance of the focused SAP UI5 element is now available.");
+		} else {
+			oFocusedInstance = undefined;
+			Log.warning("The sId is not available.");
+		}
+		return oState;
+	};
+
 	init();	//must be called to enable control if no feature vector is available.
 	return BarcodeScanner;
 

package/src/sap/ndc/BarcodeScannerButton.js

@@ -153,6 +153,8 @@ sap.ui.define([
 	};
 
 	BarcodeScannerButton.prototype._onBtnPressed = function (oEvent) {
+		var focusedElement = this.getAggregation("_btn");
+		BarcodeScanner.setFocusedInstanceId(focusedElement.sId);
 		BarcodeScanner.scan(
 			this._onScanSuccess.bind(this),
 			this._onScanFail.bind(this),

package/src/sap/ndc/library.js

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