Skip to content

fix: 🐛 more than four individuals causing colors to be incorrect #811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: 🐛 more than four individuals causing colors to be incorrect #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/power-flow-card-plus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,13 @@ export class PowerFlowCardPlus extends LitElement {
});
};

const sortedIndividualObjects = this._config.sort_individual_devices ? sortIndividualObjects(individualObjs) : individualObjs;

const individualFieldLeftTop = getTopLeftIndividual(sortedIndividualObjects);
const individualFieldLeftBottom = getBottomLeftIndividual(sortedIndividualObjects);
const individualFieldRightTop = getTopRightIndividual(sortedIndividualObjects);
const individualFieldRightBottom = getBottomRightIndividual(sortedIndividualObjects);

const individualKeys = ["left-top", "left-bottom", "right-top", "right-bottom"];
// Templates
const templatesObj: TemplatesObj = {
Expand All @@ -538,18 +545,11 @@ export class PowerFlowCardPlus extends LitElement {
entities,
homeLargestSource,
homeSources,
individual: individualObjs,
individual: sortedIndividualObjects,
nonFossil,
isCardWideEnough,
});

const sortedIndividualObjects = this._config.sort_individual_devices ? sortIndividualObjects(individualObjs) : individualObjs;

const individualFieldLeftTop = getTopLeftIndividual(sortedIndividualObjects);
const individualFieldLeftBottom = getBottomLeftIndividual(sortedIndividualObjects);
const individualFieldRightTop = getTopRightIndividual(sortedIndividualObjects);
const individualFieldRightBottom = getBottomRightIndividual(sortedIndividualObjects);

return html`
<ha-card
.header=${this._config.title}
Expand Down
10 changes: 9 additions & 1 deletion src/states/raw/individual/getIndividualObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { IndividualDeviceType } from "@/type";
import { computeFieldIcon, computeFieldName } from "@/utils/computeFieldAttributes";
import { getIndividualSecondaryState, getIndividualState } from ".";
import { hasIndividualObject } from "./hasIndividualObject";
import {convertColorListToHex} from "../../../utils/convertColor";

const fallbackIndividualObject: IndividualObject = {
field: undefined,
Expand Down Expand Up @@ -74,7 +75,14 @@ export const getIndividualObject = (hass: HomeAssistant, field: IndividualDevice
const isStateNegative = state && state < 0;
const userConfiguredInvertAnimation = field?.inverted_animation || false;
const invertAnimation = isStateNegative ? !userConfiguredInvertAnimation : userConfiguredInvertAnimation;
const color = field?.color && typeof field?.color === "string" ? field?.color : null;
let colorConv;
if (field?.color && typeof field?.color === "string") {
colorConv = field.color;
}
else if (field?.color && typeof field?.color === "object") {
colorConv = convertColorListToHex(field.color);
}
const color = colorConv ? colorConv : null;

return {
field,
Expand Down
9 changes: 3 additions & 6 deletions src/style/all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,8 @@ export const allDynamicStyles = (
);
};

let individualIndex = 0;
individual.forEach((_, index) => {
if (!individual[index].has) return;
getStylesForIndividual(entities!.individual![index], individualIndex);
individualIndex++;
});
for (let index = 0; index < (individual.length < 4 ? individual.length : 4); index++){
getStylesForIndividual(individual![index], index);
};
}
};