fix(desktop): let calendar and timeline chips fall back to the area color when the project keeps its default grey (#1124)

Author: dongdongbh

apps/desktop/src/lib/task-accent-color.test.ts

@@ -0,0 +1,61 @@
+import { describe, expect, it } from 'vitest';
+import { DEFAULT_PROJECT_COLOR, type Area, type Project, type Task } from '@mindwtr/core';
+import { getTaskAccentColor } from './task-accent-color';
+
+const task = (overrides: Partial<Task>): Task => ({
+    id: 't1',
+    title: 'test',
+    status: 'next',
+    createdAt: '2026-01-01T00:00:00.000Z',
+    updatedAt: '2026-01-01T00:00:00.000Z',
+    ...overrides,
+} as Task);
+
+const project = (overrides: Partial<Project>): Project => ({
+    id: 'p1',
+    title: 'Project',
+    status: 'active',
+    color: DEFAULT_PROJECT_COLOR,
+    order: 0,
+    tagIds: [],
+    createdAt: '2026-01-01T00:00:00.000Z',
+    updatedAt: '2026-01-01T00:00:00.000Z',
+    ...overrides,
+} as Project);
+
+const area = (overrides: Partial<Area>): Area => ({
+    id: 'a1',
+    name: 'Area',
+    order: 0,
+    createdAt: '2026-01-01T00:00:00.000Z',
+    updatedAt: '2026-01-01T00:00:00.000Z',
+    ...overrides,
+} as Area);
+
+const maps = (projects: Project[], areas: Area[]) => [
+    new Map(projects.map((p) => [p.id, p])),
+    new Map(areas.map((a) => [a.id, a])),
+] as const;
+
+describe('getTaskAccentColor', () => {
+    it('uses an explicitly chosen project color', () => {
+        const [projects, areas] = maps([project({ color: '#f97316', areaId: 'a1' })], [area({ color: '#8b5cf6' })]);
+        expect(getTaskAccentColor(task({ projectId: 'p1' }), projects, areas)).toBe('#f97316');
+    });
+
+    it('falls through the never-changed default project color to the area color (#1124)', () => {
+        const [projects, areas] = maps([project({ areaId: 'a1' })], [area({ color: '#8b5cf6' })]);
+        expect(getTaskAccentColor(task({ projectId: 'p1' }), projects, areas)).toBe('#8b5cf6');
+    });
+
+    it('uses the task area color when the task has no project', () => {
+        const [projects, areas] = maps([], [area({ color: '#3b82f6' })]);
+        expect(getTaskAccentColor(task({ areaId: 'a1' }), projects, areas)).toBe('#3b82f6');
+    });
+
+    it('returns undefined when neither project nor area carries a real color', () => {
+        const [projects, areas] = maps([project({ areaId: 'a1' })], [area({ color: DEFAULT_PROJECT_COLOR })]);
+        expect(getTaskAccentColor(task({ projectId: 'p1' }), projects, areas)).toBeUndefined();
+        expect(getTaskAccentColor(task({}), projects, areas)).toBeUndefined();
+    });
+});

apps/desktop/src/lib/task-accent-color.ts

@@ -1,4 +1,4 @@
-import type { Area, Project, Task } from '@mindwtr/core';
+import { DEFAULT_PROJECT_COLOR, type Area, type Project, type Task } from '@mindwtr/core';
 
 /**
  * The identity color a task carries on the calendar and the timeline — project
@@ -13,7 +13,10 @@ export function getTaskAccentColor(
     areaById: Map<string, Area>,
 ): string | undefined {
     const project = task.projectId ? projectById.get(task.projectId) : undefined;
-    if (project?.color) return project.color;
+    // Every project stores DEFAULT_PROJECT_COLOR until the user picks one; that
+    // placeholder grey is "no identity", so it must not shadow the area color (#1124).
+    if (project?.color && project.color !== DEFAULT_PROJECT_COLOR) return project.color;
     const areaId = project?.areaId ?? task.areaId;
-    return (areaId ? areaById.get(areaId)?.color : undefined) || undefined;
+    const areaColor = areaId ? areaById.get(areaId)?.color : undefined;
+    return (areaColor !== DEFAULT_PROJECT_COLOR ? areaColor : undefined) || undefined;
 }

docs/release-notes/unreleased.md

@@ -38,6 +38,7 @@ Changes collected after `v1.2.5` and before the next version tag.
 - Settings → About now links the official YouTube video tutorials (the Mindwtr App Demos playlist with the complete desktop and mobile walkthroughs). Desktop and mobile.
 - Desktop: the "go to Next" keybinding (`g n`, or Alt+N in the Emacs style) now opens the actual Next Actions list, with the full sort and group toolbar. It had always shown the Focus view instead, so the all-Next list was unreachable. (#1107)
 - Android: in the quick "Add task" sheet, tapping More no longer pushes the title input off the top of the screen behind the keyboard; the expanded options now scroll within the space the keyboard leaves while the input and Save buttons stay visible. (#1120)
+- Desktop calendar and Timeline: tasks in a project whose color was never changed from the default grey now take their area's color on the deadline chip bar, instead of showing the placeholder grey as if the project had no area. (#1124)
 - Mobile: the quick "Add task" sheet's More panel now starts with a Note field, so a longer thought can be captured without typing the /note: token; a typed field and a /note: token merge instead of one overwriting the other. (#1118)
 - Deleting a section now says up front that its tasks are kept and move to No Section, instead of a bare "are you sure". Desktop and mobile. (#1011)
 - Desktop Timeline: redesigned around a fixed name column — every task's title now sits in a sticky left column with its project, bars no longer carry floating labels, single-dated tasks draw as small dots on their day, and the card ends after its last row instead of stretching a gridded empty canvas. Feedback welcome on #1111.