@openui5/sap.m 1.111.6 → 1.112.1

package/src/sap/m/Toolbar.js

@@ -14,6 +14,7 @@ sap.ui.define([
 	'sap/ui/core/EnabledPropagator',
 	"sap/ui/events/KeyCodes",
 	'./ToolbarRenderer',
+	"sap/m/Button",
 	"sap/ui/core/library"
 ],
 function(
@@ -25,6 +26,7 @@ function(
 	EnabledPropagator,
 	KeyCodes,
 	ToolbarRenderer,
+	Button,
 	coreLibrary
 ) {
 	"use strict";
@@ -74,7 +76,7 @@ function(
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public
@@ -157,7 +159,13 @@ function(
 				/**
 				 * The content of the toolbar.
 				 */
-				content : {type : "sap.ui.core.Control", multiple : true, singularName : "content"}
+				content : {type : "sap.ui.core.Control", multiple : true, singularName : "content"},
+
+				/**
+				 * Hidden button that provides focus dom reference for active toolbar.
+				 * @private
+				 */
+				 _activeButton : {type : "sap.m.Button", multiple: false,  visibility: "hidden"}
 			},
 			associations : {
 
@@ -289,6 +297,33 @@ function(
 		return this;
 	};
 
+	Toolbar.prototype.enhanceAccessibilityState = function (oElement, mAriaProps) {
+		if (oElement === this.getAggregation("_activeButton")) {
+			return this.assignAccessibilityState(mAriaProps);
+		}
+	};
+
+	Toolbar.prototype.getAccessibilityState = function () {
+		var aAriaLabelledBy = this.getAriaLabelledBy(),
+			bActive = this.getActive();
+
+		return {
+			role: !bActive ? this._getAccessibilityRole() : undefined, // active toolbar is rendered with sap.m.Button as native button
+			haspopup: bActive ? this.getAriaHasPopup() : undefined,
+			labelledby: aAriaLabelledBy.length ? this.getAriaLabelledBy() : this.getTitleId(),
+			roledescription: this._sAriaRoleDescription
+		};
+	};
+
+	Toolbar.prototype.assignAccessibilityState = function (mAriaProps) {
+			if (!this._getAccessibilityRole() && !this.getActive()) {
+				// no role and not active -> no aria properties
+				return {};
+			}
+
+			return Object.assign(mAriaProps, this.getAccessibilityState(mAriaProps));
+	};
+
 	Toolbar.prototype.init = function() {
 		// define group for F6 handling
 		this.data("sap-ui-fastnavgroup", "true", true);
@@ -333,17 +368,18 @@ function(
 
 	// handle tap for active toolbar, do nothing if already handled
 	Toolbar.prototype.ontap = function(oEvent) {
-		if (this.getActive() && !oEvent.isMarked()) {
+		if (this.getActive() && !oEvent.isMarked() || oEvent.srcControl === this._getActiveButton()) {
 			oEvent.setMarked();
 			this.firePress({
 				srcControl : oEvent.srcControl
 			});
+			this.focus();
 		}
 	};
 
 	// fire press event when enter is hit on the active toolbar
 	Toolbar.prototype.onsapenter = function(oEvent) {
-		if (this.getActive() && oEvent.srcControl === this && !oEvent.isMarked()) {
+		if (this.getActive() && !oEvent.isMarked() || oEvent.srcControl === this._getActiveButton()) {
 			oEvent.setMarked();
 			this.firePress({
 				srcControl : this
@@ -353,7 +389,7 @@ function(
 
 	Toolbar.prototype.onsapspace = function(oEvent) {
 		// Prevent browser scrolling in case of SPACE key
-		if (oEvent.srcControl === this) {
+		if (oEvent.srcControl === this._getActiveButton()) {
 			oEvent.preventDefault();
 		}
 	};
@@ -393,6 +429,31 @@ function(
 		}
 	};
 
+	Toolbar.prototype.onfocusin = function(oEvent) {
+		if (this.getActive()) {
+			if (oEvent.target === this.getDomRef()) {
+				this._getActiveButton().focus();
+			}
+		}
+	};
+
+	Toolbar.prototype.getFocusDomRef = function() {
+		return this.getActive() ? this._getActiveButton().getFocusDomRef() : this.getDomRef();
+	};
+
+	Toolbar.prototype.getFocusInfo = function() {
+		return {
+			id: this._getActiveButton().getId()
+		};
+	};
+
+	Toolbar.prototype.applyFocusInfo = function(oFocusInfo) {
+		var oDomRef = this.getFocusDomRef();
+		if (oDomRef) {
+			this.focus();
+		}
+	};
+
 	// gets called after content is (re)rendered
 	// here "this" points to the control not to the toolbar
 	Toolbar.prototype._onAfterContentRendering = function() {
@@ -448,6 +509,29 @@ function(
 		}).length;
 	};
 
+	Toolbar.prototype._getActiveButton = function() {
+		if (!this._activeButton) {
+			this._activeButton = new Button({text: "", id:"sapMTBActiveButton" + this.getId()}).addStyleClass("sapMTBActiveButton");
+			this._activeButton.onfocusin = function() {
+				this.addStyleClass("sapMTBFocused");
+				if (typeof Button.prototype.onfocusin === "function") {
+					 Button.prototype.onfocusin.call(this._activeButton, arguments);
+				}
+			}.bind(this);
+
+			this._activeButton.onfocusout = function() {
+				this.removeStyleClass("sapMTBFocused");
+				if (typeof Button.prototype.onfocusout === "function") {
+					Button.prototype.onfocusout.call(this._activeButton, arguments);
+			   }
+			}.bind(this);
+
+			this.setAggregation("_activeButton", this._activeButton);
+		}
+
+		return this._activeButton;
+	};
+
 	Toolbar.prototype.getAccessibilityInfo = function () {
 		return {
 			children: this.getContent()

package/src/sap/m/ToolbarLayoutData.js

@@ -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.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ToolbarRenderer.js

@@ -26,32 +26,30 @@ sap.ui.define(['./BarInPageEnabler'],
 	ToolbarRenderer.render = BarInPageEnabler.prototype.render;
 
 	/**
-	 * Writes the accessibility state.
+	 * Writes the accessibility state of the given toolbar using the given renderer manager.
 	 * To be overwritten by subclasses.
 	 *
 	 * @private
-	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.m.Toolbar} oToolbar An object representation of the control that should be rendered.
+	 * @param {sap.ui.core.RenderManager} oRm - The renderer manager to use for writing the accessibility state.
+	 * @param {sap.m.Toolbar} oToolbar - The toolbar to write the accessibility state for.
+	 * @returns {void}
+	 *
+	 * @description
+	 * This function uses the `assignAccessibilityState` method of the toolbar to obtain a map of ARIA properties to set on
+	 * the rendered toolbar element. If the map is empty, the accessibility state is set to `null` to ensure that no
+	 * unnecessary ARIA attributes are present. Otherwise, the accessibility state is set to the toolbar.
+	 * The purpose of this logic is to ensure that the rendered toolbar has appropriate ARIA attributes for accessibility
+	 * purposes, while avoiding unnecessary attributes that could be confusing or misleading to users of assistive technology.
 	 */
 	ToolbarRenderer.writeAccessibilityState = function(oRm, oToolbar) {
-		var sRole = oToolbar._getAccessibilityRole(),
-			oAccInfo = {
-				role: sRole
-			};
-
-		if (!oToolbar.getAriaLabelledBy().length && sRole) {
-			oAccInfo.labelledby = oToolbar.getTitleId();
-		}
+		var oAccInfo = {},
+			mAriaProps = oToolbar.assignAccessibilityState(oAccInfo);
 
-		if (oToolbar.getActive()) {
-			oAccInfo.haspopup = oToolbar.getAriaHasPopup();
-		}
-
-		if (oToolbar._sAriaRoleDescription && sRole) {
-			oAccInfo.roledescription = oToolbar._sAriaRoleDescription;
+		if (!Object.keys(mAriaProps).length) {
+			oRm.accessibilityState(null);
+		} else {
+			oRm.accessibilityState(oToolbar, mAriaProps);
 		}
-
-		oRm.accessibilityState(oToolbar, oAccInfo);
 	};
 
 	/**
@@ -61,18 +59,17 @@ sap.ui.define(['./BarInPageEnabler'],
 	 * @param {sap.m.Toolbar} oToolbar an object representation of the control that should be rendered
 	 */
 	ToolbarRenderer.decorateRootElement = function (oRm, oToolbar) {
-		this.writeAccessibilityState(oRm, oToolbar);
-
-		oRm.class("sapMTB");
-		oRm.class("sapMTBNewFlex");
-
-		if (oToolbar.getActive()) {
+		var bToolbarActive = oToolbar.getActive();
+		if (bToolbarActive) {
 			oRm.class("sapMTBActive");
-			oRm.attr("tabindex", "0");
 		} else {
+			this.writeAccessibilityState(oRm, oToolbar);
 			oRm.class("sapMTBInactive");
 		}
 
+		oRm.class("sapMTB");
+		oRm.class("sapMTBNewFlex");
+
 		oRm.class("sapMTB" + oToolbar.getStyle());
 		oRm.class("sapMTB-" + oToolbar.getActiveDesign() + "-CTX");
 
@@ -81,6 +78,9 @@ sap.ui.define(['./BarInPageEnabler'],
 	};
 
 	ToolbarRenderer.renderBarContent = function(rm, oToolbar) {
+		if (oToolbar.getActive()) {
+			rm.renderControl(oToolbar._getActiveButton());
+		}
 		oToolbar.getContent().forEach(function(oControl) {
 			BarInPageEnabler.addChildClassTo(oControl, oToolbar);
 			rm.renderControl(oControl);

package/src/sap/m/ToolbarSeparator.js

@@ -23,7 +23,7 @@ sap.ui.define(['./library', 'sap/ui/core/Control', './ToolbarSeparatorRenderer']
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ToolbarSpacer.js

@@ -29,7 +29,7 @@ function(library, Control, ToolbarSpacerRenderer, Log) {
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Tree.js

@@ -41,7 +41,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TreeItemBase.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/UploadCollection.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/UploadCollectionItem.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/UploadCollectionParameter.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/UploadCollectionToolbarPlaceholder.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/VBox.js

@@ -26,7 +26,7 @@ sap.ui.define(['./FlexBox', './library', "./VBoxRenderer"],
 	 * @extends sap.m.FlexBox
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ValueStateHeader.js

@@ -23,7 +23,7 @@ sap.ui.define(
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.111.6
+		 * @version 1.112.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/VariantManagement.js

@@ -487,6 +487,7 @@ sap.ui.define([
 	VariantManagement.MAX_NAME_LEN = 100;
 	VariantManagement.COLUMN_FAV_IDX = 0;
 	VariantManagement.COLUMN_NAME_IDX = 1;
+	VariantManagement.COLUMN_DEFAULT_IDX = 3;
 
 	/*
 	 * Constructs and initializes the <code>VariantManagement</code> control.
@@ -628,7 +629,14 @@ sap.ui.define([
 		this.oVariantPopoverTrigger = new ToggleButton(this.getId() + "-trigger", {
 			icon: "sap-icon://slim-arrow-down",
 			type: ButtonType.Transparent,
-			tooltip: this._oRb.getText("VARIANT_MANAGEMENT_TRIGGER_TT")
+			tooltip: this._oRb.getText("VARIANT_MANAGEMENT_TRIGGER_TT"),
+			enabled: {
+				path: "/isDesignMode",
+				model: VariantManagement.INNER_MODEL_NAME,
+				formatter: function(bValue) {
+					return !bValue;
+				}
+			}
 		});
 
 		this.oVariantPopoverTrigger.addAriaLabelledBy(this.oVariantInvisibleText);
@@ -699,7 +707,8 @@ sap.ui.define([
 	VariantManagement.prototype._createInnerModel = function() {
 		var oModel = new JSONModel({
 			showManualVariantKey: false,
-			showCreateTile: false
+			showCreateTile: false,
+			isDesignMode: false
 		});
 		this.setModel(oModel, VariantManagement.INNER_MODEL_NAME);
 	};
@@ -719,6 +728,13 @@ sap.ui.define([
 		this._setInnerModelProperty("/showManualVariantKey", bValue);
 	};
 
+	VariantManagement.prototype.getDesignMode = function() {
+		return this._getInnerModelProperty("/isDesignMode");
+	};
+	VariantManagement.prototype.setDesignMode = function(bValue) {
+		this._setInnerModelProperty("/isDesignMode", bValue);
+	};
+
 	VariantManagement.prototype._setInnerModelProperty = function(sPropertyPath, vValue) {
 		var oInnerModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
 		if (oInnerModel) {
@@ -852,6 +868,11 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype.onclick = function(oEvent) {
+
+		if (this.getDesignMode()) {
+			return;
+		}
+
 		if (this.oVariantPopoverTrigger && !this.bPopoverOpen) {
 			this.oVariantPopoverTrigger.focus();
 		}
@@ -1207,6 +1228,24 @@ sap.ui.define([
 					path: "/supportDefault",
 					model: "$mVariants"
 				},
+				select: function(oEvent) {
+					if (this._sStyleClass) {
+						if (oEvent.getParameter("selected")) {
+							var mContexts = this._getContextInfoChanges();
+							if (this._isRestricted(mContexts)) {
+								this.oDefault.setValueState(ValueState.Error);
+								this.oDefault.setValueStateText(this._oRb.getText("VARIANT_MANAGEMENT_NO_DEFAULT_ON_RESTRICTED_VIEWS"));
+								this.oDefault.focus();
+							} else {
+								this.oDefault.setValueState(ValueState.None);
+								this.oDefault.setValueStateText("");
+							}
+						} else if (this.oDefault.getValueState() != ValueState.None){
+							this.oDefault.setValueState(ValueState.None);
+							this.oDefault.setValueStateText("");
+						}
+					}
+				}.bind(this),
 				width: "100%"
 			});
 
@@ -1355,12 +1394,18 @@ sap.ui.define([
 		return this._oRolesComponentContainer.getComponentInstance().hasErrorsAndShowErrorMessage();
 	};
 
-	VariantManagement.prototype._determineRolesSpecificText = function(mContexts, oTextControl) {
+	VariantManagement.prototype._isRestricted = function(mContexts) {
 		if (!mContexts) {
 			mContexts = { role: []};
 		}
-		if (mContexts && oTextControl) {
-			oTextControl.setText(this._oRb.getText((mContexts.role && mContexts.role.length > 0) ? "VARIANT_MANAGEMENT_VISIBILITY_RESTRICTED" : "VARIANT_MANAGEMENT_VISIBILITY_NON_RESTRICTED"));
+
+		return (mContexts.role && mContexts.role.length > 0);
+	};
+
+	VariantManagement.prototype._determineRolesSpecificText = function(oItem, oTextControl) {
+
+		if (oTextControl) {
+			oTextControl.setText(this._oRb.getText((this._isRestricted(oItem.getContexts())) ? "VARIANT_MANAGEMENT_VISIBILITY_RESTRICTED" : "VARIANT_MANAGEMENT_VISIBILITY_NON_RESTRICTED"));
 		}
 	};
 
@@ -1442,7 +1487,10 @@ sap.ui.define([
 						var oItem = this._getItemByKey(sKey);
 						if (oItem) {
 							oItem.setContexts(mContexts);
-							this._determineRolesSpecificText(mContexts, oTextControl);
+							this._determineRolesSpecificText(oItem, oTextControl);
+
+                            this._checkDefaultEnabled(oItem);
+
 						}
 					} else {
 						return false;
@@ -1514,7 +1562,13 @@ sap.ui.define([
 		this.oInputName.setValueState(ValueState.None);
 		this.oInputName.setValueStateText(null);
 
+		this.oDefault.setEnabled(true);
 		this.oDefault.setSelected(false);
+		if (this.oDefault.getValueState() !== ValueState.None) {
+			this.oDefault.setValueState(ValueState.None);
+			this.oDefault.setValueStateText("");
+		}
+
 		this.oPublic.setSelected(false);
 		this.oExecuteOnSelect.setSelected(false);
 		this.oCreateTile.setSelected(false);
@@ -1559,12 +1613,26 @@ sap.ui.define([
 			sKey = sManualKey;
 		}
 
-		if (this.oSaveAsDialog) {
-			this.oSaveAsDialog.close();
+		var mContexts = this._getContextInfoChanges();
+		var bIsRestricted = this._isRestricted(mContexts);
+		if (bIsRestricted && this.oDefault.getSelected()) {
+			this.oDefault.setValueState(ValueState.Error);
+			this.oDefault.setValueStateText(this._oRb.getText("VARIANT_MANAGEMENT_NO_DEFAULT_ON_RESTRICTED_VIEWS"));
+			this.oDefault.focus();
+			return false;
+		} else if (!bIsRestricted){
+			var bWasInErrorState = this.oDefault.getValueState() !== ValueState.None;
+
+			this.oDefault.setValueState(ValueState.None);
+			this.oDefault.setValueStateText("");
+
+			if (bWasInErrorState){
+				return false; // otherwise the error state is still visible on the UI and the Save completes...
+			}
 		}
 
-		if (this.oDefault.getSelected()) {
-			this.setDefaultKey(this.oDefault.getSelected());
+		if (this.oSaveAsDialog) {
+			this.oSaveAsDialog.close();
 		}
 
 		var oObj = {
@@ -1574,7 +1642,7 @@ sap.ui.define([
 				def: this.oDefault.getSelected(),
 				execute: this.oExecuteOnSelect.getSelected(),
 				"public": this.getSupportPublic() ? this.oPublic.getSelected() : undefined,
-				contexts: this._getContextInfoChanges()
+				contexts: mContexts
 		};
 
 		if (this._getShowCreateTile() && this.oCreateTile) {
@@ -1727,6 +1795,9 @@ sap.ui.define([
 				keyboardMode: ListKeyboardMode.Edit,
 				columns: [
 					new Column({
+						header: new InvisibleText({
+									text: this._oRb.getText("VARIANT_MANAGEMENT_FAVORITE_COLUMN")
+								}),
 						width: "3rem",
 						visible: {
 							path: "/supportFavorites",
@@ -1796,6 +1867,9 @@ sap.ui.define([
 						popinDisplay: PopinDisplay.Block,
 						minScreenWidth: ScreenSize.Tablet
 					}), new Column({
+						header: new InvisibleText({
+									text: this._oRb.getText("VARIANT_MANAGEMENT_ACTION_COLUMN")
+								}),
 						hAlign: TextAlign.Center
 					}), new Column({
 						visible: false
@@ -1892,6 +1966,21 @@ sap.ui.define([
 		}
 	};
 
+	VariantManagement.prototype._checkDefaultEnabled = function(oItem) {
+		var bDefaultEnabled = true;
+		if (this._isRestricted(oItem.getContexts())) {
+			bDefaultEnabled = false;
+			if (oItem.getKey() === this.getDefaultKey()) {
+				this.setDefaultKey(this.getStandardVariantKey());
+			}
+		}
+		var oRow = this._getRowForKey(oItem.getKey());
+		if (oRow) {
+			oRow.getCells()[VariantManagement.COLUMN_DEFAULT_IDX].setEnabled(bDefaultEnabled);
+			this._toggleIconActivityState(oRow.getCells()[0], oItem, false);
+		}
+	};
+
 	VariantManagement.prototype._templateFactoryManagementDialog = function(sId, oContext) {
 		var sTooltip = null;
 		var oDeleteButton;
@@ -2016,9 +2105,10 @@ sap.ui.define([
 		}
 
 		// roles
-		if (this._sStyleClass && (oItem.getKey() !== this.getStandardVariantKey())) {
-			var oText = new Text({ wrapping: false });
-			this._determineRolesSpecificText(oItem.getContexts(), oText);
+		var oText;
+		if (this._sStyleClass && this.getSupportContexts() && (oItem.getKey() !== this.getStandardVariantKey())) {
+			oText = new Text({ wrapping: false });
+			this._determineRolesSpecificText(oItem, oText);
 			var oIcon = new Icon({
 				src: "sap-icon://edit",
 				press: fRolesPressed
@@ -2028,14 +2118,35 @@ sap.ui.define([
 			oRolesCell = new HBox(sIdPrefix + "-role-" + nPos, {
 				items: [oText, oIcon]
 			});
+
 		} else {
 			oRolesCell = new Text();
 		}
 
+		var oDefaultRadioButton = new RadioButton(sIdPrefix + "-def-" + nPos, {
+			groupName: this.getId(),
+			select: fSelectRB,
+			selected: {
+				path: "/defaultKey",
+				model: sModelName,
+				formatter: function(sKey) {
+					return oItem.getKey() === sKey;
+				}
+			}
+		});
+
+		if (oText && this._isRestricted(oItem.getContexts())) {
+			oDefaultRadioButton.setEnabled(false);
+			if (this.getDefaultKey() === oItem.getKey())  {
+				this.setDefaultKey(this.getStandardVariantKey());
+			}
+		}
 
 		return new ColumnListItem({
 			cells: [
-				oFavoriteIcon, oNameControl, new Text(sIdPrefix + "-type-" + nPos, {
+				oFavoriteIcon,
+				oNameControl,
+				new Text(sIdPrefix + "-type-" + nPos, {
 					text: {
 						path: "sharing",
 						model: sModelName,
@@ -2044,20 +2155,16 @@ sap.ui.define([
 						}.bind(this)
 					},
 					textAlign: "Center"
-				}), new RadioButton(sIdPrefix + "-def-" + nPos, {
-					groupName: this.getId(),
-					select: fSelectRB,
-					selected: {
-						path: "/defaultKey",
-						model: sModelName,
-						formatter: function(sKey) {
-							return oItem.getKey() === sKey;
-						}
-					}
-				}), oExecuteOnSelectCtrl, oRolesCell, new Text(sIdPrefix + "-author-" + nPos, {
+				}),
+				oDefaultRadioButton,
+				oExecuteOnSelectCtrl,
+				oRolesCell,
+				new Text(sIdPrefix + "-author-" + nPos, {
 					text: '{' + sModelName + ">author}",
 					textAlign: "Begin"
-				}), oDeleteButton, new Text({
+				}),
+				oDeleteButton,
+				new Text({
 					text: '{' + sModelName + ">key}"
 				})
 			]
@@ -2335,22 +2442,25 @@ sap.ui.define([
 		}
 
 		this.oManagementDialog.close();
+		if (this._getDeletedItems().length > 0) {
+			this._bDeleteOccured = true;
 
-		this._getDeletedItems().some(function(sItemKey) {
-			if (sItemKey === this.getSelectedKey()) {
-				var sKey = this.getStandardVariantKey();
+			this._getDeletedItems().some(function(sItemKey) {
+				if (sItemKey === this.getSelectedKey()) {
+					var sKey = this.getStandardVariantKey();
 
-				this.setModified(false);
-				this.setSelectedKey(sKey);
+					this.setModified(false);
+					this.setSelectedKey(sKey);
 
-				this.fireSelect({
-					key: sKey
-				});
-				return true;
-			}
+					this.fireSelect({
+						key: sKey
+					});
+					return true;
+				}
 
-			return false;
-		}.bind(this));
+				return false;
+			}.bind(this));
+		}
 
 		if (this._getRenamedItems().indexOf(this.getSelectedKey()) >= 0) {
 			var oBinding = this.oVariantText.getBinding("text");