fix: address utility widget review

This commit is contained in:
ajnart committed 2026-08-20 15:33:28 +02:00
1 parent 52d96505a3
commit e3475d3efe
17 files changed
+138 -73

No files matched your search

+4 -2
View File
@@ -222,11 +222,13 @@ const ClockTime = ({
if (!entry.zonedTime) return null;
let formattedTime = formatLocalizedTime(now, locale, {
hour12: clockTimeFormatUses12Hours(options.customTimeFormat, options.is24HourFormat),
includeSeconds: clockTimeFormatShowsSeconds(options.customTimeFormat),
includeSeconds: clockTimeFormatShowsSeconds(options.customTimeFormat, options.showSeconds),
timeZone: entry.timeZone,
});
if (primary) {
formattedTime = entry.zonedTime.format(resolveClockTimeFormat(options.customTimeFormat, options.is24HourFormat));
formattedTime = entry.zonedTime.format(
resolveClockTimeFormat(options.customTimeFormat, options.is24HourFormat, options.showSeconds),
);
}
const accessibleDate = formatLocalizedDate(now, locale, {
dateStyle: "medium",
+8 -3
View File
@@ -15,7 +15,7 @@ dayjs.extend(advancedFormat);
export default function ClockWidget({ options, width, height, displayMode }: WidgetComponentProps<"clock">) {
const isAdvanced = displayMode === "advanced";
const showSeconds = clockTimeFormatShowsSeconds(options.customTimeFormat);
const showSeconds = clockTimeFormatShowsSeconds(options.customTimeFormat, options.showSeconds);
const time = useCurrentTime({ showSeconds });
const requestedTimeZone = options.useCustomTimezone ? options.timezone : getResolvedLocalTimeZone();
const primaryTimeZoneInvalid = !isTimeZoneSupported(requestedTimeZone);
@@ -37,7 +37,12 @@ export default function ClockWidget({ options, width, height, displayMode }: Wid
return <Center h="100%">--:--</Center>;
}
const resolvedTimeFormat = resolveClockTimeFormat(options.customTimeFormat, options.is24HourFormat);
const resolvedTimeFormat = resolveClockTimeFormat(
options.customTimeFormat,
options.is24HourFormat,
options.showSeconds,
);
const resolvedDateFormat = options.customDateFormat || options.dateFormat;
const minimumAxis = Math.min(width, height * 1.5);
let sizing: "xs" | "sm" | "md" = "md";
if (minimumAxis < 128) sizing = "xs";
@@ -71,7 +76,7 @@ export default function ClockWidget({ options, width, height, displayMode }: Wid
</Title>
{options.showDate && (
<Text className="clock-date-text" size={sizing} lineClamp={1}>
{zonedTime?.format(options.dateFormat)}
{zonedTime?.format(resolvedDateFormat)}
</Text>
)}
</Stack>
+5 -5
View File
@@ -1,9 +1,9 @@
export const automaticTimeFormat = "automatic";
export const resolveClockTimeFormat = (format: string, legacyIs24HourFormat: boolean) => {
export const resolveClockTimeFormat = (format: string, legacyIs24HourFormat: boolean, showSeconds = false) => {
if (format && format !== automaticTimeFormat) return format;
if (legacyIs24HourFormat) return "HH:mm";
return "hh:mm A";
if (legacyIs24HourFormat) return showSeconds ? "HH:mm:ss" : "HH:mm";
return showSeconds ? "hh:mm:ss A" : "hh:mm A";
};
export const clockTimeFormatUses12Hours = (format: string, legacyIs24HourFormat: boolean) => {
@@ -12,8 +12,8 @@ export const clockTimeFormatUses12Hours = (format: string, legacyIs24HourFormat:
return /h{1,2}/.test(formatWithoutLiterals);
};
export const clockTimeFormatShowsSeconds = (format: string) => {
if (!format || format === automaticTimeFormat) return false;
export const clockTimeFormatShowsSeconds = (format: string, showSeconds = false) => {
if (!format || format === automaticTimeFormat) return showSeconds;
const formatWithoutLiterals = format.replace(/\[[^\]]*\]/g, "");
return /s{1,2}/.test(formatWithoutLiterals);
};
+12 -11
View File
@@ -46,6 +46,9 @@ export const { definition, componentLoader } = createWidgetDefinition("clock", {
defaultValue: true,
withDescription: true,
}),
showSeconds: factory.switch({
defaultValue: false,
}),
useCustomTimezone: factory.switch({ defaultValue: false }),
timezone: factory.select({
options: timeZoneOptions,
@@ -73,14 +76,12 @@ export const { definition, componentLoader } = createWidgetDefinition("clock", {
defaultValue: "dddd, MMMM D",
withDescription: true,
}),
customTimeFormat: factory.select({
options: [
{ value: "HH:mm", label: `${dayjs().format("HH:mm")} · HH:mm` },
{ value: "HH:mm:ss", label: `${dayjs().format("HH:mm:ss")} · HH:mm:ss` },
{ value: "h:mm A", label: `${dayjs().format("h:mm A")} · h:mm A` },
{ value: "h:mm:ss A", label: `${dayjs().format("h:mm:ss A")} · h:mm:ss A` },
],
defaultValue: "HH:mm",
customTimeFormat: factory.text({
defaultValue: "",
withDescription: true,
}),
customDateFormat: factory.text({
defaultValue: "",
withDescription: true,
}),
showWeather: factory.switch({
@@ -110,9 +111,6 @@ export const { definition, componentLoader } = createWidgetDefinition("clock", {
}),
}),
{
is24HourFormat: {
shouldHide: () => true,
},
customTitle: {
shouldHide: (options) => !options.customTitleToggle,
},
@@ -122,6 +120,9 @@ export const { definition, componentLoader } = createWidgetDefinition("clock", {
dateFormat: {
shouldHide: (options) => !options.showDate,
},
customDateFormat: {
shouldHide: (options) => !options.showDate,
},
weatherLocation: {
shouldHide: (options) => !options.showWeather,
},
@@ -22,20 +22,20 @@
min-width: 0;
}
@container (max-width: 170px) {
@container (max-width: 10.625rem) {
.compactStatus,
.compactTarget {
display: none;
}
}
@container (max-width: 140px) {
@container (max-width: 8.75rem) {
.compactDuration {
font-size: clamp(var(--mantine-font-size-sm), 15cqw, var(--mantine-font-size-md));
}
}
@container (max-height: 105px) {
@container (max-height: 6.5625rem) {
.compactTarget {
display: none;
}
+40 -15
View File
@@ -293,9 +293,10 @@ const CompactTimer = ({
}: TimerDisplayProps) => {
const t = useScopedI18n("widget.timer");
const phaseLabel = getTimerPhaseLabel(runtime, t);
const showPhaseBadge = height >= 110;
const showCompletedFocus = runtime.mode === "pomodoro" && width >= 210;
const showCompletedFocus = runtime.mode === "pomodoro" && width >= 320;
const showProgress = height >= 125;
let phaseBadgeMaxWidth = "calc(100% - var(--mantine-spacing-md))";
if (showCompletedFocus) phaseBadgeMaxWidth = "60%";
return (
<Stack
h="100%"
@@ -304,20 +305,44 @@ const CompactTimer = ({
justify="center"
gap="xs"
p="xs"
style={{ ...attentionStyle, overflow: "hidden" }}
style={{ ...attentionStyle, overflow: "hidden", position: "relative" }}
>
<Group gap="xs" wrap="nowrap">
{showPhaseBadge && (
<Badge variant="light" size="xs" maw="70%" aria-live="polite">
{phaseLabel}
</Badge>
)}
{showCompletedFocus && (
<Text size="xs" c="dimmed">
{t("compact.completedFocus", { count: runtime.completedFocusSessions })}
</Text>
)}
</Group>
<Badge
variant="light"
size="xs"
h="auto"
maw={phaseBadgeMaxWidth}
py="calc(var(--mantine-spacing-xs) / 2)"
aria-live="polite"
style={{
insetInlineStart: "var(--mantine-spacing-xs)",
position: "absolute",
top: "var(--mantine-spacing-xs)",
}}
styles={{
label: {
lineHeight: "var(--mantine-line-height-xs)",
overflow: "visible",
textOverflow: "clip",
whiteSpace: "normal",
},
}}
>
{phaseLabel}
</Badge>
{showCompletedFocus && (
<Text
size="xs"
c="dimmed"
style={{
insetInlineEnd: "var(--mantine-spacing-xs)",
position: "absolute",
top: "var(--mantine-spacing-xs)",
}}
>
{t("compact.completedFocus", { count: runtime.completedFocusSessions })}
</Text>
)}
<Text component="time" fz="xl" fw={700} lh={1} style={{ fontVariantNumeric: "tabular-nums" }}>
{formatTimerDuration(remainingMs)}
</Text>
+2 -1
View File
@@ -101,7 +101,8 @@ export const AdvancedWeather = ({ height, options, weather, width }: AdvancedWea
const tCommon = useScopedI18n("common");
const layout = getAdvancedWeatherLayout(width, height);
const today = weather.daily[0];
const nextHour = weather.hourly[0];
const observedAt = Date.parse(weather.current.observedAt);
const nextHour = weather.hourly.find((hour) => Date.parse(hour.observedAt) > observedAt) ?? weather.hourly[0];
const hourly = getHourlyChartData(weather, options.isFormatFahrenheit);
const speedUnit = options.useImperialSpeed
? tCommon("unit.speed.milesPerHour")
@@ -24,7 +24,7 @@
}
.locationSummary {
max-width: min(100%, 320px);
max-width: min(100%, 20rem);
}
.metricCard,
@@ -32,7 +32,7 @@
.detailMetric,
.solarDetails {
background: color-mix(in srgb, var(--mantine-color-body) 72%, transparent);
border: 1px solid color-mix(in srgb, var(--mantine-color-default-border) 72%, transparent);
border: 0.0625rem solid color-mix(in srgb, var(--mantine-color-default-border) 72%, transparent);
}
.dailyCard {
@@ -48,7 +48,7 @@
}
.dailyDetailsDropdown {
width: min(390px, calc(100vw - 32px));
width: min(24.375rem, calc(100vw - 2rem));
padding: var(--mantine-spacing-sm);
}
@@ -58,7 +58,7 @@
.dailyDetailsTemperature {
flex-shrink: 0;
max-width: 132px;
max-width: 8.25rem;
}
.dailyCardFacts {
@@ -88,8 +88,8 @@
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 24px;
min-height: 24px;
min-width: 1.5rem;
min-height: 1.5rem;
}
.forecastButton,
@@ -106,8 +106,8 @@
.detailsButton:focus-visible,
.forecastButton:focus-visible,
.dailyCardButton:focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
outline: 0.125rem solid var(--mantine-primary-color-filled);
outline-offset: 0.125rem;
}
.errorIndicator {
@@ -118,8 +118,8 @@
.detailsButton,
.forecastButton,
.dailyCardButton {
min-width: 44px;
min-height: 44px;
min-width: 2.75rem;
min-height: 2.75rem;
}
}
@@ -134,6 +134,6 @@
.dailyCard,
.detailMetric,
.solarDetails {
border: 1px solid CanvasText;
border: 0.0625rem solid CanvasText;
}
}
+3 -3
View File
@@ -92,13 +92,13 @@ export const WeatherDescription = ({
const name = getWeatherKind(weatherCode);
if (weatherOnly) {
return <Text fz="16px">{t(`kind.${name}`)}</Text>;
return <Text fz="md">{t(`kind.${name}`)}</Text>;
}
return (
<Stack align="center" gap="0">
<Text fz="24px">{formatWeatherDate(time, locale, dateFormat)}</Text>
<Text fz="16px">{t(`kind.${name}`)}</Text>
<Text fz="xl">{formatWeatherDate(time, locale, dateFormat)}</Text>
<Text fz="md">{t(`kind.${name}`)}</Text>
<List>
<List.Item
icon={<IconTemperaturePlus size="var(--mantine-font-size-sm)" />}