Consolidates GraphAppState and GraphStateProvider

Author: d13

src/webviews/apps/plus/graph/graph-app.ts

@@ -13,7 +13,6 @@ import { ipcContext } from '../../shared/contexts/ipc';
 import type { TelemetryContext } from '../../shared/contexts/telemetry';
 import { telemetryContext } from '../../shared/contexts/telemetry';
 import { emitTelemetrySentEvent } from '../../shared/telemetry';
-import { stateContext } from './context';
 import type { GlGraphWrapper } from './graph-wrapper/graph-wrapper';
 import type { GlGraphHover } from './hover/graphHover';
 import type { GraphMinimapDaySelectedEventDetail } from './minimap/minimap';
@@ -36,11 +35,8 @@ export class GraphApp extends SignalWatcher(LitElement) {
 		return this;
 	}
 
-	@consume({ context: stateContext, subscribe: true })
-	state!: typeof stateContext.__context__;
-
 	@consume({ context: graphStateContext, subscribe: true })
-	graphApp!: typeof graphStateContext.__context__;
+	graphState!: typeof graphStateContext.__context__;
 
 	@consume({ context: ipcContext })
 	private readonly _ipc!: typeof ipcContext.__context__;
@@ -76,27 +72,33 @@ export class GraphApp extends SignalWatcher(LitElement) {
 					@gl-select-commits=${this.handleHeaderSearchNavigation}
 				></gl-graph-header>
 				<div class="graph__workspace">
-					${when(!this.state.allowed, () => html`<gl-graph-gate class="graph__gate"></gl-graph-gate>`)}
+					${when(
+						!this.graphState.state.allowed,
+						() => html`<gl-graph-gate class="graph__gate"></gl-graph-gate>`,
+					)}
 					<main id="main" class="graph__panes">
 						<div class="graph__graph-pane">
 							${when(
-								this.state.config?.minimap !== false,
+								this.graphState.state.config?.minimap !== false,
 								() => html`
 									<gl-graph-minimap-container
-										.activeDay=${this.graphApp.activeDay}
-										.disabled=${!this.state.config?.minimap}
-										.rows=${this.state.rows ?? []}
-										.rowsStats=${this.state.rowsStats}
-										.dataType=${this.state.config?.minimapDataType ?? 'commits'}
-										.markerTypes=${this.state.config?.minimapMarkerTypes ?? []}
-										.refMetadata=${this.state.refsMetadata}
-										.searchResults=${this.graphApp.searchResults}
-										.visibleDays=${this.graphApp.visibleDays}
+										.activeDay=${this.graphState.activeDay}
+										.disabled=${!this.graphState.state.config?.minimap}
+										.rows=${this.graphState.state.rows ?? []}
+										.rowsStats=${this.graphState.state.rowsStats}
+										.dataType=${this.graphState.state.config?.minimapDataType ?? 'commits'}
+										.markerTypes=${this.graphState.state.config?.minimapMarkerTypes ?? []}
+										.refMetadata=${this.graphState.state.refsMetadata}
+										.searchResults=${this.graphState.searchResults}
+										.visibleDays=${this.graphState.visibleDays}
 										@gl-graph-minimap-selected=${this.handleMinimapDaySelected}
 									></gl-graph-minimap-container>
 								`,
 							)}
-							${when(this.state.config?.sidebar, () => html`<gl-graph-sidebar></gl-graph-sidebar>`)}
+							${when(
+								this.graphState.state.config?.sidebar,
+								() => html`<gl-graph-sidebar></gl-graph-sidebar>`,
+							)}
 							<gl-graph-hover id="commit-hover" distance=${0} skidding=${15}></gl-graph-hover>
 							<gl-graph-wrapper
 								@gl-graph-change-selection=${this.handleGraphSelectionChanged}
@@ -119,15 +121,15 @@ export class GraphApp extends SignalWatcher(LitElement) {
 	}
 
 	private handleMinimapDaySelected(e: CustomEvent<GraphMinimapDaySelectedEventDetail>) {
-		if (!this.state.rows) return;
+		if (!this.graphState.state.rows) return;
 
 		let { sha } = e.detail;
 		if (sha == null) {
 			const date = e.detail.date?.getTime();
 			if (date == null) return;
 
 			// Find closest row to the date
-			const closest = this.state.rows.reduce((prev, curr) => {
+			const closest = this.graphState.state.rows.reduce((prev, curr) => {
 				return Math.abs(curr.date - date) < Math.abs(prev.date - date) ? curr : prev;
 			});
 			sha = closest.sha;
@@ -161,7 +163,7 @@ export class GraphApp extends SignalWatcher(LitElement) {
 	}
 
 	private handleGraphVisibleDaysChanged({ detail }: CustomEventType<'gl-graph-change-visible-days'>) {
-		this.graphApp.visibleDays = detail;
+		this.graphState.visibleDays = detail;
 	}
 
 	private handleGraphRowContextMenu(_e: CustomEventType<'gl-graph-row-context-menu'>) {