From b57bf53b6761d384dff992bb67fdee37406cba93 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Mon, 16 Nov 2020 10:59:21 -0800
Subject: [PATCH] Fix ModelView container child layout issues (#13412)

---
 extensions/schema-compare/src/schemaCompareMainWindow.ts   | 6 ++++--
 src/sql/workbench/browser/modelComponents/componentBase.ts | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/extensions/schema-compare/src/schemaCompareMainWindow.ts b/extensions/schema-compare/src/schemaCompareMainWindow.ts
index 2ce221acee..dac33a7150 100644
--- a/extensions/schema-compare/src/schemaCompareMainWindow.ts
+++ b/extensions/schema-compare/src/schemaCompareMainWindow.ts
@@ -157,7 +157,8 @@ export class SchemaCompareMainWindow {
 
 				this.sourceName = getEndpointName(this.sourceEndpointInfo);
 				this.targetName = ' ';
-				this.sourceNameComponent = view.modelBuilder.table().withProperties({
+				this.sourceNameComponent = view.modelBuilder.table().withProperties<azdata.TableComponentProperties>({
+					data: [],
 					columns: [
 						{
 							value: this.sourceName,
@@ -167,7 +168,8 @@ export class SchemaCompareMainWindow {
 					]
 				}).component();
 
-				this.targetNameComponent = view.modelBuilder.table().withProperties({
+				this.targetNameComponent = view.modelBuilder.table().withProperties<azdata.TableComponentProperties>({
+					data: [],
 					columns: [
 						{
 							value: this.targetName,
diff --git a/src/sql/workbench/browser/modelComponents/componentBase.ts b/src/sql/workbench/browser/modelComponents/componentBase.ts
index 1fbaea4727..76a52bb1c1 100644
--- a/src/sql/workbench/browser/modelComponents/componentBase.ts
+++ b/src/sql/workbench/browser/modelComponents/componentBase.ts
@@ -361,12 +361,12 @@ export abstract class ContainerBase<T, TPropertyBag extends azdata.ComponentProp
 	}
 
 	public layout(): void {
+		super.layout();
 		if (this._componentWrappers) {
 			this._componentWrappers.forEach(wrapper => {
 				wrapper.layout();
 			});
 		}
-		super.layout();
 	}
 
 	abstract setLayout(layout: any): void;