@openui5/sap.m 1.109.0 → 1.111.0

package/src/sap/m/TimePickerInputsRenderer.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/TimePickerInternals.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.
  */
 
@@ -14,7 +14,8 @@ sap.ui.define([
 	"sap/ui/core/Locale",
 	"./library",
 	"./Button",
-	'./TimePickerInternalsRenderer',
+	"sap/ui/core/date/UI5Date",
+	"./TimePickerInternalsRenderer",
 	"sap/ui/core/Configuration"
 ],
 	function(
@@ -27,6 +28,7 @@ sap.ui.define([
 		Locale,
 		library,
 		Button,
+        UI5Date,
 		TimePickerInternalsRenderer,
 		Configuration
 	) {
@@ -47,7 +49,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private
@@ -77,7 +79,7 @@ sap.ui.define([
 					 * The <code>displayFormat</code> comes from the browser language settings if not set explicitly.
 					 *
 					 */
-					displayFormat: {name: "displayFormat", type: "string", group: "Appearance"},
+					displayFormat: {type: "string", group: "Appearance"},
 
 					/**
 					 * Sets the minutes clock step. The step must be at least 1
@@ -608,7 +610,7 @@ sap.ui.define([
 					type: ButtonType.Transparent,
 					visible: false,
 					press: function () {
-						this._setTimeValues(new Date());
+						this._setTimeValues(UI5Date.getInstance());
 					}.bind(this)
 				}).addStyleClass("sapMTPNow");
 			}

package/src/sap/m/TimePickerInternalsRenderer.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/TimePickerRenderer.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/TimePickerSlider.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.
  */
 
@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private
@@ -87,7 +87,9 @@ sap.ui.define([
 			renderer: TimePickerSliderRenderer
 		});
 
-		var SCROLL_ANIMATION_DURATION = Configuration.getAnimation() ? 200 : 0;
+		var sAnimationMode = Configuration.getAnimationMode();
+		var bUseAnimations = sAnimationMode !== Configuration.AnimationMode.none && sAnimationMode !== Configuration.AnimationMode.minimal;
+		var SCROLL_ANIMATION_DURATION = bUseAnimations ? 200 : 0;
 		var MIN_ITEMS = 50;
 		var LABEL_HEIGHT = 32;
 		var ARROW_HEIGHT = 32;

package/src/sap/m/TimePickerSliderRenderer.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/TimePickerSliders.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.
  */
 
@@ -50,7 +50,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @public
@@ -79,14 +79,14 @@ sap.ui.define([
 					 * The <code>displayFormat</code> comes from the browser language settings if not set explicitly.
 					 *
 					 */
-					displayFormat: {name: "displayFormat", type: "string", group: "Appearance"},
+					displayFormat: {type: "string", group: "Appearance"},
 
 					/**
 					 * Defines the text of the picker label.
 					 *
 					 * It is read by screen readers. It is visible only on phone.
 					 */
-					labelText: {name: "labelText", type: "string"},
+					labelText: {type: "string"},
 
 					/**
 					 * Sets the minutes slider step. If step is less than 1, it will be automatically converted back to 1.

package/src/sap/m/TimePickerSlidersRenderer.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/Title.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.
  */
 
@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IShrinkable
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 1.27.0
 	 *
 	 * @constructor
@@ -87,7 +87,8 @@ sap.ui.define([
 			library : "sap.m",
 			interfaces : [
 				 "sap.ui.core.IShrinkable",
-				 "sap.m.IHyphenation"
+				 "sap.m.IHyphenation",
+				 "sap.m.IToolbarInteractiveControl"
 			],
 			properties : {
 
@@ -263,7 +264,7 @@ sap.ui.define([
 	/**
 	 * Gets the accessibility information for the <code>sap.m.Title</code> control.
 	 *
-	 * @returns {object} The accessibility info
+	 * @returns {sap.ui.core.AccessibilityInfo} The accessibility info
 	 * @protected
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 */
@@ -321,6 +322,20 @@ sap.ui.define([
 		return iLevel;
 	};
 
+	/**
+	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
+	 * Determines if the Control is interactive.
+	 *
+	 * @returns {boolean} If it is an interactive Control
+	 *
+	 * @private
+	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
+	 */
+	Title.prototype._getToolbarInteractive = function () {
+		return false;
+	};
+
+
 	// Add hyphenation to Title functionality
 	HyphenationSupport.mixInto(Title.prototype);
 

package/src/sap/m/TitlePropagationSupport.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.
  */
 
@@ -51,7 +51,7 @@ sap.ui.define(["sap/ui/core/Configuration"],
 		 * style class support on existing elements by calling this function.
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @param {string} sAggregationName the name of the aggregation which should be affected
 		 * @param {object} fnGetTitleID function that would return the ID of the title

package/src/sap/m/TitleRenderer.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/ToDoCardRenderer.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/ToggleButton.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.
  */
 
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.m.Button
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -41,7 +41,9 @@ sap.ui.define([
 	 */
 	var ToggleButton = Button.extend("sap.m.ToggleButton", /** @lends sap.m.ToggleButton.prototype */ {
 		metadata : {
-
+			interfaces : [
+				"sap.m.IToolbarInteractiveControl"
+			],
 			library : "sap.m",
 			designtime: "sap/m/designtime/ToggleButton.designtime",
 			properties : {
@@ -125,7 +127,7 @@ sap.ui.define([
 
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
-	 * @returns {object} Current accessibility state of the control.
+	 * @returns {sap.ui.core.AccessibilityInfo} Current accessibility state of the control.
 	 * @protected
 	 */
 	ToggleButton.prototype.getAccessibilityInfo = function() {
@@ -137,6 +139,18 @@ sap.ui.define([
 		return oInfo;
 	};
 
+	/**
+	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
+	 * Determines if the Control is interactive.
+	 *
+	 * @returns {boolean} If it is an interactive Control
+	 *
+	 * @private
+	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
+	 */
+	ToggleButton.prototype._getToolbarInteractive = function () {
+		return true;
+	};
 
 	return ToggleButton;
 

package/src/sap/m/ToggleButtonRenderer.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/Token.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.
  */
 
@@ -50,7 +50,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TokenRenderer.js

@@ -1,7 +1,7 @@
 /*!
 
 * 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/Tokenizer.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.
  */
 
@@ -13,6 +13,7 @@ sap.ui.define([
 	'sap/m/ResponsivePopover',
 	'sap/ui/core/Core',
 	'sap/ui/core/Control',
+	'sap/ui/core/Element',
 	'sap/ui/core/delegate/ScrollEnablement',
 	'sap/ui/Device',
 	'sap/ui/core/InvisibleText',
@@ -23,9 +24,6 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/EnabledPropagator",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/thirdparty/jquery",
-	// jQuery Plugin "control"
-	"sap/ui/dom/jquery/control",
 	// jQuery Plugin "scrollLeftRTL"
 	"sap/ui/dom/jquery/scrollLeftRTL"
 ],
@@ -37,6 +35,7 @@ sap.ui.define([
 		ResponsivePopover,
 		Core,
 		Control,
+		Element,
 		ScrollEnablement,
 		Device,
 		InvisibleText,
@@ -46,9 +45,7 @@ sap.ui.define([
 		KeyCodes,
 		Log,
 		EnabledPropagator,
-		Parameters,
-		jQuery,
-		scrollLeftRTL
+		Parameters
 	) {
 	"use strict";
 
@@ -78,7 +75,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -257,6 +254,7 @@ sap.ui.define([
 		this.allowTextSelection(false);
 		this._oTokensWidthMap = {};
 		this._oIndicator = null;
+		this._bShouldRenderTabIndex = null;
 		this._oScroller = new ScrollEnablement(this, this.getId() + "-scrollContainer", {
 			horizontal : true,
 			vertical : false,
@@ -515,7 +513,7 @@ sap.ui.define([
 	 * Toggles the popover.
 	 *
 	 * @private
-	 * @ui5-restricted for sap.m.MultiInput, sap.m.MultiComboBox
+	 * @ui5-restricted sap.m.MultiInput, sap.m.MultiComboBox
 	 */
 	Tokenizer.prototype._togglePopup = function (oPopover) {
 		var oOpenByDom,
@@ -547,7 +545,9 @@ sap.ui.define([
 		}
 
 		var oListItem = new StandardListItem({
-			selected: true
+			selected: true,
+			wrapping: true,
+			wrapCharLimit: 10000
 		}).data("tokenId", oToken.getId());
 
 		oListItem.setTitle(oToken.getText());
@@ -1060,7 +1060,7 @@ sap.ui.define([
 	Tokenizer.prototype._selectRange = function (bForwardSection) {
 		var oRange = {},
 			oTokens = this._getVisibleTokens(),
-			oFocusedControl = jQuery(document.activeElement).control()[0],
+			oFocusedControl = Element.closestTo(document.activeElement),
 			iTokenIndex = oTokens.indexOf(oFocusedControl);
 
 		if (!oFocusedControl || !oFocusedControl.isA("sap.m.Token")) {
@@ -1240,7 +1240,7 @@ sap.ui.define([
 			return;
 		}
 
-		var oFocusedElement = jQuery(document.activeElement).control()[0];
+		var oFocusedElement = Element.closestTo(document.activeElement);
 
 		// oFocusedElement could be undefined since the focus element might not correspond to an SAPUI5 Control
 		var index = oFocusedElement ? aTokens.indexOf(oFocusedElement) : -1;
@@ -1288,7 +1288,7 @@ sap.ui.define([
 			return;
 		}
 
-		var oFocusedElement = jQuery(document.activeElement).control()[0];
+		var oFocusedElement = Element.closestTo(document.activeElement);
 
 		// oFocusedElement could be undefined since the focus element might not correspond to an SAPUI5 Control
 		var index = oFocusedElement ? aTokens.indexOf(oFocusedElement) : -1;
@@ -1496,6 +1496,26 @@ sap.ui.define([
 		oEvent.preventDefault();
 	};
 
+	/**
+	 * Method for handling the state for tabindex rendering
+	 *
+	 * @param {boolean} bShouldRenderTabIndex If tabindex should be rendered
+	 * @protected
+	 */
+	Tokenizer.prototype.setShouldRenderTabIndex = function (bShouldRenderTabIndex) {
+		this._bShouldRenderTabIndex = bShouldRenderTabIndex;
+	};
+
+	/**
+	 * Flag indicating if tabindex attribute should be rendered
+	 *
+	 * @returns {boolean} True if tabindex should be rendered and false if not
+	 * @protected
+	 */
+	Tokenizer.prototype.getEffectiveTabIndex = function () {
+		return this._bShouldRenderTabIndex === null ? !!this.getTokens().length : this._bShouldRenderTabIndex;
+	};
+
 	/**
 	 * Handle the focus event on the control.
 	 *
@@ -1560,6 +1580,7 @@ sap.ui.define([
 		this._oTokensWidthMap = null;
 		this._oIndicator = null;
 		this._aTokenValidators = null;
+		this._bShouldRenderTabIndex = null;
 	};
 
 	/**

package/src/sap/m/TokenizerRenderer.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(['sap/ui/Device', 'sap/ui/core/InvisibleText'],
@@ -24,12 +24,14 @@ sap.ui.define(['sap/ui/Device', 'sap/ui/core/InvisibleText'],
 	 * @param {sap.m.Tokenizer} oControl an object representation of the control that should be rendered
 	 */
 	TokenizerRenderer.render = function(oRm, oControl){
+		var aTokens = oControl.getTokens();
+
 		//write the HTML into the render manager
-		if (oControl.getParent() && oControl.getParent().isA(["sap.m.MultiInput", "sap.m.MultiComboBox"])) {
-			oRm.openStart("div", oControl);
-		} else {
-			oRm.openStart("div", oControl);
-			this._renderTabIndex(oRm, oControl);
+		oRm.openStart("div", oControl);
+
+
+		if (oControl.getEffectiveTabIndex()) {
+			oRm.attr("tabindex", "0");
 		}
 
 
@@ -43,7 +45,6 @@ sap.ui.define(['sap/ui/Device', 'sap/ui/core/InvisibleText'],
 			oRm.class("sapMTokenizerDisabled");
 		}
 
-		var aTokens = oControl.getTokens();
 		if (!aTokens.length) {
 			oRm.class("sapMTokenizerEmpty");
 			oRm.attr("aria-hidden", "true");
@@ -137,21 +138,6 @@ sap.ui.define(['sap/ui/Device', 'sap/ui/core/InvisibleText'],
 		oRm.openEnd().close("span");
 	};
 
-	/**
-	 * Callback for specific rendering of Tokenizer tabindex attribute.
-	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *            oRm the RenderManager currently rendering this control
-	 * @param {sap.m.Tokenizer}
-	 *            oControl the Tokenizer that should be rendered
-	 * @private
-	 *
-	 * @ui5-restricted sap.ui.mdc.field.TokenizerDisplayRenderer
-	 */
-	TokenizerRenderer._renderTabIndex = function(oRm, oControl) {
-		oRm.attr("tabindex", "0");
-	};
-
 	/**
 	 * Callback for specific rendering of Tokenizer N-more indicator tabindex attribute.
 	 *

package/src/sap/m/Toolbar.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.
  */
 
@@ -32,6 +32,8 @@ function(
 	var ToolbarDesign = library.ToolbarDesign,
 		ToolbarStyle = library.ToolbarStyle;
 
+	var MIN_INTERACTIVE_CONTROLS = 2;
+
 	/**
 	 * Constructor for a new <code>Toolbar</code>.
 	 *
@@ -72,7 +74,7 @@ function(
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -402,7 +404,13 @@ function(
 
 	// gets called when any content property is changed
 	Toolbar.prototype._onContentPropertyChanged = function(oEvent) {
-		if (oEvent.getParameter("name") != "width") {
+		var oPropName = oEvent.getParameter("name");
+
+		if (oPropName === "visible") {
+			this.invalidate();
+		}
+
+		if (oPropName != "width") {
 			return;
 		}
 
@@ -413,15 +421,33 @@ function(
 	};
 
 	Toolbar.prototype._getAccessibilityRole = function () {
-		var sRole = this._getRootAccessibilityRole();
+		var sRootAccessibilityRole = this._getRootAccessibilityRole(),
+			sRole = sRootAccessibilityRole;
 
 		if (this.getActive()) {
 			sRole = "button";
+		// Custom root accessibility roles (like 'heading' for Dialog and 'group' for FacetFilter are preserved).
+		// Also when accessibility is disabled, role "none" is preserved.
+		} else if (this._getToolbarInteractiveControlsCount() < MIN_INTERACTIVE_CONTROLS && sRootAccessibilityRole === "toolbar") {
+			sRole = "";
 		}
 
 		return sRole;
 	};
 
+	/**
+	 *
+	 * @returns {number} Toolbar interactive Controls count
+	 * @private
+	 */
+	Toolbar.prototype._getToolbarInteractiveControlsCount = function () {
+		return this.getContent().filter(function (oControl) {
+			return oControl.getVisible()
+				&& oControl.isA("sap.m.IToolbarInteractiveControl")
+				&& typeof (oControl._getToolbarInteractive) === "function" && oControl._getToolbarInteractive();
+		}).length;
+	};
+
 	Toolbar.prototype.getAccessibilityInfo = function () {
 		return {
 			children: this.getContent()

package/src/sap/m/ToolbarLayoutData.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.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define(['./library', 'sap/ui/core/LayoutData'],
 	 * <code>layoutData</code> aggregation of {@link sap.m.ToolbarSpacer} and if set it's ignored.
 	 *
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ToolbarRenderer.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.
  */
 
@@ -34,11 +34,12 @@ sap.ui.define(['./BarInPageEnabler'],
 	 * @param {sap.m.Toolbar} oToolbar An object representation of the control that should be rendered.
 	 */
 	ToolbarRenderer.writeAccessibilityState = function(oRm, oToolbar) {
-		var oAccInfo = {
-			role: oToolbar._getAccessibilityRole()
-		};
+		var sRole = oToolbar._getAccessibilityRole(),
+			oAccInfo = {
+				role: sRole
+			};
 
-		if (!oToolbar.getAriaLabelledBy().length) {
+		if (!oToolbar.getAriaLabelledBy().length && sRole) {
 			oAccInfo.labelledby = oToolbar.getTitleId();
 		}
 
@@ -46,7 +47,7 @@ sap.ui.define(['./BarInPageEnabler'],
 			oAccInfo.haspopup = oToolbar.getAriaHasPopup();
 		}
 
-		if (oToolbar._sAriaRoleDescription) {
+		if (oToolbar._sAriaRoleDescription && sRole) {
 			oAccInfo.roledescription = oToolbar._sAriaRoleDescription;
 		}