@openui5/sap.m 1.99.1 → 1.102.0

package/src/sap/m/Column.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -226,6 +226,15 @@ sap.ui.define([
 		this._clearMedia();
 	};
 
+	Column.prototype.setParent = function(oParent) {
+		Element.prototype.setParent.apply(this, arguments);
+		if (!oParent) {
+			delete this._initialOrder;
+		}
+
+		return this;
+	};
+
 	Column.prototype.getTable = function() {
 		var oParent = this.getParent();
 		if (oParent && oParent.isA("sap.m.Table")) {

package/src/sap/m/ColumnHeaderPopover.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnListItem.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnListItemRenderer.js

@@ -29,6 +29,15 @@ sap.ui.define([
 	var ColumnListItemRenderer = Renderer.extend(ListItemBaseRenderer);
 	ColumnListItemRenderer.apiVersion = 2;
 
+	/**
+	 * Renders the HTML for the given control, using the provided
+	 * {@link sap.ui.core.RenderManager}.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm
+	 *            RenderManager that can be used to render the control's DOM
+	 * @param {sap.m.ColumnListItem} oLI
+	 *            The item to be rendered
+	 */
 	ColumnListItemRenderer.render = function(rm, oLI) {
 		var oTable = oLI.getTable();
 		if (!oTable) {
@@ -106,17 +115,6 @@ sap.ui.define([
 		return "";
 	};
 
-	/**
-	 * Renders the HTML for the given control, using the provided
-	 * {@link sap.ui.core.RenderManager}.
-	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *            oRenderManager the RenderManager that can be used for writing to
-	 *            the Render-Output-Buffer
-	 * @param {sap.m.ColumnListItem}
-	 *            oControl an object representation of the control that should be
-	 *            rendered
-	 */
 	ColumnListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMListTblRow");
 		var vAlign = oLI.getVAlign();
@@ -266,6 +264,7 @@ sap.ui.define([
 		rm.openStart("tr", oLI.getPopin());
 		rm.class("sapMListTblSubRow");
 		rm.attr("tabindex", "-1");
+		rm.attr("data-sap-ui-related", oLI.getId());
 
 		if (oLI.isSelectable()) {
 			rm.attr("aria-selected", oLI.getSelected());

package/src/sap/m/ColumnPopoverActionItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverIte
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverCustomItem.js

@@ -17,7 +17,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopo
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/Element'], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverSelectListItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.86

package/src/sap/m/ColumnPopoverSortItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @since 1.66

package/src/sap/m/ComboBox.js

@@ -108,7 +108,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase
@@ -495,6 +495,7 @@ sap.ui.define([
 			ComboBoxBase.prototype.exit.apply(this, arguments);
 
 			this._oSelectedItemBeforeOpen = null;
+			this._bInputFired = null;
 			this.setLastFocusedListItem(null);
 
 		};
@@ -648,6 +649,8 @@ sap.ui.define([
 				return;
 			}
 
+			this._bInputFired = true;
+
 			this.loadItems(function() {
 				this.handleInputValidation(oEvent);
 			}, {
@@ -1549,7 +1552,13 @@ sap.ui.define([
 			this.syncPickerContent();
 			ComboBoxBase.prototype.open.call(this);
 
-			this._getSuggestionsPopover() && this._getSuggestionsPopover().updateFocus(this, ListHelpers.getListItem(this.getSelectedItem()));
+			var oSelectedItem = ListHelpers.getListItem(this.getSelectedItem());
+
+			if (!this._bInputFired) {
+				this._getSuggestionsPopover() && this._getSuggestionsPopover().updateFocus(this, oSelectedItem);
+			}
+
+			this._bInputFired = false;
 
 			return this;
 		};
@@ -1893,14 +1902,26 @@ sap.ui.define([
 		 * @private
 		 */
 		ComboBox.prototype.handleClearIconPress = function (oEvent) {
+			var oPreviouslySelectedItem = this.getSelectedItem(),
+				mParam = this.getChangeEventParams();
+
 			if (!(this.getEnabled() && this.getEditable())) {
 				return;
 			}
 
 			if (this.getValue() !== "") {
 				this.clearSelection();
+				this.bOpenedByKeyboardOrButton ? this.clearFilter() : this.close();
 				this.setProperty("effectiveShowClearIcon", false);
 			}
+
+			if (oPreviouslySelectedItem) {
+				this.fireSelectionChange({
+					selectedItem: null
+				});
+
+				this.fireChangeEvent(null, mParam);
+			}
 		};
 
 		return ComboBox;

package/src/sap/m/ComboBoxBase.js

@@ -5,6 +5,7 @@
  */
 
 sap.ui.define([
+	'./Input',
 	'./ComboBoxTextField',
 	'./ComboBoxBaseRenderer',
 	'./SuggestionsPopover',
@@ -27,6 +28,7 @@ sap.ui.define([
 	"sap/ui/core/Core"
 ],
 	function(
+		Input,
 		ComboBoxTextField,
 		ComboBoxBaseRenderer,
 		SuggestionsPopover,
@@ -68,7 +70,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @public
@@ -1074,7 +1076,7 @@ sap.ui.define([
 
 			oSuggPopover.decorateParent(this);
 			// Creates the internal controls of the <code>SuggestionsPopover</code>
-			oSuggPopover.createSuggestionPopup(this, {showSelectedButton: this._hasShowSelectedButton()});
+			oSuggPopover.createSuggestionPopup(this, {showSelectedButton: this._hasShowSelectedButton()}, Input);
 			this._decoratePopupInput(oSuggPopover.getInput());
 			oSuggPopover.initContent(this.getId());
 			this.forwardEventHandlersToSuggPopover(oSuggPopover);

package/src/sap/m/ComboBoxTextField.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/CustomDynamicDateOption.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/m/DynamicDateOption'],
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/CustomListItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ListItemBase', './library', './CustomListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomListItemRenderer.js

@@ -20,12 +20,10 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer"],
 	 * Renders the HTML for the given control, using the provided
 	 * {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *            oRenderManager the RenderManager that can be used for writing to
-	 *            the Render-Output-Buffer
-	 * @param {sap.m.CustomListItem}
-	 *            oControl an object representation of the control that should be
-	 *            rendered
+	 * @param {sap.ui.core.RenderManager} rm
+	 *            RenderManager that can be used to render the control's DOM
+	 * @param {sap.m.CustomListItem} oLI
+	 *            The item to be rendered
 	 */
 	CustomListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMCLI");

package/src/sap/m/CustomTile.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Tile', './library', './CustomTileRenderer'],
 	 * Use the CustomTile control to display application specific content in the Tile control.
 	 * The tile width is 8.5em and height is 10em.
 	 * @extends sap.m.Tile
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTileRenderer.js

@@ -34,7 +34,7 @@ sap.ui.define(['./TileRenderer', 'sap/ui/core/Renderer'],
 		}
 
 		/* WAI ARIA if in TileContainer context */
-		if (oControl.getParent() instanceof sap.m.TileContainer) {
+		if (oControl.getParent() && oControl.getParent().isA("sap.m.TileContainer")) {
 			// @ui5-non-local-rendering
 			oTileContainer = oControl.getParent();
 			aVisibleTiles = oTileContainer._getVisibleTiles();

package/src/sap/m/CustomTreeItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *        <code>Table, Form</code> etc, should not be aggregated as content.
 	 * @extends sap.m.TreeItemBase
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @public
 	 * @since 1.48.0

package/src/sap/m/CustomTreeItemRenderer.js

@@ -18,8 +18,8 @@ sap.ui.define([
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager} oRenderManager RenderManager object
-	 * @param {sap.m.CustomTreeItem} oControl An object representation of the control that will be rendered
+	 * @param {sap.ui.core.RenderManager} rm RenderManager object
+	 * @param {sap.m.CustomTreeItem} oLI The item to be rendered
 	 */
 	CustomTreeItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMCTI");

package/src/sap/m/DatePicker.js

@@ -9,6 +9,8 @@ sap.ui.define([
 	'sap/ui/thirdparty/jquery',
 	'sap/ui/Device',
 	"sap/ui/core/Element",
+	"sap/ui/core/format/TimezoneUtil",
+	"sap/ui/core/format/DateFormat",
 	'./InputBase',
 	'./DateTimeField',
 	'./Button',
@@ -38,6 +40,8 @@ sap.ui.define([
 		jQuery,
 		Device,
 		Element,
+		TimezoneUtil,
+		DateFormat,
 		InputBase,
 		DateTimeField,
 		Button,
@@ -148,7 +152,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -283,7 +287,19 @@ sap.ui.define([
 					afterPopupOpened : {type : "boolean"}
 
 				}
-			}
+			},
+
+			/**
+			 * Fired when <code>value help</code> dialog opens.
+			 * @since 1.102.0
+			 */
+			afterValueHelpOpen : {},
+
+			/**
+			 * Fired when <code>value help</code> dialog closes.
+			 * @since 1.102.0
+			 */
+			afterValueHelpClose : {}
 		},
 		designtime: "sap/m/designtime/DatePicker.designtime",
 		dnd: { draggable: false, droppable: true }
@@ -1184,7 +1200,7 @@ sap.ui.define([
 		if (!oDomRef) {
 			oDomRef = this.getDomRef();
 		}
-		this._oPopup._getPopup().setAutoCloseAreas([oDomRef]);
+		this._oPopup._getPopup().setExtraContent([oDomRef]);
 		this._oPopup.openBy(oDomRef || this);
 	};
 
@@ -1248,7 +1264,6 @@ sap.ui.define([
 			this._getCalendar().addSelectedDate(this._oDateRange);
 			this._getCalendar()._setSpecialDatesControlOrigin(this);
 			this._getCalendar().attachCancel(_cancel, this);
-			this._getCalendar().setPopupMode(true);
 
 			if (this.$().closest(".sapUiSizeCompact").length > 0) {
 				this._getCalendar().addStyleClass("sapUiSizeCompact");
@@ -1320,13 +1335,19 @@ sap.ui.define([
 	};
 
 	DatePicker.prototype._fillDateRange = function(){
-
+		var sFormattedDate;
 		var oDate = this.getDateValue();
 
 		if (oDate &&
 			oDate.getTime() >= this._oMinDate.getTime() &&
 			oDate.getTime() <= this._oMaxDate.getTime()) {
 
+			sFormattedDate = this._getPickerParser().format(
+				oDate,
+				sap.ui.getCore().getConfiguration().getTimezone()
+			);
+			oDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
+
 			this._getCalendar().focusDate(new Date(oDate.getTime()));
 			if (!this._oDateRange.getStartDate() || this._oDateRange.getStartDate().getTime() != oDate.getTime()) {
 				this._oDateRange.setStartDate(new Date(oDate.getTime()));
@@ -1334,10 +1355,17 @@ sap.ui.define([
 		} else {
 			var oInitialFocusedDateValue = this.getInitialFocusedDateValue();
 			var oFocusDate = oInitialFocusedDateValue ? oInitialFocusedDateValue : new Date();
-			var iMaxTimeMillis = this._oMaxDate.getTime();
 
-			if (oFocusDate.getTime() < this._oMinDate.getTime() || oFocusDate.getTime() > iMaxTimeMillis) {
+			sFormattedDate = this._getPickerParser().format(
+				oFocusDate,
+				sap.ui.getCore().getConfiguration().getTimezone()
+			);
+			oFocusDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
+
+			if (oFocusDate.getTime() < this._oMinDate.getTime()) {
 				oFocusDate = this._oMinDate;
+			} else if (oFocusDate.getTime() > this._oMaxDate.getTime()) {
+				oFocusDate = this._oMaxDate;
 			}
 			this._getCalendar().focusDate(oFocusDate);
 
@@ -1373,6 +1401,13 @@ sap.ui.define([
 			oDate = this._getSelectedDate(),
 			sValue = "";
 
+		var sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+		var oParts = this._getPickerParser().parse(
+			sFormattedDate,
+			sap.ui.getCore().getConfiguration().getTimezone()
+		);
+		oDate = oParts && oParts[0];
+
 		// do not use this.onChange() because output pattern will change date (e.g. only last 2 number of year -> 1966 -> 2066 )
 		if (!deepEqual(oDate, oDateOld)) {
 			this.setDateValue(new Date(oDate.getTime()));
@@ -1570,11 +1605,11 @@ sap.ui.define([
 		this._renderedDays = this._getCalendar().$("-Month0-days").find(".sapUiCalItem").length;
 
 		this.$("inner").attr("aria-owns", this.getId() + "-cal");
-		this.$("inner").attr("aria-expanded", true);
 
 		InstanceManager.addPopoverInstance(this._oPopup);
 
 		this._oCalendar.focus();
+		this.fireAfterValueHelpOpen();
 	}
 
 	function _handleClose() {
@@ -1582,11 +1617,11 @@ sap.ui.define([
 			this._oPopup.getBeginButton().setEnabled(false);
 		}
 		this.removeStyleClass(InputBase.ICON_PRESSED_CSS_CLASS);
-		this.$("inner").attr("aria-expanded", false);
 
 		this._getCalendar()._closePickers();
 
 		InstanceManager.removePopoverInstance(this._oPopup);
+		this.fireAfterValueHelpClose();
 	}
 
 	function _resizeCalendar(oEvent){
@@ -1623,6 +1658,14 @@ sap.ui.define([
 
 	}
 
+	DatePicker.prototype._getPickerParser = function() {
+		if (!this._calendarParser) {
+			this._calendarParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
+		}
+
+		return this._calendarParser;
+	};
+
 	/**
 	 * Fired when the input operation has finished and the value has changed.
 	 *

package/src/sap/m/DatePickerRenderer.js

@@ -49,7 +49,6 @@ sap.ui.define(['sap/ui/core/Renderer', './InputBaseRenderer', 'sap/ui/core/libra
 		mAccessibilityState["roledescription"] = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_DATEINPUT");
 		mAccessibilityState["autocomplete"] = "none";
 		mAccessibilityState["haspopup"] = coreLibrary.aria.HasPopup.Grid.toLowerCase();
-		mAccessibilityState["expanded"] = false;
 		// aria-disabled is not necessary if we already have a native 'disabled' attribute
 		mAccessibilityState["disabled"] = null;
 

package/src/sap/m/DateRangeSelection.js

@@ -11,6 +11,7 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/LocaleData',
 	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/TimezoneUtil',
 	'sap/ui/core/date/UniversalDate',
 	'./DateRangeSelectionRenderer',
 	"sap/ui/unified/calendar/CustomMonthPicker",
@@ -26,6 +27,7 @@ sap.ui.define([
 		library,
 		LocaleData,
 		DateFormat,
+		TimezoneUtil,
 		UniversalDate,
 		DateRangeSelectionRenderer,
 		CustomMonthPicker,
@@ -126,8 +128,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.99.1
-	 * @version 1.99.1
+	 * @version 1.102.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -200,6 +202,7 @@ sap.ui.define([
 			oCalendar._getYearPicker().setIntervalSelection(true);
 		}
 
+		this._getCalendar().detachWeekNumberSelect(this._handleWeekSelect, this);
 		this._getCalendar().attachWeekNumberSelect(this._handleWeekSelect, this);
 		this._getCalendar().getSelectedDates()[0].setStartDate(this._oDateRange.getStartDate());
 		this._getCalendar().getSelectedDates()[0].setEndDate(this._oDateRange.getEndDate());
@@ -807,11 +810,18 @@ sap.ui.define([
 		DatePicker.prototype._fillDateRange.apply(this, arguments);
 
 		var oEndDate = this.getSecondDateValue();
+		var sFormattedEndDate;
 
 		if (oEndDate &&
 			oEndDate.getTime() >= this._oMinDate.getTime() &&
 			oEndDate.getTime() <= this._oMaxDate.getTime()) {
 			if (!this._oDateRange.getEndDate() || this._oDateRange.getEndDate().getTime() !== oEndDate.getTime()) {
+				sFormattedEndDate = this._getPickerParser().format(
+					oEndDate,
+					sap.ui.getCore().getConfiguration().getTimezone()
+				);
+				oEndDate = this._getPickerParser().parse(sFormattedEndDate, TimezoneUtil.getLocalTimezone())[0];
+
 				this._oDateRange.setEndDate(new Date(oEndDate.getTime()));
 			}
 		} else {
@@ -824,6 +834,8 @@ sap.ui.define([
 
 	DateRangeSelection.prototype._selectDate = function () {
 		var aSelectedDates = this._getCalendar().getSelectedDates();
+		var sFormattedDate, oParts;
+		var sTimezone = sap.ui.getCore().getConfiguration().getTimezone();
 
 		if (aSelectedDates.length > 0) {
 			var oDate1 = aSelectedDates[0].getStartDate();
@@ -836,6 +848,17 @@ sap.ui.define([
 				// the selected range includes all of the hours from the second date
 				oDate2.setHours(23, 59, 59, 999);
 
+				sFormattedDate = this._getPickerParser().format(oDate1, TimezoneUtil.getLocalTimezone());
+				oParts = this._getPickerParser().parse(sFormattedDate, sTimezone);
+				oDate1 = oParts && oParts[0];
+
+				sFormattedDate = this._getPickerParser().format(oDate2, TimezoneUtil.getLocalTimezone());
+				oParts = this._getPickerParser().parse(sFormattedDate, sTimezone);
+				oDate2 = oParts && oParts[0];
+
+				//the parser does not include milliseconds, so restore them
+				oDate2.setMilliseconds(999);
+
 				var sValue;
 				if (!deepEqual(oDate1, oDate1Old) || !deepEqual(oDate2, oDate2Old)) {
 					// compare Dates because value can be the same if only 2 digits for year
@@ -888,8 +911,15 @@ sap.ui.define([
 
 	DateRangeSelection.prototype._handleWeekSelect = function(oEvent){
 		var oSelectedDates = oEvent.getParameter("weekDays"),
-			oSelectedStartDate = oSelectedDates.getStartDate(),
-			oSelectedEndDate = oSelectedDates.getEndDate();
+			oSelectedStartDate,
+			oSelectedEndDate;
+
+		if (!oSelectedDates) {
+			return;
+		}
+
+		oSelectedStartDate = oSelectedDates.getStartDate();
+		oSelectedEndDate = oSelectedDates.getEndDate();
 
 		if (this.getShowFooter()) {
 			this._oPopup.getBeginButton().setEnabled(!!(oSelectedStartDate && oSelectedEndDate));
@@ -1058,6 +1088,14 @@ sap.ui.define([
 		}
 	};
 
+	DateRangeSelection.prototype._getPickerParser = function() {
+		if (!this._calendarParser) {
+			this._calendarParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
+		}
+
+		return this._calendarParser;
+	};
+
 	function _getIncrementedDate(oOldDate, iNumber, sUnit) {
 		// use UniversalDate to calculate new date based on used calendar
 		var oBinding = this.getBinding("value"),

package/src/sap/m/DateTimeField.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -239,7 +239,10 @@ sap.ui.define([
 			// open value state message popup when focus is in the input
 			this.openValueStateMessage();
 		} else if (this._oValueStateHeader) {
-			this._oValueStateHeader.setVisible(this.getValueState() !== ValueState.None);
+			this._oValueStateHeader
+				.setValueState(this.getValueState())
+				.setText(this._getTextForPickerValueStateContent())
+				.setVisible(this.getValueState() !== ValueState.None);
 		}
 
 	};
@@ -308,7 +311,7 @@ sap.ui.define([
 			oDateLocal,
 			oDate;
 
-		if (oBindingType && this._isSupportedBindingType(oBindingType)) {
+		if (this._isSupportedBindingType(oBindingType)) {
 			try {
 				oDate = oBindingType.parseValue(sValue, "string");
 
@@ -352,7 +355,7 @@ sap.ui.define([
 			oFormatOptions,
 			oDateUTC;
 
-		if (oBindingType && this._isSupportedBindingType(oBindingType)) {
+		if (this._isSupportedBindingType(oBindingType)) {
 			if ((oBindingType.oFormatOptions && oBindingType.oFormatOptions.UTC) || (oBindingType.oConstraints && oBindingType.oConstraints.isDateOnly)) {
 				// convert to UTC date because it will be formatted as UTC date
 				oDateUTC = new Date(Date.UTC(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(),
@@ -378,7 +381,7 @@ sap.ui.define([
 	};
 
 	DateTimeField.prototype._isSupportedBindingType = function (oBindingType) {
-		return oBindingType.isA([
+		return !!oBindingType && oBindingType.isA([
 			"sap.ui.model.type.Date",
 			"sap.ui.model.odata.type.DateTime",
 			"sap.ui.model.odata.type.DateTimeOffset"

package/src/sap/m/DateTimeInput.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public