Fix statistics handling for negating power charge

Author: TCWORLD

src/data/energy.ts

@@ -1374,21 +1374,16 @@ export const calculateSolarConsumedGauge = (
 /**
  * Get current power value from entity state, normalized to kW
  * @param stateObj - The entity state object to get power value from
- * @param negateValue - Whether a bi-directional power value should be negated
  * @returns Power value in kW, or 0 if entity not found or invalid
  */
-export const getPowerFromState = (
-  stateObj: HassEntity,
-  negateValue = false
-): number | undefined => {
+export const getPowerFromState = (stateObj: HassEntity): number | undefined => {
   if (!stateObj) {
     return undefined;
   }
-  let value = parseFloat(stateObj.state);
+  const value = parseFloat(stateObj.state);
   if (isNaN(value)) {
     return undefined;
   }
-  if (negateValue) value = -value;
 
   // Normalize to kW based on unit of measurement (case-sensitive)
   // Supported units: GW, kW, MW, mW, TW, W

src/panels/lovelace/cards/energy/hui-power-sankey-card.ts

@@ -736,7 +736,9 @@ class HuiPowerSankeyCard
     // Track this entity for state change detection
     this._entities.add(entityId);
 
-    return getPowerFromState(this.hass.states[entityId], negateValue) ?? 0;
+    let value = getPowerFromState(this.hass.states[entityId]) ?? 0;
+    if (negateValue) value = -value;
+    return value;
   }
 
   /**

src/panels/lovelace/cards/energy/hui-power-sources-graph-card.ts

@@ -225,14 +225,22 @@ export class HuiPowerSourcesGraphCard
         // The interpolation breaks the stacking, so this positive/negative is a workaround
         const { positive, negative } = this._processData(
           statIds[key].stats.map((stat: StatsArgs) => {
-            const stats = energyData.stats[stat.id] ?? [];
-            const currentState = getPowerFromState(
-              this.hass.states[stat.id],
-              !!stat.negate
-            );
+            let stats = energyData.stats[stat.id] ?? [];
+            const currentState = getPowerFromState(this.hass.states[stat.id]);
             if (currentState !== undefined) {
               stats.push({ start: now, end: now, mean: currentState });
             }
+            if (stat.negate) {
+              stats = stats.map((point) => {
+                if (point.mean)
+                  return {
+                    start: point.start,
+                    end: point.end,
+                    mean: -point.mean,
+                  };
+                return point;
+              });
+            }
             return stats;
           })
         );