diff --git a/frontend/src/App.vue b/frontend/src/App.vue index b776927..9536ba1 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -12,6 +12,7 @@ import { createCompletionPulse } from './lib/completion-motion' import MvpPanel from './MvpPanel.vue' import CountdownPanel from './CountdownPanel.vue' import FloatingAddButton from './components/FloatingAddButton.vue' +import CalendarPicker from './components/CalendarPicker.vue' type FolderItem = { id: string; name: string } type TaskList = { id: string; folder_id: string | null; name: string; is_inbox: boolean } @@ -78,7 +79,8 @@ const composeListId = ref('') const composeDueAt = ref('') const composeHasTime = ref(false) const composeTime = ref('12:00') -const composeDatePicker = ref(null) +const composeCalendarOpen = ref(false) +const composeDateButton = ref(null) const composeTimePicker = ref(null) const composePriority = ref(0) const composeDescription = ref('') @@ -110,6 +112,7 @@ function openTaskCompose() { composeDescription.value = '' composeRepeat.value = 'none' composeRepeatConfig.value = defaultRepeatConfig() + composeCalendarOpen.value = false taskComposeOpen.value = true nextTick(() => document.querySelector('.task-compose-input')?.focus()) } @@ -120,16 +123,6 @@ const composeDueLabel = computed(() => { const value = new Date(year, month - 1, day) return Number.isNaN(value.getTime()) ? '设置截止日期' : new Intl.DateTimeFormat('zh-CN', { month: 'short', day: 'numeric', weekday: 'short' }).format(value) }) -function openComposeDuePicker() { - const picker = composeDatePicker.value as (HTMLInputElement & { showPicker?: () => void }) | null - if (!picker) return - try { - if (picker.showPicker) picker.showPicker() - else picker.click() - } catch { - picker.click() - } -} function clearComposeDueDate() { composeDueAt.value = '' composeHasTime.value = false @@ -142,7 +135,7 @@ function addComposeTime() { try { picker?.showPicker?.() } catch { picker?.focus() } }) } -function closeTaskCompose() { taskComposeOpen.value = false } +function closeTaskCompose() { composeCalendarOpen.value = false; taskComposeOpen.value = false } function activateFloatingAdd(origin: { x: number; y: number }) { composeOrigin.value = origin if (activeView.value === 'habits') habitComposer.value?.openHabitComposer(origin) @@ -305,6 +298,9 @@ const filteredTaskTree = computed(() => groupTaskTree(visibleTasks.value)) const taskTree = computed(() => filteredTaskTree.value) const overdueTaskTree = computed(() => groupTaskTree(overdueTasks.value)) let searchTimer: number | undefined +watch(composeDueAt, (value) => { + if (!value) { composeHasTime.value = false; composeRepeat.value = 'none' } +}) watch(query, () => { if (searchTimer) window.clearTimeout(searchTimer) if (!isTaskView(activeView.value)) return @@ -945,10 +941,10 @@ onMounted(bootstrap)
- - +
diff --git a/frontend/src/components/CalendarPicker.integration.test.ts b/frontend/src/components/CalendarPicker.integration.test.ts new file mode 100644 index 0000000..440a6bd --- /dev/null +++ b/frontend/src/components/CalendarPicker.integration.test.ts @@ -0,0 +1,40 @@ +import { describe, expect, it } from 'vitest' +import { readFileSync } from 'node:fs' + +const app = readFileSync('src/App.vue', 'utf8') +const picker = readFileSync('src/components/CalendarPicker.vue', 'utf8') +const css = readFileSync('src/style.css', 'utf8') + +describe('add-task CalendarPicker integration', () => { + it('replaces only the composer native date input with the custom picker', () => { + expect(app).toContain("import CalendarPicker from './components/CalendarPicker.vue'") + expect(app).toContain('ref="composeDateButton"') + expect(app).toContain('aria-haspopup="dialog" :aria-expanded="composeCalendarOpen" @click="composeCalendarOpen=true"') + expect(app).toContain('watch(composeDueAt, (value) => {') + expect(app).toContain("if (!value) { composeHasTime.value = false; composeRepeat.value = 'none' }") + expect(app).not.toContain('ref="composeDatePicker"') + expect(app).not.toContain('function openComposeDuePicker()') + expect(app).toContain('type="datetime-local"') + expect(app).toContain('v-model="composeTime" type="time"') + }) + + it('uses a fixed desktop popover and opaque mobile bottom sheet above task compose', () => { + expect(css).toContain('.calendar-picker-layer{position:fixed;z-index:90;inset:0;pointer-events:none}') + expect(css).toContain('.calendar-picker{position:fixed;width:328px;background:#fffdf8;border:1px solid #ded6ca;') + expect(css).toContain('.calendar-picker__grid button.selected{background:var(--accent);color:#fff}') + expect(css).toContain('@media(max-width:600px){.calendar-picker-layer{pointer-events:auto;background:rgba(45,38,31,.3);display:flex;align-items:flex-end}') + expect(css).toContain('height:min(520px,72dvh)') + expect(css).not.toContain('.calendar-picker{backdrop-filter') + }) + + it('exposes dialog, grid, selected/current states and draft completion actions', () => { + expect(picker).toContain('role="dialog" aria-modal="true"') + expect(picker).toContain('role="grid"') + expect(picker).toContain(':aria-selected="day.isSelected"') + expect(picker).toContain(':aria-current="day.isToday?\'date\':undefined"') + expect(picker).toContain('data-action="today"') + expect(picker).toContain('data-action="clear"') + expect(picker).toContain('data-action="cancel"') + expect(picker).toContain('data-action="done"') + }) +}) diff --git a/frontend/src/components/CalendarPicker.test.ts b/frontend/src/components/CalendarPicker.test.ts new file mode 100644 index 0000000..525b80b --- /dev/null +++ b/frontend/src/components/CalendarPicker.test.ts @@ -0,0 +1,86 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { createApp, h, nextTick, ref } from 'vue' +import CalendarPicker from './CalendarPicker.vue' + +const mounted: Array<() => void> = [] + +async function mountPicker(initial = '2026-09-12', anchorRect = { left: 100, top: 100, bottom: 144, width: 120, height: 44 }) { + const host = document.createElement('div') + const anchor = document.createElement('button') + document.body.append(host, anchor) + Object.defineProperty(anchor, 'getBoundingClientRect', { value: () => anchorRect }) + const open = ref(true) + const updates: string[] = [] + const app = createApp({ setup: () => () => h(CalendarPicker, { open: open.value, modelValue: initial, anchor, 'onUpdate:open': (value: boolean) => { open.value = value }, 'onUpdate:modelValue': (value: string) => updates.push(value) }) }) + app.mount(host) + mounted.push(() => { app.unmount(); host.remove(); anchor.remove() }) + await nextTick() + return { open, updates } +} + +beforeEach(() => { + vi.stubGlobal('matchMedia', vi.fn().mockReturnValue({ matches: false, addEventListener: vi.fn(), removeEventListener: vi.fn() })) +}) +afterEach(() => { mounted.splice(0).forEach((cleanup) => cleanup()); document.body.innerHTML = ''; vi.unstubAllGlobals() }) + +describe('CalendarPicker', () => { + it('keeps selection as a draft until 完成', async () => { + const { updates } = await mountPicker() + const next = document.querySelector('[data-date="2026-09-13"]')! + next.click() + await nextTick() + expect(updates).toEqual([]) + document.querySelector('[data-action="done"]')!.click() + expect(updates).toEqual(['2026-09-13']) + }) + + it('cancels without changing the original value', async () => { + const { updates } = await mountPicker() + document.querySelector('[data-date="2026-09-13"]')!.click() + document.querySelector('[data-action="cancel"]')!.click() + expect(updates).toEqual([]) + }) + + it('supports grid keyboard navigation, selection and Escape', async () => { + const { open, updates } = await mountPicker() + const selected = document.querySelector('[aria-selected="true"]')! + selected.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowRight', bubbles: true })) + await nextTick() + expect(document.activeElement?.getAttribute('data-date')).toBe('2026-09-13') + document.activeElement?.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })) + await nextTick() + expect(updates).toEqual([]) + document.querySelector('[role="dialog"]')!.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true })) + await nextTick() + expect(open.value).toBe(false) + expect(updates).toEqual([]) + }) + + it('positions from the rendered popover height and shifts vertically when space is tight', async () => { + vi.stubGlobal('innerHeight', 500) + vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (this: HTMLElement) { + if (this.classList.contains('calendar-picker')) return { left: 0, top: 0, bottom: 388, right: 328, width: 328, height: 388, x: 0, y: 0, toJSON: () => ({}) } + return { left: 0, top: 0, bottom: 0, right: 0, width: 0, height: 0, x: 0, y: 0, toJSON: () => ({}) } + }) + await mountPicker('2026-09-12', { left: 100, top: 220, bottom: 264, width: 120, height: 44 }) + expect((document.querySelector('[role="dialog"]') as HTMLElement).style.top).toBe('100px') + }) + + it('moves focus into the newly visible month when month controls are used', async () => { + await mountPicker('2026-09-30') + document.querySelector('[aria-label="下个月"]')!.click() + await nextTick() + expect(document.querySelectorAll('[role="gridcell"][tabindex="0"]')).toHaveLength(1) + expect(document.activeElement?.getAttribute('data-date')).toBe('2026-10-30') + }) + + it('marks today and selected days with accessible grid state', async () => { + vi.setSystemTime(new Date(2026, 8, 9, 12)) + await mountPicker() + expect(document.querySelector('[role="dialog"][aria-modal="true"]')).not.toBeNull() + expect(document.querySelector('[role="grid"]')).not.toBeNull() + expect(document.querySelector('[data-date="2026-09-09"]')?.getAttribute('aria-current')).toBe('date') + expect(document.querySelector('[data-date="2026-09-12"]')?.getAttribute('aria-selected')).toBe('true') + vi.useRealTimers() + }) +}) diff --git a/frontend/src/components/CalendarPicker.vue b/frontend/src/components/CalendarPicker.vue new file mode 100644 index 0000000..9270bd5 --- /dev/null +++ b/frontend/src/components/CalendarPicker.vue @@ -0,0 +1,115 @@ + + + diff --git a/frontend/src/lib/calendar-picker.test.ts b/frontend/src/lib/calendar-picker.test.ts new file mode 100644 index 0000000..2004eef --- /dev/null +++ b/frontend/src/lib/calendar-picker.test.ts @@ -0,0 +1,47 @@ +import { describe, expect, it } from 'vitest' +import { + addCalendarDays, + buildCalendarMonth, + formatLocalDate, + moveCalendarFocus, + parseLocalDate, + positionCalendarPopover, +} from './calendar-picker' + +describe('CalendarPicker local calendar dates', () => { + it('round-trips a local natural day without UTC conversion', () => { + const value = parseLocalDate('2026-09-09') + expect(value && [value.getFullYear(), value.getMonth(), value.getDate()]).toEqual([2026, 8, 9]) + expect(formatLocalDate(value!)).toBe('2026-09-09') + expect(parseLocalDate('2026-02-30')).toBeNull() + }) + + it('builds a six-week Monday-first grid including adjacent months', () => { + const days = buildCalendarMonth(new Date(2026, 8, 1), new Date(2026, 8, 9), new Date(2026, 8, 12)) + expect(days).toHaveLength(42) + expect(formatLocalDate(days[0].date)).toBe('2026-08-31') + expect(formatLocalDate(days[41].date)).toBe('2026-10-11') + expect(days.find((day) => day.isToday)?.value).toBe('2026-09-09') + expect(days.find((day) => day.isSelected)?.value).toBe('2026-09-12') + expect(days[0].inMonth).toBe(false) + }) + + it('moves keyboard focus by day, week, month and week boundary', () => { + const start = new Date(2026, 8, 9) + expect(formatLocalDate(addCalendarDays(start, 1))).toBe('2026-09-10') + expect(formatLocalDate(moveCalendarFocus(start, 'ArrowUp'))).toBe('2026-09-02') + expect(formatLocalDate(moveCalendarFocus(start, 'PageDown'))).toBe('2026-10-09') + expect(formatLocalDate(moveCalendarFocus(start, 'Home'))).toBe('2026-09-07') + expect(formatLocalDate(moveCalendarFocus(start, 'End'))).toBe('2026-09-13') + }) + + it('flips above on bottom collision and shifts inside viewport edges', () => { + expect(positionCalendarPopover({ left: 900, top: 700, bottom: 744, width: 100, height: 44 }, 1024, 768, 388)).toEqual({ left: 684, top: 304 }) + expect(positionCalendarPopover({ left: 4, top: 20, bottom: 64, width: 100, height: 44 }, 1024, 768, 388)).toEqual({ left: 12, top: 72 }) + }) + + it('uses the rendered height and vertically shifts when neither side fits', () => { + expect(positionCalendarPopover({ left: 100, top: 220, bottom: 264, width: 120, height: 44 }, 1024, 500, 388)).toEqual({ left: 100, top: 100 }) + expect(positionCalendarPopover({ left: 100, top: 120, bottom: 164, width: 120, height: 44 }, 1024, 300, 388)).toEqual({ left: 100, top: 12 }) + }) +}) diff --git a/frontend/src/lib/calendar-picker.ts b/frontend/src/lib/calendar-picker.ts new file mode 100644 index 0000000..d7fa6de --- /dev/null +++ b/frontend/src/lib/calendar-picker.ts @@ -0,0 +1,85 @@ +export type CalendarDay = { + date: Date + value: string + inMonth: boolean + isToday: boolean + isSelected: boolean +} + +export type AnchorRect = Pick + +const DAY_MS = 86_400_000 + +export function parseLocalDate(value: string): Date | null { + const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value) + if (!match) return null + const year = Number(match[1]) + const month = Number(match[2]) - 1 + const day = Number(match[3]) + const date = new Date(year, month, day) + return date.getFullYear() === year && date.getMonth() === month && date.getDate() === day ? date : null +} + +export function formatLocalDate(date: Date): string { + const year = date.getFullYear() + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + return `${year}-${month}-${day}` +} + +export function addCalendarDays(date: Date, amount: number): Date { + const next = new Date(date.getFullYear(), date.getMonth(), date.getDate()) + next.setDate(next.getDate() + amount) + return next +} + +function addCalendarMonths(date: Date, amount: number): Date { + const wantedDay = date.getDate() + const next = new Date(date.getFullYear(), date.getMonth() + amount, 1) + const finalDay = new Date(next.getFullYear(), next.getMonth() + 1, 0).getDate() + next.setDate(Math.min(wantedDay, finalDay)) + return next +} + +export function moveCalendarFocus(date: Date, key: string): Date { + if (key === 'ArrowLeft') return addCalendarDays(date, -1) + if (key === 'ArrowRight') return addCalendarDays(date, 1) + if (key === 'ArrowUp') return addCalendarDays(date, -7) + if (key === 'ArrowDown') return addCalendarDays(date, 7) + if (key === 'PageUp') return addCalendarMonths(date, -1) + if (key === 'PageDown') return addCalendarMonths(date, 1) + const mondayIndex = (date.getDay() + 6) % 7 + if (key === 'Home') return addCalendarDays(date, -mondayIndex) + if (key === 'End') return addCalendarDays(date, 6 - mondayIndex) + return new Date(date) +} + +export function buildCalendarMonth(month: Date, today: Date, selected: Date | null): CalendarDay[] { + const first = new Date(month.getFullYear(), month.getMonth(), 1) + const start = addCalendarDays(first, -((first.getDay() + 6) % 7)) + const todayValue = formatLocalDate(today) + const selectedValue = selected ? formatLocalDate(selected) : '' + return Array.from({ length: 42 }, (_, index) => { + const date = addCalendarDays(start, index) + const value = formatLocalDate(date) + return { date, value, inMonth: date.getMonth() === month.getMonth(), isToday: value === todayValue, isSelected: value === selectedValue } + }) +} + +export function positionCalendarPopover(anchor: AnchorRect, viewportWidth: number, viewportHeight: number, height: number) { + const width = 328 + const gap = 8 + const edge = 12 + const left = Math.min(Math.max(anchor.left, edge), viewportWidth - width - edge) + const below = anchor.bottom + gap + const above = anchor.top - height - gap + const maxTop = Math.max(edge, viewportHeight - height - edge) + const top = below + height <= viewportHeight - edge + ? below + : above >= edge + ? above + : Math.min(Math.max(anchor.bottom - anchor.height + gap, edge), maxTop) + return { left, top } +} + +export const calendarDayDistance = (from: Date, to: Date) => Math.round((Date.UTC(to.getFullYear(), to.getMonth(), to.getDate()) - Date.UTC(from.getFullYear(), from.getMonth(), from.getDate())) / DAY_MS) diff --git a/frontend/src/style.css b/frontend/src/style.css index 4c2472b..4d41238 100644 --- a/frontend/src/style.css +++ b/frontend/src/style.css @@ -36,7 +36,9 @@ main{min-width:0;padding:27px 34px 50px;overflow:auto;background:linear-gradient .unified-fab{display:grid;place-items:center;position:fixed;z-index:60;right:20px;bottom:22px;width:56px;height:56px;border:0;border-radius:50%;background:var(--accent);color:#fff;box-shadow:0 8px 20px rgba(241,90,41,.28);transition:transform .16s ease,box-shadow .16s ease;touch-action:none;user-select:none}.unified-fab svg{width:25px;height:25px}.unified-fab:hover{transform:translateY(-2px);box-shadow:0 10px 24px rgba(241,90,41,.32)}.unified-fab:active{transform:scale(.96)}.unified-fab.dragging{transform:scale(1.06);box-shadow:0 12px 28px rgba(241,90,41,.36)}.app-sheet-mask.app-sheet-mask{background:var(--sheet-scrim);overscroll-behavior:contain}.app-sheet{min-height:0;overflow:hidden;background:var(--paper)}.app-sheet__header{min-height:64px;flex:0 0 64px;position:sticky;z-index:3;top:0;background:var(--paper);border-bottom:1px solid var(--line);padding:0 18px}.app-sheet__header>div{min-width:0}.app-sheet__header h2,.app-sheet__header h3{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.app-sheet__header>button{width:44px;height:44px;flex:0 0 44px;display:grid;place-items:center;border:0;background:transparent;border-radius:10px}.app-sheet__body{min-height:0;overflow-y:auto;overscroll-behavior:contain;-webkit-overflow-scrolling:touch;display:grid;gap:14px;padding:16px 18px}.app-sheet__footer{position:sticky;bottom:0;z-index:3;margin:0;background:var(--paper);border-top:1px solid var(--line);padding:12px 18px;padding-bottom:calc(16px + env(safe-area-inset-bottom));display:flex;justify-content:flex-end;gap:8px}.app-sheet__danger{border-top:1px solid #f1d4cd;background:#fff8f6;padding:12px 18px;padding-bottom:calc(16px + env(safe-area-inset-bottom));display:flex;justify-content:flex-end}.app-sheet--actions .app-sheet__body{gap:6px;padding:8px 16px calc(16px + env(safe-area-inset-bottom))}.app-sheet--actions .app-sheet__body>button{min-height:50px;width:100%;display:flex;align-items:center;gap:12px;border:0;background:#fff;padding:13px;border-radius:12px;text-align:left} @media(max-width:930px){.app-sheet{width:100%;max-height:min(88dvh,760px);display:flex!important;flex-direction:column!important;overflow:hidden!important;border-radius:var(--sheet-radius) var(--sheet-radius) 0 0!important;padding:0!important}.app-sheet--detail,.app-sheet--create{max-width:none!important}.app-sheet-mask{padding:0!important;place-items:end center!important;align-items:flex-end!important}.app-sheet__header{display:flex!important;align-items:center!important;justify-content:space-between!important;width:100%}.app-sheet__body{width:100%;flex:1 1 auto}.app-sheet__body label{display:grid;gap:6px}.app-sheet__footer{width:100%;flex:0 0 auto}.app-sheet__footer .primary-small{min-width:124px}.app-sheet__danger{width:100%;flex:0 0 auto}.app-sheet__danger .danger-text{width:100%;min-height:48px;justify-content:center}} -.task-compose-mask{position:fixed;z-index:70;inset:0;background:rgba(45,38,31,.34);display:flex;align-items:flex-end;padding:0}.task-compose-sheet{width:100%;max-height:min(88dvh,720px);overflow:auto;background:#fffdf8;border-radius:24px 24px 0 0;padding:18px 18px calc(20px + env(safe-area-inset-bottom));box-shadow:0 -16px 42px rgba(56,40,24,.2);display:grid;gap:14px;transform-origin:var(--fab-origin-x,calc(100% - 44px)) var(--fab-origin-y,100%)}.task-compose-sheet header{display:flex;align-items:center;justify-content:space-between}.task-compose-sheet header small{color:var(--accent);font-size:10px;font-weight:800;letter-spacing:.12em}.task-compose-sheet h2{margin:2px 0 0;font-size:22px}.task-compose-sheet label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.task-compose-sheet input,.task-compose-sheet select,.task-compose-sheet textarea{width:100%;border:1px solid var(--line);background:#fff;border-radius:11px;padding:12px;outline:none;resize:vertical}.task-compose-sheet input:focus,.task-compose-sheet select:focus,.task-compose-sheet textarea:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.task-compose-row{display:grid;grid-template-columns:minmax(0,1fr) 105px;gap:10px}.task-compose-date-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px}.task-compose-date-control{position:relative;display:flex;align-items:center;min-width:0}.task-compose-date-chip{position:relative;display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:7px!important;width:auto;min-height:44px;padding:0 12px;border:1px solid var(--line);border-radius:999px;background:#fffaf3;color:#776e62!important;font-size:13px!important;font-weight:700!important;overflow:hidden;cursor:pointer}.task-compose-date-chip.selected{border-color:#f3b18f;background:var(--accent-soft);color:#b7421e!important}.task-compose-date-chip svg{width:16px;height:16px;flex:none}.task-compose-native-picker{position:absolute;width:1px!important;height:1px!important;left:12px;top:50%;transform:translateY(-50%);opacity:0;pointer-events:none;padding:0!important;border:0!important}.task-compose-date-clear{display:grid;place-items:center;width:34px;height:34px;margin-left:2px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-date-clear:hover{background:#f5eee5;color:var(--text)}.task-compose-date-clear svg{width:15px;height:15px}.task-compose-time-add{min-width:0;height:40px;padding:0 13px;border:1px dashed #e5b89d;border-radius:999px;background:transparent;color:var(--accent);font-weight:700}.task-compose-time-add:hover{border-color:var(--accent);background:#fff4e8}.task-compose-time-chip{display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:5px!important;width:auto;color:var(--muted)!important;font-size:12px!important}.task-compose-time-chip input{width:102px!important;min-width:0;padding:9px 8px!important;border-radius:999px!important}.task-compose-time-remove{display:grid;place-items:center;flex:0 0 34px;width:34px;height:34px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-time-remove:hover{background:#f5eee5;color:var(--text)}.task-compose-time-remove svg{width:15px;height:15px}.task-compose-sheet footer{display:flex;justify-content:flex-end;gap:9px;padding-top:4px}.task-compose-sheet button:disabled{opacity:.45}.task-compose-enter-active,.task-compose-leave-active{transition:background .22s ease}.task-compose-enter-active .task-compose-sheet,.task-compose-leave-active .task-compose-sheet{transition:transform .28s cubic-bezier(.2,.9,.25,1.08),opacity .2s ease}.task-compose-enter-from,.task-compose-leave-to{background:rgba(45,38,31,0)}.task-compose-enter-from .task-compose-sheet,.task-compose-leave-to .task-compose-sheet{transform:translateY(36px) scale(.86);opacity:0} +.calendar-picker-layer{position:fixed;z-index:90;inset:0;pointer-events:none}.calendar-picker{position:fixed;width:328px;background:#fffdf8;border:1px solid #ded6ca;border-radius:18px;box-shadow:0 18px 46px rgba(56,40,24,.2);padding:14px;display:grid;gap:10px;pointer-events:auto;color:var(--text)}.calendar-picker__header{display:grid;grid-template-columns:40px 1fr 40px;align-items:center;gap:4px}.calendar-picker__header h3{margin:0;text-align:center;font-size:16px}.calendar-picker__header button,.calendar-picker__grid button{border:0;background:transparent;display:grid;place-items:center}.calendar-picker__header button{width:40px;height:40px;border-radius:10px}.calendar-picker__header svg{width:18px}.calendar-picker__close{display:none!important}.calendar-picker__weekdays,.calendar-picker__grid{display:grid;grid-template-columns:repeat(7,1fr);gap:3px}.calendar-picker__weekdays span{text-align:center;color:var(--muted);font-size:11px;padding:3px 0}.calendar-picker__grid button{height:34px;border-radius:10px;color:#4f483f;font-size:13px}.calendar-picker__grid button:hover,.calendar-picker__grid button:focus-visible{background:#f6ede2;outline:2px solid transparent}.calendar-picker__grid button.outside{color:#b9b0a5}.calendar-picker__grid button.today{box-shadow:inset 0 0 0 1px var(--accent);color:#b7421e}.calendar-picker__grid button.selected{background:var(--accent);color:#fff}.calendar-picker__grid button.selected.today{box-shadow:inset 0 0 0 1px #fff}.calendar-picker__footer{display:grid;grid-template-columns:auto auto 1fr auto auto;align-items:center;gap:4px;border-top:1px solid #e8e0d5;padding-top:10px}.calendar-picker__footer button{min-height:36px;border:0;background:transparent;border-radius:9px;padding:0 9px;color:#6d6459;font-weight:650}.calendar-picker__footer button:hover{background:#f6ede2}.calendar-picker__footer .calendar-picker__done{background:var(--accent);color:#fff}.calendar-picker__footer .calendar-picker__done:hover{background:#df4e22}@media(max-width:600px){.calendar-picker-layer{pointer-events:auto;background:rgba(45,38,31,.3);display:flex;align-items:flex-end}.calendar-picker{position:relative!important;left:auto!important;top:auto!important;width:100%;height:min(520px,72dvh);border-width:1px 0 0;border-radius:24px 24px 0 0;padding:18px 18px calc(16px + env(safe-area-inset-bottom));grid-template-rows:auto auto 1fr auto}.calendar-picker__header{grid-template-columns:44px 1fr 44px 44px}.calendar-picker__close{display:grid!important}.calendar-picker__grid{align-content:stretch}.calendar-picker__grid button{height:auto;min-height:42px}.calendar-picker__footer button{min-height:44px}} + +.task-compose-mask{position:fixed;z-index:70;inset:0;background:rgba(45,38,31,.34);display:flex;align-items:flex-end;padding:0}.task-compose-sheet{width:100%;max-height:min(88dvh,720px);overflow:auto;background:#fffdf8;border-radius:24px 24px 0 0;padding:18px 18px calc(20px + env(safe-area-inset-bottom));box-shadow:0 -16px 42px rgba(56,40,24,.2);display:grid;gap:14px;transform-origin:var(--fab-origin-x,calc(100% - 44px)) var(--fab-origin-y,100%)}.task-compose-sheet header{display:flex;align-items:center;justify-content:space-between}.task-compose-sheet header small{color:var(--accent);font-size:10px;font-weight:800;letter-spacing:.12em}.task-compose-sheet h2{margin:2px 0 0;font-size:22px}.task-compose-sheet label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.task-compose-sheet input,.task-compose-sheet select,.task-compose-sheet textarea{width:100%;border:1px solid var(--line);background:#fff;border-radius:11px;padding:12px;outline:none;resize:vertical}.task-compose-sheet input:focus,.task-compose-sheet select:focus,.task-compose-sheet textarea:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.task-compose-row{display:grid;grid-template-columns:minmax(0,1fr) 105px;gap:10px}.task-compose-date-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px}.task-compose-date-control{position:relative;display:flex;align-items:center;min-width:0}.task-compose-date-chip{position:relative;display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:7px!important;width:auto;min-height:44px;padding:0 12px;border:1px solid var(--line);border-radius:999px;background:#fffaf3;color:#776e62!important;font-size:13px!important;font-weight:700!important;overflow:hidden;cursor:pointer}.task-compose-date-chip.selected{border-color:#f3b18f;background:var(--accent-soft);color:#b7421e!important}.task-compose-date-chip svg{width:16px;height:16px;flex:none}.task-compose-date-clear{display:grid;place-items:center;width:34px;height:34px;margin-left:2px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-date-clear:hover{background:#f5eee5;color:var(--text)}.task-compose-date-clear svg{width:15px;height:15px}.task-compose-time-add{min-width:0;height:40px;padding:0 13px;border:1px dashed #e5b89d;border-radius:999px;background:transparent;color:var(--accent);font-weight:700}.task-compose-time-add:hover{border-color:var(--accent);background:#fff4e8}.task-compose-time-chip{display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:5px!important;width:auto;color:var(--muted)!important;font-size:12px!important}.task-compose-time-chip input{width:102px!important;min-width:0;padding:9px 8px!important;border-radius:999px!important}.task-compose-time-remove{display:grid;place-items:center;flex:0 0 34px;width:34px;height:34px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-time-remove:hover{background:#f5eee5;color:var(--text)}.task-compose-time-remove svg{width:15px;height:15px}.task-compose-sheet footer{display:flex;justify-content:flex-end;gap:9px;padding-top:4px}.task-compose-sheet button:disabled{opacity:.45}.task-compose-enter-active,.task-compose-leave-active{transition:background .22s ease}.task-compose-enter-active .task-compose-sheet,.task-compose-leave-active .task-compose-sheet{transition:transform .28s cubic-bezier(.2,.9,.25,1.08),opacity .2s ease}.task-compose-enter-from,.task-compose-leave-to{background:rgba(45,38,31,0)}.task-compose-enter-from .task-compose-sheet,.task-compose-leave-to .task-compose-sheet{transform:translateY(36px) scale(.86);opacity:0} .countdown-compose-enter-active,.countdown-compose-leave-active{transition:background .24s ease}.countdown-compose-enter-active .countdown-modal,.countdown-compose-leave-active .countdown-modal{transition:transform .34s cubic-bezier(.18,.9,.28,1.16),opacity .22s ease,filter .22s ease;transform-origin:var(--fab-origin-x,calc(100% - 43px)) var(--fab-origin-y,calc(100% - 104px))}.countdown-compose-enter-from,.countdown-compose-leave-to{background:rgba(45,38,31,0)}.countdown-compose-enter-from .countdown-modal,.countdown-compose-leave-to .countdown-modal{transform:translate(20px,28px) scale(.18) rotate(8deg);opacity:0;filter:blur(5px)}@media(max-width:930px){.unified-fab{bottom:calc(82px + env(safe-area-inset-bottom))}}@media(prefers-reduced-motion:reduce){*,*:before,*:after{scroll-behavior:auto!important;animation-duration:.01ms!important;transition-duration:.01ms!important}} .overdue-section{margin-top:18px}.overdue-heading{color:var(--danger);margin-bottom:6px}.overdue-heading span{min-width:22px;height:22px;padding:0 7px;display:inline-grid;place-items:center;border-radius:999px;background:#fde2dc;color:var(--danger);font-size:11px}.overdue-list{margin-bottom:18px}.overdue-task{background:#fff8f6}.overdue-task .meta,.overdue-badge{color:var(--danger)}.overdue-badge{font-size:11px;font-weight:700;background:#fde2dc;border-radius:999px;padding:4px 8px}.pager{display:flex;align-items:center;justify-content:flex-end;gap:10px;margin:0 0 14px}.pager button:disabled{opacity:.4;cursor:not-allowed}.pager span{color:var(--muted);font-size:13px}.section-heading{display:flex;align-items:center;gap:7px;margin:16px 0 10px;font-size:16px;line-height:1.35;color:#514a40}.section-heading svg{width:17px;height:17px;color:var(--accent)}.sr-only{position:absolute!important;width:1px!important;height:1px!important;padding:0!important;margin:-1px!important;overflow:hidden!important;clip:rect(0,0,0,0)!important;white-space:nowrap!important;border:0!important}.more-settings{border:1px solid var(--line);border-radius:10px;background:#fff}.more-settings summary{cursor:pointer;padding:11px 13px;color:#756d61;font-size:12px;font-weight:700}.more-settings-body{display:grid;gap:12px;padding:0 13px 13px}.more-settings-body>label{display:grid;grid-template-columns:80px 1fr;align-items:center;gap:7px;color:#756d61;font-size:12px;font-weight:650}.modal-mask{position:fixed;inset:0;z-index:80;background:rgba(45,38,31,.4);display:grid;place-items:center;padding:24px}.modal-box{width:min(360px,92vw);background:#fffdf8;border:1px solid var(--line);border-radius:14px;box-shadow:var(--shadow);padding:22px;display:grid;gap:14px}.modal-box h3{margin:0;font-size:17px}.modal-box label{display:grid;gap:7px;font-size:12px;font-weight:650;color:#756d61}.modal-input{width:100%;border:1px solid var(--line);background:#fff;padding:11px;border-radius:9px;outline:none;font-size:16px}.modal-actions{display:flex;justify-content:flex-end;gap:8px}.countdown-view{display:grid;gap:16px;padding-bottom:36px}.countdown-content{display:grid;gap:16px}.countdown-hero{display:flex;align-items:end;justify-content:space-between;border-bottom:1px solid var(--line);padding-bottom:10px}.countdown-hero small{display:block;color:var(--muted);font-size:12px}.countdown-layout{display:grid;gap:22px;align-items:start}.countdown-timeline{display:grid;gap:20px;max-width:820px;width:100%;margin:0 auto}.countdown-group{display:grid;gap:2px}.countdown-group>h3{margin:0 0 7px;padding-left:12px;color:#8a8175;font-size:11px;font-weight:750;letter-spacing:.08em}.countdown-row{--countdown-tone:#d9a17c;position:relative;width:100%;min-height:66px;display:grid;grid-template-columns:minmax(0,1fr) 86px;align-items:center;gap:14px;border:0;border-bottom:1px solid var(--line);border-radius:0;background:transparent;padding:9px 10px 9px 17px;text-align:left;color:inherit;transition:background .15s ease,transform .15s ease}.countdown-row:before{content:'';position:absolute;left:3px;top:50%;width:4px;height:4px;border-radius:50%;background:var(--countdown-tone);transform:translateY(-50%)}.countdown-row:first-of-type{border-top:1px solid var(--line)}.countdown-row:hover{background:#fffaf3}.countdown-row:active{transform:scale(.995)}.countdown-row.kind-anniversary{--countdown-tone:#b69b7d}.countdown-row.kind-birthday{--countdown-tone:#9cab8d}.countdown-row.today{--countdown-tone:#71856b}.countdown-row.past{--countdown-tone:#aaa094;opacity:.66}.countdown-row .pinned-icon{position:absolute;right:4px;top:5px}.countdown-icon{width:38px;height:38px;border-radius:12px;background:#fff2e8;display:grid;place-items:center;font-size:19px}.countdown-main{min-width:0;display:grid;gap:4px}.countdown-main>b{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:15px;color:#3f3932}.countdown-main>small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--muted);font-size:11px}.countdown-badges{display:flex;gap:5px}.countdown-badges em{font-style:normal;color:#8a7f72;font-size:10px}.countdown-badges em+em:before{content:'·';margin-right:5px;color:#c1b7aa}.countdown-state{display:grid;justify-items:end;gap:3px}.countdown-state strong{font-variant-numeric:tabular-nums;font-size:26px;line-height:1;color:#62594e}.countdown-state small{color:var(--muted);font-size:10px}.countdown-row.today .countdown-state strong,.countdown-row.today .countdown-state small{color:#71856b}.countdown-row.past .countdown-state strong{color:#887d70}.countdown-focus{--countdown-tone:#d9a17c;width:min(720px,100%);min-height:255px;margin:0 auto;display:grid;place-content:center;justify-items:center;gap:7px;border:1px solid color-mix(in srgb,var(--countdown-tone) 34%,var(--line));border-radius:16px;background:color-mix(in srgb,var(--countdown-tone) 7%,#fffdf8);padding:28px 24px;text-align:center;color:inherit;box-shadow:none;transition:border-color .15s ease,background .15s ease}.countdown-focus:hover{border-color:color-mix(in srgb,var(--countdown-tone) 54%,var(--line));background:color-mix(in srgb,var(--countdown-tone) 10%,#fffdf8)}.countdown-focus.kind-anniversary{--countdown-tone:#b69b7d}.countdown-focus.kind-birthday{--countdown-tone:#9cab8d}.countdown-focus>small{color:#8b8276;font-size:10px;font-weight:750;letter-spacing:.1em}.countdown-focus h3{margin:7px 0 0;font-size:20px;font-weight:680}.countdown-focus p{margin:1px 0 0;color:var(--muted);font-size:11px}.countdown-number{display:flex;align-items:end;gap:6px;margin:4px 0 3px}.countdown-number strong{font-variant-numeric:tabular-nums;font-size:76px;line-height:.9;font-weight:720;letter-spacing:-.05em;color:#3f3932}.countdown-number span{font-size:13px;color:#7a7165;padding-bottom:6px}.countdown-copy{font-size:12px;color:#71685e;font-weight:650}.countdown-empty{min-height:260px;background:#fffdf8;border:1px dashed var(--line);border-radius:16px;padding:26px;color:#766d60;text-align:center;display:grid;gap:9px;place-content:center;justify-items:center}.countdown-empty svg{color:var(--accent);width:30px;height:30px}.countdown-empty span{font-size:12px}.countdown-empty button{margin-top:5px}.archived-toggle,.archived-countdowns button{display:inline-flex;align-items:center;gap:5px;border:1px solid var(--line);background:#fff;border-radius:10px;padding:8px 11px;font-size:12px}.archived-toggle{justify-self:start}.archived-countdowns{display:grid;gap:10px}.archived-countdowns article{display:flex;align-items:center;gap:10px;background:#fff;border:1px solid var(--line);border-radius:14px;padding:12px 14px}.archived-countdowns article b{flex:1}.archived-countdowns article small{color:var(--muted)}.countdown-detail-mask,.countdown-modal-mask{position:fixed;inset:0;background:rgba(45,38,31,.36);display:grid;padding:20px}.countdown-detail-mask{z-index:85;place-items:end center}.countdown-detail-sheet{width:min(500px,100%);background:#fffdf8;border:1px solid var(--line);border-radius:20px;box-shadow:0 12px 36px rgba(56,40,24,.18);padding:18px;display:grid;gap:16px}.countdown-detail-sheet header{display:grid;grid-template-columns:42px 1fr 44px;align-items:center;gap:10px}.countdown-detail-sheet header small{color:var(--muted);font-size:11px}.countdown-detail-sheet header h3{margin:2px 0 0;font-size:19px}.countdown-detail-sheet header button{min-width:44px;min-height:44px;border:0;background:transparent;color:#766d60;border-radius:8px;width:44px;height:44px;display:grid;place-items:center}.countdown-modal header button{min-width:44px;min-height:44px;border:0;background:transparent;color:#766d60;border-radius:8px;width:44px;height:44px;display:grid;place-items:center}.countdown-detail-days{display:flex;align-items:baseline;gap:6px;padding:8px 0}.countdown-detail-days strong{font-variant-numeric:tabular-nums;font-size:46px;line-height:1}.countdown-detail-days span{color:var(--muted)}.countdown-detail-days b{margin-left:auto;color:var(--accent);font-size:13px}.countdown-detail-sheet dl{margin:0;display:grid;gap:1px;background:var(--line)}.countdown-detail-sheet dl div{display:grid;grid-template-columns:62px 1fr;gap:10px;background:#fffdf8;padding:10px 0}.countdown-detail-sheet dt{color:var(--muted);font-size:12px}.countdown-detail-sheet dd{margin:0;font-size:13px}.countdown-detail-sheet footer{display:flex;justify-content:flex-end;gap:8px}.countdown-detail-sheet footer button{min-height:44px;display:inline-flex;align-items:center;gap:6px;border:1px solid var(--line);background:#fff;border-radius:10px;padding:9px 13px}.countdown-modal-mask{z-index:90;place-items:center}.countdown-modal{width:min(420px,96vw);background:#fffdf8;border:1px solid var(--line);border-radius:18px;box-shadow:var(--shadow);padding:18px;display:grid;gap:12px}.countdown-modal header{display:flex;justify-content:space-between;align-items:start}.countdown-modal header small{color:var(--muted)}.countdown-modal header h3{margin:2px 0 0}.countdown-modal label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.countdown-modal input,.countdown-modal select{border:1px solid var(--line);background:#fff;border-radius:10px;padding:11px 12px;outline:none}.countdown-modal input:focus,.countdown-modal select:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.countdown-title-fields{display:grid;grid-template-columns:72px 1fr;gap:8px}.countdown-modal footer{display:flex;justify-content:flex-end;gap:8px;padding-top:6px}.countdown-advanced{border:1px solid var(--line);border-radius:11px;background:#fffaf4}.countdown-advanced summary{min-height:44px;display:flex;align-items:center;justify-content:space-between;padding:0 12px;cursor:pointer;color:#756d61;font-size:12px;font-weight:700;list-style:none}.countdown-advanced summary::-webkit-details-marker{display:none}.countdown-advanced summary svg{width:16px;height:16px;transition:transform .16s ease}.countdown-advanced[open] summary svg{transform:rotate(180deg)}.countdown-advanced>label,.countdown-advanced>.countdown-title-fields{margin:0 12px 12px}.countdown-detail-enter-active,.countdown-detail-leave-active{transition:background .2s ease}.countdown-detail-enter-active .countdown-detail-sheet,.countdown-detail-leave-active .countdown-detail-sheet{transition:transform .24s ease,opacity .2s ease}.countdown-detail-enter-from .countdown-detail-sheet,.countdown-detail-leave-to .countdown-detail-sheet{transform:translateY(100%);opacity:.6}@media(max-width:930px){.countdown-layout{grid-template-columns:1fr;gap:16px}.countdown-focus{display:grid;min-height:205px;padding:22px 16px}.countdown-number strong{font-size:64px}.countdown-timeline{gap:16px}}@media(max-width:800px){.countdown-hero{align-items:center}.countdown-hero h2{font-size:19px}.countdown-row{grid-template-columns:minmax(0,1fr) 72px;padding:9px 4px;gap:9px}.countdown-state strong{font-size:25px}.countdown-detail-mask,.countdown-modal-mask{place-items:end;padding:0}.countdown-detail-sheet,.countdown-modal{width:100%;border-radius:22px 22px 0 0;padding:18px 16px calc(18px + env(safe-area-inset-bottom));max-height:min(88dvh,760px);overflow:auto}.countdown-view{position:relative}} @media(max-width:930px){.countdown-row,.countdown-row:first-of-type{min-height:62px;grid-template-columns:minmax(0,1fr) 72px;gap:8px;padding:8px 9px 8px 17px;background:transparent;border:0;border-bottom:1px solid var(--line);border-radius:0;box-shadow:none}.countdown-row:first-of-type{border-top:1px solid var(--line)}.countdown-row.pinned,.countdown-row.today{background:transparent}.countdown-state strong{font-size:24px}} diff --git a/frontend/src/style.test.ts b/frontend/src/style.test.ts index 437fb56..ccc7e25 100644 --- a/frontend/src/style.test.ts +++ b/frontend/src/style.test.ts @@ -483,12 +483,11 @@ describe('unified floating add interaction', () => { it('uses compact date and time chips instead of large visible mobile inputs', () => { expect(app).toContain("composeDueAt.value = activeView.value === 'today' ? defaultTaskDueAt() : ''") expect(app).toContain('const composeDueLabel = computed') - expect(app).toContain('ref="composeDatePicker"') - expect(app).toContain('aria-label="选择截止日期" tabindex="-1"') + expect(app).toContain('ref="composeDateButton"') + expect(app).toContain('aria-haspopup="dialog" :aria-expanded="composeCalendarOpen"') expect(app).toContain('class="task-compose-date-chip"') - expect(app).toContain('@click="openComposeDuePicker"') - expect(app).toContain('function openComposeDuePicker()') - expect(app).toContain('picker.showPicker()') + expect(app).toContain('@click="composeCalendarOpen=true"') + expect(app).toContain('{{ composeDueLabel }}') expect(app).toContain('v-if="composeDueAt" class="task-compose-date-clear"') expect(app).toContain('v-if="composeDueAt && !composeHasTime"') @@ -497,9 +496,8 @@ describe('unified floating add interaction', () => { expect(css).toContain('.task-compose-date-control{position:relative;display:flex;align-items:center;min-width:0}') expect(css).toContain('.task-compose-date-chip{position:relative;display:inline-flex!important') expect(css).toContain('.task-compose-date-chip{position:relative;display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:7px!important;width:auto;min-height:44px') - expect(css).toContain('.task-compose-native-picker{position:absolute;width:1px!important;height:1px!important;left:12px;top:50%;transform:translateY(-50%)') - expect(css).toContain('pointer-events:none') expect(css).not.toContain('@media(max-width:480px){.task-compose-due-row') + expect(css).not.toContain('.task-compose-native-picker{') expect(app).toContain("composeHasTime.value ? composeTime.value : '23:59'") })