Skip to content

Commit eecc097

Browse files
committed
fix(web): preserve artwork across theme renames
1 parent d8d60fb commit eecc097

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

‎apps/web/src/components/settings/ThemeEditorPanel.tsx‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,16 @@ export function ThemeEditorPanel({
321321
const mergeTargetId = mergeTarget?.id ?? null;
322322
const takenAppearancesKey = takenAppearances.join(",");
323323
useEffect(() => {
324-
if (isEditing || previousMergeTargetIdRef.current === mergeTargetId) return;
324+
if (previousMergeTargetIdRef.current === mergeTargetId) return;
325325
previousMergeTargetIdRef.current = mergeTargetId;
326-
// Creating with an existing theme's name adds its missing appearance.
327-
// Seed theme-level options from that target so adding a palette does not
328-
// silently reset them; the user can still change the toggle afterward.
329-
setSidebarArtwork(mergeTarget?.sidebarArtwork === true);
330-
}, [isEditing, mergeTarget, mergeTargetId]);
326+
// A matching name makes that existing theme the surviving merge target.
327+
// Seed theme-level options from it so adding a palette or renaming onto it
328+
// does not silently reset them. Leaving the merge restores the edited
329+
// theme's option (or the off-by-default choice for a new theme).
330+
setSidebarArtwork(
331+
mergeTarget ? mergeTarget.sidebarArtwork === true : editingTheme?.sidebarArtwork === true,
332+
);
333+
}, [editingTheme, mergeTarget, mergeTargetId]);
331334

332335
useEffect(() => {
333336
if (isEditing || mergeTargetId === null) return;

0 commit comments

Comments
 (0)