DigiLive/mushroom-strategy
1
0
Fork 1
mirror of https://github.com/DigiLive/mushroom-strategy.git synced 2025-07-31 10:27:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix hiding areas

Browse Source 
Closes #205.
This commit is contained in:
DigiLive
2025-05-14 06:41:51 +02:00
parent 9f818f6294
commit b58ece65cf
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utilities/RegistryFilter.ts
View File

@ -16,7 +16,7 @@ import { logMessage, lvlWarn } from './debug';
class RegistryFilter<T extends RegistryEntry, K extends keyof T = keyof T> { class RegistryFilter<T extends RegistryEntry, K extends keyof T = keyof T> {
private readonly entries: T[]; private readonly entries: T[];
private filters: (((entry: T) => boolean) | ((entry: T, index: number) => boolean))[] = []; private filters: (((entry: T) => boolean) | ((entry: T, index: number) => boolean))[] = [];
private readonly entryIdentifier: ('entity_id' | 'floor_id' | 'id') & K; private readonly entryIdentifier: ('entity_id' | 'area_id' | 'id') & K;
private invertNext: boolean = false; private invertNext: boolean = false;
/** /**
@ -27,8 +27,8 @@ class RegistryFilter<T extends RegistryEntry, K extends keyof T = keyof T> {
constructor(entries: T[]) { constructor(entries: T[]) {
this.entries = entries; this.entries = entries;
this.entryIdentifier = ( this.entryIdentifier = (
entries.length === 0 || 'entity_id' in entries[0] ? 'entity_id' : 'floor_id' in entries[0] ? 'floor_id' : 'id' entries.length === 0 || 'entity_id' in entries[0] ? 'entity_id' : 'floor_id' in entries[0] ? 'area_id' : 'id'
) as ('entity_id' | 'floor_id' | 'id') & K; ) as ('entity_id' | 'area_id' | 'id') & K;
} }
/** /**
@ -261,7 +261,12 @@ class RegistryFilter<T extends RegistryEntry, K extends keyof T = keyof T> {
} }
const id = entry[this.entryIdentifier] as keyof StrategyConfig['card_options']; const id = entry[this.entryIdentifier] as keyof StrategyConfig['card_options'];
const isHiddenByConfig = Registry.strategyOptions?.card_options?.[id]?.hidden === true; const options =
this.entryIdentifier === 'area_id'
? { ...Registry.strategyOptions.areas['_'], ...Registry.strategyOptions.areas[id] }
: Registry.strategyOptions.card_options?.[id];
const isHiddenByConfig = options?.hidden === true;
return !isHiddenByProperty && !isHiddenByConfig; return !isHiddenByProperty && !isHiddenByConfig;
}; };