@sapui5/sap.ui.vk 1.120.12 → 1.120.13

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new Viewport control.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.ViewportBase
 	 * @alias sap.ui.vk.Viewport
 	 * @since 1.50.0
@@ -290,6 +290,33 @@ sap.ui.define([
 		return basePrototype.getHotspotColor.call(this);
 	};
 
+	Viewport.prototype.setHotspotCustomTextOutlineWidth = function(value) {
+		this._implementation?.setHotspotCustomTextOutlineWidth(value);
+		return this;
+	};
+
+	Viewport.prototype.getHotspotCustomTextOutlineWidth = function() {
+		return this._implementation?.getHotspotCustomTextOutlineWidth() ?? basePrototype.getHotspotCustomTextOutlineWidth.call(this);
+	};
+
+	Viewport.prototype.setHotspotCustomTextOutlineColor = function(value) {
+		this._implementation?.setHotspotCustomTextOutlineColor(value);
+		return this;
+	};
+
+	Viewport.prototype.getHotspotCustomTextOutlineColor = function() {
+		return this._implementation?.getHotspotCustomTextOutlineColor() ?? basePrototype.getHotspotCustomTextOutlineColor.call(this);
+	};
+
+	Viewport.prototype.setHotspotCustomTextHaloWidth = function(value) {
+		this._implementation?.setHotspotCustomTextHaloWidth(value);
+		return this;
+	};
+
+	Viewport.prototype.getHotspotCustomTextHaloWidth = function() {
+		return this._implementation?.getHotspotCustomTextHaloWidth() ?? basePrototype.getHotspotCustomTextHaloWidth.call(this);
+	};
+
 	Viewport.prototype.setKeepOutputSize = function(value) {
 		if (this._implementation && this._implementation.setKeepOutputSize) {
 			this._implementation.setKeepOutputSize(value);

package/src/sap/ui/vk/ViewportBase.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @public
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vk.ViewportBase
 	 * @since 1.50.0
@@ -174,6 +174,21 @@ sap.ui.define([
 					defaultValue: "rgba(89, 0, 0, 0.73)"
 				},
 
+				hotspotCustomTextOutlineWidth: {
+					type: "float",
+					defaultValue: 1
+				},
+
+				hotspotCustomTextOutlineColor: {
+					type: "sap.ui.core.CSSColor",
+					defaultValue: "white"
+				},
+
+				hotspotCustomTextHaloWidth: {
+					type: "float",
+					defaultValue: 10
+				},
+
 				/*
 				 * Enables or disables output size
 				 */

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.BaseNodeProxy
 	 * @implements sap.ui.base.Poolable
 	 * @deprecated Since version 1.72.0.

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.dvl.ContentManager
 	 * @deprecated Since version 1.72.0.

package/src/sap/ui/vk/dvl/GraphicsCore.js

@@ -279,7 +279,7 @@ sap.ui.define([
 	 * @param {object} webGLContextAttributes The WebGL context attributes. See {@link https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.2 WebGL context attributes}.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.base.EventProvider
 	 * @alias sap.ui.vk.dvl.GraphicsCore
 	 * @deprecated Since version 1.72.0.

package/src/sap/ui/vk/dvl/LayerProxy.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.LayerProxy
 	 * @deprecated Since version 1.72.0.
 	 * @alias sap.ui.vk.dvl.LayerProxy

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

@@ -71,7 +71,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.NodeHierarchy
 	 * @alias sap.ui.vk.dvl.NodeHierarchy
 	 * @deprecated Since version 1.72.0.

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.NodeProxy
 	 * @alias sap.ui.vk.dvl.NodeProxy
 	 * @deprecated Since version 1.72.0.

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.Scene
 	 * @alias sap.ui.vk.dvl.Scene
 	 * @deprecated Since version 1.72.0.

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewStateManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.dvl.ViewStateManager
 	 * @deprecated Since version 1.72.0.

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

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new Viewport control.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.ViewportBase
 	 * @alias sap.ui.vk.dvl.Viewport
 	 * @deprecated Since version 1.72.0.

package/src/sap/ui/vk/i18n/messagebundle_es.properties

@@ -269,7 +269,7 @@ IMAGECONTENTMANAGER_CANNOT_LOAD_IMAGE_HIERARCHY=No se puede cargar una jerarqu\u
 IMAGECONTENTMANAGER_UNSUPPORTED_IMAGE_TYPE=Tipo de imagen no admitido.
 IMAGECONTENTMANAGER_IMAGE_LOAD_FAILED=No se ha podido cargar la imagen.
 
-LOADER_FILENOTFOUND=No se puede encontrar el archivo o el usuario no tiene permiso para cargarlo.
+LOADER_FILENOTFOUND=No se ha encontrado el archivo o el usuario no tiene permiso para cargarlo.
 LOADER_WRONGFILEFORMAT=No se ha podido cargar el recurso de contenido. Es posible que la versi\u00F3n de modelo est\u00E9 obsoleta y que ya no se admita o que un fichero binario sea err\u00F3neo.
 LOADER_WRONGPASSWORD=El archivo est\u00E1 protegido por contrase\u00F1a pero no se ha proporcionado la contrase\u00F1a.
 LOADER_ERRORREADINGFILE=Error al leer archivo. El contenido del archivo puede estar da\u00F1ado.

package/src/sap/ui/vk/i18n/messagebundle_iw.properties

@@ -230,7 +230,7 @@ SCENE_CONTEXT_FINISHED_TEXTURES=\u05DE\u05E8\u05E7\u05DE\u05D9\u05DD \u05D4\u05D
 SCENE_CONTEXT_LOADING_TEXTURES=\u05D8\u05D5\u05E2\u05DF \u05DE\u05E8\u05E7\u05DE\u05D9\u05DD
 SCENE_CONTEXT_LOADING_MODEL_VIEWS=\u05D8\u05D5\u05E2\u05DF \u05EA\u05E6\u05D5\u05D2\u05D5\u05EA \u05DE\u05D5\u05D3\u05DC\u05D9\u05DD
 
-OVERLAY_MSG_EVENTHANDLERFAILED_SUMMARY=\u05DE\u05D8\u05E2\u05E4\u05DC \u05D1\u05D0\u05D9\u05E8\u05D5\u05E2 \u05E0\u05DB\u05E9\u05DC.
+OVERLAY_MSG_EVENTHANDLERFAILED_SUMMARY=\u05DE\u05D8\u05E4\u05DC \u05D1\u05D0\u05D9\u05E8\u05D5\u05E2 \u05E0\u05DB\u05E9\u05DC.
 OVERLAY_MSG_EVENTHANDLERFAILED_UNSUPPORTEDEVENTTYPE_CAUSE=\u05E1\u05D5\u05D2 \u05D0\u05D9\u05E8\u05D5\u05E2 \u05E9\u05D0\u05D9\u05E0\u05D5 \u05E0\u05EA\u05DE\u05DA \u05D1\u05E9\u05D9\u05DE\u05D5\u05E9.
 OVERLAY_MSG_EVENTHANDLERFAILED_UNSUPPORTEDEVENTTYPE_CHECKEVENTTYPE_RESOLUTION=\u05D5\u05D3\u05D0 \u05E9\u05E1\u05D5\u05D2 \u05D0\u05D9\u05E8\u05D5\u05E2 \u05E0\u05EA\u05DE\u05DA \u05E0\u05DE\u05E6\u05D0 \u05D1\u05E9\u05D9\u05DE\u05D5\u05E9.
 

package/src/sap/ui/vk/library.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vk
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @public
 	 */
 
@@ -149,7 +149,7 @@ sap.ui.define([
 			"sap.ui.vk.tools.PoiManipulationTool"
 		],
 		noLibraryCSS: false,
-		version: "1.120.12",
+		version: "1.120.13",
 		designtime: "sap/ui/vk/designtime/library.designtime"
 	});
 

package/src/sap/ui/vk/matai/MataiLoaderWorker.js

@@ -94,6 +94,34 @@
 		return result;
 	}
 
+	const CONTENT_TYPES = [
+		undefined, // 0
+		"GEOMETRY", // 1
+		"PMI", // 2
+		"DRAWING", // 3
+		"SOLID", // 4
+		"ANNOTATION", // 5
+		"THRUSTLINE", // 6
+		"ANIMATION", // 7
+		"VIEWPORT_GROUP", // 8
+		"LIST", // 9
+		"LIST_ITEM", // 10
+		"DETAIL_VIEWS", // 11
+		"MEASUREMENT", // 12
+		"CAMERA", // 13
+		"LAYER", // 14
+		"MODEL_VIEW", // 15
+		"SECTION_PLANE", // 16
+		"PARAMETRIC", // 17
+		"HOTSPOT", // 18
+		"PLAYBACK", // 19
+		"REFERENCE", // 20
+		"BACKGROUND", // 21
+		"SYMBOL", // 22
+		"POINT_CLOUD_GROUP", // 23
+		"SVG" // 24
+	];
+
 	SceneBuilderProxy.prototype.createNode = function(info) {
 		const transferable = [info.transform.buffer];
 		if (info.objectTransform) {
@@ -108,13 +136,7 @@
 		}
 		info.sid = info.nodeRef;
 
-		if (info.contentType === 2) {
-			info.contentType = "PMI";
-		} else if (info.contentType === 18) {
-			info.contentType = "Hotspot";
-		} else {
-			info.contentType = undefined;
-		}
+		info.contentType = CONTENT_TYPES[info.contentType];
 
 		if (info.veids) {
 			info.veids = parseVEIDs(info.veids);

package/src/sap/ui/vk/measurements/Angle.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @param {object} [settings] A JSON-like object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Angle
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Area.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @param {object} [settings] A JSON-like object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Area
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Distance.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [settings] A JSON-like object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Distance
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Edge.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {float[]} [settings.edge] World coordinates of the edge ends in form <code>[x1, y1, z1, x2, y2, z2]</code>.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Edge
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Face.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 *     where <code>e</code> is the number of edges in the list.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Face
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Feature.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Feature
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Vertex.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {float[]} [settings.vertex] World coordinates of the vertex in form <code>[x, y, z]</code>.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @alias sap.ui.vk.measurement.Vertex
 	 * @since 1.101.0
 	 */

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.120.12
+	 * @version 1.120.13
 	 * @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.120.12
+	 * @version 1.120.13
 	 * @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.120.12
+	 * @version 1.120.13
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.svg.ContentManager
 	 * @since 1.80.0

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

@@ -11,12 +11,14 @@ sap.ui.define([
 	"../cssColorToColor",
 	"../NodeContentType",
 	"sap/base/assert",
+	"sap/base/Log",
 	"sap/base/util/uid"
 ], function(
 	abgrToColor,
 	cssColorToColor,
 	NodeContentType,
 	assert,
+	Log,
 	uid
 ) {
 	"use strict";
@@ -136,6 +138,11 @@ sap.ui.define([
 				this.stroke = convertColor(material.lineColor, 1);
 				this.strokeWidth = material.lineWidth !== undefined ? material.lineWidth : 1;
 				this.strokeDashArray = (material.lineStyle && material.lineStyle.dashPattern) || [];
+				this.coordinateSpace = material.lineStyle?.widthCoordinateSpace ?? unknownCoordinateSpace;
+				if (material.lineStyle?.endCapStyle) {
+					this.linecap = "round";
+					this.linejoin = "round";
+				}
 			}
 		}
 
@@ -274,6 +281,19 @@ sap.ui.define([
 
 			node.userData.skipIt = true;
 
+			if (hotspotNode && node._isGeometryNode()) {
+				Object.defineProperty(node, "filter", {
+					get: function() {
+						return hotspotNode.getHotspotEffectDef().name;
+					},
+					configurable: true
+				});
+			}
+
+			if (node.hasOwnProperty("opacity")) {
+				delete node.opacity;
+			}
+
 			if (node._isGeometryNode()) {
 				node.fill = node.stroke = new Float32Array([1, 1, 1, 1]);
 				node._updateColor();
@@ -289,6 +309,13 @@ sap.ui.define([
 			return; // ignore this hotspot node because it has a hotspot ancestor
 		}
 
+		Object.defineProperty(this, "opacity", {
+			get: function() {
+				return this.highlightColor || this.customHotspotColor || this.hotspotColor ? 1 : 0;
+			},
+			configurable: true
+		});
+
 		this._updateHotspotDescendants(this);
 
 		if (this.domRef !== null) {
@@ -362,8 +389,17 @@ sap.ui.define([
 		var domRef = this.domRef;
 		if (domRef !== null) {
 			if (this.nodeContentType === NodeContentType.Hotspot && !this._hasHostpotAncestor()) {
-				domRef.setAttribute("filter", "url(#" + this.getHotspotEffectDef().name + ")");
-				domRef.setAttribute("opacity", this._getHotspotOpacity());
+				if (this.customText) {
+					this.customText.filter = this.getHotspotEffectDef().name + "-custom-text";
+					this.customText.domRef?.setAttribute("filter", `url(#${this.customText.filter})`);
+				}
+				this.traverse((node) => {
+					const filter = node.filter;
+					if (filter) {
+						node.domRef?.setAttribute("filter", `url(#${filter})`);
+					}
+				});
+				domRef.setAttribute("opacity", this.opacity);
 			} else {
 				var setAttributeFunc = domRef.setAttribute.bind(domRef);
 				if (this.highlightColor || this.tintColor) {
@@ -397,10 +433,6 @@ sap.ui.define([
 		}
 	};
 
-	Element.prototype._getHotspotOpacity = function() {
-		return this.highlightColor || this.customHotspotColor || this.hotspotColor ? 1 : 0;
-	};
-
 	Element._hotspotEffectName = function(color) {
 		return "hotspot-effect-" + rgbaToCSS(color.red, color.green, color.blue, color.alpha);
 	};
@@ -440,7 +472,7 @@ sap.ui.define([
 	};
 
 	Element.prototype.setTintColor = function(mask, tintColor) {
-		assert(this.nodeContentType !== NodeContentType.Hotspot && "setTintColor() method is not for hotspots, use setHotspotColor() method");
+		assert(this.nodeContentType !== NodeContentType.Hotspot, "setTintColor() method is not for hotspots, use setHotspotColor() method");
 		this.tintColor = tintColor;
 		this._updateColor(mask);
 	};
@@ -456,7 +488,7 @@ sap.ui.define([
 	};
 
 	Element.prototype.setCustomHotspotColor = function(mask, color) {
-		assert(this.nodeContentType === NodeContentType.Hotspot && "setCustomHotspotColor() method is only for hotspots");
+		assert(this.nodeContentType === NodeContentType.Hotspot, "setCustomHotspotColor() method is only for hotspots");
 		this.customHotspotColor = color;
 		this._updateColor(mask);
 	};
@@ -466,7 +498,7 @@ sap.ui.define([
 	};
 
 	Element.prototype.setOpacity = function(opacity) {
-		assert(this.nodeContentType !== NodeContentType.Hotspot && "setOpacity() method is not for hotspots");
+		assert(this.nodeContentType !== NodeContentType.Hotspot, "setOpacity() method is not for hotspots");
 
 		if (this._isGeometryNode()) {
 			return;
@@ -502,6 +534,68 @@ sap.ui.define([
 				}
 			}
 		}
+		this._updateCustomText();
+	};
+
+	/**
+	 * Attaches a custom text to this element.
+	 * @param {object} [options] The custom text options. If not specified, the existing custom text will be removed.
+	 * @param {string} [options.text] The text to display, it's mutually exclusive with "htmlText" option.
+	 * Line breaks are not supported, use "htmlText" option for multi-line text.
+	 * @param {string} [options.htmlText] The HTML text to display, it's mutually exclusive with "text" option.
+	 * Line breaks are supported using paragraphs: <p>Line 1</p><p>Line 2</p>.
+	 * htmlText example:
+	 * <p>Line <strong>1</strong></p>
+	 * <p>Line <em>2</em></p>
+	 * <p>Line <span style="font-size: 24pt;color: blue;font-family: 'courier new';">3</span></p>
+	 * @param {number} [options.size] The font size of the text in scene coordinate units. If not specified then the size will be
+	 * automatically determined based on the median text size in the scene or computed from the bounding box of the scene, but better
+	 * to specify it explicitly to avoid unexpected results.
+	 * @param {string} [options.fontFamily] The font family of the text. Default is "Arial".
+	 * @param {string} [options.fontStyle] The font style of the text (normal | italic | oblique). Default is undefined ("normal").
+	 * @param {string} [options.fontWeight] The font weight of the text (normal | bold | bolder | lighter | <number>). Default is undefined ("normal").
+	 * @param {string} [options.textDecoration] The text decoration of the text (none | underline | line-through, etc). Default is undefined ("none").
+	 * @param {string} [options.fill] The fill color of the text in CSS format. Default is "black".
+	 * @param {number[]} [options.pivot] The pivot point of the custom text, relative to the text bounding box.
+	 * The pivot point is used together with the anchor point to position the text.
+	 * Default is [0.5, 0.5] (middle of the custom text). [0, 0] is top-left, [1, 1] is bottom-right.
+	 * @param {number[]} [options.anchor] The anchor point of the text, relative to the bounding box of the node to which
+	 * the custom text is attached.
+	 * Default is [0.5, 0.5] (center of node). [0, 0] is top-left, [1, 1] is bottom-right.
+	 * @returns {sap.ui.vk.svg.Element} Returns <code>this</code> to allow method chaining.
+	 * @public
+	 * @experimental
+	 * @since 1.120.0
+	 */
+	Element.prototype.setCustomText = function(options) {
+		Log.warning("You need to import 'sap.ui.vk.svg.Text' module to call method setCustomText().");
+		return this;
+	};
+
+	Element.prototype._updateCustomText = function() {
+		if (this.customText) {
+			const bbox = this._getBBox(null, true);
+			const textBBox = this.customText.domRef?.getBBox();
+			if (bbox && textBBox) {
+				// calculate the matrix of the custom text element based on the bounding box of the element
+				const matrix = this._matrixWorld();
+				const pivot = this.customText.pivot ?? [0.5, 0.5]; // default pivot is center of the bonding box
+				const x = bbox.x + bbox.width * pivot[0];
+				const y = bbox.y + bbox.height * (matrix[3] < 0 ? 1 - pivot[1] : pivot[1]);
+				matrix[4] = matrix[5] = 0;
+				const p = Element._transformPoint(x, y, matrix);
+				const anchor = this.customText.anchor;
+				if (anchor) {
+					p.x -= textBBox.x + textBBox.width * anchor[0];
+					p.y -= textBBox.y + textBBox.height * anchor[1];
+				}
+				const invMatrix = Element._invertMatrix(matrix);
+				const p2 = Element._transformPoint(p.x, p.y, invMatrix);
+				invMatrix[4] = p2.x;
+				invMatrix[5] = p2.y;
+				this.customText.setMatrix(invMatrix);
+			}
+		}
 	};
 
 	Element._multiplyMatrices = function(a, b) {
@@ -650,10 +744,10 @@ sap.ui.define([
 	}
 
 	// This method returns aligned bounding box if the matrix is passed, or oriented bounding box if no matrix is passed
-	Element.prototype._getBBox = function(matrix) {
+	Element.prototype._getBBox = function(matrix, childrenOnly) {
 		if (this.domRef) {
 			var bbox;
-			if (!this.parent || this.domRef !== this.parent.domRef) {
+			if (!childrenOnly && this.domRef !== this.parent?.domRef) {
 				bbox = this.domRef.getBBox();
 				if (matrix && bbox) {// transform bounding box to parent coordinate system
 					bbox = transformBBox(bbox, matrix);
@@ -687,7 +781,8 @@ sap.ui.define([
 			isIdentityMatrix(element.matrix) &&
 			element.opacity === undefined &&
 			(element.nodeContentType !== NodeContentType.Hotspot || element._hasHostpotAncestor()) && // not a hotspot
-			element.vMask === 1;
+			element.vMask === 1 &&
+			element.customText == null;
 	}
 
 	Element.prototype._getSceneTreeElement = function() {
@@ -777,13 +872,14 @@ sap.ui.define([
 	Element.prototype._setBaseAttributes = function(setAttributeFunc, mask) {
 		setAttributeFunc("id", this.uid);
 
-		if (this.nodeContentType === NodeContentType.Hotspot) {
-			if (!this._hasHostpotAncestor()) {
-				setAttributeFunc("filter", "url(#" + this.getHotspotEffectDef().name + ")");
-				setAttributeFunc("opacity", this._getHotspotOpacity());
-			}
-		} else if (this.opacity !== undefined) {
-			setAttributeFunc("opacity", this.opacity);
+		const filter = this.filter; // filter can be defined as a getter for hotspots
+		if (filter != null) {
+			setAttributeFunc("filter", `url(#${filter})`);
+		}
+
+		const opacity = this.opacity; // opacity can be defined as a getter for hotspots
+		if (opacity != null) {
+			setAttributeFunc("opacity", opacity);
 		}
 		if (!isIdentityMatrix(this.matrix)) {
 			setAttributeFunc("transform", "matrix(" + this.matrix.join(",") + ")");
@@ -824,8 +920,11 @@ sap.ui.define([
 			if (this.strokeDashArray.length > 0) {
 				setAttributeFunc("stroke-dasharray", this.strokeDashArray.join(" "));
 			}
-			if (this.lineCap != null) {
-				setAttributeFunc("stroke-linecap", this.lineCap);
+			if (this.linecap != null) {
+				setAttributeFunc("stroke-linecap", this.linecap);
+			}
+			if (this.linejoin != null) {
+				setAttributeFunc("stroke-linejoin", this.linejoin);
 			}
 			if (!this.coordinateSpace || this.coordinateSpace === unknownCoordinateSpace) {
 				setAttributeFunc("vector-effect", "non-scaling-stroke");
@@ -888,6 +987,8 @@ sap.ui.define([
 			element.render(rm, mask);
 		});
 
+		this.customText?.render(rm, mask);
+
 		if (!skipIt) {
 			rm.close(tagName);
 		}
@@ -979,6 +1080,11 @@ sap.ui.define([
 			}
 			child._setDomRef(childDomRef);
 		}
+
+		if (this.customText) {
+			this.customText.domRef = document.getElementById(this.customText.uid);
+			this._updateCustomText();
+		}
 	};
 
 	Element.prototype.getElementByProperty = function(name, value) {
@@ -986,14 +1092,17 @@ sap.ui.define([
 			return this;
 		}
 
-		var children = this.children;
-		for (var i = 0, l = children.length; i < l; i++) {
-			var element = children[i].getElementByProperty(name, value);
+		for (let child of this.children) {
+			const element = child.getElementByProperty(name, value);
 			if (element !== null) {
 				return element;
 			}
 		}
 
+		if (this.customText && this.customText[name] === value) {
+			return this.customText;
+		}
+
 		return null;
 	};
 

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

@@ -59,6 +59,10 @@ sap.ui.define([
 			parametric.major = this.rx;
 			parametric.minor = this.ry;
 		}
+		if (this.cx || this.cy) {
+			parametric.cx = this.cx;
+			parametric.cy = this.cy;
+		}
 		return parametric;
 	};