Revert "web/elements: fix chart not rendering if update events happens before initial render"

This reverts commit f53343141e.
This commit is contained in:
Jens Langhammer 2022-03-30 10:36:50 +02:00
parent afea262e14
commit 53851efacb
4 changed files with 2306 additions and 1864 deletions

View file

@ -22,7 +22,7 @@ export abstract class AKChart<T> extends LitElement {
abstract apiRequest(): Promise<T>; abstract apiRequest(): Promise<T>;
abstract getChartData(data: T): ChartData; abstract getChartData(data: T): ChartData;
chart: Chart; chart?: Chart;
@property() @property()
centerText?: string; centerText?: string;
@ -45,22 +45,17 @@ export abstract class AKChart<T> extends LitElement {
constructor() { constructor() {
super(); super();
const canvas = this.shadowRoot?.querySelector<HTMLCanvasElement>("canvas");
if (!canvas) {
console.warn("Failed to get canvas element");
return;
}
const ctx = canvas.getContext("2d");
if (!ctx) {
console.warn("failed to get 2d context");
return;
}
this.chart = this.configureChart(undefined, ctx);
window.addEventListener("resize", () => { window.addEventListener("resize", () => {
this.chart.resize(); if (this.chart) {
this.chart.resize();
}
}); });
window.addEventListener(EVENT_REFRESH, () => { window.addEventListener(EVENT_REFRESH, () => {
this.firstUpdated(); this.apiRequest().then((r: T) => {
if (!this.chart) return;
this.chart.data = this.getChartData(r);
this.chart.update();
});
}); });
const matcher = window.matchMedia("(prefers-color-scheme: light)"); const matcher = window.matchMedia("(prefers-color-scheme: light)");
const handler = (ev?: MediaQueryListEvent) => { const handler = (ev?: MediaQueryListEvent) => {
@ -76,9 +71,18 @@ export abstract class AKChart<T> extends LitElement {
} }
firstUpdated(): void { firstUpdated(): void {
this.apiRequest().then((r: T) => { this.apiRequest().then((r) => {
this.chart.data = this.getChartData(r); const canvas = this.shadowRoot?.querySelector<HTMLCanvasElement>("canvas");
this.chart.update(); if (!canvas) {
console.warn("Failed to get canvas element");
return false;
}
const ctx = canvas.getContext("2d");
if (!ctx) {
console.warn("failed to get 2d context");
return false;
}
this.chart = this.configureChart(r, ctx);
}); });
} }
@ -151,10 +155,10 @@ export abstract class AKChart<T> extends LitElement {
} as ChartOptions; } as ChartOptions;
} }
configureChart(data: T | undefined, ctx: CanvasRenderingContext2D): Chart { configureChart(data: T, ctx: CanvasRenderingContext2D): Chart {
const config = { const config = {
type: this.getChartType(), type: this.getChartType(),
data: data ? this.getChartData(data) : {}, data: this.getChartData(data),
options: this.getOptions(), options: this.getOptions(),
plugins: this.getPlugins(), plugins: this.getPlugins(),
}; };

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff