@openui5/sap.m 1.141.1 → 1.142.0

package/src/sap/m/ButtonRenderer.js

@@ -60,7 +60,6 @@ sap.ui.define([
 		var sTooltip = oButton._getTooltip();
 		var sText = oButton._getText();
 		var sTextDir = oButton.getTextDirection();
-		// render bdi tag only if the browser is different from IE and Edge since it is not supported there
 		var bRenderBDI = (sTextDir === TextDirection.Inherit);
 
 		// get icon from icon pool

package/src/sap/m/Carousel.js

@@ -132,7 +132,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public
@@ -413,7 +413,7 @@ sap.ui.define([
 	};
 
 	Carousel.prototype._resize = function() {
-		var $inner = this.$().find('> .sapMCrslInner');
+		var $inner = this.$().find('> .sapMCrslList > .sapMCrslInner');
 
 		if (this._iResizeTimeoutId) {
 			clearTimeout(this._iResizeTimeoutId);
@@ -581,7 +581,7 @@ sap.ui.define([
 		}
 
 		var $element = this.$(),
-			$inner = $element.find('> .sapMCrslInner'),
+			$inner = $element.find('> .sapMCrslList > .sapMCrslInner'),
 			$items = $inner.children(),
 			iIndex = this._iCurrSlideIndex,
 			iLength = $items.length,
@@ -698,7 +698,6 @@ sap.ui.define([
 		this.$().find(Carousel._ITEM_SELECTOR).each(function (iIndex, oPage) {
 			var bSelected = iIndex === iSelectedPageIndex;
 
-			oPage.setAttribute("aria-selected", bSelected);
 			oPage.setAttribute("aria-hidden", !this._isPageDisplayed(iIndex));
 			oPage.setAttribute("tabindex", bSelected ? 0 : -1);
 		}.bind(this));
@@ -1213,7 +1212,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Carousel.prototype.onsapup = function(oEvent) {
-		this._fnSkipToIndex(oEvent, 1, false);
+		this._fnSkipToIndex(oEvent, -1, false);
 	};
 
 	/**
@@ -1234,7 +1233,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Carousel.prototype.onsapdown = function(oEvent) {
-		this._fnSkipToIndex(oEvent, -1, false);
+		this._fnSkipToIndex(oEvent, 1, false);
 	};
 
 	/**
@@ -1556,7 +1555,7 @@ sap.ui.define([
 	};
 
 	Carousel.prototype._initialize  = function () {
-		var $inner = this.$().find('> .sapMCrslInner'),
+		var $inner = this.$().find('> .sapMCrslList > .sapMCrslInner'),
 			iNumberOfItemsToShow = this._getNumberOfItemsToShow();
 
 		this._bIsInitialized = false;
@@ -1595,7 +1594,7 @@ sap.ui.define([
 		}
 
 		var $element = this.$(),
-			$inner = $element.find('> .sapMCrslInner'),
+			$inner = $element.find('> .sapMCrslList > .sapMCrslInner'),
 			$items = $inner.children(),
 			$start = $items.eq(0),
 			$current = $items.eq(this._iCurrSlideIndex),
@@ -1620,7 +1619,7 @@ sap.ui.define([
 	Carousel.prototype._initActivePages = function () {
 		var sActiveClass = "sapMCrslActive",
 			$element = this.$(),
-			$inner = $element.find('> .sapMCrslInner'),
+			$inner = $element.find('> .sapMCrslList > .sapMCrslInner'),
 			$items = $inner.children(),
 			sId = this.getDomRef().id,
 			sPageIndicatorId = sId.replace(/(:|\.)/g,'\\$1') + '-pageIndicator',

package/src/sap/m/CarouselLayout.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/base/ManagedObject", "./library"], function (ManagedObjec
 	 * Applies a <code>sap.m.CarouselLayout</code> to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/m/CarouselRenderer.js

@@ -6,10 +6,8 @@
 
 sap.ui.define([
 	"sap/m/library",
-	"sap/base/strings/capitalize",
-	"sap/ui/Device",
-	"sap/ui/core/Lib"
-], function (library, capitalize, Device, Library) {
+	"sap/base/strings/capitalize"
+], function (library, capitalize) {
 	"use strict";
 
 	// shortcut for sap.m.CarouselArrowsPlacement
@@ -18,8 +16,6 @@ sap.ui.define([
 	// shortcut for sap.m.CarouselPageIndicatorPlacementType
 	var CarouselPageIndicatorPlacementType = library.CarouselPageIndicatorPlacementType;
 
-	var oResourceBundle = Library.getResourceBundleFor("sap.m");
-
 	/**
 	 * Carousel renderer.
 	 * @namespace
@@ -50,21 +46,23 @@ sap.ui.define([
 		//visual indicator
 		if (sPageIndicatorPlacement === CarouselPageIndicatorPlacementType.Top ||
 			sPageIndicatorPlacement === CarouselPageIndicatorPlacementType.OverContentTop) {
-			this._renderPageIndicatorAndArrows(oRM, oCarousel, {
-				iPageCount: iPageCount,
-				iIndex: iIndex,
-				sArrowsPlacement : sArrowsPlacement,
-				sPlacement: sPageIndicatorPlacement,
-				bShowPageIndicator: oCarousel.getShowPageIndicator()
-			});
-		}
-
+				this._renderPageIndicatorAndArrows(oRM, oCarousel, {
+					iPageCount: iPageCount,
+					iIndex: iIndex,
+					sArrowsPlacement : sArrowsPlacement,
+					sPlacement: sPageIndicatorPlacement,
+					bShowPageIndicator: oCarousel.getShowPageIndicator()
+				});
+			}
+		this._renderListDiv(oRM, oCarousel);
 		this._renderInnerDiv(oRM, oCarousel, aPages, sPageIndicatorPlacement);
 
 		if (iPageCount > oCarousel._getNumberOfItemsToShow() && sArrowsPlacement === CarouselArrowsPlacement.Content) {
 			this._renderHudArrows(oRM, oCarousel);
 		}
 
+		//close list div
+		oRM.close("div");
 		//visual indicator
 		if (sPageIndicatorPlacement === CarouselPageIndicatorPlacementType.OverContentBottom
 			|| sPageIndicatorPlacement === CarouselPageIndicatorPlacementType.Bottom) {
@@ -78,6 +76,7 @@ sap.ui.define([
 		}
 
 		this._renderDummyArea(oRM, oCarousel, "after");
+		//close opening div
 		oRM.close("div");
 		//page-wrap ends
 	};
@@ -95,8 +94,8 @@ sap.ui.define([
 			.style("height", oCarousel.getHeight())
 			.attr("data-sap-ui-customfastnavgroup", true) // custom F6 handling
 			.accessibilityState(oCarousel, {
-				role: "list",
-				roledescription: Library.getResourceBundleFor("sap.m").getText("CAROUSEL_ARIA_ROLE_DESCRIPTION")
+				role: "region",
+				roledescription: oCarousel._oRb.getText("CAROUSEL_ARIA_ROLE_DESCRIPTION")
 			});
 
 		if (sTooltip) {
@@ -106,6 +105,17 @@ sap.ui.define([
 		oRM.openEnd();
 	};
 
+	CarouselRenderer._renderListDiv = function (oRM, oCarousel) {
+		oRM.openStart("div")
+			.class("sapMCrslList")
+			.accessibilityState({
+				role: "list",
+				label: oCarousel._oRb.getText("CAROUSEL_ARIA_LIST_LABEL")
+		});
+
+		oRM.openEnd();
+	};
+
 	CarouselRenderer._renderInnerDiv = function (oRM, oCarousel, aPages, sPageIndicatorPlacement) {
 		oRM.openStart("div").class("sapMCrslInner");
 
@@ -153,7 +163,6 @@ sap.ui.define([
 				role: "listitem",
 				posinset: iIndex + 1,
 				setsize: aArray.length,
-				selected: bSelected,
 				hidden: !oCarousel._isPageDisplayed(iIndex)
 			})
 			.attr("tabindex", bSelected ? 0 : -1)
@@ -172,6 +181,7 @@ sap.ui.define([
 			.attr("tabindex", 0)
 			.class("sapMCrslNoDataItem")
 			.accessibilityState({
+				role: "listitem",
 				label: oAccInfo.type + " " + oAccInfo.description
 			})
 			.openEnd();
@@ -251,8 +261,8 @@ sap.ui.define([
 				oRM.openStart("span")
 					.attr("data-slide", i)
 					.accessibilityState({
-						role: "img",
-						label: oResourceBundle.getText("CAROUSEL_POSITION", [i, iPageCount])
+						role: "presentation",
+						hidden: true
 					}).openEnd()
 					.close("span");
 			}
@@ -261,9 +271,13 @@ sap.ui.define([
 			oRM.class("sapMCrslNumeric")
 				.openEnd();
 
-			var sTextBetweenNumbers = oResourceBundle.getText("CAROUSEL_PAGE_INDICATOR_TEXT", [mSettings.iIndex + 1, iPageCount - iNumberOfItemsToShow + 1]);
+			var sTextBetweenNumbers = oCarousel._oRb.getText("CAROUSEL_PAGE_INDICATOR_TEXT", [mSettings.iIndex + 1, iPageCount - iNumberOfItemsToShow + 1]);
 			oRM.openStart("span", sId + "-" + "slide-number")
 				.attr("dir", "auto")
+				.accessibilityState({
+					role: "presentation",
+					hidden: true
+				})
 				.openEnd()
 				.text(sTextBetweenNumbers)
 				.close("span");
@@ -318,7 +332,11 @@ sap.ui.define([
 			.class("sapMCrslArrow")
 			.class("sapMCrsl" + capitalize(sShort))
 			.attr("data-slide", sShort)
-			.attr("title", oResourceBundle.getText("PAGINGBUTTON_" + sDirection.toUpperCase()));
+			.accessibilityState({
+				role: "presentation",
+				hidden: true
+			})
+			.attr("title", oCarousel._oRb.getText("PAGINGBUTTON_" + sDirection.toUpperCase()));
 
 		// Hide unneeded arrow when we are on the first or last page and "loop" property is set to false
 		if (bFirstPageIsActive && sDirection === "previous" && !bLoop) {

package/src/sap/m/CheckBox.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColorPalette.js

@@ -108,7 +108,7 @@ sap.ui.define([
 		 * To prevent this, apps using the <code>ColorPalette</code> should also load the <code>sap.ui.unified</code> library in advance.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.141.1
+		 * @version 1.142.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ColorPalettePopover.js

@@ -39,7 +39,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.m.ColorPalette} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.141.1
+		 * @version 1.142.0
 		 *
 		 * @public
 		 * @since 1.54

package/src/sap/m/Column.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnListItem.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @implements sap.m.ITableItem
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public
@@ -84,13 +84,18 @@ sap.ui.define([
 	 */
 	var TablePopin = Element.extend("sap.m.TablePopin", {
 		ontap: function(oEvent) {
-			// prevent the tap event if selection is done within the popin control and mark the event
+			// prevent the tap event if selection is done within the popin control
 			if (oEvent.isMarked() || ListItemBase.detectTextSelection(this.getDomRef())) {
 				return oEvent.stopImmediatePropagation(true);
 			}
-			if (oEvent.srcControl === this || !jQuery(oEvent.target).is(":sapFocusable")) {
+		},
+		ontouchend: function() {
+			if (document.activeElement === this.getFocusDomRef()) {
 				this.getParent().focus({ preventScroll: true });
 			}
+		},
+		getFocusDomRef: function() {
+			return this.getParent().getDomRef("subcont");
 		}
 	});
 
@@ -323,12 +328,13 @@ sap.ui.define([
 
 		if (oTarget.classList.contains("sapMListTblCell")) {
 			const oColumn = Element.getElementById(oTarget.getAttribute("data-sap-ui-column"));
-
 			sInvisibleText = this.getContentAnnouncementOfCell(oColumn);
 		} else if (oTarget.classList.contains("sapMListTblSubCnt")) {
 			sInvisibleText = this.getContentAnnouncementOfPopin();
 		} else if (oTarget.classList.contains("sapMListTblNavCol")) {
 			sInvisibleText = this.getContentAnnouncementOfRowAction();
+		} else if (oTarget.classList.contains("sapMListTblActionsCol")) {
+			sInvisibleText = this._getCustomActionsAnnouncement(true);
 		}
 
 		if (sInvisibleText) {

package/src/sap/m/ColumnListItemRenderer.js

@@ -75,7 +75,7 @@ sap.ui.define([
 	ColumnListItemRenderer.renderHighlight = function(rm, oLI) {
 		rm.openStart("td");
 		rm.class("sapMListTblHighlightCell");
-		rm.attr("role", "presentation");
+		rm.attr("role", "none");
 		rm.openEnd();
 
 		// let the list item base render the highlight
@@ -87,7 +87,7 @@ sap.ui.define([
 	ColumnListItemRenderer.renderNavigated = function(rm, oLI) {
 		rm.openStart("td");
 		rm.class("sapMListTblNavigatedCell");
-		rm.attr("role", "presentation");
+		rm.attr("role", "none");
 		rm.openEnd();
 
 		// let the list item base render the navigated state
@@ -251,7 +251,7 @@ sap.ui.define([
 	ColumnListItemRenderer.renderDummyCell = function(rm, oTable) {
 		rm.openStart("td");
 		rm.class("sapMListTblDummyCell");
-		rm.attr("role", "presentation");
+		rm.attr("role", "none");
 		rm.openEnd();
 		rm.close("td");
 	};
@@ -279,7 +279,7 @@ sap.ui.define([
 		// popin row
 		rm.openStart("tr", oLI.getPopin());
 		rm.class("sapMListTblSubRow");
-		rm.attr("tabindex", "-1");
+		rm.attr("role", "none");
 		rm.attr("data-sap-ui-related", oLI.getId());
 		rm.openEnd();
 

package/src/sap/m/ComboBox.js

@@ -106,7 +106,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.141.1
+		 * @version 1.142.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase

package/src/sap/m/ComboBoxBase.js

@@ -70,7 +70,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.141.1
+		 * @version 1.142.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ComboBoxTextField.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.141.1
+		 * @version 1.142.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ContentConfig.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class This element is used within the TileAttribute control that generates either a link or text
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @constructor
 	 * @public
 	 * @experimental since 1.122

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.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

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.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

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.141.1
+	 * @version 1.142.0
 	 * @constructor
 	 * @public
 	 * @since 1.48.0

package/src/sap/m/DatePicker.js

@@ -186,7 +186,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateRangeSelection.js

@@ -168,8 +168,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.141.1
-	 * @version 1.141.1
+	 * @version 1.142.0
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeField.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeInput.js

@@ -68,7 +68,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimePicker.js

@@ -183,7 +183,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Dialog.js

@@ -171,7 +171,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.141.1
+		* @version 1.142.0
 		*
 		* @constructor
 		* @public
@@ -397,7 +397,10 @@ function(
 					rightButton: {type: "sap.m.Button", multiple: false, deprecated: true},
 
 					/**
-					 * In the Dialog focus is set first on the <code>beginButton</code> and then on <code>endButton</code>, when available. If another control needs to get the focus, set the <code>initialFocus</code> with the control which should be focused on. Setting <code>initialFocus</code> to input controls doesn't open the On-Screen keyboard on mobile device as, due to browser restriction, the On-Screen keyboard can't be opened with JavaScript code. The opening of On-Screen keyboard must be triggered by real user action.
+					 * In the Dialog, focus is initially set on the first focusable element, or on the dialog itself if no such element is available.
+					 * If another control needs to receive focus, set the <code>initialFocus</code> to the control that should be focused.
+					 * Setting <code>initialFocus</code> on input controls does not open the on-screen keyboard on mobile devices.
+					 * Due to browser restrictions, the on-screen keyboard can't be opened with JavaScript code; it must be triggered explicitly by the user.
 					 * @since 1.15.0
 					 */
 					initialFocus: {type: "sap.ui.core.Control", multiple: false},
@@ -661,7 +664,6 @@ function(
 			this._$dialog = this.$();
 
 			if (this.isOpen()) {
-				//restore the focus after rendering when dialog is already open
 				this._setInitialFocus();
 			}
 		};
@@ -952,7 +954,7 @@ function(
 				oPromiseArgument = {},
 				that = this;
 
-			if (this._isSpaceOrEnterPressed) {
+			if (this._isSpacePressed) {
 				return;
 			}
 
@@ -990,27 +992,27 @@ function(
 
 		/**
 		 * Event handler for the onkeyup event.
-		 * Register if SPACE or ENTER is released.
+		 * Register if SPACE is released.
 		 *
 		 * @param {jQuery.Event} oEvent The event object
 		 * @private
 		 */
 		Dialog.prototype.onkeyup = function (oEvent) {
-			if (this._isSpaceOrEnter(oEvent)) {
-				this._isSpaceOrEnterPressed = false;
+			if (this._isSpace(oEvent)) {
+				this._isSpacePressed = false;
 			}
 		};
 
 		/**
 		 * Event handler for the onkeydown event.
-		 * Register if SPACE or ENTER is pressed.
+		 * Register if SPACE is pressed.
 		 *
 		 * @param {jQuery.Event} oEvent The event object
 		 * @private
 		 */
 		Dialog.prototype.onkeydown = function (oEvent) {
-			if (this._isSpaceOrEnter(oEvent)) {
-				this._isSpaceOrEnterPressed = true;
+			if (this._isSpace(oEvent)) {
+				this._isSpacePressed = true;
 			}
 
 			var iKeyCode = oEvent.which || oEvent.keyCode;
@@ -1152,16 +1154,16 @@ function(
 		};
 
 		/**
-		 * Determines if the key from oEvent is SPACE or ENTER.
+		 * Determines if the key from oEvent is SPACE.
 		 *
 		 * @param {jQuery.Event} oEvent The event object
 		 * @private
-		 * @return {boolean} True if the key from the event is space or enter
+		 * @return {boolean} True if the key from the event is space
 		 */
-		Dialog.prototype._isSpaceOrEnter = function (oEvent) {
-			var iKeyCode = oEvent.which || oEvent.keyCode;
+		Dialog.prototype._isSpace = function (oEvent) {
+			var iKeyCode = oEvent.which || oEvent.key;
 
-			return iKeyCode == KeyCodes.SPACE || iKeyCode == KeyCodes.ENTER;
+			return iKeyCode == KeyCodes.SPACE;
 		};
 
 		/* =========================================================== */
@@ -1508,13 +1510,32 @@ function(
 			return false;
 		};
 
+		Dialog.prototype.getFocusInfo = function () {
+			return {
+				id: this.getId(),
+				dialogActiveElement: this.getDomRef()?.contains(document.activeElement) ? document.activeElement : null
+			};
+		};
+
+		Dialog.prototype.applyFocusInfo = function (oFocusInfo) {
+			const oDialogActiveElement = oFocusInfo?.dialogActiveElement;
+
+			if (oDialogActiveElement && this.getDomRef()?.contains(oDialogActiveElement)) {
+				oDialogActiveElement.focus();
+
+				return this;
+			}
+
+			return Control.prototype.applyFocusInfo.apply(this, arguments);
+		};
+
 		/**
 		 *
 		 * @private
 		 */
 		Dialog.prototype._getFocusDomRef = function () {
-			// Left or Right button can be visible false and therefore not rendered.
-			// In such a case, focus should be set somewhere else.
+			// Either the left or right button might not be visible and hence not rendered.
+			// In such cases, the focus should be set elsewhere.
 			var sInitialFocusId = this.getInitialFocus();
 
 			if (sInitialFocusId) {
@@ -1591,13 +1612,8 @@ function(
 			return $dialogContent.firstFocusableDomRef();
 		};
 
-		// The control that needs to be focused after the Dialog is open is calculated in the following sequence:
-		// initialFocus, first focusable element in content area, beginButton, endButton
-		// the Dialog is always modal so the focus doesn't need to be on the Dialog when there's
-		// no initialFocus, beginButton and endButton available, but to keep the consistency,
-		// the focus will in the end fall back on the Dialog itself.
 		/**
-		 *
+		 * Applies focus and sets initial focus association
 		 * @private
 		 */
 		Dialog.prototype._setInitialFocus = function () {
@@ -1609,7 +1625,7 @@ function(
 			}
 
 			if (oControl) {
-				//if someone tries to focus on an existing but not visible control, focus the Dialog itself.
+				// If attempting to focus on an existing but invisible control, focus the dialog itself.
 				if (oControl.getVisible && !oControl.getVisible()) {
 					this.focus();
 					return;
@@ -1618,10 +1634,9 @@ function(
 				oFocusDomRef = oControl.getFocusDomRef();
 			}
 
-			// if focus dom ref is not found
 			if (!oFocusDomRef) {
 				this.setInitialFocus(""); // clear the saved initial focus
-				oFocusDomRef = this._getFocusDomRef(); // recalculate the element on focus
+				oFocusDomRef = this._getFocusDomRef(); // Recalculate the element to focus on.
 			}
 
 			//if there is no set initial focus, set the default one to the initialFocus association
@@ -1637,7 +1652,7 @@ function(
 					oFocusDomRef.focus();
 				}
 			} else {
-				// Set the focus on the popup itself in order to keep the tab chain
+				// Set the focus on the dialog itself in order to keep the tab chain intact.
 				this.focus();
 			}
 		};

package/src/sap/m/DialogRenderer.js

@@ -168,6 +168,7 @@ sap.ui.define([
 			// In that case, the controller will focus the last focusable element.
 			oRM.openStart("span", sId + "-firstfe")
 				.class("sapMDialogFirstFE")
+				.class("sapUiSkipFocusFail")
 				.attr("role", "none")
 				.attr("tabindex", "0")
 				.openEnd()
@@ -264,6 +265,7 @@ sap.ui.define([
 			// In that case, the controller will focus the first focusable element.
 			oRM.openStart("span", sId + "-lastfe")
 				.class("sapMDialogLastFE")
+				.class("sapUiSkipFocusFail")
 				.attr("role", "none")
 				.attr("tabindex", "0")
 				.openEnd()