Fix hover over output not working after second execution

roblourens · roblourens · commit cc62699a1d6a · 2020-06-09T14:24:55.000-05:00
Fix microsoft#94314
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -179,6 +179,25 @@ function webviewPreloads() {
 		return element;
 	}
 
+	function addMouseoverListeners(element: HTMLElement, outputId: string): void {
+		element.addEventListener('mouseenter', () => {
+			vscode.postMessage({
+				__vscode_notebook_message: true,
+				type: 'mouseenter',
+				id: outputId,
+				data: {}
+			});
+		});
+		element.addEventListener('mouseleave', () => {
+			vscode.postMessage({
+				__vscode_notebook_message: true,
+				type: 'mouseleave',
+				id: outputId,
+				data: {}
+			});
+		});
+	}
+
 	const dontEmit = Symbol('dontEmit');
 
 	function createEmitter<T>(listenerChange: (listeners: Set<Listener<T>>) => void = () => undefined): EmitterLike<T> {
@@ -280,23 +299,6 @@ function webviewPreloads() {
 						container.appendChild(newElement);
 						cellOutputContainer = newElement;
 
-						cellOutputContainer.addEventListener('mouseenter', () => {
-							vscode.postMessage({
-								__vscode_notebook_message: true,
-								type: 'mouseenter',
-								id: outputId,
-								data: {}
-							});
-						});
-						cellOutputContainer.addEventListener('mouseleave', () => {
-							vscode.postMessage({
-								__vscode_notebook_message: true,
-								type: 'mouseleave',
-								id: outputId,
-								data: {}
-							});
-						});
-
 						const lowerWrapperElement = createFocusSink(id, outputId, true);
 						container.appendChild(lowerWrapperElement);
 					}
@@ -307,8 +309,9 @@ function webviewPreloads() {
 					outputNode.style.left = event.data.left + 'px';
 					outputNode.style.width = 'calc(100% - ' + event.data.left + 'px)';
 					outputNode.style.minHeight = '32px';
-
 					outputNode.id = outputId;
+
+					addMouseoverListeners(outputNode, outputId);
 					let content = event.data.content;
 					outputNode.innerHTML = content;
 					cellOutputContainer.appendChild(outputNode);
