jaredandClaude Opus 4.8
7d67cdeef0
There was no way to see or cancel a reminder once set (removeReminder was only called by the fire-and-forget monitor), and addReminder didn't dedupe, so a message could silently accumulate duplicate reminders. The Remind Me dialog now lists the reminders already set on that message (soonest first) each with a cancel button. - New shared, tested formatFriendlyDateTime(ts, now?) in utils/datetimeInput.ts (Today/Tomorrow/date + time). - Per-row cancel busy-guard; inline "Could not cancel" on failure. Also applies two nits from the custom-time review: focus the date input when the custom picker is revealed, and clear the error when editing date/time. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
63 lines
2.5 KiB
TypeScript
63 lines
2.5 KiB
TypeScript
import { CSSProperties } from 'react';
|
|
import { color as foldsColor, config as foldsConfig } from 'folds';
|
|
|
|
const pad = (n: number): string => String(n).padStart(2, '0');
|
|
|
|
// Format a Date as the value string expected by <input type="date"> in the
|
|
// user's LOCAL timezone. (toISOString would shift to UTC and can land on the
|
|
// wrong calendar day.)
|
|
export function toLocalDate(date: Date): string {
|
|
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
|
|
}
|
|
|
|
// Format a Date as the value string expected by <input type="time"> (local, HH:mm).
|
|
export function toLocalTime(date: Date): string {
|
|
return `${pad(date.getHours())}:${pad(date.getMinutes())}`;
|
|
}
|
|
|
|
// Parse the local date + time <input> values back into a Date. Returns null when
|
|
// either value is missing or the combination is invalid (e.g. a partial entry).
|
|
export function parseLocalDateTime(dateValue: string, timeValue: string): Date | null {
|
|
if (!dateValue || !timeValue) return null;
|
|
const dt = new Date(`${dateValue}T${timeValue}:00`);
|
|
return Number.isNaN(dt.getTime()) ? null : dt;
|
|
}
|
|
|
|
// Human-friendly absolute time: "Today at 3:00 PM", "Tomorrow at 9:00 AM", or
|
|
// "1/5/2026 at 3:00 PM". `now` is injectable so the relative-day logic is testable.
|
|
export function formatFriendlyDateTime(ts: number, now: number = Date.now()): string {
|
|
const date = new Date(ts);
|
|
const nowDate = new Date(now);
|
|
const sameDay = (a: Date, b: Date): boolean =>
|
|
a.getFullYear() === b.getFullYear() &&
|
|
a.getMonth() === b.getMonth() &&
|
|
a.getDate() === b.getDate();
|
|
const tomorrow = new Date(nowDate);
|
|
tomorrow.setDate(tomorrow.getDate() + 1);
|
|
const timeStr = date.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' });
|
|
if (sameDay(date, nowDate)) return `Today at ${timeStr}`;
|
|
if (sameDay(date, tomorrow)) return `Tomorrow at ${timeStr}`;
|
|
return `${date.toLocaleDateString()} at ${timeStr}`;
|
|
}
|
|
|
|
// Shared style for date/time <input>s — matches the app's surface tokens and
|
|
// hints a dark-mode calendar/clock popup via colorScheme.
|
|
export function pickerInputStyle(
|
|
c: typeof foldsColor = foldsColor,
|
|
cfg: typeof foldsConfig = foldsConfig,
|
|
): CSSProperties {
|
|
return {
|
|
background: c.SurfaceVariant.Container,
|
|
color: c.SurfaceVariant.OnContainer,
|
|
border: `${cfg.borderWidth.B300} solid ${c.SurfaceVariant.ContainerLine}`,
|
|
borderRadius: cfg.radii.R300,
|
|
padding: `${cfg.space.S200} ${cfg.space.S300}`,
|
|
fontSize: '0.875rem',
|
|
width: '100%',
|
|
boxSizing: 'border-box',
|
|
outline: 'none',
|
|
fontFamily: 'inherit',
|
|
colorScheme: 'dark',
|
|
};
|
|
}
|