diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts index 432dada500..68ac83ab67 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts @@ -217,6 +217,10 @@ export class HuiEnergyGasGraphCard plugins: { tooltip: { position: "nearest", + filter: (val) => val.formattedValue !== "0", + itemSort: function (a, b) { + return b.datasetIndex - a.datasetIndex; + }, callbacks: { title: (datasets) => { if (dayDifference > 0) { diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts index 49290b5647..778ccb77d1 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts @@ -213,6 +213,10 @@ export class HuiEnergySolarGraphCard plugins: { tooltip: { position: "nearest", + filter: (val) => val.formattedValue !== "0", + itemSort: function (a, b) { + return b.datasetIndex - a.datasetIndex; + }, callbacks: { title: (datasets) => { if (dayDifference > 0) { diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts index 5b97bd290d..b804dedc0a 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts @@ -209,6 +209,18 @@ export class HuiEnergyUsageGraphCard tooltip: { position: "nearest", filter: (val) => val.formattedValue !== "0", + itemSort: function (a: any, b: any) { + if (a.raw?.y > 0 && b.raw?.y < 0) { + return -1; + } + if (b.raw?.y > 0 && a.raw?.y < 0) { + return 1; + } + if (a.raw?.y > 0) { + return b.datasetIndex - a.datasetIndex; + } + return a.datasetIndex - b.datasetIndex; + }, callbacks: { title: (datasets) => { if (dayDifference > 0) { diff --git a/src/panels/lovelace/cards/energy/hui-energy-water-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-water-graph-card.ts index 84f21089c2..41d4029c04 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-water-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-water-graph-card.ts @@ -217,6 +217,10 @@ export class HuiEnergyWaterGraphCard plugins: { tooltip: { position: "nearest", + filter: (val) => val.formattedValue !== "0", + itemSort: function (a, b) { + return b.datasetIndex - a.datasetIndex; + }, callbacks: { title: (datasets) => { if (dayDifference > 0) {