@sapui5/sap.ui.vk 1.138.0 → 1.139.0

package/src/sap/ui/vk/pdf/Page.js

@@ -21,17 +21,16 @@ sap.ui.define([
 			return this.#pdfjsPage.pageNumber - 1;
 		}
 
-		/**
-		 * @returns {number[]} The coordinates of the bottom left `(x1, y1)` and top right `(x2, y2)` corners of the
-		 *     page in user units `[x1, y1, x2, y2]`;
-		 * @public
-		 */
-		get viewBox() {
-			return this.#pdfjsPage.view;
-		}
-
 		get rawDimensions() {
-			return this.#pdfjsPage.getViewport({ scale: 1 }).rawDims;
+			const {
+				width: pageWidth,
+				height: pageHeight,
+				viewBox: [
+					pageX,
+					pageY
+				]
+			} = this.#pdfjsPage.getViewport({ scale: 1 });
+			return { pageX, pageY, pageWidth, pageHeight };
 		}
 
 		get userUnit() {

package/src/sap/ui/vk/pdf/Utils.js

@@ -6,7 +6,9 @@
  */
 
 sap.ui.define([
+	"../helpers/WorkerScriptLoader"
 ], (
+	WorkerScriptLoader
 ) => {
 	"use strict";
 
@@ -17,8 +19,8 @@ sap.ui.define([
 			let pdfjsLib = Utils.#pdfjsLib;
 
 			if (pdfjsLib == null) {
-				const pdfjsLibUrl = sap.ui.require.toUrl("sap/ui/vk/thirdparty/pdf.js");
-				const pdfjsLibWorkerUrl = sap.ui.require.toUrl("sap/ui/vk/thirdparty/pdf.worker.js");
+				const pdfjsLibUrl = WorkerScriptLoader.absoluteUri("sap/ui/vk/thirdparty/pdf.js").toString();
+				const pdfjsLibWorkerUrl = WorkerScriptLoader.absoluteUri("sap/ui/vk/thirdparty/pdf.worker.js").toString();
 
 				this.#pdfjsLib = pdfjsLib = await import(pdfjsLibUrl);
 

package/src/sap/ui/vk/pdf/Viewport.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.vk.ViewportBase
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.vk.pdf.Viewport

package/src/sap/ui/vk/svg/BaseNodeProxy.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.BaseNodeProxy
 	 * @implements sap.ui.base.Poolable
 	 * @alias sap.ui.vk.svg.BaseNodeProxy

package/src/sap/ui/vk/svg/ContentDeliveryService.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Provides a class to communicate with content delivery service.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.svg.ContentDeliveryService
 	 */

package/src/sap/ui/vk/svg/ContentManager.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @protected
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.svg.ContentManager
 	 * @since 1.80.0
@@ -234,7 +234,7 @@ sap.ui.define([
 			includeBackground: contentResource.getIncludeBackground(),
 			includeHidden: contentResource.getIncludeHidden(),
 			includeParametric: true,
-			includeMetadata: contentResource.getIncludeMetadata(),
+			includeMetadata: contentResource.getIncludeMetadata() || contentResource.getEffectiveSourceType() === "ecad", // Always load metadata for ECAD models.
 			includeUsageId: contentResource.getIncludeUsageId(),
 			metadataFilter: contentResource.getMetadataFilter(),
 			pushPMI: true,
@@ -378,14 +378,13 @@ sap.ui.define([
 					}));
 				}
 			} else {
-				var sourceType = contentResource.getSourceType();
+				const sourceType = contentResource.getEffectiveSourceType()?.toLowerCase();
 
-				switch (sourceType ? sourceType.toLowerCase() : null) {
+				switch (sourceType) {
 					case "ecad":
 					case "stream2d": {
 						// Since SVG coordinate system origin is top left and ours is bottom left we apply vertical flip
 						element.matrix = new Float32Array([1, 0, 0, -1, 0, 0]);
-						element.userData.sourceType = sourceType;
 						promises.push(this._loadStream(element, contentResource));
 						break;
 					}

package/src/sap/ui/vk/svg/NodeHierarchy.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.NodeHierarchy
 	 * @alias sap.ui.vk.svg.NodeHierarchy
 	 */

package/src/sap/ui/vk/svg/NodeProxy.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.NodeProxy
 	 * @alias sap.ui.vk.svg.NodeProxy
 	 */

package/src/sap/ui/vk/svg/OrthographicCamera.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.OrthographicCamera
 	 * @alias sap.ui.vk.svg.OrthographicCamera
 	 * @since 1.80.0

package/src/sap/ui/vk/svg/Scene.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.Scene
 	 * @alias sap.ui.vk.svg.Scene
 	 */

package/src/sap/ui/vk/svg/SceneBuilder.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;

package/src/sap/ui/vk/svg/ViewStateManager.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewStateManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.svg.ViewStateManager
 	 * @since 1.80.0

package/src/sap/ui/vk/svg/Viewport.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @extends sap.ui.vk.ViewportBase
 	 * @alias sap.ui.vk.svg.Viewport
 	 */
@@ -389,7 +389,6 @@ sap.ui.define([
 		this._currentViewIndex = 0;
 		this._currentView = null;
 		this._styles.clear();
-		this._isEcad = undefined;
 
 		if (scene) {
 			this.setCamera(new OrthographicCamera());
@@ -581,7 +580,7 @@ sap.ui.define([
 		var node = this.hitTest(x, y, true);
 
 		if (this.isECAD() && node) {
-			const element = this._findElement(node);
+			const element = this.findElement(node);
 			if (element == null) {
 				return this; // nothing found, must be ECAD orphan node
 			}
@@ -748,7 +747,7 @@ sap.ui.define([
 					}
 				};
 				selection.forEach(ref => {
-					const element = this._findElement(ref);
+					const element = this.findElement(ref);
 					if (element != null) {
 						include(element, output);
 					}
@@ -1755,17 +1754,7 @@ sap.ui.define([
 	};
 
 	Viewport.prototype.isECAD = function() {
-		if (this._isEcad != undefined) {
-			return this._isEcad; // cached value
-		}
-		if (this._scene) {
-			const metadata = this._scene.getSceneMetadata();
-			if (metadata && metadata.length !== 0) {
-				const data = metadata.find((el) => el.category === "ecad" && el.tag === "version" && el.value === "8");
-				return (this._isEcad = !!data);
-			}
-		}
-		return (this._isEcad = false);
+		return this._scene?.isECADScene() ?? false;
 	};
 
 	Viewport.prototype._extractMetadata = function(metadata) {
@@ -1830,7 +1819,7 @@ sap.ui.define([
 		root.setMatrix(ElementSVG._multiplyMatrices(reflect, rotate));
 	};
 
-	Viewport.prototype._findElement = function(ref) {
+	Viewport.prototype.findElement = function(ref) {
 		while (ref != null) {
 			const metadata = this._extractMetadata(ref.userData.metadata ?? {});
 
@@ -1844,7 +1833,9 @@ sap.ui.define([
 
 	Viewport.prototype.rotatePcbCW = function() {
 		if (this.isECAD()) {
-			this._pcbRotateAngle -= Math.PI / 2;
+			this._pcbRotateAngle += this._pcbVisibleSurface === EcadLayerZone.Top
+				? -Math.PI / 2
+				: Math.PI / 2;
 			this._setRootTransform();
 			this.zoomTo(ZoomTo.Visible);
 		}
@@ -1852,7 +1843,9 @@ sap.ui.define([
 
 	Viewport.prototype.rotatePcbCCW = function() {
 		if (this.isECAD()) {
-			this._pcbRotateAngle += Math.PI / 2;
+			this._pcbRotateAngle += this._pcbVisibleSurface === EcadLayerZone.Top
+				? Math.PI / 2
+				: -Math.PI / 2;
 			this._setRootTransform();
 			this.zoomTo(ZoomTo.Visible);
 		}

package/src/sap/ui/vk/thirdparty/pdf.worker.js

@@ -54306,7 +54306,7 @@ class PDFDocument {
     if (PDF_VERSION_REGEXP.test(version)) {
       this._version = version;
     } else {
-      warn(`Invalid PDF header version: 1.138.0`);
+      warn(`Invalid PDF header version: 1.139.0`);
     }
   }
   parseStartXRef() {