fluxerapp/fluxer
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(app): improve UX for nested sidebars (#50)

Browse Source
This commit is contained in:
hampus-fluxer
2026-01-06 04:27:05 +01:00
committed by GitHub
parent 21e489638b
commit abd17f5d49
3 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fluxer_app/src/stores/SettingsSidebarStore.tsx
View File

@@ -24,6 +24,7 @@ class SettingsSidebarStore {
ownerId: string | null = null;
overrideContent: React.ReactNode | null = null;
useOverride = false;
dismissedOwnerId: string | null = null;
constructor() {
makeAutoObservable(this, {overrideContent: observable.ref}, {autoBind: true});
@@ -36,7 +37,8 @@ class SettingsSidebarStore {
setOverride(ownerId: string, content: React.ReactNode, options?: {defaultOn?: boolean}): void {
this.ownerId = ownerId;
this.overrideContent = content;
if (options?.defaultOn) this.useOverride = true;
this.dismissedOwnerId = null;
this.useOverride = options?.defaultOn ?? false;
}
updateOverride(ownerId: string, content: React.ReactNode): void {
@@ -48,16 +50,40 @@ class SettingsSidebarStore {
if (ownerId && this.ownerId && this.ownerId !== ownerId) return;
this.ownerId = null;
this.overrideContent = null;
this.dismissedOwnerId = null;
this.useOverride = false;
}
dismissOverride(ownerId?: string): void {
if (ownerId && this.ownerId && this.ownerId !== ownerId) return;
const targetOwnerId = ownerId ?? this.ownerId;
this.useOverride = false;
this.dismissedOwnerId = targetOwnerId;
}
setUseOverride(value: boolean): void {
if (!this.hasOverride) {
this.useOverride = false;
return;
}
if (value) {
this.dismissedOwnerId = null;
}
this.useOverride = value;
}
activateOverride(ownerId?: string): void {
if (!this.hasOverride) return;
if (ownerId && this.ownerId && this.ownerId !== ownerId) return;
this.useOverride = true;
this.dismissedOwnerId = null;
}
isDismissed(ownerId?: string): boolean {
if (!this.dismissedOwnerId) return false;
if (!ownerId) return this.ownerId === this.dismissedOwnerId;
return ownerId === this.dismissedOwnerId;
}
}
export default new SettingsSidebarStore();