@openui5/sap.m 1.84.31 → 1.84.32

package/src/sap/m/ObjectStatusRenderer.js

@@ -1,21 +1,17 @@
 /*!
  * 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/core/ValueStateSupport', 'sap/ui/core/IndicationColorSupport', 'sap/ui/core/InvisibleText', 'sap/ui/core/library'],
-	function(ValueStateSupport, IndicationColorSupport, InvisibleText, coreLibrary) {
+sap.ui.define(['sap/ui/core/library'],
+	function(coreLibrary) {
 	"use strict";
 
 
 	// shortcut for sap.ui.core.TextDirection
 	var TextDirection = coreLibrary.TextDirection;
 
-	// shortcut for sap.ui.core.ValueState
-	var ValueState = coreLibrary.ValueState;
-
-
 	/**
 	 * ObjectStatus renderer.
 	 * @namespace
@@ -39,22 +35,18 @@ sap.ui.define(['sap/ui/core/ValueStateSupport', 'sap/ui/core/IndicationColorSupp
 			oRm.openEnd();
 		} else {
 
-			var sState = oObjStatus.getState();
-			var bInverted = oObjStatus.getInverted();
-			var sTextDir = oObjStatus.getTextDirection();
-			var oCore = sap.ui.getCore();
-			var bPageRTL = oCore.getConfiguration().getRTL();
-			var oAccAttributes = {
-				roledescription: oCore.getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS")
-			};
-			var sValueStateText;
-			var accValueText;
+			var sState = oObjStatus.getState(),
+				sStateText = oObjStatus._getStateText(sState),
+				bInverted = oObjStatus.getInverted(),
+				sTextDir = oObjStatus.getTextDirection(),
+				bPageRTL = sap.ui.getCore().getConfiguration().getRTL(),
+				oAccAttributes = {},
+				sTooltip = oObjStatus.getTooltip_AsString();
 
 			if (sTextDir === TextDirection.Inherit) {
 				sTextDir = bPageRTL ? TextDirection.RTL : TextDirection.LTR;
 			}
 
-			var sTooltip = oObjStatus.getTooltip_AsString();
 			if (sTooltip) {
 				oRm.attr("title", sTooltip);
 			}
@@ -69,8 +61,7 @@ sap.ui.define(['sap/ui/core/ValueStateSupport', 'sap/ui/core/IndicationColorSupp
 				oRm.class("sapMObjStatusActive");
 				oRm.attr("tabindex", "0");
 				oAccAttributes.role = "button";
-			} else {
-				oAccAttributes.role = "group";
+				oAccAttributes.roledescription = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS_ACTIVE");
 			}
 
 			oRm.accessibilityState(oObjStatus, oAccAttributes);
@@ -123,23 +114,14 @@ sap.ui.define(['sap/ui/core/ValueStateSupport', 'sap/ui/core/IndicationColorSupp
 			if (oObjStatus._isActive()) {
 				oRm.close("span");
 			}
-			/* ARIA adding hidden node in span element */
-			if (sState != ValueState.None) {
-				sValueStateText = ValueStateSupport.getAdditionalText(sState);
-				if (sValueStateText) {
-					accValueText = sValueStateText;
-				} else {
-					accValueText = IndicationColorSupport.getAdditionalText(sState);
-				}
-				if (accValueText) {
-					oRm.openStart("span", oObjStatus.getId() + "sapSRH");
-					oRm.class("sapUiPseudoInvisibleText");
-					oRm.openEnd();
-					oRm.text(accValueText);
-					oRm.close("span");
-				}
-			}
 
+			if (sStateText) {
+				oRm.openStart("span", oObjStatus.getId() + "sapSRH");
+				oRm.class("sapUiPseudoInvisibleText");
+				oRm.openEnd();
+				oRm.text(sStateText);
+				oRm.close("span");
+			}
 		}
 
 		oRm.close("div");

package/src/sap/m/OverflowToolbar.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.
  */
 
@@ -125,7 +125,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 *
 	 * @constructor
 	 * @public
