@sapui5/sap.ui.vk 1.135.0 → 1.138.0

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.135.0
+	 * @version 1.138.0
 	 *
 	 * @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,39 +125,12 @@ 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._onFullScreen = function() {
-		this.oViewer = Element.getElementById(this.getViewer());
-		if (this.oViewer != null) {
-			var newStateFullScreenButton = this._enterFullScreenButton.getPressed();
-			this.oViewer.activateFullScreenMode(newStateFullScreenButton);
-		}
+		this._getViewer()?.activateFullScreenMode();
 	};
 
 	Toolbar.prototype._fullScreenHandler = function(event) {
@@ -195,54 +149,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 ToggleButton({
+		this._enterFullScreenButton = new Button({
 			icon: "sap-icon://full-screen",
 			type: ButtonType.Transparent,
-			tooltip: getResourceBundle().getText("VIEWER_FULLSCREENBUTTONTOOLTIP"),
-			press: this._onFullScreen.bind(this)
-		}).data("help-id", "sapUiVkEnterFullScreenBtn", true);
-		this.setAggregation("_enterFullScreenButton", this._enterFullScreenButton);
-
-		var _exitFullScreenButton = new Button({
-			icon: "sap-icon://exit-full-screen",
-			type: ButtonType.Transparent,
-			tooltip: getResourceBundle().getText("VIEWER_FULLSCREENBUTTONTOOLTIP")
-		}).data("help-id", "sapUiVkExitFullScreenBtn", true);
-		this.setAggregation("_exitFullScreenButton", _exitFullScreenButton);
+			press: this._onFullScreen.bind(this),
+			tooltip: getResourceBundle().getText("ENTER_FULLSCREEN")
+		}).data("help-id", "sapUiVkEnterFullScreenBtn", true).addStyleClass("sapUiVkFullScreenToolbarButton");
 
 		var toolbarContent = [
 			new ToolbarSpacer(),
@@ -250,6 +220,10 @@ sap.ui.define([
 			new ToolbarSpacer(),
 			this._sceneTreeButton,
 			this._stepNavigationButton,
+			this._layersPanelButton,
+			this._elementsPanelButton,
+			this._pageGalleryButton,
+			this._toggleHotspotsButton,
 			this._miniMapButton,
 			new ToolbarSeparator(),
 			this._enterFullScreenButton
@@ -263,10 +237,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() {
@@ -274,23 +245,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.135.0
+	 * @version 1.138.0
 	 * @extends sap.ui.base.ManagedObject
 	 * @implements sap.ui.vk.IPlaybackCollection
 	 * @alias sap.ui.vk.View
@@ -124,7 +124,7 @@ sap.ui.define([
 	 *
 	 * @returns {sap.ui.vk.Camera} View camera
 	 * @public
-	 * @experimental Since 1.73.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.73.0
 	 */
 	View.prototype.getCamera = function() {
 		return this._camera;
@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @param {sap.ui.vk.Camera} camera View camera
 	 * @return {sap.ui.vk.View} return this
 	 * @public
-	 * @experimental Since 1.73.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.73.0
 	 */
 	View.prototype.setCamera = function(camera) {
 		this._camera = camera;
@@ -492,8 +492,7 @@ sap.ui.define([
 	 * }
 	 * </pre>
 	 * @public
-	 *
-	 * @experimental Since 1.73.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.73.0
 	 */
 	View.prototype.getNodeInfos = function() {
 		return this._nodeInfos ? this._nodeInfos : [];
@@ -510,12 +509,9 @@ sap.ui.define([
 	 * @param {boolean} infos[].visible - Node visibility
 	 * @param {float} infos[].opacity - Node opacity
 	 * @param {float} infos[].annotationId - Optional, annotation id
-	 *
 	 * @returns {this} Reference to this in order to allow method chaining
-	 *
 	 * @public
-	 *
-	 * @experimental Since 1.73.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.73.0
 	 */
 	View.prototype.setNodeInfos = function(infos) {
 		this._nodeInfos = infos;
@@ -533,10 +529,8 @@ sap.ui.define([
 	 * @param {boolean} update[].visible - Node visibility
 	 * @param {float} update[].opacity - Node opacity
 	 * @returns {this} Reference to this in order to allow method chaining
-	 *
 	 * @public
-	 *
-	 * @experimental Since 1.73.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.73.0
 	 */
 	View.prototype.updateNodeInfos = function(update) {
 		var currentData = this.getNodeInfos();
@@ -574,7 +568,7 @@ sap.ui.define([
 	 *
 	 * @return {sap.ui.model.Model} returns the model for this view.
 	 * @public
-	 * @experimental Since 1.76.0 This class is experimental and might be modified or removed in future versions.
+	 * @since 1.76.0
 	 */
 	View.prototype.getModel = function() {
 		return this._model;

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.135.0
+	 * @version 1.138.0
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vk.ViewGallery
 	 * @since 1.62.0
@@ -440,7 +440,7 @@ sap.ui.define([
 	};
 
 	ViewGallery.prototype._updateAnimationTimeSlider = function(viewGroup) {
-		const hasAnimatedView = viewGroup.views.some(view => view.animated === true);
+		const hasAnimatedView = viewGroup.views?.some(view => view.animated === true);
 		this.setShowAnimationTimeSlider(hasAnimatedView);
 	};
 

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.135.0
+	 * @version 1.138.0
 	 * @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.135.0
+	 * @version 1.138.0
 	 * @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.135.0
+	 * @version 1.138.0
 	 * @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.135.0
+	 * @version 1.138.0
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.ViewStateManager
 	 * @since 1.32.0
@@ -1123,7 +1123,7 @@ sap.ui.define([
 	 * @param {string} nodeId node Id string, optional
 	 * @returns {any[]} An array of nodes
 	 * @public
-	 * @experimental Since 1.82.0 This method is experimental and might be modified or removed in future versions
+	 * @since 1.82.0
 	 */
 	ViewStateManager.prototype.getSymbolNodes = function(nodeId) {
 		if (this._implementation && this._implementation.getSymbolNodes) {

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @public
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.138.0
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.ViewStateManagerBase
 	 * @since 1.32.0
@@ -919,7 +919,7 @@ sap.ui.define([
 	 * @returns {float|float[]} A single value or an array of values. Value <code>null</code> means that the node's own
 	 *                          <code>selectable</code> property should be used.
 	 * @public
-	 * @experimental Since 1.111.0 This method is experimental and might be modified or removed in future versions.
+	 * @since 1.111.0
 	 */
 	ViewStateManagerBase.prototype.getSelectable = function(nodeRefs) {
 		// Return default value which is `true`.
@@ -950,7 +950,7 @@ sap.ui.define([
 	 *                                  node's own <code>selectable</code> property is in use.
 	 * @returns {this} <code>this</code> to allow method chaining.
 	 * @public
-	 * @experimental Since 1.111.0 This method is experimental and might be modified or removed in future versions.
+	 * @since 1.111.0
 	 */
 	ViewStateManagerBase.prototype.setSelectable = function(nodeRefs, selectable) {
 		// Do nothing.