@openui5/sap.m 1.109.0 → 1.111.0

package/src/sap/m/DynamicDateRange.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.
  */
 
@@ -39,7 +39,8 @@ sap.ui.define([
 	'./library',
 	'sap/ui/thirdparty/jquery',
 	'sap/ui/core/Configuration',
-	'sap/ui/dom/jquery/Focusable' // provides jQuery.fn.firstFocusableDomRef
+	'sap/ui/unified/calendar/CalendarUtils',
+	"sap/ui/core/CustomData"
 ], function(
 		InvisibleText,
 		Element,
@@ -73,7 +74,9 @@ sap.ui.define([
 		StandardDynamicDateOption,
 		library,
 		jQuery,
-		Configuration
+		Configuration,
+		CalendarUtils,
+		CustomData
 	) {
 		"use strict";
 
@@ -123,7 +126,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @public
@@ -250,11 +253,15 @@ sap.ui.define([
 							"TODATETIME",
 							"YEARTODATE",
 							"DATETOYEAR",
+							"LASTMINUTES",
+							"LASTHOURS",
 							"LASTDAYS",
 							"LASTWEEKS",
 							"LASTMONTHS",
 							"LASTQUARTERS",
 							"LASTYEARS",
+							"NEXTMINUTES",
+							"NEXTHOURS",
 							"NEXTDAYS",
 							"NEXTWEEKS",
 							"NEXTMONTHS",
@@ -296,7 +303,15 @@ sap.ui.define([
 					 *
 					 * @since 1.105
 					 */
-					 hideInput: { type: "boolean", group: "Misc", defaultValue: false }
+					 hideInput: { type: "boolean", group: "Misc", defaultValue: false },
+
+					  /**
+					 * If set, the calendar week numbering is used for display.
+					 * If not set, the calendar week numbering of the global configuration is used.
+					 * @since 1.111.0
+					 */
+
+					calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 
 				},
 				aggregations: {
@@ -338,6 +353,16 @@ sap.ui.define([
 
 		MessageMixin.call(DynamicDateRange.prototype);
 
+		var aDateTimeOperators = [
+			"LASTHOURS",
+			"LASTMINUTES",
+			"NEXTHOURS",
+			"NEXTMINUTES"
+		];
+
+		var aLastOptions = ["LASTMINUTES", "LASTHOURS", "LASTDAYS", "LASTWEEKS", "LASTMONTHS", "LASTQUARTERS", "LASTYEARS"];
+		var aNextOptions = ["NEXTMINUTES", "NEXTHOURS", "NEXTDAYS", "NEXTWEEKS", "NEXTMONTHS", "NEXTQUARTERS", "NEXTYEARS"];
+
 		DynamicDateRange.prototype.init = function() {
 			this._oInput = new DynamicDateRangeInput(this.getId() + "-input", {
 				showValueHelp: true,
@@ -356,7 +381,7 @@ sap.ui.define([
 			};
 
 			this._oInput._getValueHelpIcon().setDecorative(false);
-			this._oInput._getValueHelpIcon().resetProperty("alt");
+
 			this._oInput.addDelegate(this._onBeforeInputRenderingDelegate, this);
 
 			this.setAggregation("_input", this._oInput, false);
@@ -402,14 +427,19 @@ sap.ui.define([
 			this._oInput.setValueState(this.getValueState());
 			this._oInput.setValueStateText(this.getValueStateText());
 
-			this.setValue(this._substitudeMissingValue(this.getValue()));
+			this.setValue(this._substituteMissingValue(this.getValue()));
 		};
 
+		/**
+		 * Setter for the <code>value</code> control property.
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
+		 * @returns {this} Reference to <code>this</code> for method chaining
+		 */
 		DynamicDateRange.prototype.setValue = function(oValue) {
 			var sOptionKey = oValue && oValue.operator;
 
-			// substutude the semantically equivalent values
-			oValue = this._substitudeValue(oValue);
+			// substitute the semantically equivalent values
+			oValue = this._substituteValue(oValue);
 
 			this.setProperty("value", oValue);
 			this._oSelectedOption = DynamicDateUtil.getOption(sOptionKey);
@@ -608,25 +638,85 @@ sap.ui.define([
 			});
 		};
 
-		DynamicDateRange.prototype._getDatesLabelFormatter = function() {
-			var oFormatOptions,
-				aValueHelpTypes = this._oSelectedOption ? this._oSelectedOption.getValueHelpUITypes() : [],
+		DynamicDateRange.prototype._getValueHelpTypeForFormatter = function() {
+			var	sOptionKey = this._oSelectedOption ? this._oSelectedOption.getKey() : '',
+				aLastOptionsSelectedIndex = aLastOptions.indexOf(sOptionKey),
+				aNextOptionsSelectedIndex = aNextOptions.indexOf(sOptionKey),
+				aPopupContent = this._oNavContainer ? this._oNavContainer.getPages()[1].getContent()[3] || [] : [],
+				aButtons = aPopupContent.getButtons ? aPopupContent.getButtons() : [],
+				aSuggestionItems = this.getAggregation('_input').getAggregation('suggestionItems'),
+				oValue = this.getValue(),
+				oCustomData,
+				aPopupContent,
+				aButtons,
+				aValueHelpTypes,
+				sType,
+				iButtonSelectedIndex,
+				sRealOptionKey,
+				sSuggestionOptionKey;
+
+			if (
+				!oValue &&
+				(!aButtons[0] || !aButtons[0].getDomRef()) &&
+				aSuggestionItems && aSuggestionItems.length &&
+				aSuggestionItems[aSuggestionItems.length - 1].getCustomData
+			) {
+				oCustomData = aSuggestionItems[aSuggestionItems.length - 1].getCustomData()[0];
+			}
+
+			if (oCustomData) {
+				sSuggestionOptionKey = oCustomData.getValue();
+				aLastOptionsSelectedIndex = aDateTimeOperators.indexOf(sSuggestionOptionKey);
+				aNextOptionsSelectedIndex = aDateTimeOperators.indexOf(sSuggestionOptionKey);
+			}
+
+			if (oCustomData && sSuggestionOptionKey) {
+				if (aDateTimeOperators.indexOf(sSuggestionOptionKey) > -1) {
+					sType = 'datetime';
+					return sType;
+				}
+			}
+
+			//if option requires extra formatting.
+			if (this._oNavContainer && aButtons.length && (aLastOptionsSelectedIndex > -1 || aNextOptionsSelectedIndex > -1)) {
+				iButtonSelectedIndex = aButtons[0].getParent().getSelectedIndex();
+				if (aLastOptionsSelectedIndex > -1) {
+					sRealOptionKey = aLastOptions[iButtonSelectedIndex];
+				} else if (aNextOptionsSelectedIndex > -1) {
+					sRealOptionKey = aNextOptions[iButtonSelectedIndex];
+				}
+				aValueHelpTypes = this._oSelectedOption ? this._oSelectedOption.getValueHelpUITypes() : [];
 				sType = aValueHelpTypes && aValueHelpTypes.length ? aValueHelpTypes[0].getType() : "";
 
-			if (!this._oDatesLabelFormatter) {
-				switch (sType) {
-					case "datetime":
-						oFormatOptions = Object.create(this._getFormatter()._dateTimeFormatter.oFormatOptions);
-						oFormatOptions.singleIntervalValue = true;
-						oFormatOptions.interval = true;
-						this._oDatesLabelFormatter = DateFormat.getDateTimeInstance(oFormatOptions);
-						break;
-					default:
-						oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
-						oFormatOptions.singleIntervalValue = true;
-						oFormatOptions.interval = true;
-						this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
+				if (aDateTimeOperators.indexOf(sRealOptionKey) > -1) {
+					sType = 'datetime';
 				}
+
+				return sType;
+			}
+
+			aValueHelpTypes = this._oSelectedOption ? this._oSelectedOption.getValueHelpUITypes() : [];
+
+			return aValueHelpTypes && aValueHelpTypes.length ? aValueHelpTypes[0].getType() : "";
+		};
+
+		DynamicDateRange.prototype._getDatesLabelFormatter = function() {
+			var oFormatOptions,
+				sType = this._getValueHelpTypeForFormatter();
+
+			switch (sType) {
+				case "datetime":
+					oFormatOptions = Object.create(this._getFormatter()._dateTimeFormatter.oFormatOptions);
+					oFormatOptions.singleIntervalValue = true;
+					oFormatOptions.interval = true;
+					this._oDatesLabelFormatter = DateFormat.getDateTimeInstance(oFormatOptions);
+
+					break;
+				default:
+					oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
+					oFormatOptions.singleIntervalValue = true;
+					oFormatOptions.interval = true;
+					this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
 			}
 
 			return this._oDatesLabelFormatter;
@@ -651,7 +741,7 @@ sap.ui.define([
 		 */
 		DynamicDateRange.prototype._addSuggestionItem = function(oSuggestValue) {
 			var bTimezone = this._checkFormatterUTCTimezone(oSuggestValue);
-			var aValueDates = DynamicDateUtil.toDates(oSuggestValue);
+			var aValueDates = DynamicDateUtil.toDates(oSuggestValue, this.getCalendarWeekNumbering());
 			var aResultingDates = [];
 			for (var i = 0; i < aValueDates.length; i++) {
 				aResultingDates[i] = this._convertDate(aValueDates[i], bTimezone);
@@ -659,10 +749,19 @@ sap.ui.define([
 
 			var oItem = new ListItem({
 				text: DynamicDateUtil.getOption(oSuggestValue.operator).format(oSuggestValue, this._getFormatter()),
-				additionalText: this._getDatesLabelFormatter().format(aResultingDates)
+				additionalText: '',
+				customData: [
+					new CustomData({
+						key : "operator",
+						value: oSuggestValue.operator
+					})
+				]
 			});
 
 			this._oInput.addSuggestionItem(oItem);
+
+			// Called after addSuggestionItem because the suggested items are needed in _getDatesLabelFormatter.
+			oItem.setAdditionalText(this._getDatesLabelFormatter().format(aResultingDates));
 		};
 
 		/**
@@ -688,6 +787,10 @@ sap.ui.define([
 			var oPrevValue = this.getValue();
 			var bValid = sInputValue.trim() === "" || !!oVal;
 
+			if (this._isDateRange(oVal)) {
+				this._swapDates(oVal.values);
+			}
+
 			if (!bValid) {
 				this.setValue({ operator: "PARSEERROR", values: [oResourceBundle.getText("DDR_WRONG_VALUE"), sInputValue] });
 			} else {
@@ -697,6 +800,27 @@ sap.ui.define([
 			this.fireChange({ value: this.getValue(), prevValue: oPrevValue, valid: bValid });
 		};
 
+		/**
+		 * Checks if the <code>value</code> property operator corresponds to a date range.
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
+		 * @returns {boolean} True in case of a date range
+		 * @private
+		 */
+		DynamicDateRange.prototype._isDateRange = function(oValue) {
+			return Boolean(oValue && (oValue.operator === "DATERANGE" || oValue.operator === "DATETIMERANGE"));
+		};
+
+		/**
+		 * Swaps the start and end date of the value if the start date is after the end date.
+		 * @param {Array<Date>} aValues An array of JS Dates
+		 * @private
+		 */
+		DynamicDateRange.prototype._swapDates = function(aValues) {
+			if (aValues.length > 1 && aValues[0].getTime() > aValues[1].getTime()) {
+				aValues.reverse();
+			}
+		};
+
 		DynamicDateRange.prototype._enhanceInputValue = function(sFormattedValue, oVal) {
 			if (DynamicDateUtil.getOption(oVal.operator).enhanceFormattedValue()
 				|| (oVal.operator === "LASTDAYS" && oVal.values[0] <= 1)
@@ -725,12 +849,11 @@ sap.ui.define([
 
 		DynamicDateRange.prototype._toDatesString = function(oValue) {
 			var bTimezone = this._checkFormatterUTCTimezone(oValue);
-			var aValueDates = DynamicDateUtil.toDates(oValue);
+			var aValueDates = DynamicDateUtil.toDates(oValue, this.getCalendarWeekNumbering());
 			var aDates = [];
 			for (var i = 0; i < aValueDates.length; i++) {
 				aDates[i] = this._convertDate(aValueDates[i], bTimezone);
 			}
-
 			return this._getDatesLabelFormatter().format(aDates);
 		};
 
@@ -764,7 +887,6 @@ sap.ui.define([
 			if (!this._calendarParser) {
 				this._calendarParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
 			}
-
 			return this._calendarParser;
 		};
 
@@ -982,24 +1104,34 @@ sap.ui.define([
 			var oOutputValue = this._oSelectedOption.getValueHelpOutput(this),
 				bTimezone = this._checkFormatterUTCTimezone(oOutputValue),
 				aResultDates = [],
-				sFormattedDates;
+				sFormattedDates,
+				sSelectedOptionKey;
 
-			var aValueDates = DynamicDateUtil.toDates(oOutputValue);
+			var aValueDates = DynamicDateUtil.toDates(oOutputValue, this.getCalendarWeekNumbering());
 
 			if (!oOutputValue || !oOutputValue.operator || !DynamicDateUtil.getOption(oOutputValue.operator)) {
 				return;
 			}
 
 			for (var i = 0; i < aValueDates.length; i++) {
-				aResultDates[i] = this._convertDate(aValueDates[i], bTimezone);
+				aResultDates[i] = CalendarUtils._createUTCDate(this._convertDate(aValueDates[i], bTimezone), true);
+			}
+
+			if (this._isDateRange(oOutputValue)) {
+				this._swapDates(aResultDates);
 			}
 
 			if (aResultDates) {
-				if (this._oSelectedOption.getKey() === "FROMDATETIME" || this._oSelectedOption.getKey() === "TODATETIME"
-					|| this._oSelectedOption.getKey() === "FROM" || this._oSelectedOption.getKey() === "TO") {
+				sSelectedOptionKey = this._oSelectedOption.getKey();
+				if (
+					sSelectedOptionKey === "FROMDATETIME" ||
+					sSelectedOptionKey === "TODATETIME" ||
+					sSelectedOptionKey === "FROM" ||
+					sSelectedOptionKey === "TO"
+				) {
 					aResultDates.push(null);
 				}
-				sFormattedDates = this._getDatesLabelFormatter().format(aResultDates);
+				sFormattedDates = this._getDatesLabelFormatter().format(aResultDates, true);
 				this._getDatesLabel().setText(oResourceBundle.getText("DDR_INFO_DATES", [sFormattedDates]));
 			}
 		};
@@ -1099,6 +1231,31 @@ sap.ui.define([
 			return this._oOptionsList;
 		};
 
+		/**
+		 * Function which determines which DDR option should be focused. Also considers hidden options.
+		 * @param {object} oValue The DynamicDateRange value.
+		 */
+		DynamicDateRange.prototype._determineOptionFocus = function (oValue) {
+				var aOptions = this._oOptionsList.getItems(),
+				oOption = aOptions.filter(
+					function (oItem) { return oItem.getOptionKey && oItem.getOptionKey() === oValue.operator; }
+				)[0];
+
+			if (!oOption) {
+				if (aLastOptions.indexOf(oValue.operator) > -1) {
+					oOption = aOptions.filter(
+						function (oItem) { return oItem.getOptionKey && oItem.getOptionKey() === aLastOptions[0];}
+					)[0];
+				} else if (aNextOptions.indexOf(oValue.operator) > -1) {
+					oOption = aOptions.filter(
+						function (oItem) { return oItem.getOptionKey && oItem.getOptionKey() === aNextOptions[0];}
+					)[0];
+				}
+			}
+
+			return oOption;
+		};
+
 		/**
 		 * Applies focus to the navigated page.
 		 *
@@ -1111,18 +1268,24 @@ sap.ui.define([
 				oElementToFocus;
 
 			if (oToPage === oOptionsListPage && oValue) {
-				oElementToFocus = this._oOptionsList.getItems().find(function(oListItem) {
-					return oListItem.isA("sap.m.DynamicDateRangeListItem") &&
-						(oListItem.getOptionKey() === oValue.operator);
-				});
+				oElementToFocus = this._determineOptionFocus(oValue) || oElementToFocus;
+			}
+
+			if (!oToPage.getDomRef()) {
+				return;
 			}
 
 			if (!oElementToFocus) {
 				oElementToFocus = jQuery(oToPage.getDomRef().querySelector("section")).firstFocusableDomRef();
 			}
 
-			oElementToFocus.focus();
-			oElementToFocus && oElementToFocus.setSelected && oElementToFocus.setSelected(true);
+			if (oValue && oValue.operator !== "PARSEERROR" && oElementToFocus) {
+				oElementToFocus.setSelected && oElementToFocus.setSelected(true);
+			}
+
+			if (oElementToFocus) {
+				oElementToFocus.focus();
+			}
 
 			this._reApplyFocusToElement(oToPage, oValue);
 		};
@@ -1232,13 +1395,17 @@ sap.ui.define([
 		DynamicDateRange.prototype._applyValue = function() {
 			this._oOutput = this._oSelectedOption.getValueHelpOutput(this);
 			var sTimezone = this._checkFormatterUTCTimezone(this._oOutput);
-			var aValueDates = DynamicDateUtil.toDates(this._oOutput);
+			var aValueDates = DynamicDateUtil.toDates(this._oOutput, this.getCalendarWeekNumbering());
 			for (var i = 0; i < aValueDates.length; i++) {
 				if (this._oOutput.values[i] instanceof Date) {
 					this._oOutput.values[i] = this._convertDate(aValueDates[i], sTimezone);
 				}
 			}
 
+			if (this._isDateRange(this._oOutput)) {
+				this._swapDates(this._oOutput.values);
+			}
+
 			var prevValue = this.getValue();
 			this.setValue(this._oOutput);
 			this.fireChange({ prevValue: prevValue, value: this.getValue(), valid: true });
@@ -1303,7 +1470,7 @@ sap.ui.define([
 		 * @private
 		 * @returns {object} A substituted value if needed, or the same value if not
 		 */
-		DynamicDateRange.prototype._substitudeValue = function(oValue) {
+		DynamicDateRange.prototype._substituteValue = function(oValue) {
 			var sKey, aParams, oNewValue;
 
 			if (!oValue || !oValue.operator || !oValue.values) {
@@ -1355,7 +1522,7 @@ sap.ui.define([
 		 * @private
 		 * @returns {object} A substituted value if needed, or the same value if not
 		 */
-		DynamicDateRange.prototype._substitudeMissingValue = function(oValue) {
+		DynamicDateRange.prototype._substituteMissingValue = function(oValue) {
 			var oNewValue = oValue;
 
 			if (oValue  && oValue.operator === "YESTERDAY" && !this.getOptions().includes("YESTERDAY") && this.getOptions().includes("LASTDAYS")) {
@@ -1377,6 +1544,29 @@ sap.ui.define([
 			return this._getFormatter()._checkFormatterUTCTimezone(oValue.operator);
 		};
 
+		/**
+		 * Returns a date range from a provided object in the format of the DynamicDateRange's value.
+		 * @example
+		 * var aDates = DynamicDateRange.toDates({operator: StandardDynamicDateRangeKeys.TODAY, values: []});
+		 * aDates[0].toString()
+		 * // output: "Fri Mar 31 2023 00:00:00 GMT+0200 (Eastern European Standard Time)" - assuming TODAY is Mar 31, 2023, 2:37:00 PM in the configured time zone
+		 *
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
+	 	 * @param {string} sCalendarWeekNumbering The type of calendar week numbering
+		 * @returns {Date[]} An array of two date objects - start and end date
+		 * @static
+		 * @public
+		 */
+		DynamicDateRange.toDates = function(oValue, sCalendarWeekNumbering) {
+			return DynamicDateUtil.toDates(oValue, sCalendarWeekNumbering).map(function (oDate) {
+				if (oDate instanceof Date) {
+					return oDate;
+				}
+
+				return oDate.getJSDate();
+			});
+		};
+
 		var DynamicDateRangeInputRenderer = Renderer.extend(InputRenderer);
 
 		DynamicDateRangeInputRenderer.apiVersion = 2;

package/src/sap/m/DynamicDateRangeRenderer.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/DynamicDateUtil.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.
  */
 
@@ -37,11 +37,15 @@ sap.ui.define([
 		"TO",
 		"YEARTODATE",
 		"DATETOYEAR",
+		"LASTMINUTES",
+		"LASTHOURS",
 		"LASTDAYS",
 		"LASTWEEKS",
 		"LASTMONTHS",
 		"LASTQUARTERS",
 		"LASTYEARS",
+		"NEXTMINUTES",
+		"NEXTHOURS",
 		"NEXTDAYS",
 		"NEXTWEEKS",
 		"NEXTMONTHS",
@@ -104,11 +108,15 @@ sap.ui.define([
 			"NEXTMONTH": new StandardDynamicDateOption({ key: "NEXTMONTH", valueTypes: [] }),
 			"NEXTQUARTER": new StandardDynamicDateOption({ key: "NEXTQUARTER", valueTypes: [] }),
 			"NEXTYEAR": new StandardDynamicDateOption({ key: "NEXTYEAR", valueTypes: [] }),
+			"LASTMINUTES": new StandardDynamicDateOption({ key: "LASTMINUTES", valueTypes: ["int"] }),
+			"LASTHOURS": new StandardDynamicDateOption({ key: "LASTHOURS", valueTypes: ["int"] }),
 			"LASTDAYS": new StandardDynamicDateOption({ key: "LASTDAYS", valueTypes: ["int"] }),
 			"LASTWEEKS": new StandardDynamicDateOption({ key: "LASTWEEKS", valueTypes: ["int"] }),
 			"LASTMONTHS": new StandardDynamicDateOption({ key: "LASTMONTHS", valueTypes: ["int"] }),
 			"LASTQUARTERS": new StandardDynamicDateOption({ key: "LASTQUARTERS", valueTypes: ["int"] }),
 			"LASTYEARS": new StandardDynamicDateOption({ key: "LASTYEARS", valueTypes: ["int"] }),
+			"NEXTMINUTES": new StandardDynamicDateOption({ key: "NEXTMINUTES", valueTypes: ["int"] }),
+			"NEXTHOURS": new StandardDynamicDateOption({ key: "NEXTHOURS", valueTypes: ["int"] }),
 			"NEXTDAYS": new StandardDynamicDateOption({ key: "NEXTDAYS", valueTypes: ["int"] }),
 			"NEXTWEEKS": new StandardDynamicDateOption({ key: "NEXTWEEKS", valueTypes: ["int"] }),
 			"NEXTMONTHS": new StandardDynamicDateOption({ key: "NEXTMONTHS", valueTypes: ["int"] }),
@@ -191,13 +199,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Parses a string to an array of objects in the DynamicDateRange's value format.
+	 * Parses a string to an array of objects of type <code>sap.m.DynamicDateRangeValue</code>.
 	 * Uses the provided formatter.
 	 *
 	 * @param {string} sValue The string to be parsed
 	 * @param {sap.m.DynamicDateFormat} oFormatter A dynamic date formatter
-	 * @param {array} aOptionKeys array of option names
-	 * @returns {object[]} An array of value objects in the DynamicDateRange's value format
+	 * @param {string[]} aOptionKeys array of option names
+	 * @returns {sap.m.DynamicDateRangeValue[]} An array of <code>sap.m.DynamicDateRangeValue</code> objects
 	 * @static
 	 * @public
 	 */
@@ -235,13 +243,14 @@ sap.ui.define([
 	 * Calculates a date range from a provided object in the format of the DynamicDateRange's value.
 	 *
 	 * @param {string} oValue The provided value
+	 * @param {string} sCalendarWeekNumbering The type of calendar week numbering
 	 * @returns {sap.ui.core.date.UniversalDate[]} An array of two date objects - start and end date
 	 * @static
 	 * @public
 	 */
-	DynamicDateUtil.toDates = function(oValue) {
+	DynamicDateUtil.toDates = function(oValue, sCalendarWeekNumbering) {
 		var sKey = oValue.operator;
-		return DynamicDateUtil._options[sKey].toDates(oValue);
+		return DynamicDateUtil._options[sKey].toDates(oValue, sCalendarWeekNumbering);
 	};
 
 

package/src/sap/m/DynamicDateValueHelpUIType.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.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -50,7 +50,7 @@ sap.ui.define(['sap/ui/core/Element'],
 					/**
 					 * Describes the options in a radio button group.
  					 */
-					options: { type: "string[]", multiple: true, defaultValue: null }
+					options: { type: "string[]", defaultValue: null }
 				}
 			}
 		});

package/src/sap/m/ExpandableText.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.
 */
 
@@ -105,7 +105,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -198,6 +198,19 @@ function(library,
 		this._updateAriaLabelledByText();
 	};
 
+	ExpandableText.prototype._onAfterLinkRendering = function() {
+		var oShowMoreLinkDomRef;
+
+		if (!this._isExpandable() ||
+			this.getOverflowMode() === ExpandableTextOverflowMode.Popover) {
+			return;
+		}
+
+		oShowMoreLinkDomRef = this._getShowMoreLink().getDomRef();
+		oShowMoreLinkDomRef.setAttribute("aria-expanded", this.getProperty("expanded"));
+		oShowMoreLinkDomRef.setAttribute("aria-controls", this.getId() + "-string");
+	};
+
 	/**
 	 * Gets the text.
 	 *
@@ -350,6 +363,10 @@ function(library,
 				}.bind(this)
 			});
 
+			showMoreLink.addEventDelegate({
+				onAfterRendering: this._onAfterLinkRendering
+			}, this);
+
 			this.setAggregation("_showMoreLink", showMoreLink, true);
 		}
 
@@ -364,17 +381,12 @@ function(library,
 	};
 
 	ExpandableText.prototype._updateAriaLabelledByText = function (bExpanded) {
-		var sAriaText;
+		var sAriaText = "";
 
 		bExpanded = bExpanded || this.getProperty("expanded");
 
-		switch (this.getOverflowMode()) {
-			case ExpandableTextOverflowMode.Popover:
-				sAriaText = oRb.getText(bExpanded ? "EXPANDABLE_TEXT_SHOW_LESS_POPOVER_ARIA_LABEL" : "EXPANDABLE_TEXT_SHOW_MORE_POPOVER_ARIA_LABEL");
-				break;
-			default:
-				sAriaText = oRb.getText(bExpanded ? "EXPANDABLE_TEXT_SHOW_LESS_ARIA_LABEL" : "EXPANDABLE_TEXT_SHOW_MORE_ARIA_LABEL");
-				break;
+		if (this.getOverflowMode() === ExpandableTextOverflowMode.Popover) {
+			sAriaText = oRb.getText(bExpanded ? "EXPANDABLE_TEXT_SHOW_LESS_POPOVER_ARIA_LABEL" : "EXPANDABLE_TEXT_SHOW_MORE_POPOVER_ARIA_LABEL");
 		}
 
 		this.getAggregation("_ariaLabelledBy").setText(sAriaText);
@@ -394,7 +406,7 @@ function(library,
 	 * Gets the accessibility information for the text.
 	 *
 	 * @protected
-	 * @returns {object} Accessibility information for the text.
+	 * @returns {sap.ui.core.AccessibilityInfo} Accessibility information for the text.
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 */
 	ExpandableText.prototype.getAccessibilityInfo = function () {

package/src/sap/m/ExpandableTextRenderer.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.
  */