@sapui5/sap.rules.ui 1.109.0 → 1.111.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.rules.ui",
-  "version": "1.109.0",
+  "version": "1.111.0",
   "description": "SAPUI5 Library sap.rules.ui",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/rules/ui/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2016 SAP SE. All rights reserved
 	</copyright>
-	<version>1.109.0</version>
+	<version>1.111.0</version>
 
 	<documentation>UI5 library: sap.rules.ui</documentation>
 

package/src/sap/rules/ui/AstExpressionBasic.js

@@ -902,7 +902,7 @@ sap.ui.define([
 		},
 
 		_closeAutoSuggestionPopup: function () {
-			if (this._oAutoSuggestionPopUp)
+			if (this._oAutoSuggestionPopUp && this._oAutoSuggestionPopUp.isOpen())
 				this._oAutoSuggestionPopUp.close();
 		},
 
@@ -916,7 +916,7 @@ sap.ui.define([
 				keyCodes = [16, 17, 18, 93, 13, 9, 35, 36, 45, 34, 33, 40, 37, 38, 39, 27, 44, 145, 19, 112, 113, 114, 115, 116, 117, 118,
 					119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135
 				]; //Non printable keys refer https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode
-
+			var isMac = sap.ui.Device.os.name === "mac";
 			this.aKeyTracker = [];
 			if (!this._focusedOut) {
 				that._setCurrentCursorPosition(that._cursorPostion);
@@ -934,9 +934,12 @@ sap.ui.define([
 					that._handleArrowNavigation(event);
 				} else if (event.key === "Control") {
 					that.ctrlPressed = true;
-				} else if (that.ctrlPressed && (event.keyCode === 32 || event.key === " ")) {
+				} else if (isMac && event.key === "Alt") {
+					that.optionPressed = true;
+				} else if ((that.ctrlPressed && (event.keyCode === 32 || event.key === " ")) || (isMac && that.optionPressed && (event.keyCode === 32 || event.key === " ")) ) {
 					that._initializeCursorSpan();
 					that.ctrlPressed = false;
+					that.optionPressed = false;
 					that._bCtrlSpacePressed = true;
 					//For where Clause
 					if (!that.dataObjectInfo) {
@@ -945,6 +948,9 @@ sap.ui.define([
 					if (!that.relString) {
 						that.relString = "";
 					}
+					if (isMac){
+						event.preventDefault();
+					}
 				} else if (event.key === "Shift") {
 					that.bShiftPressed = true;
 				} else if (that.bShiftPressed && keyCodes.indexOf(event.keyCode) === -1) {
@@ -969,6 +975,7 @@ sap.ui.define([
 
 			this._input.on("click", function (event) {
 				that.ctrlPressed = false;
+				that.optionPressed = false;
 				that.forceFireChange = false;
 				that._initializeCursorSpan();
 				var json;
@@ -1022,7 +1029,7 @@ sap.ui.define([
 
 				//After space keyup, this is needed, else it continues
 				// till _handleKeyUpEvent and closes the autosuggestion
-				if (event.key === "Control" || event.keyCode === 35 || event.keyCode === 36 || event.keyCode === 37 || event.keyCode === 39 || event.keyCode === 20 || event.keyCode === 144) {
+				if (event.key === "Control" || (sap.ui.Device.os.name === "mac" && event.key === "Alt") || event.keyCode === 35 || event.keyCode === 36 || event.keyCode === 37 || event.keyCode === 39 || event.keyCode === 20 || event.keyCode === 144) {
 					return;
 				}
 
@@ -1066,6 +1073,10 @@ sap.ui.define([
 				}
 
 				if (currentText !== lastText) {
+					if(lastText? lastText.trim() == "" : true && currentText.trim() == ""){
+						this.textContent = "";
+						return;
+					}
 					that.bTypingFlow = true;
 					//needed when shift and some key has been keyed up at same time
 					if (((event.keyCode !== 8 && event.keyCode !== 46) && keyCodes.indexOf(event.keyCode) === -1) || (event.key === "Shift" && that
@@ -2614,6 +2625,8 @@ sap.ui.define([
 					title: this.oBundle.getText("astSuggestionDialogTitle"),
 					initialFocus: that, //To keep focus on input even after popup is opened
 					afterOpen: function () { //Needed to set cursor for text rule
+						// focus should be set on the popover after its opened
+						this.focus();
                         var position;
                         if (that.bEditInBetween) {
                             position = that.filterTextLength;
@@ -2790,7 +2803,9 @@ sap.ui.define([
 							Log.error("Error in parsing string to JSON: " + e.message);
 						}
 					}
-					this._uiModel.push(item);
+					if(!(this.getDomRef("input").children && this.getDomRef("input").children.length == 1 && this.getDomRef("input").children[0].outerHTML == "<br>")){
+						this._uiModel.push(item);
+					}
 				}
 				that._uiModeltoString();
 			}

package/src/sap/rules/ui/AstExpressionBasicRenderer.js

@@ -37,6 +37,9 @@ sap.ui.define([
 		}
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
 		var placeHolderText = oBundle.getText("ctrlSpaceCue");
+		if(sap.ui.Device.os.name == "mac"){
+			placeHolderText = oBundle.getText("optionSpaceCue");
+		}
 		if(placeHolderText.length>50 && oControl.getParent().getId() ===  "popover") {
 			placeHolderText = placeHolderText.substring(0,50) + " ...";
 		}
@@ -72,4 +75,4 @@ sap.ui.define([
 
 	return AstExpressionBasicRenderer;
 
-}, /* bExport= */ true);
+}, /* bExport= */ true);

package/src/sap/rules/ui/BindingSpy.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends  ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/rules/ui/Constants.js

@@ -37,6 +37,46 @@ sap.ui.define(function() {
 	Constants.UP = "UP";
 	Constants.DOWN = "DOWN";
 	Constants.CONDITION = "CONDITION";
+	Constants.OPERATOR_MAPPING = [{valueHelpType:"U",operator:"EQ",exclude:false,supported:true,message:"equal to"},
+		{valueHelpType:"O",operator:"EQ",exclude:false,supported:true,message:"equal to"},
+		{valueHelpType:"U",operator:"Contains",exclude:false,supported:true,message:"contains"},
+		{valueHelpType:"O",operator:"Contains",exclude:false,supported:true,message:"contains"},
+		{valueHelpType:"U",operator:"EQ",exclude:true,supported:true,message:"equal to"},
+		{valueHelpType:"O",operator:"EQ",exclude:true,supported:true,message:"equal to"},
+		{valueHelpType:"U",operator:"Contains",exclude:true,supported:false,message:"does not contain"},
+		{valueHelpType:"O",operator:"Contains",exclude:true,supported:false,message:"does not contain"},
+		{valueHelpType:"U",operator:"BT",exclude:false,supported:true,message:"between"},
+		{valueHelpType:"O",operator:"BT",exclude:false,supported:false,message:"between"},
+		{valueHelpType:"U",operator:"BT",exclude:true,supported:false,message:"not between"},
+		{valueHelpType:"O",operator:"BT",exclude:true,supported:false,message:"not between"},
+		{valueHelpType:"U",operator:"StartsWith",exclude:false,supported:false,message:"starts with"},
+		{valueHelpType:"O",operator:"StartsWith",exclude:false,supported:false,message:"starts with"},
+		{valueHelpType:"U",operator:"StartsWith",exclude:true,supported:false,message:"does not start with"},
+		{valueHelpType:"O",operator:"StartsWith",exclude:true,supported:false,message:"does not start with"},
+		{valueHelpType:"U",operator:"EndsWith",exclude:false,supported:false,message:"ends with"},
+		{valueHelpType:"O",operator:"EndsWith",exclude:false,supported:false,message:"ends with"},
+		{valueHelpType:"U",operator:"EndsWith",exclude:true,supported:false,message:"does not end with"},
+		{valueHelpType:"O",operator:"EndsWith",exclude:true,supported:false,message:"does not end with"},
+		{valueHelpType:"U",operator:"LT",exclude:false,supported:true,message:"less than"},
+		{valueHelpType:"O",operator:"LT",exclude:false,supported:false,message:"less than"},
+		{valueHelpType:"U",operator:"LT",exclude:true,supported:true,message:"not less than"},
+		{valueHelpType:"O",operator:"LT",exclude:true,supported:false,message:"not less than"},
+		{valueHelpType:"U",operator:"LE",exclude:false,supported:true,message:"less than equal to"},
+		{valueHelpType:"O",operator:"LE",exclude:false,supported:false,message:"less than equal to"},
+		{valueHelpType:"U",operator:"LE",exclude:true,supported:true,message:"not less than equal to"},
+		{valueHelpType:"O",operator:"LE",exclude:true,supported:false,message:"not less than equal to"},
+		{valueHelpType:"U",operator:"GT",exclude:false,supported:true,message:"greater than"},
+		{valueHelpType:"O",operator:"GT",exclude:false,supported:false,message:"greater than"},
+		{valueHelpType:"U",operator:"GT",exclude:true,supported:true,message:"not greater than"},
+		{valueHelpType:"O",operator:"GT",exclude:true,supported:false,message:"not greater than"},
+		{valueHelpType:"U",operator:"GE",exclude:false,supported:true,message:"greater than equal to"},
+		{valueHelpType:"O",operator:"GE",exclude:false,supported:false,message:"greater than equal to"},
+		{valueHelpType:"U",operator:"GE",exclude:true,supported:true,message:"not greater than equal to"},
+		{valueHelpType:"O",operator:"GE",exclude:true,supported:false,message:"not greater than equal to"},
+		{valueHelpType:"U",operator:"Empty",exclude:false,supported:false,message:"empty"},
+		{valueHelpType:"O",operator:"Empty",exclude:false,supported:false,message:"empty"},
+		{valueHelpType:"U",operator:"Empty",exclude:true,supported:false,message:"not empty"},
+		{valueHelpType:"O",operator:"Empty",exclude:true,supported:false,message:"not empty"}];
 	return Constants;
 	
 }, true);

package/src/sap/rules/ui/DecisionTable.js

@@ -58,7 +58,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.109.0
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableCell.js

@@ -35,7 +35,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/rules/ui/DecisionTableCellAstExpressionBasic.js

@@ -27,7 +27,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.AstExpressionBasic
      *
      * @author SAP SE
-     * @version 1.109.0
+     * @version 1.111.0
      *
      * @constructor
      * @private
@@ -128,7 +128,7 @@ sap.ui.define([
 
     };
 
-    DecisionTableCellAstExpressionBasic.prototype._updateModelAstNodes = function (oModel, oColumnData) {
+    DecisionTableCellAstExpressionBasic.prototype._updateModelAstNodes = function (oModel, oColumnData, sGroupId) {
         if (this.oDecisionTableCell) {
             var astNodes = oColumnData.ASTNodes;
             for (var node in astNodes) {
@@ -163,13 +163,13 @@ sap.ui.define([
 
                 var mParameters = {};
                 mParameters.properties = updatedAstNode;
-                mParameters.groupId = "changes";
+                mParameters.groupId = sGroupId;
                 oModel.createEntry("/DecisionTableRowCellASTs", mParameters);
             }
         }
     };
 
-    DecisionTableCellAstExpressionBasic.prototype._removeExistingAstNodes = function (oModel, oColumnData, sPath, astNodes) {
+    DecisionTableCellAstExpressionBasic.prototype._removeExistingAstNodes = function (oModel, oColumnData, sPath, astNodes, sGroupId) {
 		if (this.oDecisionTableCell) {
 			var mParameters = {};
 			mParameters.ColId = oColumnData.ColId;
@@ -199,7 +199,7 @@ sap.ui.define([
 
 			oModel.callFunction("/DeleteDTRowCellASTDraft", {
 				method: "POST",
-				groupId: "changes",
+				groupId: sGroupId,
 				urlParameters: mParameters
 			});
 
@@ -222,22 +222,23 @@ sap.ui.define([
     };
 
     DecisionTableCellAstExpressionBasic.prototype._removeAndUpdateExisitingNodes = function (oModel, oData, sPath, astNodes,sCellContentPath) {
-		oModel.setDeferredGroups(["changes"]);
+	    	var sGroupId = oData.RowId + "," + oData.ColId;
+		oModel.setDeferredGroups([sGroupId]);
 		var oEventBus = sap.ui.getCore().getEventBus();
 		oModel.update(sPath, {
 			"Content": oModel.getProperty(sCellContentPath)
 		}, {
-			groupId: "changes",
+			groupId: sGroupId,
 			success: function (oData) {
                 oEventBus.publish("sap.ui.rules", "astCreated");
             }
 		});
-		this._removeExistingAstNodes(oModel, oData, sPath, astNodes);
+		this._removeExistingAstNodes(oModel, oData, sPath, astNodes, sGroupId);
 		if (this._checkEmptyMarkerNode(astNodes)) {
-			this._updateModelAstNodes(oModel, oData);
+			this._updateModelAstNodes(oModel, oData, sGroupId);
 		}
 		oModel.submitChanges({
-			groupId: "changes"
+			groupId: sGroupId
 		});
 	};
 
@@ -266,9 +267,8 @@ sap.ui.define([
 			var sCellContentPath = this.oDecisionTableCell.getValuePath();
 			var sPath = "/" + sCellContentPath.split("/")[1];
 			oEventBus.publish("sap.ui.rules", "astCreating");
-			if (!oModel.hasPendingChanges()) {
-				this._removeAndUpdateExisitingNodes(oModel, oData, sPath, astNodes,sCellContentPath);
-			}
+			this._removeAndUpdateExisitingNodes(oModel, oData, sPath, astNodes,sCellContentPath);
+			
 		}
 	};
 

package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * @extends  sap.rules.ui.ExpressionAdvanced
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.ExpressionBasic
      *
      * @author SAP SE
-     * @version 1.109.0
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableConfiguration.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/rules/ui/DecisionTableSettings.js

@@ -44,7 +44,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.109.0
+         * @version 1.111.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/DecisionTableSettingsOld.js

@@ -38,7 +38,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.109.0
+         * @version 1.111.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/ExpressionBase.js

@@ -22,7 +22,7 @@ sap.ui.define([
     * @extends sap.ui.core.Control
     *
     * @author SAP SE
-    * @version 1.109.0
+    * @version 1.111.0
     *
     * @constructor
     * @private

package/src/sap/rules/ui/ExpressionBasic.js

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.109.0
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/RuleBase.js

@@ -24,7 +24,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.109.0
+     * @version 1.111.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/RuleBuilder.js

@@ -34,7 +34,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/rules/ui/TextRule.js

@@ -47,7 +47,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		 * @extends  Control
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private
@@ -95,6 +95,9 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			 *  Create Odata call for TextRuleBranch or TextRuleDefaultBranch based on type of condition
 			 */
 			_addConditionBlock: function (oEvent, sType) {
+			    if(this._isAddCallInProgress) {
+			        return;
+			    }
 				var that = this;
 				var oDataModel = this._getModel();
 				var oSource = oEvent.getSource();
@@ -143,6 +146,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				mParameters.error = function () {
 					Log.info("Error creating " + sKeytext + "entity");
 				};
+				this._isAddCallInProgress = true;
 				oDataModel.createEntry(sKeytext, mParameters);
 			},
 
@@ -158,6 +162,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			_addConditionSuccess: function (newCondition, that, data) {
 				var sNumbering;
 				var nNewIndex;
+				var bConditionCreated = false;
 				var sConditionId = newCondition.Id;
 				var oDataModel = that._getModel();
 				var oHeaderKey = {
@@ -186,6 +191,18 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							var oElsePanel = that._createElseFormLayout(oContext, that.oBundle.getText("titleElse"), true);
 							oVerticalLayout.removeContent(data.nIndex);
 							oVerticalLayout.insertContent(oElsePanel, data.nIndex);
+							oElsePanel.addEventDelegate({
+							    onAfterRendering: function(){
+							    	if (data && data.bfirst && !bConditionCreated && oElsePanel.getContent().length > 0 && oElsePanel.getContent()[0].getFormContainers() && 
+							    			oElsePanel.getContent()[0].getFormContainers().length > 0 && oElsePanel.getContent()[0].getFormContainers()[0].getFormElements() &&
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements().length > 0 && oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields() &&
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields().length > 0 && 
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input) {
+							    		oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+										bConditionCreated = true;
+									}
+							    }
+							});
 						} else if (response.Type === that.typeElseIf) {
 							that.getModel("displayModel").getProperty("/textRuleConditions/ElseIf").push(response);
 							if (data.bfirst) {
@@ -198,12 +215,26 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							var oElseIfPanel = that._createFormLayout(oContext, that.oBundle.getText("titleElseIf") + sNumbering, true);
 							oVerticalLayout.insertContent(oElseIfPanel, nNewIndex);
 							that._adjustElseIfTitle(data.verticalLayout, nNewIndex, true);
+							oElseIfPanel.addEventDelegate({
+							    onAfterRendering: function(){
+							    	if (data && data.bfirst && !bConditionCreated && oElseIfPanel.getContent().length > 0 && oElseIfPanel.getContent()[0].getFormContainers() && 
+							    			oElseIfPanel.getContent()[0].getFormContainers().length > 0 && oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements() &&
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements().length > 0 && oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields() &&
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields().length > 0 && 
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input) {
+							    		oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+										bConditionCreated = true;
+									}
+							    }
+							});
 						}
+						that._isAddCallInProgress = false;
 						that._updateBusyState(false);
 						sap.m.MessageToast.show(that.oBundle.getText("branchCreatedSuccess"));
 					},
 					error: function () {
 						Log.info("Error reading TextRuleResultExpressions");
+						that._isAddCallInProgress = false;
 					}
 				});
 
@@ -431,7 +462,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						tooltip: this.oBundle.getText("deleteElseIf"),
 						visible: "{TextRuleModel>/editable}",
 						press: function (oEvent) {
-							that._deleteConditionBlock(oEvent);
+							that.showDeleteConfirmationDialogMessage(oEvent.getSource());
 						}
 					}).setBindingContext(oContext);
 
@@ -466,7 +497,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					tooltip: this.oBundle.getText("deleteElse"),
 					visible: "{TextRuleModel>/editable}",
 					press: function (oEvent) {
-						that._deleteConditionBlock(oEvent);
+						that.showDeleteConfirmationDialogMessage(oEvent.getSource());
 					}
 				}).setBindingContext(oContext);
 
@@ -505,6 +536,35 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				return oPanel;
 			},
 
+			showDeleteConfirmationDialogMessage: function(oSource) {
+				var that = this;
+				var oDialog = new Dialog({	
+					title: this.oBundle.getText("warning_title"),	
+					type: sap.m.DialogType.Message,	
+					state: sap.ui.core.ValueState.Warning,	
+					content: new Text({	
+						text: this.oBundle.getText("condition_delete_confirmation_message")	
+					}),	
+					afterClose: function() {	
+						oDialog.destroy();	
+					}	
+				});	
+				oDialog.setBeginButton(new Button({	
+					text: this.oBundle.getText("textrule_confirmation_dialog_delete"),
+					press: function() {	
+						that._deleteConditionBlock(oSource)	
+						oDialog.close();
+					}
+				}));	
+				oDialog.setEndButton(new Button({	
+					text: this.oBundle.getText("textrule_confirmation_dialog_cancel"),	
+					press: function() {
+						oDialog.close();
+					}
+				}));	
+				oDialog.open();	
+			},
+
 			/*
 			 * Returns If form container
 			 */
@@ -627,10 +687,9 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			 * Deletes based on Binding path
 			 * Vertical layout content deleted based on its index
 			 */
-			_deleteConditionBlock: function (oEvent) {
+			_deleteConditionBlock: function (oSource) {
 				var that = this;
 				var oDataModel = this._getModel();
-				var oSource = oEvent.getSource();
 				var oPanel = oSource.getParent().getParent();
 				var oVerticalLayout = oPanel.getParent();
 				var nIndex = oVerticalLayout.indexOfContent(oPanel);
@@ -638,6 +697,8 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				var sConditionId = oBindingContext.getProperty("Id");
 				var sType = oBindingContext.getProperty("Type");
 				var sKeyText;
+				var initialConditionCount = oVerticalLayout.getContent().length;
+				var bConditionDeleted = false;
 				if (sType === that.typeElse) {
 					sKeyText = "/TextRuleDefaultBranches";
 				} else if (sType === that.typeElseIf) {
@@ -676,6 +737,23 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						that._adjustElseIfTitle(oVerticalLayout, nIndex, false);
 					} /* eslint-enable */
 					that._updateBusyState(false);
+					oVerticalLayout.addEventDelegate({
+					    onAfterRendering: function(){
+					    	if(!bConditionDeleted) {
+					    		if (initialConditionCount === 3 && (nIndex === 1 || nIndex === 2)){
+					    			oVerticalLayout.getContent()[nIndex].getContent()[0].focus();
+					    		} else if(nIndex === initialConditionCount-2 && oVerticalLayout.getContent().length > 0 && oVerticalLayout.getContent()[nIndex] && 
+					    				oVerticalLayout.getContent()[nIndex].getContent().length > 0 && oVerticalLayout.getContent()[nIndex].getContent()[0].getMetadata().getName() 
+					    				=== "sap.m.Button") {
+					    			oVerticalLayout.getContent()[initialConditionCount-2].getContent()[0].focus()
+					    		} else if(oVerticalLayout.getContent().length > 0 && oVerticalLayout.getContent()[nIndex] && 
+					    				oVerticalLayout.getContent()[nIndex].getContent().length > 0 && oVerticalLayout.getContent()[nIndex].getContent()[0].getFormContainers().length > 0) {
+					    			oVerticalLayout.getContent()[nIndex].getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+					    		}
+					    		bConditionDeleted = true;
+					    	}
+					    }
+					});
 					sap.m.MessageToast.show(that.oBundle.getText("branchDeletedSuccess"));
 				};
 

package/src/sap/rules/ui/TextRuleConfiguration.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/rules/ui/TextRuleSettings.js

@@ -45,7 +45,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.109.0
+         * @version 1.111.0
          *
          * @constructor
          * @private