@openui5/sap.ui.mdc 1.113.0 → 1.115.0

package/src/sap/ui/mdc/ChartRenderer.js

@@ -28,25 +28,25 @@ sap.ui.define(['./library'],
          * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
          *
          * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-         * @param {sap.ui.mdc.Chart} oMDCChart An object representation of the control that should be rendered
+         * @param {sap.ui.mdc.Chart} oChart An object representation of the control that should be rendered
          */
-        ChartRenderer.render = function(oRm, oMDCChart) {
-                oRm.openStart("div", oMDCChart);
+        ChartRenderer.render = function(oRm, oChart) {
+                oRm.openStart("div", oChart);
                 oRm.class(ChartRenderer.CSS_CLASS);
                 //oRm.class("sapUiFixFlex");
                 //oRm.style("overflow", "hidden");
-                oRm.style("height", oMDCChart.getHeight());
-                oRm.style("width", oMDCChart.getWidth());
-                oRm.style("min-height", oMDCChart.getMinHeight());
-                oRm.style("min-width", oMDCChart.getMinWidth());
+                oRm.style("height", oChart.getHeight());
+                oRm.style("width", oChart.getWidth());
+                oRm.style("min-height", oChart.getMinHeight());
+                oRm.style("min-width", oChart.getMinWidth());
                 oRm.openEnd();
                     oRm.openStart("div");
                     oRm.openEnd();
-                    this.renderToolbar(oRm, oMDCChart.getAggregation("_toolbar"));
-                    this.renderInfoToolbar(oRm, oMDCChart.getAggregation("_infoToolbar"));
+                    this.renderToolbar(oRm, oChart.getAggregation("_toolbar"));
+                    this.renderInfoToolbar(oRm, oChart.getAggregation("_infoToolbar"));
                     oRm.close("div");
-                this.renderBreadcrumbs(oRm, oMDCChart.getAggregation("_breadcrumbs"));
-                this.renderInnerStructure(oRm, oMDCChart.getAggregation("_innerChart"));
+                this.renderBreadcrumbs(oRm, oChart.getAggregation("_breadcrumbs"));
+                this.renderInnerStructure(oRm, oChart.getAggregation("_innerChart"));
                 oRm.close("div");
         };
 

package/src/sap/ui/mdc/Control.js

@@ -20,13 +20,14 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getControlDelegate as getControlDelegate
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getPayload as getPayload
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getTypeUtil as getTypeUtil
+ 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getTypeMap as getTypeMap
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.initControlDelegate as initControlDelegate
 	 *
 	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.initPropertyHelper as initPropertyHelper
@@ -39,10 +40,9 @@ sap.ui.define([
 	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.retrieveInbuiltFilter as retrieveInbuiltFilter
  	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getInbuiltFilter as getInbuiltFilter
 	 *
-	 * @private
 	 * @since 1.61
-	 * @experimental As of version 1.61
-	 * @ui5-restricted sap.ui.mdc
+	 * @public
+ 	 * @experimental As of version 1.61
 	 */
 	var Control = CoreControl.extend("sap.ui.mdc.Control", /** @lends sap.ui.mdc.Control.prototype */ {
 		metadata: {

package/src/sap/ui/mdc/DefaultTypeMap.js

@@ -0,0 +1,84 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'sap/ui/mdc/util/TypeMap',
+	'sap/ui/mdc/enums/BaseType'
+], function(TypeMap, BaseType) {
+"use strict";
+
+	/**
+	*
+	* Generic <code>TypeMap</code> configuration for simplistic usecases
+	*
+	* <b>Note:</b> This <code>TypeMap</code> implementation contains the following types:
+	*
+	* <ul>
+	* <li>sap.ui.model.type.Boolean (alias Boolean)</li>
+	* <li>sap.ui.model.type.Currency (alias Currency)</li>
+	* <li>sap.ui.model.type.Date (alias Date)</li>
+	* <li>sap.ui.model.type.DateTime (alias DateTime)</li>
+	* <li>sap.ui.model.type.Float (alias Float)</li>
+	* <li>sap.ui.model.type.Integer (alias Integer)</li>
+	* <li>sap.ui.model.type.String (alias String)</li>
+	* <li>sap.ui.model.type.Time (alias Time)</li>
+	* <li>sap.ui.model.type.Unit (alias Unit)</li>
+	* </ul>
+	*
+	* @author SAP SE
+	* @version 1.115.0
+	* @public
+	* @since 1.114.0
+	* @namespace
+	* @alias module:sap/ui/mdc/DefaultTypeMap
+	* @extends module:sap/ui/mdc/util/TypeMap
+	*/
+	var DefaultTypeMap = Object.assign({}, TypeMap);
+
+	DefaultTypeMap.getUnitBaseType = function (oFormatOptions, oConstraints) {
+		if (!oFormatOptions || ((!oFormatOptions.hasOwnProperty("showMeasure") || oFormatOptions.showMeasure) && (!oFormatOptions.hasOwnProperty("showNumber") || oFormatOptions.showNumber))) {
+			return BaseType.Unit;
+		} else if (!oFormatOptions.hasOwnProperty("showNumber") || oFormatOptions.showNumber) {
+			return BaseType.Numeric; // only number to show
+		} else {
+			return BaseType.String; // only unit to show
+		}
+	};
+
+	DefaultTypeMap.getUnitOptions = function (oFormatOptions, oConstraints, oCustomOptions) {
+		if (oCustomOptions) {
+			oFormatOptions = Object.assign({}, oFormatOptions, {strictParsing: true, showNumber: !!oCustomOptions.showNumber, showMeasure: !!oCustomOptions.showMeasure});
+		}
+		if (oFormatOptions && oFormatOptions.hasOwnProperty("unitOptional")) { // as per default set if both, showNumber and showMeasure set
+			delete oFormatOptions.unitOptional; // let the type determine the right default
+		}
+		return [oFormatOptions, oConstraints];
+	};
+
+	DefaultTypeMap.set("sap.ui.model.type.Boolean", BaseType.Boolean);
+	DefaultTypeMap.set("sap.ui.model.type.Currency", DefaultTypeMap.getUnitBaseType, DefaultTypeMap.getUnitOptions);
+	DefaultTypeMap.set("sap.ui.model.type.Date", BaseType.Date);
+	DefaultTypeMap.set("sap.ui.model.type.DateTime", BaseType.DateTime);
+	DefaultTypeMap.set("sap.ui.model.type.Float", BaseType.Numeric);
+	DefaultTypeMap.set("sap.ui.model.type.Integer", BaseType.Numeric);
+	DefaultTypeMap.set("sap.ui.model.type.String", BaseType.String);
+	DefaultTypeMap.set("sap.ui.model.type.Time", BaseType.Time);
+	DefaultTypeMap.set("sap.ui.model.type.Unit", DefaultTypeMap.getUnitBaseType, DefaultTypeMap.getUnitOptions);
+
+	DefaultTypeMap.setAlias("Boolean", "sap.ui.model.type.Boolean");
+	DefaultTypeMap.setAlias("Currency", "sap.ui.model.type.Currency");
+	DefaultTypeMap.setAlias("Date", "sap.ui.model.type.Date");
+	DefaultTypeMap.setAlias("DateTime", "sap.ui.model.type.DateTime");
+	DefaultTypeMap.setAlias("Float", "sap.ui.model.type.Float");
+	DefaultTypeMap.setAlias("Integer", "sap.ui.model.type.Integer");
+	DefaultTypeMap.setAlias("String", "sap.ui.model.type.String");
+	DefaultTypeMap.setAlias("Time", "sap.ui.model.type.Time");
+	DefaultTypeMap.setAlias("Unit","sap.ui.model.type.Unit");
+
+	DefaultTypeMap.freeze();
+
+	return DefaultTypeMap;
+});

package/src/sap/ui/mdc/Element.js

@@ -20,13 +20,14 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getControlDelegate as getControlDelegate
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getPayload as getPayload
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getTypeUtil as getTypeUtil
+  	 * @borrows sap.ui.mdc.mixin.DelegateMixin.getTypeMap as getTypeMap
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.initControlDelegate as initControlDelegate
 	 *
 	 * @borrows sap.ui.mdc.mixin.PropertyHelperMixin.initPropertyHelper as initPropertyHelper
@@ -39,10 +40,9 @@ sap.ui.define([
 	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.retrieveInbuiltFilter as retrieveInbuiltFilter
  	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getInbuiltFilter as getInbuiltFilter
 	 *
-	 * @private
 	 * @since 1.74
-	 * @experimental As of version 1.74
-	 * @ui5-restricted sap.ui.mdc
+	 * @public
+  	 * @experimental As of version 1.74
 	 */
 	var Element = CoreElement.extend("sap.ui.mdc.Element", /** @lends sap.ui.mdc.Element.prototype */ {
 		metadata: {