@@ -1141,6 +1141,21 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 *
+	 * @returns {number} Toolbar interactive Controls count
+	 * @private
+	 */
+	OverflowToolbar.prototype._getToolbarInteractiveControlsCount = function () {
+		var aInteractiveControlsRendered = this._getVisibleAndNonOverflowContent().filter(function(oControl) {
+			return this._getControlPriority(oControl) !== OverflowToolbarPriority.AlwaysOverflow
+				&& oControl.isA("sap.m.IToolbarInteractiveControl")
+				&& typeof (oControl._getToolbarInteractive) === "function" && oControl._getToolbarInteractive();
+		}, this);
+
+		return this._getOverflowButtonNeeded() ? aInteractiveControlsRendered.length + 1 : aInteractiveControlsRendered.length;
+	};
+
 	/***************************************AGGREGATIONS AND LISTENERS******************************************/
 
 	/**

package/src/sap/m/OverflowToolbarAssociativePopover.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(['./Popover', './PopoverRenderer', './OverflowToolbarAssociativePo
 	 * @extends sap.m.Popover
 	 *
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/OverflowToolbarAssociativePopoverControls.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/OverflowToolbarButton.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(['sap/m/Button', 'sap/m/ButtonRenderer'],
 	 * @implements sap.f.IShellBar
 	 *
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 *
 	 * @constructor
 	 * @public
@@ -38,7 +38,8 @@ sap.ui.define(['sap/m/Button', 'sap/m/ButtonRenderer'],
 	var OverflowToolbarButton = Button.extend("sap.m.OverflowToolbarButton", /** @lends sap.m.OverflowToolbarButton.prototype */ {
 		metadata: {
 			interfaces: [
-				"sap.f.IShellBar"
+				"sap.f.IShellBar",
+				"sap.m.IToolbarInteractiveControl"
 			]
 		},
 		renderer: ButtonRenderer.render
@@ -52,6 +53,19 @@ sap.ui.define(['sap/m/Button', 'sap/m/ButtonRenderer'],
 			return "";
 	};
 
+	/**
+	 * 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
+	 */
+	OverflowToolbarButton.prototype._getToolbarInteractive = function () {
+		return true;
+	};
+
 	return OverflowToolbarButton;
 
 });

package/src/sap/m/OverflowToolbarLayoutData.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.
  */
 
