@sapui5/sap.ui.vk 1.136.2 → 1.136.3

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2s
+	 * @version 1.136.3s
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.RedlineCollaboration
 	 * @since 1.89.0

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

@@ -27,7 +27,7 @@ sap.ui.define([
 		 *
 		 * @public
 		 * @author SAP SE
-		 * @version 1.136.2
+		 * @version 1.136.3
 		 * @extends sap.ui.core.Element
 		 * @alias sap.ui.vk.RedlineConversation
 		 * @since 1.89.0

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.RedlineSurface
 	 * @alias sap.ui.vk.RedlineDesign
 	 * @since 1.40.0

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.RedlineElement
 	 * @since 1.40.0

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.RedlineElementComment
 	 * @since 1.89.0

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.RedlineElement
 	 * @alias sap.ui.vk.RedlineElementEllipse
 	 * @since 1.40.0

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.RedlineElement
 	 * @alias sap.ui.vk.RedlineElementFreehand
 	 * @since 1.40.0

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.RedlineElement
 	 * @alias sap.ui.vk.RedlineElementLine
 	 * @since 1.40.0

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.RedlineElement
 	 * @alias sap.ui.vk.RedlineElementRectangle
 	 * @since 1.40.0

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.RedlineElement
 	 * @alias sap.ui.vk.RedlineElementText
 	 * @since 1.40.0

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

@@ -32,7 +32,7 @@ sap.ui.define([
 		 *
 		 * @public
 		 * @author SAP SE
-		 * @version 1.136.2
+		 * @version 1.136.3
 		 * @extends sap.ui.core.Control
 		 * @alias sap.ui.vk.RedlineSurface
 		 * @since 1.40.0

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vk.SafeArea
 	 */

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @public
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.Scene
 	 */
@@ -628,5 +628,20 @@ sap.ui.define([
 		return this;
 	};
 
+	Scene.prototype._metadata = null;
+
+	Scene.prototype.setSceneMetadata = function(metadata) {
+		this._metadata = metadata;
+		return this;
+	};
+
+	Scene.prototype.getSceneMetadata = function(metadata) {
+		return this._metadata;
+	};
+
+	Scene.prototype.isECADScene = function() {
+		return this._metadata?.some(({ category, tag, value }) => category === "ecad" && tag === "version" && value === "8");
+	};
+
 	return Scene;
 });

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 *
 	 * @constructor
 	 * @public
@@ -522,13 +522,12 @@ sap.ui.define([
 	};
 
 	SceneTree.prototype.refresh = function() {
-		if (!this._scene || !this._viewStateManager || !this._viewStateManager.getNodeHierarchy()) {
+		const nodeHierarchy = this._scene?.getDefaultNodeHierarchy?.();
+		if (!nodeHierarchy || !this._viewStateManager?.getNodeHierarchy()) {
 			this._model.setData([]);
 			return;
 		}
 
-		var nodeHierarchy = this._scene.getDefaultNodeHierarchy();
-
 		// building the tree model which is going to be passed to the TreeTable control.
 		var tree = [];
 		var getChildrenRecursively = function(tree, nodeRefs) {

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

@@ -79,7 +79,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new Step Navigation control.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vk.StepNavigation
 	 * @deprecated Since version 1.72.0. This class is used only with DVL namespace which will be removed in future. Use {@link sap.ui.vk.ViewGallery} instead.
@@ -335,7 +335,6 @@ sap.ui.define([
 
 		// Create JSON data model
 		this.oModel = new JSONModel();
-		this.setModel(this.oModel);
 
 		// Create layout panel
 		this._layout = new Toolbar({

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.Texture
 	 * @experimental Since 1.58.0 This class is experimental and might be modified or removed in future versions.

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

@@ -61,7 +61,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vk.ToggleMenuButton
 	 */

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.MenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 *
 	 * @constructor
 	 * @private

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

@@ -8,7 +8,6 @@
 // Provides control sap.ui.vk.Toolbar.
 sap.ui.define([
 	"./library",
-	"./ToolbarRenderer",
 	"./getResourceBundle",
 	"sap/ui/core/Control",
 	"sap/m/library",
@@ -21,7 +20,6 @@ sap.ui.define([
 	"sap/ui/core/Element"
 ], function(
 	vkLibrary,
-	ToolbarRenderer,
 	getResourceBundle,
 	Control,
 	mobileLibrary,
@@ -49,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 *
 	 * @constructor
 	 * @public
@@ -100,43 +98,26 @@ sap.ui.define([
 					type: "sap.m.Toolbar",
 					multiple: false,
 					visibility: "hidden"
-				},
-				_helpButton: {
-					type: "sap.m.Button",
-					multiple: false,
-					visibility: "hidden"
-				},
-				_stepNavigationButton: {
-					type: "sap.m.ToggleButton",
-					multiple: false,
-					visibility: "hidden"
-				},
-				_sceneTreeButton: {
-					type: "sap.m.ToggleButton",
-					multiple: false,
-					visibility: "hidden"
-				},
-				_miniMapButton: {
-					type: "sap.m.ToggleButton",
-					multiple: false,
-					visibility: "hidden"
-				},
-				_enterFullScreenButton: {
-					type: "sap.m.ToggleButton",
-					multiple: false,
-					visibility: "hidden"
-				},
-				_exitFullScreenButton: {
-					type: "sap.m.Button",
-					multiple: false,
-					visibility: "hidden"
-				},
-				_toolbarTitle: {
-					type: "sap.m.Title",
-					multiple: false,
-					visibility: "hidden"
 				}
 			}
+		},
+
+		constructor: function(id, settings) {
+			Control.apply(this, arguments);
+
+			this._getViewer()?.attachFullScreen(this._fullScreenHandler, this);
+		},
+
+		renderer: {
+			apiVersion: 2,
+
+			render: function(rm, control) {
+				rm.openStart("div", control);
+				rm.class("sapVizKitToolbar");
+				rm.openEnd();
+				rm.renderControl(control.getAggregation("_toolbar"));
+				rm.close("div");
+			}
 		}
 	});
 
@@ -144,31 +125,8 @@ sap.ui.define([
 		return this._toolbar;
 	};
 
-	/*
-	 * Toggles the step navigation control visibility and updates its button
-	 */
-	Toolbar.prototype._onSceneTree = function() {
-		this.oViewer = Element.getElementById(this.getViewer());
-		if (this.oViewer != null) {
-			this.oViewer._componentsState.sceneTree.userInteractionShow = this._sceneTreeButton.getPressed();
-			this.oViewer.setShowSceneTree(this.oViewer._componentsState.sceneTree.userInteractionShow);
-		}
-	};
-
-	Toolbar.prototype._onStepNavigation = function() {
-		this.oViewer = Element.getElementById(this.getViewer());
-		if (this.oViewer != null) {
-			this.oViewer._componentsState.stepNavigation.userInteractionShow = this._stepNavigationButton.getPressed();
-			this.oViewer.setShowStepNavigation(this.oViewer._componentsState.stepNavigation.userInteractionShow);
-		}
-	};
-
-	Toolbar.prototype._onMiniMap = function() {
-		this.oViewer = Element.getElementById(this.getViewer());
-		if (this.oViewer != null) {
-			this.oViewer._componentsState.miniMap.userInteractionShow = this._miniMapButton.getPressed();
-			this.oViewer.setShowMiniMap(this.oViewer._componentsState.miniMap.userInteractionShow);
-		}
+	Toolbar.prototype._getViewer = function() {
+		return Element.getElementById(this.getViewer());
 	};
 
 	Toolbar.prototype._getViewer = function() {
@@ -176,7 +134,7 @@ sap.ui.define([
 	};
 
 	Toolbar.prototype._onFullScreen = function() {
-		this._getViewer()?.activateFullScreenMode();
+		this._getViewer()?.activateFullScreenMode(this._enterFullScreenButton.getPressed());
 	};
 
 	Toolbar.prototype._fullScreenHandler = function(event) {
@@ -195,46 +153,70 @@ sap.ui.define([
 			Control.prototype.init.apply(this);
 		}
 
-		var _helpButton = new Button({
-			icon: "sap-icon://sys-help",
-			type: ButtonType.Transparent,
-			tooltip: getResourceBundle().getText("VIEWER_HELPBUTTONTOOLTIP")
-		});
-		this.setAggregation("_helpButton", _helpButton);
-
 		this._stepNavigationButton = new ToggleButton({
 			icon: "sap-icon://step",
 			type: ButtonType.Transparent,
-			enabled: false,
 			tooltip: getResourceBundle().getText("STEP_NAV_MENUBUTTONTOOLTIP"),
-			press: this._onStepNavigation.bind(this)
+			visible: "{= ${_internal>/stepNavigation/enabled} === true && ${_internal>/stepNavigation/supported} === true }",
+			pressed: "{_internal>/stepNavigation/visible}"
 		}).data("help-id", "sapUiVkStepNavigationBtn", true);
-		this.setAggregation("_stepNavigationButton", this._stepNavigationButton);
 
 		this._sceneTreeButton = new ToggleButton({
 			icon: "sap-icon://tree",
 			type: ButtonType.Transparent,
 			tooltip: getResourceBundle().getText("SCENETREE_MENUBUTTONTOOLTIP"),
-			press: this._onSceneTree.bind(this)
+			visible: "{= ${_internal>/sceneTree/enabled} === true && ${_internal>/sceneTree/supported} === true }",
+			pressed: "{_internal>/sceneTree/visible}"
 		}).data("help-id", "sapUiVkSceneTreeBtn", true);
-		this.setAggregation("_sceneTreeButton", this._sceneTreeButton);
+
+		this._layersPanelButton = new ToggleButton({
+			icon: "sap-icon://dimension",
+			type: ButtonType.Transparent,
+			tooltip: getResourceBundle().getText("LAYERS_BUTTONTOOLTIP"),
+			visible: "{= ${_internal>/layersPanel/enabled} === true && ${_internal>/layersPanel/supported} === true }",
+			pressed: "{_internal>/layersPanel/visible}"
+		}).data("help-id", "sapUiVkLayersBtn", true);
+
+		this._elementsPanelButton = new ToggleButton({
+			icon: "sap-icon://group-2",
+			type: ButtonType.Transparent,
+			tooltip: getResourceBundle().getText("ELEMENTS_BUTTONTOOLTIP"),
+			visible: "{= ${_internal>/elementsPanel/enabled} === true && ${_internal>/elementsPanel/supported} === true }",
+			pressed: "{_internal>/elementsPanel/visible}"
+		}).data("help-id", "sapUiVkElementsBtn", true);
+
+		this._pageGalleryButton = new ToggleButton({
+			icon: "sap-icon://documents",
+			type: ButtonType.Transparent,
+			tooltip: getResourceBundle().getText("PAGE_GALLERY_BUTTONTOOLTIP"),
+			visible: "{= ${_internal>/pageGallery/enabled} === true && ${_internal>/pageGallery/supported} === true }",
+			pressed: "{_internal>/pageGallery/visible}"
+		}).data("help-id", "sapUiVkPageGalleryBtn", true);
 
 		this._miniMapButton = new ToggleButton({
 			icon: "sap-icon://map-3",
 			type: ButtonType.Transparent,
 			tooltip: getResourceBundle().getText("MINIMAP_BUTTONTOOLTIP"),
-			press: this._onMiniMap.bind(this)
+			visible: "{= ${_internal>/miniMap/enabled} === true && ${_internal>/miniMap/supported} === true }",
+			pressed: "{_internal>/miniMap/visible}"
 		}).data("help-id", "sapUiVkMiniMapBtn", true);
 
+		this._toggleHotspotsButton = new ToggleButton({
+			icon: "sap-icon://example",
+			type: ButtonType.Transparent,
+			tooltip: getResourceBundle().getText("TOGGLE_HOTSPOTS_BUTTONTOOLTIP"),
+			visible: "{= ${_internal>/hotspots/supported} === true && ${_internal>/hotspots/enabled} === true }",
+			pressed: "{_internal>/hotspots/showAll}"
+		}).data("help-id", "sapUiVkToolgeHotspotsBtn", true);
+
 		this._toolbarTitle = new Title();
-		this.setAggregation("_toolbarTitle", this._toolbarTitle);
 
 		this._enterFullScreenButton = new Button({
 			icon: "sap-icon://full-screen",
 			type: ButtonType.Transparent,
-			press: this._onFullScreen.bind(this),
-			tooltip: getResourceBundle().getText("ENTER_FULLSCREEN")
-		}).data("help-id", "sapUiVkEnterFullScreenBtn", true).addStyleClass("sapUiVkFullScreenToolbarButton");
+			tooltip: getResourceBundle().getText("VIEWER_FULLSCREENBUTTONTOOLTIP"),
+			press: this._onFullScreen.bind(this)
+		}).data("help-id", "sapUiVkEnterFullScreenBtn", true);
 
 		var toolbarContent = [
 			new ToolbarSpacer(),
@@ -242,6 +224,10 @@ sap.ui.define([
 			new ToolbarSpacer(),
 			this._sceneTreeButton,
 			this._stepNavigationButton,
+			this._layersPanelButton,
+			this._elementsPanelButton,
+			this._pageGalleryButton,
+			this._toggleHotspotsButton,
 			this._miniMapButton,
 			new ToolbarSeparator(),
 			this._enterFullScreenButton
@@ -255,10 +241,7 @@ sap.ui.define([
 	};
 
 	Toolbar.prototype.exit = function() {
-		this.oViewer = Element.getElementById(this.getViewer());
-		if (this.oViewer) {
-			this.oViewer.detachFullScreen(this._fullScreenHandler.bind(this));
-		}
+		this._getViewer()?.detachFullScreen(this._fullScreenHandler, this);
 	};
 
 	Toolbar.prototype.onBeforeRendering = function() {
@@ -266,23 +249,6 @@ sap.ui.define([
 		this._toolbarTitle.setText(this.getTitle());
 	};
 
-	Toolbar.prototype.refresh = function() {
-		this.oViewer = Element.getElementById(this.getViewer());
-		this._stepNavigationButton.setPressed(this.oViewer.getShowStepNavigation());
-		this._stepNavigationButton.setEnabled(this.oViewer.getEnableStepNavigation());
-		this._sceneTreeButton.setPressed(this.oViewer.getShowSceneTree());
-		this._sceneTreeButton.setEnabled(this.oViewer.getEnableSceneTree());
-		this._miniMapButton.setPressed(this.oViewer.getShowMiniMap());
-		this._miniMapButton.setVisible(this.oViewer.getEnableMiniMap());
-
-		this.oViewer.attachFullScreen(this._fullScreenHandler.bind(this));
-		return true;
-	};
-
-	Toolbar.prototype.onAfterRendering = function() {
-		this.refresh();
-	};
-
 	return Toolbar;
 
 });

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.base.ManagedObject
 	 * @implements sap.ui.vk.IPlaybackCollection
 	 * @alias sap.ui.vk.View

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

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new View Gallery control.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vk.ViewGallery
 	 * @since 1.62.0

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewGalleryThumbnail.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.m.Image
 	 * @alias sap.ui.vk.ViewGalleryThumbnail
 	 * @since 1.72.0

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.ViewGroup
 	 */

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.ViewManager
 	 */

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewStateManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.ViewStateManager
 	 * @since 1.32.0

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @public
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.ViewStateManagerBase
 	 * @since 1.32.0