@sapui5/sap.ndc 1.106.0 → 1.108.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ndc",
-  "version": "1.106.0",
+  "version": "1.108.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-2022 SAP SE. All rights reserved.</copyright>
-    <version>1.106.0</version>
+    <version>1.108.0</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 
@@ -33,22 +33,16 @@
         <!-- 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.19.1" homepage="https://zxing-js.github.io/library/" id="73554900106100111243">
+            <lib name="@zxing/library" displayName="ZXing" npmName="@zxing/library" version="0.17.1" hash="79570fa03328b5b34c67123245d74925" homepage="https://zxing-js.github.io/library/" id="73554900106100054816">
                <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>
-               <pattern>sap/ndc/thirdparty/ZXing-dbg.js</pattern>
             </lib>
         </thirdparty>
 

package/src/sap/ndc/BarcodeScanner.js

@@ -27,9 +27,10 @@ sap.ui.define([
 		"sap/m/MessageToast",
 		'sap/m/library',
 		"sap/ui/base/Event",
-		"sap/ui/base/EventProvider"
+		"sap/ui/base/EventProvider",
+		'sap/ui/Device'
 	],
-	function(Log, JSONModel, ResourceModel, Input, Label, Button, Dialog, includeStylesheet, BarcodeScannerUIContainer, MessageToast, mobileLibrary, Event, EventProvider) {
+	function(Log, JSONModel, ResourceModel, Input, Label, Button, Dialog, includeStylesheet, BarcodeScannerUIContainer, MessageToast, mobileLibrary, Event, EventProvider, Device) {
 	"use strict";
 
 	/*global cordova EB*/
@@ -44,6 +45,8 @@ sap.ui.define([
 	/**
 	 * @class
 	 *
+	 * Please refer to <a target="_blank" rel="noopener,noreferrer" href="https://launchpad.support.sap.com/#/notes/2402585">SAP Note 2402585</a> for information on barcode scanner support in native iOS and Android browsers.
+	 *
 	 * Here is an example of how to trigger the scan function of BarcodeScanner:
 	 * <pre>
 	 * sap.ui.require(["sap/ndc/BarcodeScanner"], function(BarcodeScanner) {
@@ -318,7 +321,7 @@ sap.ui.define([
 	 * @private
 	 */
 	function openBarcodeScannerDialog() {
-		if (navigator.mediaDevices.getUserMedia) {
+		if (window.navigator.mediaDevices.getUserMedia) {
 			if (oPreferFrontCamera) {
 				defaultConstraints.video.facingMode = 'user';
 			} else {
@@ -328,11 +331,16 @@ sap.ui.define([
 			if (defaultConstraints.video.frameRate !== undefined) {
 				delete defaultConstraints.video.frameRate;
 			}
-			navigator.mediaDevices
+			window.navigator.mediaDevices
 				.getUserMedia(defaultConstraints)
 				.then(
 					function(stream) {
 						if (oZXingScannerAPI) {
+							// When decoding QR-code by iPhone (iOS 16), this stream will clash with another stream from ZXing-js.
+							if (Device.os.ios && Device.os.versionStr.split('.')[0] === '16') {
+								var videoTrack = stream.getTracks();
+								videoTrack[0].stop();
+							}
 							openBarcodeScannerDialogContains();
 						} else {
 							oScanDialog.getModel().setProperty("/isNoScanner", true);

package/src/sap/ndc/BarcodeScannerButton.js

@@ -4,8 +4,14 @@
  */
 
 // Provides control sap.ndc.BarcodeScannerButton.
-sap.ui.define(["sap/ui/thirdparty/jquery", './BarcodeScanner', './library', 'sap/ui/core/Control', './BarcodeScannerButtonRenderer', 'sap/ui/model/resource/ResourceModel'],
-	function(jQuery, BarcodeScanner, library, Control, ScannerButtonRenderer, ResourceModel) {
+sap.ui.define([
+	'./BarcodeScanner',
+	'./BarcodeScannerButtonRenderer',
+	'./library',
+	'sap/m/Button',
+	'sap/ui/core/Control',
+	'sap/ui/model/resource/ResourceModel'
+], function(BarcodeScanner, BarcodeScannerButtonRenderer, library, Button, Control, ResourceModel) {
 	"use strict";
 
 
@@ -27,104 +33,106 @@ sap.ui.define(["sap/ui/thirdparty/jquery", './BarcodeScanner', './library', 'sap
 	 * @constructor
 	 * @public
 	 * @alias sap.ndc.BarcodeScannerButton
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var BarcodeScannerButton = Control.extend("sap.ndc.BarcodeScannerButton", /** @lends sap.ndc.BarcodeScannerButton.prototype */ { metadata : {
-
-		library : "sap.ndc",
-		properties : {
-
-			/**
-			 * If set to true, the button remains visible if the scanner is not available and triggers a dialog to enter bar code.
-			 */
-			provideFallback : {type : "boolean", defaultValue : true},
-
-			/**
-			 * The invisible bar code scanner button is not rendered regardless of the availability of the native scan feature.
-			 */
-			visible : {type : "boolean", defaultValue : true},
-
-			/**
-			 * Defines the width of the scanner button.
-			 */
-			width : {type: "sap.ui.core.CSSSize", defaultValue : null},
-
-			/**
-			 * Defines the bar code input dialog title. If unset, a predefined title will be used.
-			 */
-			dialogTitle : {type: "string", defaultValue: null},
-
-			/**
-			 * If set to true, the front camera will be used to decode.
-			 */
-			preferFrontCamera : {type : "boolean", defaultValue : false},
-
-			/**
-			 * Defines the frame rate of the camera.
-			 */
-			frameRate : {type : "float"},
-
-			/**
-			 * Defines the zoom of the camera. This parameter is not supported on iOS.
-			 */
-			zoom : {type : "float"},
-
-			/**
-			 * If set to true, the camera should be used for scanning in Zebra Enterprise Browser.
-			 */
-			keepCameraScan : {type : "boolean", defaultValue : false}
-		},
-		aggregations : {
-
-			/**
-			 * Internal aggregation to hold the inner Button.
-			 */
-			_btn : {type : "sap.m.Button", multiple : false, visibility : "hidden"}
-		},
-		events : {
-
-			/**
-			 * Event is fired when the scanning is finished or cancelled
-			 */
-			scanSuccess : {
-				parameters : {
-
-					/**
-					 * The the text representation of the bar code data.
-					 */
-					text : {type : "string"},
-
-					/**
-					 * The type of the bar code detected.
-					 */
-					format : {type : "string"},
-
-					/**
-					 * Indicates whether or not the user cancelled the scan.
-					 */
-					cancelled : {type : "boolean"}
-				}
+	var BarcodeScannerButton = Control.extend("sap.ndc.BarcodeScannerButton", /** @lends sap.ndc.BarcodeScannerButton.prototype */ {
+		metadata : {
+
+			library : "sap.ndc",
+			properties : {
+
+				/**
+				 * If set to true, the button remains visible if the scanner is not available and triggers a dialog to enter bar code.
+				 */
+				provideFallback : {type : "boolean", defaultValue : true},
+
+				/**
+				 * The invisible bar code scanner button is not rendered regardless of the availability of the native scan feature.
+				 */
+				visible : {type : "boolean", defaultValue : true},
+
+				/**
+				 * Defines the width of the scanner button.
+				 */
+				width : {type: "sap.ui.core.CSSSize", defaultValue : null},
+
+				/**
+				 * Defines the bar code input dialog title. If unset, a predefined title will be used.
+				 */
+				dialogTitle : {type: "string", defaultValue: null},
+
+				/**
+				 * If set to true, the front camera will be used to decode.
+				 */
+				preferFrontCamera : {type : "boolean", defaultValue : false},
+
+				/**
+				 * Defines the frame rate of the camera.
+				 */
+				frameRate : {type : "float"},
+
+				/**
+				 * Defines the zoom of the camera. This parameter is not supported on iOS.
+				 */
+				zoom : {type : "float"},
+
+				/**
+				 * If set to true, the camera should be used for scanning in Zebra Enterprise Browser.
+				 */
+				keepCameraScan : {type : "boolean", defaultValue : false}
 			},
+			aggregations : {
 
-			/**
-			 * Event is fired when the native scanning process is failed.
-			 */
-			scanFail : {},
-
-			/**
-			 * Event is fired when the text in the dialog's input field is changed.
-			 */
-			inputLiveUpdate : {
-				parameters : {
-
-					/**
-					 * The new value of the input field.
-					 */
-					newValue : {type : "string"}
+				/**
+				 * Internal aggregation to hold the inner Button.
+				 */
+				_btn : {type : "sap.m.Button", multiple : false, visibility : "hidden"}
+			},
+			events : {
+
+				/**
+				 * Event is fired when the scanning is finished or cancelled
+				 */
+				scanSuccess : {
+					parameters : {
+
+						/**
+						 * The the text representation of the bar code data.
+						 */
+						text : {type : "string"},
+
+						/**
+						 * The type of the bar code detected.
+						 */
+						format : {type : "string"},
+
+						/**
+						 * Indicates whether or not the user cancelled the scan.
+						 */
+						cancelled : {type : "boolean"}
+					}
+				},
+
+				/**
+				 * Event is fired when the native scanning process is failed.
+				 */
+				scanFail : {},
+
+				/**
+				 * Event is fired when the text in the dialog's input field is changed.
+				 */
+				inputLiveUpdate : {
+					parameters : {
+
+						/**
+						 * The new value of the input field.
+						 */
+						newValue : {type : "string"}
+					}
 				}
 			}
-		}
-	}});
+		},
+		renderer: BarcodeScannerButtonRenderer
+	});
 
 	var oResourceModel;
 
@@ -135,10 +143,10 @@ sap.ui.define(["sap/ui/thirdparty/jquery", './BarcodeScanner', './library', 'sap
 			bundleName: "sap.ndc.messagebundle"
 		});
 
-		this.setAggregation("_btn", new sap.m.Button({
+		this.setAggregation("_btn", new Button({
 			icon: "sap-icon://bar-code",
 			tooltip: oResourceModel.getProperty("BARCODE_SCANNER_BUTTON_TOOLTIP"),
-			press: jQuery.proxy(this._onBtnPressed, this),
+			press: this._onBtnPressed.bind(this),
 			width: "100%"
 		}));
 
@@ -148,9 +156,9 @@ sap.ui.define(["sap/ui/thirdparty/jquery", './BarcodeScanner', './library', 'sap
 
 	BarcodeScannerButton.prototype._onBtnPressed = function (oEvent) {
 		BarcodeScanner.scan(
-			jQuery.proxy(this._onScanSuccess, this),
-			jQuery.proxy(this._onScanFail, this),
-			jQuery.proxy(this._onInputLiveUpdate, this),
+			this._onScanSuccess.bind(this),
+			this._onScanFail.bind(this),
+			this._onInputLiveUpdate.bind(this),
 			this.getProperty("dialogTitle"),
 			this.getProperty("preferFrontCamera"),
 			this.getProperty("frameRate"),

package/src/sap/ndc/BarcodeScannerButtonRenderer.js

@@ -11,7 +11,9 @@ sap.ui.define([],
 	 * BarcodeScannerButton renderer.
 	 * @namespace
 	 */
-	var BarcodeScannerButtonRenderer = {};
+	var BarcodeScannerButtonRenderer = {
+		apiVersion: 2
+	};
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
@@ -23,20 +25,14 @@ sap.ui.define([],
 	 */
 	BarcodeScannerButtonRenderer.render = function(oRm, oControl) {
 
-		if (!oControl.getVisible()) {
-			return;
-		}
 		//we need this additional wrapping element to be able to control this button from our controller.
-		oRm.write("<span");
-		oRm.writeControlData(oControl);
+		oRm.openStart("span", oControl);
 		// we need to change the containing span tag's width instead of the button
-		oRm.addStyle("display", "inline-block");
-		oRm.addStyle("width", oControl.getWidth());
-		oRm.writeStyles();
-		oRm.writeClasses();
-		oRm.write(">");
+		oRm.style("display", "inline-block");
+		oRm.style("width", oControl.getWidth());
+		oRm.openEnd();
 		oRm.renderControl(oControl.getAggregation("_btn"));
-		oRm.write("</span>");
+		oRm.close("span");
 	};
 
 

package/src/sap/ndc/library.js

@@ -6,8 +6,11 @@
 /**
  * Initialization Code and shared classes of library sap.ndc.
  */
-sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
-	function(library2, library1) {
+sap.ui.define([
+	'sap/m/library', // library dependency
+	'sap/ui/core/Core',  // provides sap.ui.getCore()
+	'sap/ui/core/library' // library dependency
+], function() {
 	"use strict";
 
 
@@ -24,11 +27,12 @@ sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
 		types: [],
 		interfaces: [],
 		controls: [
-			"sap.ndc.BarcodeScannerButton"
+			"sap.ndc.BarcodeScannerButton",
+			"sap.ndc.BarcodeScannerUIContainer" // private
 		],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.106.0"
+		version: "1.108.0"
 	});
 
 	return thisLib;