@@ -22,7 +22,7 @@ sap.ui.define(['sap/m/ToolbarLayoutData', 'sap/m/library', "sap/base/Log"],
 	 * Holds layout data for the {@link sap.m.OverflowToolbar} items.
 	 * @extends sap.m.ToolbarLayoutData
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/OverflowToolbarRenderer.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/OverflowToolbarToggleButton.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.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define(['sap/m/ToggleButton', 'sap/m/ToggleButtonRenderer'],
 		 * @extends sap.m.ToggleButton
 		 *
 		 * @author SAP SE
-		 * @version 1.84.31
+		 * @version 1.84.32
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/P13nAnyFilterItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>filterItems</code> aggregation in P13nFilterPanel control.
 	 * @extends sap.m.P13nFilterItem
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @private
 	 * @since 1.56.0

package/src/sap/m/P13nColumnsItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>columnsItems</code> aggregation in <code>P13nColumnsPanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @author SAP SE
 	 * @public

package/src/sap/m/P13nColumnsPanel.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([
 	 * @class The <code>P13nColumnsPanel</code> control is used to define column-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nConditionPanel.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.
  */
 
@@ -113,7 +113,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The ConditionPanel Control will be used to implement the Sorting, Filtering and Grouping panel of the new Personalization dialog.
 	 * @extends sap.ui.core.Control
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nConditionPanelRenderer.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/P13nDialog.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.
  */
 
@@ -57,7 +57,7 @@ sap.ui.define([
 	 *        tables.
 	 * @extends sap.m.Dialog
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nDimMeasureItem.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.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>columnsItems</code> aggregation in <code>P13nDimMeasurePanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @author SAP SE
 	 * @public

package/src/sap/m/P13nDimMeasurePanel.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.
  */
 
@@ -87,7 +87,7 @@ sap.ui.define([
 	 *        dimensions and measures for table personalization.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.34.0

package/src/sap/m/P13nFilterItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>filterItems</code> aggregation in P13nFilterPanel control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nFilterPanel.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.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The P13nFilterPanel control is used to define filter-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nFilterPanelRenderer.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/P13nGroupItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>groupItems</code> aggregation in P13nGroupPanel control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.28.0

package/src/sap/m/P13nGroupPanel.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([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The P13nGroupPanel control is used to define group-specific settings for table personalization.
 	 * @extends sap.m.P13nPanel
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Base type for <code>items</code> aggregation in <code>P13nPanel</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nOperationsHelper.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/P13nPanel.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class An abstract base type for <code>panels</code> aggregation in <code>P13nDialog</code> control.
 	 * @extends sap.ui.core.Control
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @abstract

package/src/sap/m/P13nSelectionItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>selectionItems</code> aggregation in <code>P13nSelectionPanel</code> control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @author SAP SE
 	 * @private

package/src/sap/m/P13nSelectionPanel.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([
 	 * @class The P13nSelectionPanel control is used to define selection settings like the visibility or the order of items.
 	 * @extends sap.m.P13nPanel
 	 * @author SAP SE
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @private
 	 * @since 1.46.0

package/src/sap/m/P13nSortItem.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for <code>sortItems</code> aggregation in P13nSortPanel control.
 	 * @extends sap.ui.core.Item
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/P13nSortPanel.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.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The P13nSortPanel control is used to define settings for sorting in table personalization.
 	 * @extends sap.m.P13nPanel
-	 * @version 1.84.31
+	 * @version 1.84.32
 	 * @constructor
 	 * @public
 	 * @since 1.26.0

package/src/sap/m/PDFViewer.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.
  */
 
@@ -47,7 +47,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.84.31
+		 * @version 1.84.32
 		 * @since 1.48
 		 *
 		 * @constructor

package/src/sap/m/PDFViewerRenderManager.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/PDFViewerRenderer.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.
  */
 
@@ -100,7 +100,14 @@ sap.ui.define(['sap/ui/Device', "sap/base/Log"],
 				oRm.renderControl(oControl._objectsRegister.getOverflowToolbarControl());
 			}
 
-			if (oControl._isEmbeddedModeAllowed() && this._isPdfPluginEnabled()) {
+			/**
+			 * if displayType is not link and pdfPlugin is not enabled .. render error content.
+			 * case: if "Always download pdf's" option is enabled in browser setting.. in that
+			 * case display error content (to retain control behaviour)
+			 */
+			if (!oControl._isDisplayTypeLink() && !this._isPdfPluginEnabled()) {
+				this.renderErrorContent(oRm, oControl);
+			} else if (oControl._isEmbeddedModeAllowed() && this._isPdfPluginEnabled()) {
 				this.renderPdfContent(oRm, oControl);
 			}
 
@@ -125,10 +132,6 @@ sap.ui.define(['sap/ui/Device', "sap/base/Log"],
 				oRm.write("</iframe>");
 			} else {
 				this.renderErrorContent(oRm, oControl);
-				if (!PDFViewerRenderer._isPdfPluginEnabled()) {
-					Log.warning("The PDF plug-in is not available on this device.");
-					oControl.fireEvent("error", {}, true);
-				}
 			}
 		};
 
@@ -145,6 +148,11 @@ sap.ui.define(['sap/ui/Device', "sap/base/Log"],
 			oRm.write(">");
 			oRm.renderControl(oErrorContent);
 			oRm.write("</div>");
+
+			if (!PDFViewerRenderer._isPdfPluginEnabled()) {
+				Log.warning("Either Inline viewing of pdf is disabled or pdf plug-in is unavailable on this device.");
+				oControl.fireEvent("error", {}, true);
+			}
 		};
 
 		return PDFViewerRenderer;