Merge "[INTERNAL] ValueHelpDialog: Improve Accessibility"

maxreichmann · Sep 23, 2021 · 5da3f06 · 5da3f06
2 parents b298b40 + 8f6087b
commit 5da3f06
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/sap.m/src/sap/m/P13nConditionPanel.js b/src/sap.m/src/sap/m/P13nConditionPanel.js
@@ -762,11 +762,19 @@ sap.ui.define([
 		this._oInvisibleTextField = new InvisibleText({
 			text: this._oRb.getText("CONDITIONPANEL_FIELD_LABEL")
 		});
+		this._oInvisibleTextOperatorInputValue = new InvisibleText({
+			text: this._oRb.getText("CONDITIONPANEL_FIELD_VALUE_LABEL")
+		});
 		this._oInvisibleTextOperator = new InvisibleText({
 			text: this._oRb.getText("CONDITIONPANEL_OPERATOR_LABEL")
 		});
+		this._oInvisibleTextOperatorAddButton = new InvisibleText({
+			text: this._oRb.getText("CONDITIONPANEL_ADD_SCREENREADER_DESCRIPTION")
+		});
 		this.addAggregation("content", this._oInvisibleTextField);
+		this.addAggregation("content", this._oInvisibleTextOperatorInputValue);
 		this.addAggregation("content", this._oInvisibleTextOperator);
+		this.addAggregation("content", this._oInvisibleTextOperatorAddButton);
 
 		this.addAggregation("content", this._oConditionsGrid);
 
@@ -851,7 +859,6 @@ sap.ui.define([
 
 		this._oAddButton = new Button({
 			icon: IconPool.getIconURI("add"),
-			tooltip: this._oRb.getText("CONDITIONPANEL_ADD" + (this._sAddRemoveIconTooltipKey ? "_" + this._sAddRemoveIconTooltipKey : "") + "_TOOLTIP"),
 			visible: true,
 			press: function(oEvent) {
 				var oConditionGrid = that._createConditionRow(that._oConditionsGrid, undefined, null, 0);
@@ -866,7 +873,8 @@ sap.ui.define([
 			},
 			layoutData: new OverflowToolbarLayoutData({
 				priority: OverflowToolbarPriority.Low
-			})
+			}),
+			ariaDescribedBy: this._oInvisibleTextOperatorAddButton
 		});
 
 		this._oHeaderText = new Text({

diff --git a/src/sap.m/src/sap/m/messagebundle.properties b/src/sap.m/src/sap/m/messagebundle.properties
@@ -742,7 +742,9 @@ GROUPPANEL_TITLE=Group
 #XFLD: Label text for combobox control
 CONDITIONPANEL_FIELD_LABEL=Field\:
 #XFLD: Label text for select control
-CONDITIONPANEL_OPERATOR_LABEL=Operator\:
+CONDITIONPANEL_OPERATOR_LABEL=Conditions Operator\:
+#XFLD: Label text for field value control
+CONDITIONPANEL_FIELD_VALUE_LABEL=Conditions Value\:
 
 #XTIT: ConditionPanel Option
 CONDITIONPANEL_OPTIONBT=between
@@ -877,6 +879,8 @@ CONDITIONPANEL_REMOVE_CONDITION_TOOLTIP=Remove Condition
 CONDITIONPANEL_REMOVE_ALL=Remove All
 #XTIT: ConditionPanel predefined field warning hint
 CONDITIONPANEL_FIELDMESSAGE=Enter valid value
+#YACT: ValueHelpDialog Condition Panel Add Button ARIA description
+CONDITIONPANEL_ADD_SCREENREADER_DESCRIPTION=Add Condition Row
 
 #XTIT: Text for title 'Chart' in the personalization dialog
 CHARTPANEL_TITLE=Chart