fix(clock): defer live time until mount
This commit is contained in:
1 parent
a87a16edb1
commit
965d130ce7
1 file changed
+4
-7
@@ -24,6 +24,7 @@ export default function ClockWidget({ options, width }: WidgetComponentProps<"cl
|
|||||||
const customDateFormat = options.customDateFormat;
|
const customDateFormat = options.customDateFormat;
|
||||||
const timezone = options.useCustomTimezone ? options.timezone : Intl.DateTimeFormat().resolvedOptions().timeZone;
|
const timezone = options.useCustomTimezone ? options.timezone : Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||||
const time = useCurrentTime(options);
|
const time = useCurrentTime(options);
|
||||||
|
const zonedTime = time === null ? null : dayjs(time).tz(timezone);
|
||||||
|
|
||||||
const sizing = width < 128 ? "xs" : width < 196 ? "sm" : "md";
|
const sizing = width < 128 ? "xs" : width < 196 ? "sm" : "md";
|
||||||
const showWeatherCorner = options.showWeather && sizing !== "xs";
|
const showWeatherCorner = options.showWeather && sizing !== "xs";
|
||||||
@@ -44,15 +45,11 @@ export default function ClockWidget({ options, width }: WidgetComponentProps<"cl
|
|||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
<Title className="clock-time-text" fw={700} order={sizing === "md" ? 2 : sizing === "sm" ? 4 : 6} lh="1">
|
<Title className="clock-time-text" fw={700} order={sizing === "md" ? 2 : sizing === "sm" ? 4 : 6} lh="1">
|
||||||
{options.customTimeFormat
|
{zonedTime === null ? "--:--" : zonedTime.format(options.customTimeFormat ? customTimeFormat : timeFormat)}
|
||||||
? dayjs(time).tz(timezone).format(customTimeFormat)
|
|
||||||
: dayjs(time).tz(timezone).format(timeFormat)}
|
|
||||||
</Title>
|
</Title>
|
||||||
{options.showDate && (
|
{options.showDate && (
|
||||||
<Text className="clock-date-text" size={sizing} lineClamp={1}>
|
<Text className="clock-date-text" size={sizing} lineClamp={1}>
|
||||||
{options.customDateFormat
|
{zonedTime?.format(options.customDateFormat ? customDateFormat : dateFormat)}
|
||||||
? dayjs(time).tz(timezone).format(customDateFormat)
|
|
||||||
: dayjs(time).tz(timezone).format(dateFormat)}
|
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
</Stack>
|
</Stack>
|
||||||
@@ -90,7 +87,7 @@ interface UseCurrentTimeProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const useCurrentTime = ({ showSeconds }: UseCurrentTimeProps) => {
|
const useCurrentTime = ({ showSeconds }: UseCurrentTimeProps) => {
|
||||||
const [time, setTime] = useState(() => new Date(0));
|
const [time, setTime] = useState<Date | null>(null);
|
||||||
const timeoutRef = useRef<NodeJS.Timeout>(null);
|
const timeoutRef = useRef<NodeJS.Timeout>(null);
|
||||||
const intervalRef = useRef<NodeJS.Timeout>(null);
|
const intervalRef = useRef<NodeJS.Timeout>(null);
|
||||||
const intervalMultiplier = useMemo(() => (showSeconds ? 1 : 60), [showSeconds]);
|
const intervalMultiplier = useMemo(() => (showSeconds ? 1 : 60), [showSeconds]);
|
||||||
|
|||||||
Reference in new issue
Block a user