Skip to content

Commit d8d60fb

Browse files
committed
fix(web): preserve artwork when merging theme palettes
1 parent 8103892 commit d8d60fb

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ export function ThemeEditorPanel({
179179
const [isInspecting, setIsInspecting] = useState(false);
180180
const [selectedRole, setSelectedRole] = useState<ThemeColorRole | null>(null);
181181
const [usageCount, setUsageCount] = useState<number | null>(null);
182+
const previousMergeTargetIdRef = useRef<string | null>(null);
182183
// Null parks the panel at its default corner; a value is a dragged spot,
183184
// kept clamped so the header can always be grabbed again.
184185
const [position, setPosition] = useState<{ x: number; y: number } | null>(null);
@@ -319,6 +320,15 @@ export function ThemeEditorPanel({
319320
// an explanation instead.
320321
const mergeTargetId = mergeTarget?.id ?? null;
321322
const takenAppearancesKey = takenAppearances.join(",");
323+
useEffect(() => {
324+
if (isEditing || previousMergeTargetIdRef.current === mergeTargetId) return;
325+
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]);
331+
322332
useEffect(() => {
323333
if (isEditing || mergeTargetId === null) return;
324334
const taken = takenAppearancesKey.split(",").filter(Boolean) as ThemeAppearance[];

0 commit comments

Comments
 (0)