From fa79e5b016f51d731b67727d1ed931548931ee5c Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Mon, 28 Oct 2019 14:48:47 -0700
Subject: [PATCH] Fix for propagating aria-label title of form components to
 loading component (#8051)

---
 src/sql/azdata.d.ts                              | 10 ++++------
 src/sql/workbench/api/common/extHostModelView.ts |  3 +++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts
index d97a9e95f2..c9dc123a38 100644
--- a/src/sql/azdata.d.ts
+++ b/src/sql/azdata.d.ts
@@ -3010,6 +3010,10 @@ declare module 'azdata' {
 		 * Corresponds to the display CSS property for the element
 		 */
 		display?: DisplayType;
+		/**
+		 * Corresponds to the aria-label accessibility attribute for this component
+		 */
+		ariaLabel?: string;
 		/**
 		 * Matches the CSS style key and its available values.
 		 */
@@ -3024,7 +3028,6 @@ declare module 'azdata' {
 
 	export interface InputBoxProperties extends ComponentProperties {
 		value?: string;
-		ariaLabel?: string;
 		ariaLive?: string;
 		placeHolder?: string;
 		inputType?: InputBoxInputType;
@@ -3147,7 +3150,6 @@ declare module 'azdata' {
 		values?: string[] | CategoryValue[];
 		editable?: boolean;
 		fireOnTextChange?: boolean;
-		ariaLabel?: string;
 		required?: boolean;
 	}
 
@@ -3226,10 +3228,6 @@ declare module 'azdata' {
 		 * The title for the button. This title will show when hovered over
 		 */
 		title?: string;
-		/**
-		 * The accessibility aria label for this component
-		 */
-		ariaLabel?: string;
 	}
 
 	export interface LoadingComponentProperties {
diff --git a/src/sql/workbench/api/common/extHostModelView.ts b/src/sql/workbench/api/common/extHostModelView.ts
index 00bf818a26..9b6ab37da2 100644
--- a/src/sql/workbench/api/common/extHostModelView.ts
+++ b/src/sql/workbench/api/common/extHostModelView.ts
@@ -331,6 +331,9 @@ class FormContainerBuilder extends GenericContainerBuilder<azdata.FormContainer,
 		}
 		if (formComponent.title && componentWrapper) {
 			componentWrapper.ariaLabel = formComponent.title;
+			if (componentWrapper instanceof LoadingComponentWrapper) {
+				componentWrapper.component.ariaLabel = formComponent.title;
+			}
 		}
 		let actions: string[] = undefined;
 		if (formComponent.actions) {