fix: keep watcher save state visible (#2037)

This commit is contained in:
Carlos Florêncio
2026-07-29 14:05:38 +01:00
committed by GitHub
parent c96b893174
commit 1f19dbe6d5
11 changed files with 557 additions and 10 deletions
@@ -1,6 +1,6 @@
"use client";
import { useCallback, useMemo, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useSettingsSaveContributor } from "@/components/settings/settings-save-provider";
type EnabledItem = { id: string; enabled: boolean };
@@ -17,17 +17,39 @@ export function useWatcherEnabledDrafts<T extends EnabledItem>({
saveEnabled,
}: WatcherEnabledDraftOptions<T>) {
const [drafts, setDrafts] = useState<Record<string, boolean>>({});
const [saved, setSaved] = useState<Record<string, boolean>>({});
useEffect(() => {
setSaved((current) => {
let changed = false;
const next = { ...current };
for (const [id, enabled] of Object.entries(current)) {
const item = items.find((candidate) => candidate.id === id);
if (!item || item.enabled === enabled) {
delete next[id];
changed = true;
}
}
return changed ? next : current;
});
}, [items, saved]);
const changes = useMemo(
() =>
items
.filter((item) => drafts[item.id] !== undefined && drafts[item.id] !== item.enabled)
.filter(
(item) =>
drafts[item.id] !== undefined && drafts[item.id] !== (saved[item.id] ?? item.enabled),
)
.map((item) => ({ item, enabled: drafts[item.id] }))
.sort((left, right) => left.item.id.localeCompare(right.item.id)),
[drafts, items],
[drafts, items, saved],
);
const draftItems = useMemo(
() => items.map((item) => ({ ...item, enabled: drafts[item.id] ?? item.enabled })),
[drafts, items],
() =>
items.map((item) => ({
...item,
enabled: drafts[item.id] ?? saved[item.id] ?? item.enabled,
})),
[drafts, items, saved],
);
const dirtyIds = useMemo(() => new Set(changes.map(({ item }) => item.id)), [changes]);
@@ -42,6 +64,7 @@ export function useWatcherEnabledDrafts<T extends EnabledItem>({
const results = await Promise.allSettled(
changes.map(async ({ item, enabled }) => {
await saveEnabled(item, enabled);
setSaved((current) => ({ ...current, [item.id]: enabled }));
setDrafts((current) => {
if (current[item.id] !== enabled) return current;
const next = { ...current };