From 6c1677063c297e859037c94836f6a471da40d85b Mon Sep 17 00:00:00 2001
From: Gabriel Bodeen <gabriel.bodeen@ericsson.com>
Date: Thu, 7 Mar 2024 20:26:34 +0100
Subject: [PATCH] Changes requested by reviewers

---
 src/webview/components/memory-table.tsx  | 9 ++++++---
 src/webview/components/memory-widget.tsx | 4 ++--
 src/webview/memory-webview-view.tsx      | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/webview/components/memory-table.tsx b/src/webview/components/memory-table.tsx
index 0fefae9..e67684c 100644
--- a/src/webview/components/memory-table.tsx
+++ b/src/webview/components/memory-table.tsx
@@ -101,7 +101,7 @@ export const MoreMemorySelect: React.FC<MoreMemorySelectProps> = ({ count, offse
 interface MemoryTableProps extends TableRenderOptions, MemoryDisplayConfiguration {
     memory?: Memory;
     decorations: Decoration[];
-    hovers: HoverService;
+    hoverService: HoverService;
     offset: number;
     count: number;
     fetchMemory(partialOptions?: Partial<DebugProtocol.ReadMemoryArguments>): Promise<void>;
@@ -189,9 +189,12 @@ export class MemoryTable extends React.PureComponent<MemoryTableProps, MemoryTab
         return (
             <div className='flex-1 overflow-auto px-4'>
                 <Tooltip
+                    // On mouseover of a .hoverable element, this.handleOnBeforeTooltipShow runs and generates this.state.hoverContent
+                    target=".hoverable"
                     onBeforeShow={this.handleOnBeforeTooltipShow}
                     onHide={this.handleOnTooltipHide}
-                    target=".hoverable"
+                    showDelay={1000}
+                    autoHide={false}
                 >{this.state.hoverContent}</Tooltip>
                 <DataTable<MemoryRowData[]>
                     ref={this.datatableRef}
@@ -338,7 +341,7 @@ export class MemoryTable extends React.PureComponent<MemoryTableProps, MemoryTab
         try {
             extraData = JSON.parse(event.target.dataset[columnId] ?? '{}');
         } catch { /* no-op */ }
-        const node = await this.props.hovers.render({ columnId, textContent, extraData });
+        const node = await this.props.hoverService.render({ columnId, textContent, extraData });
         this.setState(prev => ({
             ...prev,
             hoverContent: node,
diff --git a/src/webview/components/memory-widget.tsx b/src/webview/components/memory-widget.tsx
index dead649..b465699 100644
--- a/src/webview/components/memory-widget.tsx
+++ b/src/webview/components/memory-widget.tsx
@@ -26,7 +26,7 @@ interface MemoryWidgetProps extends MemoryDisplayConfiguration {
     memory?: Memory;
     title: string;
     decorations: Decoration[];
-    hovers: HoverService;
+    hoverService: HoverService;
     columns: ColumnStatus[];
     memoryReference: string;
     offset: number;
@@ -82,7 +82,7 @@ export class MemoryWidget extends React.Component<MemoryWidgetProps, MemoryWidge
             />
             <MemoryTable
                 decorations={this.props.decorations}
-                hovers={this.props.hovers}
+                hoverService={this.props.hoverService}
                 columnOptions={this.props.columns.filter(candidate => candidate.active)}
                 memory={this.props.memory}
                 endianness={this.state.endianness}
diff --git a/src/webview/memory-webview-view.tsx b/src/webview/memory-webview-view.tsx
index eed0475..f2fc5ae 100644
--- a/src/webview/memory-webview-view.tsx
+++ b/src/webview/memory-webview-view.tsx
@@ -46,7 +46,7 @@ import { VariableHover } from './hovers/variable-hover';
 export interface MemoryAppState extends MemoryState, MemoryDisplayConfiguration {
     title: string;
     decorations: Decoration[];
-    hovers: HoverService;
+    hoverService: HoverService;
     columns: ColumnStatus[];
     isFrozen: boolean;
 }
@@ -79,7 +79,7 @@ class App extends React.Component<{}, MemoryAppState> {
             offset: 0,
             count: 256,
             decorations: [],
-            hovers: hoverService,
+            hoverService: hoverService,
             columns: columnContributionService.getColumns(),
             isMemoryFetching: false,
             isFrozen: false,
@@ -109,7 +109,7 @@ class App extends React.Component<{}, MemoryAppState> {
             <MemoryWidget
                 memory={this.state.memory}
                 decorations={this.state.decorations}
-                hovers={this.state.hovers}
+                hoverService={this.state.hoverService}
                 columns={this.state.columns}
                 memoryReference={this.state.memoryReference}
                 offset={this.state.offset ?? 0}