From 60bf331f19f32cde22558992748790a0fb29704d Mon Sep 17 00:00:00 2001
From: Cory Rivera <corivera@microsoft.com>
Date: Tue, 13 Aug 2019 14:14:18 -0700
Subject: [PATCH] Correctly set focus on new Notebook cells after clicking on
 inline buttons. (#6708)

---
 .../parts/notebook/browser/notebook.component.html        | 8 ++++----
 .../parts/notebook/browser/notebook.component.ts          | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/sql/workbench/parts/notebook/browser/notebook.component.html b/src/sql/workbench/parts/notebook/browser/notebook.component.html
index e7de69e9c9..bd3626aa07 100644
--- a/src/sql/workbench/parts/notebook/browser/notebook.component.html
+++ b/src/sql/workbench/parts/notebook/browser/notebook.component.html
@@ -11,11 +11,11 @@
 		<loading-spinner [loading]="isLoading"></loading-spinner>
 		<div class="hoverButtonsContainer" *ngIf="(cells && cells.length > 0) && !isLoading">
 			<span class="containerBackground"></span>
-			<button class="hoverButton" (click)="addCell('code', 0)">
+			<button class="hoverButton" (click)="addCell('code', 0, $event)">
 				<div class="addCodeIcon"></div>
 				<span>{{addCodeLabel}}</span>
 			</button>
-			<button class="hoverButton" (click)="addCell('markdown', 0)">
+			<button class="hoverButton" (click)="addCell('markdown', 0, $event)">
 				<div class="addTextIcon"></div>
 				<span>{{addTextLabel}}</span>
 			</button>
@@ -29,11 +29,11 @@
 			</div>
 			<div class="hoverButtonsContainer">
 				<span class="containerBackground"></span>
-				<button class="hoverButton" (click)="addCell('code', findCellIndex(cell) + 1)">
+				<button class="hoverButton" (click)="addCell('code', findCellIndex(cell) + 1, $event)">
 					<div class="addCodeIcon"></div>
 					<span>{{addCodeLabel}}</span>
 				</button>
-				<button class="hoverButton" (click)="addCell('markdown', findCellIndex(cell) + 1)">
+				<button class="hoverButton" (click)="addCell('markdown', findCellIndex(cell) + 1, $event)">
 					<div class="addTextIcon"></div>
 					<span>{{addTextLabel}}</span>
 				</button>
diff --git a/src/sql/workbench/parts/notebook/browser/notebook.component.ts b/src/sql/workbench/parts/notebook/browser/notebook.component.ts
index e489677947..73bf44d52c 100644
--- a/src/sql/workbench/parts/notebook/browser/notebook.component.ts
+++ b/src/sql/workbench/parts/notebook/browser/notebook.component.ts
@@ -200,7 +200,10 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	}
 
 	// Add cell based on cell type
-	public addCell(cellType: CellType, index?: number) {
+	public addCell(cellType: CellType, index?: number, event?: Event) {
+		if (event) {
+			event.stopPropagation();
+		}
 		this._model.addCell(cellType, index);
 	}