@openui5/sap.m 1.109.0 → 1.111.0

package/src/sap/m/Dialog.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -109,18 +109,7 @@ function(
 		/**
 		 * Margin on top and bottom of dialog
 		 */
-		var VERTICAL_MARGIN = Parameters.get({
-				name: "_sap_m_Dialog_VerticalMargin",
-				callback: function(sValue) {
-					VERTICAL_MARGIN = parseFloat(sValue);
-				}
-			});
-
-		if (VERTICAL_MARGIN) {
-			VERTICAL_MARGIN = parseFloat(VERTICAL_MARGIN);
-		} else {
-			VERTICAL_MARGIN = 3; // default value
-		}
+		var VERTICAL_MARGIN = 3; // default value
 
 		/**
 		* Constructor for a new Dialog.
@@ -178,7 +167,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.109.0
+		* @version 1.111.0
 		*
 		* @constructor
 		* @public
@@ -200,11 +189,12 @@ function(
 
 					/**
 					 * Title text appears in the Dialog header.
+					 * <br/><b>Note:</b> The heading level of the Dialog is <code>H1</code>. Headings in the Dialog content should start with <code>H2</code> heading level.
 					 */
 					title: {type: "string", group: "Appearance", defaultValue: null},
 
 					/**
-					 * Determines whether the header is shown inside the Dialog. If this property is set to <code>true</code>, the <code>text</code> and <code>icon</code> properties are ignored. This property has a default value <code>true</code>.
+					 * Determines whether the header is shown inside the Dialog. If this property is set to <code>false</code>, the <code>text</code> and <code>icon</code> properties are ignored. This property has a default value <code>true</code>.
 					 * @since 1.15.1
 					 */
 					showHeader: {type: "boolean", group: "Appearance", defaultValue: true},
@@ -322,6 +312,7 @@ function(
 
 					/**
 					 * When it is set, the <code>icon</code>, <code>title</code> and <code>showHeader</code> properties are ignored. Only the <code>customHeader</code> is shown as the header of the Dialog.
+					 * <br/><b>Note:</b> To improve accessibility, titles with heading level <code>H1</code> should be used inside the custom header.
 					 * @since 1.15.1
 					 */
 					customHeader: {type: "sap.m.IBar", multiple: false},
@@ -350,10 +341,16 @@ function(
 
 					/**
 					 * Buttons can be added to the footer area of the Dialog through this aggregation. When this aggregation is set, any change to the <code>beginButton</code> and <code>endButton</code> has no effect anymore. Buttons which are inside this aggregation are aligned at the right side (left side in RTL mode) of the footer instead of in the middle of the footer.
+					 * The buttons aggregation can not be used together with the footer aggregation.
 					 * @since 1.21.1
 					 */
 					buttons: {type: "sap.m.Button", multiple: true, singularName: "button"},
 
+					/**
+					 * The footer of this dialog. It is always located at the bottom of the dialog. The footer aggregation can not  be used together with the buttons aggregation.
+					 */
+					footer: {type: "sap.m.Toolbar", multiple: false},
+
 					/**
 					 * The hidden aggregation for internal maintained <code>header</code>.
 					 */
@@ -454,11 +451,38 @@ function(
 			renderer: DialogRenderer
 		});
 
+		/**
+		 * Sets a new value for property {@link #setEscapeHandler escapeHandler}.
+		 *
+		 * This property expects a function with one parameter of type Promise. In the function, you should call either <code>resolve()</code> or <code>reject()</code> on the Promise object.
+		 * The function allows you to define custom behavior which will be executed when the Escape key is pressed. By default, when the Escape key is pressed, the dialog is immediately closed.
+		 *
+		 * When called with a value of <code>null</code> or <code>undefined</code>, the default value of the property will be restored.
+		 *
+		 * @method
+		 * @param {function({resolve: function, reject: function})} [fnEscapeHandler] New value for property <code>escapeHandler</code>
+		 * @public
+		 * @name sap.m.Dialog#setEscapeHandler
+		 * @returns {this} Reference to <code>this</code> in order to allow method chaining
+		 */
+
+		/**
+		 * Gets current value of property {@link #getEscapeHandler escapeHandler}.
+		 *
+		 * This property expects a function with one parameter of type Promise. In the function, you should call either <code>resolve()</code> or <code>reject()</code> on the Promise object.
+		 * The function allows you to define custom behavior which will be executed when the Escape key is pressed. By default, when the Escape key is pressed, the dialog is immediately closed.
+		 *
+		 * @method
+		 * @returns {function({resolve: function, reject: function})|null} Value of property <code>escapeHandler</code>
+		 * @public
+		 * @name sap.m.Dialog#getEscapeHandler
+		 */
+
 		ResponsivePaddingsEnablement.call(Dialog.prototype, {
 			header: {suffix: "header"},
 			subHeader: {selector: ".sapMDialogSubHeader .sapMIBar"},
 			content: {selector: ".sapMDialogScrollCont"},
-			footer: {suffix: "footer"}
+			footer: {selector: ".sapMDialogFooter .sapMIBar"}
 		});
 
 		// Add title propagation support
@@ -538,6 +562,8 @@ function(
 		};
 
 		Dialog.prototype.onBeforeRendering = function () {
+			this._loadVerticalMargin();
+
 			var oHeader = this._getAnyHeader();
 
 			if (!Dialog._bPaddingByDefault && this.hasStyleClass("sapUiPopupWithPadding")) {
@@ -964,7 +990,15 @@ function(
 		 * @private
 		 */
 		 Dialog.prototype._findFirstPositiveButton = function () {
-			var aButtons = this.getButtons();
+			var aButtons;
+
+			if (this.getFooter()) {
+				aButtons = this.getFooter().getContent().filter(function (oItem) {
+					return oItem.isA("sap.m.Button");
+				});
+			} else {
+				aButtons = this.getButtons();
+			}
 
 			for (var i = 0; i < aButtons.length; i++) {
 				var oButton = aButtons[i];
@@ -1215,6 +1249,10 @@ function(
 						$dialogContent.css({"padding-right" : ""});
 						this._iLastWidthAndHeightWithScroll = null;
 					}
+				} else if (!this._hasVerticalScrollbar() || !bMinWidth) {
+					$dialog.removeClass("sapMDialogVerticalScrollIncluded");
+					$dialogContent.css({"padding-right" : ""});
+					this._iLastWidthAndHeightWithScroll = null;
 				}
 			}
 
@@ -1292,7 +1330,7 @@ function(
 		Dialog.prototype._calcMaxSizes = function () {
 			var oAreaDimensions = this._getAreaDimensions(),
 				$this = this.$(),
-				iHeaderHeight = $this.find(".sapMDialogTitle").height() || 0,
+				iHeaderHeight = $this.find(".sapMDialogTitleGroup").height() || 0,
 				iSubHeaderHeight = $this.find(".sapMDialogSubHeader").height() || 0,
 				iFooterHeight = $this.find("> footer").height() || 0,
 				iHeightAsPadding = iHeaderHeight + iSubHeaderHeight + iFooterHeight,
@@ -1375,7 +1413,7 @@ function(
 			} else {
 				this._headerTitle = new Title(this.getId() + "-title", {
 					text: sTitle,
-					level: TitleLevel.H2
+					level: TitleLevel.H1
 				}).addStyleClass("sapMDialogTitle");
 
 				this._header.addContentMiddle(this._headerTitle);
@@ -1461,7 +1499,7 @@ function(
 				return null;
 			}
 
-			return this.$().find('header.sapMDialogTitle .sapMDialogTitleGroup')[0];
+			return this.$().find('header .sapMDialogTitleGroup')[0];
 		};
 
 		/**
@@ -1665,6 +1703,9 @@ function(
 		};
 
 		Dialog.prototype._createToolbarButtons = function () {
+			if (this.getFooter()) {
+				return;
+			}
 			var toolbar = this._getToolbar();
 			var buttons = this.getButtons();
 			var beginButton = this.getBeginButton();
@@ -1776,6 +1817,26 @@ function(
 			return "";
 		};
 
+		/**
+		 * Returns the value of the Vertical Margin from the CSS parameter
+		 * @private
+		 */
+		Dialog.prototype._loadVerticalMargin = function () {
+			VERTICAL_MARGIN = Parameters.get({
+				name: "_sap_m_Dialog_VerticalMargin",
+				callback: function(sValue) {
+					VERTICAL_MARGIN = parseFloat(sValue);
+				}
+			});
+
+			if (VERTICAL_MARGIN) {
+				VERTICAL_MARGIN = parseFloat(VERTICAL_MARGIN);
+			} else {
+				VERTICAL_MARGIN = 3; // default value
+			}
+
+		};
+
 		/* =========================================================== */
 		/*                      end: private functions                 */
 		/* =========================================================== */
@@ -1962,7 +2023,7 @@ function(
 				return true;
 			}
 
-			return $target.hasClass('sapMDialogTitle');
+			return $target.hasClass('sapMDialogTitleGroup');
 		}
 
 		if (Device.system.desktop) {

package/src/sap/m/DialogRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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([
@@ -52,7 +52,8 @@ sap.ui.define([
 			sState = oDialog.getState(),
 			bStretch = oDialog.getStretch(),
 			bStretchOnPhone = oDialog.getStretchOnPhone() && Device.system.phone,
-			oValueStateText = oDialog.getAggregation("_valueState");
+			oValueStateText = oDialog.getAggregation("_valueState"),
+			oFooter = oDialog.getFooter();
 
 		// write the HTML into the render manager
 		// the initial size of the dialog have to be 0, because if there is a large dialog content the initial size can be larger than the html's height (scroller)
@@ -87,7 +88,8 @@ sap.ui.define([
 		var bNoToolbarAndNoButtons = !oDialog._oToolbar && !oBeginButton && !oEndButton;
 		var bEmptyToolbarAndNoButtons = oDialog._oToolbar && oDialog._isToolbarEmpty() && !oBeginButton && !oEndButton;
 		var bHiddenFooter = oDialog._oToolbar && !oDialog._oToolbar.getVisible();
-		if (bNoToolbarAndNoButtons || bEmptyToolbarAndNoButtons || bHiddenFooter) {
+		var hasFooter = !bNoToolbarAndNoButtons && !bEmptyToolbarAndNoButtons && !bHiddenFooter || oFooter;
+		if (!hasFooter) {
 			oRM.class("sapMDialog-NoFooter");
 		}
 
@@ -166,38 +168,39 @@ sap.ui.define([
 				.close("span");
 		}
 
-		if (oHeader) {
-			oHeader._applyContextClassFor("header");
+		if (oHeader || oSubHeader) {
 			oRM.openStart("header")
-				.class("sapMDialogTitle")
-				.openEnd()
-				.openStart("div")
-				.class("sapMDialogTitleGroup");
-
-			if (oDialog._isDraggableOrResizable()) {
-				oRM.attr("tabindex", 0)
-					.accessibilityState(oHeader, {
-						role: "group",
-						roledescription: Core.getLibraryResourceBundle("sap.m").getText("DIALOG_HEADER_ARIA_ROLE_DESCRIPTION"),
-						describedby: { value: oDialog.getId() + "-ariaDescribedbyText", append: true }
-					});
+				.openEnd();
+			if (oHeader) {
+				oHeader._applyContextClassFor("header");
+				oRM.openStart("div")
+					.class("sapMDialogTitleGroup");
+
+				if (oDialog._isDraggableOrResizable()) {
+					oRM.attr("tabindex", 0)
+						.accessibilityState(oHeader, {
+							role: "group",
+							roledescription: Core.getLibraryResourceBundle("sap.m").getText("DIALOG_HEADER_ARIA_ROLE_DESCRIPTION"),
+							describedby: { value: oDialog.getId() + "-ariaDescribedbyText", append: true }
+						});
+				}
+
+				oRM.openEnd()
+					.renderControl(oHeader)
+					.renderControl(oDialog._oAriaDescribedbyText)
+					.close("div");
 			}
 
-			oRM.openEnd()
-			.renderControl(oHeader)
-			.renderControl(oDialog._oAriaDescribedbyText)
-			.close("div")
-			.close("header");
-
-		}
+			if (oSubHeader && oSubHeader.getVisible()) {
+				oSubHeader._applyContextClassFor("subheader");
+				oRM.openStart("div")
+					.class("sapMDialogSubHeader")
+					.openEnd()
+					.renderControl(oSubHeader)
+					.close("div");
+			}
+			oRM.close("header");
 
-		if (oSubHeader && oSubHeader.getVisible()) {
-			oSubHeader._applyContextClassFor("subheader");
-			oRM.openStart("header")
-				.class("sapMDialogSubHeader")
-				.openEnd()
-				.renderControl(oSubHeader)
-				.close("header");
 		}
 
 		if (oValueStateText) {
@@ -227,13 +230,18 @@ sap.ui.define([
 			.close("div")
 			.close("section");
 
-		if (!bNoToolbarAndNoButtons && !bEmptyToolbarAndNoButtons && !bHiddenFooter) {
-			oDialog._oToolbar._applyContextClassFor("footer");
+		if (hasFooter) {
 			oRM.openStart("footer")
 				.class("sapMDialogFooter")
-				.openEnd()
-				.renderControl(oDialog._oToolbar)
-				.close("footer");
+				.openEnd();
+			if (oFooter) {
+				oFooter._applyContextClassFor("footer");
+				oRM.renderControl(oFooter);
+			} else {
+				oDialog._oToolbar._applyContextClassFor("footer");
+				oRM.renderControl(oDialog._oToolbar);
+			}
+			oRM.close("footer");
 		}
 
 		if (Device.system.desktop) {

package/src/sap/m/DisplayListItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DisplayListItemRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/DraftIndicator.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DraftIndicatorRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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([],

package/src/sap/m/DynamicDate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @public
@@ -70,8 +70,8 @@ sap.ui.define([
 		 * Only formats the 'values' part of the given object. The dates are expected as 'timestamp' numbers
 		 * and are converted to Javascript Date objects. The numbers and strings are left untouched.
 		 *
-		 * @param {object} oValue The value to be formatted
-		 * @return {object} A value object in a similar form
+		 * @param {{operator: string, values: Array<number|string>}} oValue The value to be formatted
+		 * @return {{operator: string, values: Array<Date|number|string>}} A value object in a similar form
 		 *
 		 * @public
 		 */
@@ -105,8 +105,8 @@ sap.ui.define([
 		 * and are converted to timestamps. The numbers and strings are left untouched.
 		 * Special values with operator: "PARSEERROR" generate a parse exception.
 		 *
-		 * @param {object} oValue The value to be parsed
-		 * @return {object} A value object in a similar form
+		 * @param {{operator: string, values: Array<Date|number|string>}} oValue The value to be parsed
+		 * @return {{operator: string, values: Array<number|string|null>}} A value object in a similar form
 		 *
 		 * @public
 		 */

package/src/sap/m/DynamicDateFormat.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -43,11 +43,15 @@ sap.ui.define([
 			"DATETIME": ["datetime"],
 			"DATERANGE": ["date", "date"],
 			"DATETIMERANGE": ["datetime", "datetime"],
+			"LASTMINUTES": ["int"],
+			"LASTHOURS": ["int"],
 			"LASTDAYS": ["int"],
 			"LASTWEEKS": ["int"],
 			"LASTMONTHS": ["int"],
 			"LASTQUARTERS": ["int"],
 			"LASTYEARS": ["int"],
+			"NEXTMINUTES": ["int"],
+			"NEXTHOURS": ["int"],
 			"NEXTDAYS": ["int"],
 			"NEXTWEEKS": ["int"],
 			"NEXTMONTHS": ["int"],
@@ -98,11 +102,24 @@ sap.ui.define([
 			_dynamicParameterIndexes[sKey] = aParams;
 		}
 
+		/**
+		 * @typedef {object} sap.m.DynamicDateFormatOptions
+		 * @description Object which defines the format options
+		 *
+		 * @param {sap.ui.core.Locale} [oFormatOptions.oLocale] Formatter locale
+		 * @param {sap.ui.core.LocaleData} [oFormatOptions.oLocaleData] Locale-specific data, such as, date formats, number formats, and currencies
+		 * @param {Object<string, object>} [oFormatOptions.oOriginalFormatOptions] Default format options
+		 *
+		 * @public
+		 * @since 1.111
+		 */
+
 		/**
 		 * Get an instance of the DynamicDateFormat which can be used for formatting.
 		 *
-		 * @param {object} [oFormatOptions] Object which defines the format options
+		 * @param {sap.m.DynamicDateFormatOptions} [oFormatOptions] Object which defines the format options
 		 * @param {sap.ui.core.Locale} [oLocale] Locale to get the formatter for
+		 * @ui5-omissible-params oFormatOptions
 		 * @return {sap.m.DynamicDateFormat} Instance of the DynamicDateFormat
 		 * @public
 		 *
@@ -122,7 +139,7 @@ sap.ui.define([
 		/**
 		 * Create an instance of the DynamicDateFormat.
 		 *
-		 * @param {object} [oFormatOptions] Object which defines the format options
+		 * @param {sap.m.DynamicDateFormatOptions} [oFormatOptions] Object which defines the format options
 		 * @param {sap.ui.core.Locale} [oLocale] Locale to get the formatter for
 		 * @return {sap.m.DynamicDateFormat} Instance of the DynamicDateFormat
 		 * @private
@@ -168,7 +185,7 @@ sap.ui.define([
 		/**
 		 * Formats a list according to the given format options.
 		 *
-		 * @param {object} oObj The value to format
+		 * @param {sap.m.DynamicDateRangeValue} oObj The value to format
 		 * @param {boolean} bSkipCustomFormatting If set to <code>true</code> the formatter does not format to the equivalent user-friendly string. Instead, the formatter uses the specified option key and parameters.
 		 * @return {string} The formatted output value.
 		 * @public
@@ -241,7 +258,7 @@ sap.ui.define([
 		 *
 		 * @param {string} sValue String value to be parsed
 		 * @param {string} sKey String value of the key we will parse for
-		 * @return {object} The parsed output value
+		 * @return {sap.m.DynamicDateRangeValue[]} The parsed output value
 		 * @public
 		 */
 		DynamicDateFormat.prototype.parse = function(sValue, sKey) {

package/src/sap/m/DynamicDateOption.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -38,7 +38,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -60,7 +60,7 @@ sap.ui.define([
 					 * the array items are "date" and "int". A date range is usually represented
 					 * with two consecutive "date" values.
 					 */
-					valueTypes: { type: "string[]", multiple: true }
+					valueTypes: { type: "string[]" }
 				}
 			}
 		});
@@ -96,7 +96,7 @@ sap.ui.define([
 		 * getValueHelpUITypes is not enough to define the UI.
 		 *
 		 * @param {sap.m.DynamicDateRange} oControl The control instance
-		 * @param {function} fnControlsUpdated A callback invoked when any of the created controls updates its value
+		 * @param {function(sap.ui.base.Event)} fnControlsUpdated A callback invoked when any of the created controls updates its value
 		 * @returns {sap.ui.core.Control[]} An array with the option's value help UI controls
 		 * @public
 		 */
@@ -189,10 +189,10 @@ sap.ui.define([
 
 		/**
 		 * Gets the value help controls' output values and
-		 * converts them to a DynamicDateRange value.
+		 * converts them to a <code>sap.m.DynamicDateRangeValue</code>.
 		 *
 		 * @param {sap.m.DynamicDateRange} oControl The control instance
-		 * @returns {object} A DynamicDateRange value
+		 * @returns {sap.m.DynamicDateRangeValue} A <code>sap.m.DynamicDateRangeValue</code>
 		 * @public
 		 */
 		DynamicDateOption.prototype.getValueHelpOutput = function(oControl) {
@@ -281,7 +281,7 @@ sap.ui.define([
 		/**
 		 * Formats the option's value to a string.
 		 *
-		 * @param {object} oValue A DynamicDateRange value
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
 		 * @returns {string} A string representing this option's value
 		 * @public
 		 */
@@ -290,10 +290,10 @@ sap.ui.define([
 		};
 
 		/**
-		 * Parses a string to a DynamicDateRange value.
+		 * Parses a string to a <code>sap.m.DynamicDateRangeValue</code>.
 		 *
 		 * @param {string} sValue An input string
-		 * @returns {object} This option's DynamicDateRange value
+		 * @returns {sap.m.DynamicDateRangeValue} This parsed value
 		 * @public
 		 */
 		DynamicDateOption.prototype.parse = function(sValue) {
@@ -303,7 +303,7 @@ sap.ui.define([
 		/**
 		 * Calculates an absolute date range from the options relative value.
 		 *
-		 * @param {object} oValue A DynamicDateRange value
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
 		 * @returns {sap.ui.core.date.UniversalDate[]} A couple of dates marking the start and the end of the range
 		 * @public
 		 */
@@ -376,8 +376,11 @@ sap.ui.define([
 			return oControl;
 		};
 
-		DynamicDateOption.prototype._createDateTimeControl = function(oValue, iIndex, fnControlsUpdated) {
-			var oControl = new DateTimePicker({timezone: TimezoneUtil.getLocalTimezone()});
+		DynamicDateOption.prototype._createDateTimeControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
+			var oControl = new DateTimePicker({
+				timezone: TimezoneUtil.getLocalTimezone(),
+				calendarWeekNumbering: sCalendarWeekNumbering
+			});
 
 			if (oValue && this.getKey() === oValue.operator) {
 				oControl.setDateValue(oValue.values[iIndex]);
@@ -392,9 +395,10 @@ sap.ui.define([
 			return oControl;
 		};
 
-		DynamicDateOption.prototype._createDateControl = function(oValue, iIndex, fnControlsUpdated, bUTC) {
+		DynamicDateOption.prototype._createDateControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
 			var oControl = new Calendar({
-				width: "100%"
+				width: "100%",
+				calendarWeekNumbering: sCalendarWeekNumbering
 			});
 			var oInputControlValue;
 
@@ -422,9 +426,10 @@ sap.ui.define([
 		/**
 		 * Returns DateTimePicker PopupContent control (single "datetime" option)
 		 */
-		DynamicDateOption.prototype._createDateTimeInnerControl = function(oValue, iIndex, fnControlsUpdated, bUTC) {
+		DynamicDateOption.prototype._createDateTimeInnerControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
 			var oControl = new DateTimePicker({
-					width: "100%"
+					width: "100%",
+					calendarWeekNumbering: sCalendarWeekNumbering
 				}),
 				oPopupContent;
 
@@ -471,10 +476,11 @@ sap.ui.define([
 			return oPopupContent;
 		};
 
-		DynamicDateOption.prototype._createDateRangeControl = function(oValue, iIndex, fnControlsUpdated, bUTC) {
+		DynamicDateOption.prototype._createDateRangeControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
 			var oControl = new Calendar({
 				intervalSelection: true,
-				width: "100%"
+				width: "100%",
+				calendarWeekNumbering: sCalendarWeekNumbering
 			});
 			if (oValue && this.getKey() === oValue.operator) {
 				// a date range UI type maps to 2 consecutive date parameters from the value