@sapui5/sap.ui.vk 1.136.1 → 1.139.0

package/src/sap/ui/vk/ecad/LayersPanel.js

@@ -1,8 +1,5 @@
 /*!
- * SAP UI development toolkit for HTML5 (SAPUI5)
-
-        (c) Copyright 2009-2015 SAP SE. All rights reserved
-    
+ * ${c\pyright}
  */
 
 // Provides control sap.ui.vk.ecad.LayerPanel
@@ -12,53 +9,45 @@ sap.ui.define([
 	"sap/m/OverflowToolbar",
 	"sap/m/ToolbarLayoutData",
 	"sap/m/ToolbarSpacer",
-	"sap/m/Text",
+	"sap/m/Label",
 	"sap/m/Table",
 	"sap/m/Column",
-	"sap/m/Sticky",
-	"sap/m/ScrollContainer",
 	"sap/m/ColumnListItem",
-	"sap/ui/core/Core",
+	"sap/m/plugins/ColumnResizer",
 	"sap/ui/core/Control",
 	"sap/ui/core/Element",
 	"sap/ui/core/Icon",
 	"sap/ui/core/library",
-	"sap/ui/core/ResizeHandler",
 	"sap/ui/model/json/JSONModel",
 	"../Core",
-	"../library",
-	"../ViewStateManager",
-	"./LayersPanelRenderer",
 	"./VisibilityType",
-	"../getResourceBundle"
+	"../getResourceBundle",
+	"sap/m/library"
 ], function(
 	Button,
 	SearchField,
 	OverflowToolbar,
 	ToolbarLayoutData,
 	ToolbarSpacer,
-	Text,
+	Label,
 	Table,
 	Column,
-	Sticky,
-	ScrollContainer,
 	ColumnListItem,
-	Core,
+	ColumnResizer,
 	Control,
 	Element,
 	Icon,
 	Library,
-	ResizeHandler,
 	JSONModel,
 	vkCore,
-	vkLibrary,
-	ViewStateManager,
-	LayersPanelRenderer,
 	VisibilityType,
-	getResourceBundle
+	getResourceBundle,
+	SapMLibrary
 ) {
 	"use strict";
 
+	const Sticky = SapMLibrary.Sticky;
+
 	/**
 	 * Constructor for a new LayersPanel.
 	 *
@@ -69,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public
@@ -80,9 +69,19 @@ sap.ui.define([
 	var LayersPanel = Control.extend("sap.ui.vk.ecad.LayersPanel", /** @lends sap.ui.vk.ecad.LayersPanel.prototype */ {
 		metadata: {
 			library: "sap.ui.vk",
+			properties: {
+				width: {
+					type: "sap.ui.core.CSSSize",
+					defaultValue: "auto"
+				},
+				height: {
+					type: "sap.ui.core.CSSSize",
+					defaultValue: "100%"
+				}
+			},
 			aggregations: {
 				content: {
-					type: "sap.m.ScrollContainer",
+					type: "sap.m.Table",
 					multiple: false
 				}
 			},
@@ -112,19 +111,40 @@ sap.ui.define([
 				}
 			}
 		},
-
-		renderer: LayersPanelRenderer,
-
+		renderer: {
+			apiVersion: 2,
+			render: function(oRm, oControl) {
+				oRm.openStart("div", oControl);
+				oRm.class("sapUiSizeCompact");
+				const width = oControl.getWidth();
+				if (width != null) {
+					oRm.style("width", width);
+				}
+				const height = oControl.getHeight();
+				if (height != null) {
+					oRm.style("height", height);
+				}
+				oRm.openEnd();
+				oRm.renderControl(oControl.getAggregation("content"));
+				oRm.close("div");
+			}
+		},
 		constructor: function(sId, mSettings) {
 			Control.apply(this, arguments);
 			vkCore.observeAssociations(this);
 		}
 	});
 
-	var iconHidden = "sap-icon://status-inactive";
-	var iconPartial = "sap-icon://rhombus-milestone";
-	var iconVisible = "sap-icon://rhombus-milestone-2";
+	const IconType = {
+		Hidden: "sap-icon://status-inactive",
+		Partial: "sap-icon://vk-icons/partially-visible-layer",
+		Visible: "sap-icon://rhombus-milestone-2"
+	};
 
+	const ElementType = {
+		Component: "2",
+		Net: "4"
+	};
 	LayersPanel.prototype.onSetViewStateManager = function(manager) {
 		this._manager = manager;
 		manager.attachVisibilityChanged(this._onVisibilityChanged, this);
@@ -153,12 +173,21 @@ sap.ui.define([
 		if (Control.prototype.init) {
 			Control.prototype.init.apply(this);
 		}
-		var that = this;
+		const that = this;
+
+		this._searchField = new SearchField({
+			layoutData: new ToolbarLayoutData({
+				shrinkable: true,
+				maxWidth: "400px"
+			}),
+			search: function(event) {
+				that._onSearch.call(that, event.getParameter("query"));
+			}
+		});
 
 		this._showButton = new Button({
 			enabled: false,
-			iconFirst: true,
-			icon: iconVisible,
+			icon: IconType.Visible,
 			text: getResourceBundle().getText("LAYERS_PANEL_SHOW_BUTTON"),
 			tooltip: getResourceBundle().getText("LAYERS_PANEL_SHOW_BUTTON_TOOLTIP"),
 			press: this._onShowLayers.bind(this)
@@ -166,8 +195,7 @@ sap.ui.define([
 
 		this._hideButton = new Button({
 			enabled: false,
-			iconFirst: true,
-			icon: iconHidden,
+			icon: IconType.Hidden,
 			text: getResourceBundle().getText("LAYERS_PANEL_HIDE_BUTTON"),
 			tooltip: getResourceBundle().getText("LAYERS_PANEL_HIDE_BUTTON_TOOLTIP"),
 			press: this._onHideLayers.bind(this)
@@ -175,35 +203,34 @@ sap.ui.define([
 
 		this._table = new Table({
 			mode: "MultiSelect",
+			includeItemInSelection: true,
+			noDataText: getResourceBundle().getText("LAYERS_PANEL_NO_DATA"),
 			sticky: [Sticky.HeaderToolbar, Sticky.ColumnHeaders],
 			selectionChange: this._onSelectionChanged.bind(this),
 			headerToolbar: new OverflowToolbar({
 				content: [
-					new SearchField({
-						layoutData: new ToolbarLayoutData({
-							shrinkable: true,
-							maxWidth: "400px"
-						}),
-						search: function(event) {
-							this._onSearch(event.getParameter("query")).bind(this);
-						}
-					}),
+					this._searchField,
 					new ToolbarSpacer(),
 					this._showButton,
 					this._hideButton
 				]
 			}),
+			dependents: [
+				new ColumnResizer({
+					columnResize: that._onColumnResize.bind(this)
+				})
+			],
 			columns: [
 				new Column({
 					minScreenWidth: "10rem",
 					hAlign: Library.TextAlign.Begin,
-					header: new Text({ text: getResourceBundle().getText("LAYERS_PANEL__NAME_COLUMN") })
+					header: new Label({ text: getResourceBundle().getText("LAYERS_PANEL_NAME_COLUMN") })
 
 				}),
 				new Column({
 					minScreenWidth: "6rem",
 					hAlign: Library.TextAlign.Center,
-					header: new Text({ text: getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN") })
+					header: new Label({ text: getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN") })
 				})
 			],
 			items: {
@@ -211,32 +238,34 @@ sap.ui.define([
 				template: new ColumnListItem({
 					vAlign: "Middle",
 					cells: [
-						new Text({
+						new Label({
 							text: "{name}"
 						}),
 						new Icon({
 							src: {
 								path: "",
 								formatter: function(layer) {
-									var type = that._getVisibility(layer);
-									if (type === VisibilityType.Hidden) {
-										return iconHidden;
-									} else if (type === VisibilityType.Partial) {
-										return iconPartial;
+									switch (that._getVisibility(layer)) {
+										case VisibilityType.Hidden:
+											return IconType.Hidden;
+										case VisibilityType.Partial:
+											return IconType.Partial;
+										default:
+											return IconType.Visible;
 									}
-									return iconVisible;
 								}
 							},
 							tooltip: {
 								path: "",
 								formatter: function(layer) {
-									var type = that._getVisibility(layer);
-									if (type === VisibilityType.Hidden) {
-										return getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN_HIDDEN_TOOLTIP");
-									} else if (type === VisibilityType.Partial) {
-										return getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN_PARTIAL_TOOLTIP");
+									switch (that._getVisibility(layer)) {
+										case VisibilityType.Hidden:
+											return getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN_HIDDEN_TOOLTIP");
+										case VisibilityType.Partial:
+											return getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN_PARTIAL_TOOLTIP");
+										default:
+											return getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN_VISIBLE_TOOLTIP");
 									}
-									return getResourceBundle().getText("LAYERS_PANEL_VISIBLE_COLUMN_VISIBLE_TOOLTIP");
 								}
 							}
 						})
@@ -245,58 +274,90 @@ sap.ui.define([
 			}
 		});
 
-		this._scrollContainer = new ScrollContainer({
-			vertical: true,
-			horizontal: false,
-			height: "100%",
-			content: this._table
-		});
-
-		this.setAggregation("content", this._scrollContainer);
+		this.setAggregation("content", this._table);
 
 		this._scene = null;
 		this._model = new JSONModel();
 		this._table.setModel(this._model);
+		this._skipEvent = false;
+	};
+
+	LayersPanel.prototype.exit = function() {
+		this._model.destroy();
+		this._model = null;
+
+		Control.prototype.exit?.apply(this);
+	};
+
+	LayersPanel.prototype.getControl = function() {
+		return this._table;
 	};
 
 	LayersPanel.prototype.refresh = function() {
-		if (!this._scene || !this._manager || !this._manager.getNodeHierarchy()) {
-			this._model.setData([]);
+		if (!this._scene || !this._manager) {
+			// This method may be called indirectly from the exit method after _model is destroyed
+			this._model?.setData([]);
 			return;
 		}
 		// scan the tree and collect layers info
-		var layers = new Map();
-		this._scanTree(layers, this._manager.getNodeHierarchy().getSceneRef());
+		this._initialLayerIndex = 1;
+		const layers = new Map();
+		this._scanTree(layers, this._scene.getRootElement());
+
+		// get layer index info from scene metadata
+		const indices = this._extractLayersIndex();
+
+		indices.forEach(function(index, name) {
+			const layer = layers.get(name);
+			if (layer) {
+				layer.index = +index;
+			}
+		}, this);
 
-		this._model.setData(layers.values().toArray());
+		const data = layers.values().toArray();
+		data.sort((a, b) => a.index - b.index);
+		this._model.setSizeLimit(data.length);
+		this._model.setData(data);
 		this._table.setModel(this._model);
-		this.fireContentChanged();
-	};
 
-	LayersPanel.prototype.onBeforeRendering = function() {
-		this._table.setVisible(true);
-		if (!this._resizeListenerId) {
-			this._resizeListenerId = ResizeHandler.register(this, this._handleResize.bind(this));
-		}
+		this.fireContentChanged();
 	};
 
 	LayersPanel.prototype._setScene = function(scene) {
-		this._scene = scene;
+		this._scene = scene?.isECADScene() ? scene : null;
 		this.refresh();
 	};
 
+	LayersPanel.prototype._extractLayersIndex = function() {
+		const index = new Map();
+		const metadata = this._scene.getSceneMetadata();
+		const layers = metadata.find((el) => el.category === "ecad" && el.tag === "Layers");
+
+		if (layers) {
+			const list = layers.value.split("|");
+			list.forEach(function(name) {
+				const idx = metadata.find((el) => el.category === name && el.tag === "Index");
+				if (idx) {
+					index.set(name, idx.value);
+				}
+			}, this);
+		}
+		return index;
+	};
+
 	LayersPanel.prototype._getVisibility = function(layer) {
-		if (layer.hiddenElements === 0) {
+		if (layer.hiddenElements.size === 0) {
 			return VisibilityType.Visible;
-		} else if (layer.hiddenElements < layer.elements.size) {
+		} else if (layer.hiddenElements.size < layer.elements.size) {
 			return VisibilityType.Partial;
 		}
 		return VisibilityType.Hidden;
 	};
 
-	LayersPanel.prototype._extractMetadata = function(metadata) {
-		if (metadata.length != undefined) {
-			var map = new Map();
+	LayersPanel.prototype._extractMetadata = function(nodeRef) {
+		const metadata = nodeRef?.userData?.metadata ?? {};
+		if (metadata.length) {
+			const map = new Map();
 			metadata.forEach(function(entry) {
 				if (entry.category === "ecad") {
 					map.set(entry.tag, entry.value);
@@ -307,48 +368,33 @@ sap.ui.define([
 		return null;
 	};
 
-	LayersPanel.prototype._addElement = function(layers, layerName, nodeRef, nodeVisibility) {
-		var layer = layers.get(layerName);
+	LayersPanel.prototype._addToLayer = function(layers, layerName, nodeRef) {
+		let layer = layers.get(layerName);
 		if (!layer) {
 			layer = {
 				name: layerName,
-				order: 0, // wait until CAD Translators support
+				index: this._initialLayerIndex++,
 				elements: new Map(),
-				hiddenElements: 0
+				hiddenElements: new Set()
 			};
 			layers.set(layerName, layer);
 		}
-		if (nodeVisibility == false) {
-			layer.hiddenElements++;
+		if (this._manager.getVisibilityState(nodeRef) === false) {
+			layer.hiddenElements.add(nodeRef.uid);
 		}
 		layer.elements.set(nodeRef.uid, nodeRef);
 	};
 
 	LayersPanel.prototype._scanTree = function(layers, nodeRef) {
-		var hierarchy = this._manager.getNodeHierarchy();
-		var node = hierarchy.createNodeProxy(nodeRef);
-		var metadata = this._extractMetadata(node.getNodeMetadata());
-		hierarchy.destroyNodeProxy(node);
-
+		const metadata = this._extractMetadata(nodeRef);
 		if (metadata) {
-			var layer = metadata.get("layer");
+			const layer = metadata.get("layer");
 			if (layer) {
-				this._addElement(layers, layer, nodeRef, this._manager.getVisibilityState(nodeRef));
+				this._addToLayer(layers, layer, nodeRef);
 				return; // don't go further down the hierarchy
 			}
 		}
-
-		hierarchy.getChildren(nodeRef).forEach(function(ref) {
-			this._scanTree(layers, ref);
-		}, this);
-	};
-
-	LayersPanel.prototype._onSelectionChanged = function(event) {
-		this._updateButtons();
-	};
-
-	LayersPanel.prototype._onVisibilityChanged = function(event) {
-		//
+		nodeRef.children.forEach((child) => this._scanTree(layers, child));
 	};
 
 	LayersPanel.prototype._handleResize = function(event) {
@@ -358,9 +404,9 @@ sap.ui.define([
 	LayersPanel.prototype._setContent = function(content) {
 		// If there is no explicitly assigned view state manager then use the content connector's default one.
 		if (content && !this.getViewStateManager()) {
-			var connector = Element.getElementById(this.getContentConnector());
+			const connector = Element.getElementById(this.getContentConnector());
 			if (connector) {
-				var defaultManager = connector.getDefaultViewStateManager();
+				const defaultManager = connector.getDefaultViewStateManager();
 				if (defaultManager) {
 					this.setViewStateManager(defaultManager);
 				}
@@ -375,16 +421,18 @@ sap.ui.define([
 	};
 
 	LayersPanel.prototype._onContentChangesFinished = function(event) {
-		this.refresh();
+		// causes second rebuild of everything
+		// this.refresh();
 	};
 
 	LayersPanel.prototype._updateButtons = function() {
-		var canShow = false, canHide = false;
-		var selected = this._table.getSelectedItems();
+		let canHide = false;
+		let canShow = false;
+		const selected = this._table.getSelectedItems();
 
 		selected.forEach(function(item) {
-			var layer = item.getBindingContext().getObject();
-			var visibility = this._getVisibility(layer);
+			const layer = item.getBindingContext().getObject();
+			const visibility = this._getVisibility(layer);
 
 			if (visibility === VisibilityType.Visible) {
 				canHide = true;
@@ -401,40 +449,108 @@ sap.ui.define([
 	};
 
 	LayersPanel.prototype._onShowLayers = function() {
-		var toShow = [];
-		var selected = this._table.getSelectedItems();
+		const toShow = [];
+		const selected = this._table.getSelectedItems();
 
 		selected.forEach(function(item) {
-			var layer = item.getBindingContext().getObject();
-			if (layer.hiddenElements !== 0) {
-				layer.hiddenElements = 0;
+			const layer = item.getBindingContext().getObject();
+			if (layer.hiddenElements.size > 0) {
+				layer.hiddenElements.clear();
 				layer.elements.forEach(function(nodeRef) {
 					toShow.push(nodeRef);
-				});
+				}, this);
 			}
-		});
+		}, this);
+
+		this._skipEvent = true;
 		this._manager.setVisibilityState(toShow, true, true, true);
 		this._model.updateBindings(true);
 		this._updateButtons();
 	};
 
 	LayersPanel.prototype._onHideLayers = function() {
-		var toHide = [];
-		var selected = this._table.getSelectedItems();
+		const toHide = [];
+		const selected = this._table.getSelectedItems();
 
 		selected.forEach(function(item) {
-			var layer = item.getBindingContext().getObject();
-			if (layer.hiddenElements !== layer.elements.size) {
-				layer.hiddenElements = layer.elements.size;
+			const layer = item.getBindingContext().getObject();
+			if (layer.hiddenElements.size !== layer.elements.size) {
+				layer.hiddenElements.clear();
 				layer.elements.forEach(function(nodeRef) {
+					layer.hiddenElements.add(nodeRef.uid);
 					toHide.push(nodeRef);
-				});
+				}, this);
 			}
-		});
+		}, this);
+		this._skipEvent = true;
 		this._manager.setVisibilityState(toHide, false, true, true);
 		this._model.updateBindings(true);
 		this._updateButtons();
 	};
 
+	LayersPanel.prototype._onSearch = function(query) {
+		if (query !== "") {
+			const selected = [];
+			this._table.getItems().forEach(function(item) {
+				if (item.getBindingContext().getObject().name.lastIndexOf(query) !== -1) {
+					selected.push(item);
+				}
+			}, this);
+			if (selected.length > 0) {
+				this._table.removeSelections(true, false);
+				selected.forEach(function(item) {
+					this._table.setSelectedItem(item);
+				}, this);
+				this._table.fireSelectionChange({ listItems: selected });
+			}
+		}
+	};
+
+	LayersPanel.prototype._onSelectionChanged = function(event) {
+		this._updateButtons();
+	};
+
+	LayersPanel.prototype._onVisibilityChanged = function(event) {
+		if (this._skipEvent) {
+			this._skipEvent = false;
+			return;
+		}
+		const layers = this._model.getData();
+		const hidden = event.getParameter("hidden");
+		const visible = event.getParameter("visible");
+
+		const process = (list, show) => {
+			list.forEach(function(item) {
+				const metadata = this._extractMetadata(item);
+				const layer = metadata?.get("layer");
+				if (layer) {
+					const type = metadata?.get("type");
+					const input = type === ElementType.Component ? [item] : [item].concat(item.children);
+					input.forEach(function(ref) {
+						for (let i = 0; i < layers.length; ++i) {
+							if (layers[i].elements.has(ref.uid)) {
+								if (show) {
+									layers[i].hiddenElements.delete(ref.uid);
+								} else {
+									layers[i].hiddenElements.add(ref.uid);
+								}
+								break;
+							}
+						}
+					});
+				}
+			}, this);
+		};
+
+		process(hidden, false);
+		process(visible, true);
+
+		this._model.updateBindings(true);
+		this._updateButtons();
+	};
+
+	LayersPanel.prototype._onColumnResize = function(event) {
+	};
+
 	return LayersPanel;
 });