Skip to content

Shows the tooltip date time on DateTImeAccurate component #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Shows the tooltip date time on DateTImeAccurate component #2021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 74 additions & 47 deletions apps/webapp/app/components/primitives/DateTime.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,12 @@ export const DateTime = ({
}, []);

const tooltipContent = (
<div className="flex flex-col gap-1">
<div className="flex flex-col gap-2.5 pb-1">
{timeZone && timeZone !== "UTC" && (
<DateTimeTooltipContent
title={timeZone}
dateTime={formatDateTime(realDate, timeZone, locales, true, true)}
isoDateTime={formatDateTimeISO(realDate, timeZone)}
icon={<GlobeAmericasIcon className="size-4 text-purple-500" />}
/>
)}
<DateTimeTooltipContent
title="UTC"
dateTime={formatDateTime(realDate, "UTC", locales, true, true)}
isoDateTime={formatDateTimeISO(realDate, "UTC")}
icon={<GlobeAltIcon className="size-4 text-blue-500" />}
/>
<DateTimeTooltipContent
title="Local"
dateTime={formatDateTime(realDate, localTimeZone, locales, true, true)}
isoDateTime={formatDateTimeISO(realDate, localTimeZone)}
icon={<Laptop className="size-4 text-green-500" />}
/>
</div>
</div>
<TooltipContent
realDate={realDate}
timeZone={timeZone}
localTimeZone={localTimeZone}
locales={locales}
/>
);

const formattedDateTime = (
Expand Down Expand Up @@ -215,42 +197,48 @@ export const DateTimeAccurate = ({
date,
timeZone = "UTC",
previousDate = null,
showTooltip = true,
}: DateTimeProps) => {
const locales = useLocales();
const [localTimeZone, setLocalTimeZone] = useState<string>("UTC");
const realDate = typeof date === "string" ? new Date(date) : date;
const realPrevDate = previousDate
? typeof previousDate === "string"
? new Date(previousDate)
: previousDate
: null;

// Use the new Smart formatting if previousDate is provided
const initialFormattedDateTime = realPrevDate
? isSameDay(realDate, realPrevDate)
? formatTimeOnly(realDate, timeZone, locales)
: formatDateTimeAccurate(realDate, timeZone, locales)
: formatDateTimeAccurate(realDate, timeZone, locales);

const [formattedDateTime, setFormattedDateTime] = useState<string>(initialFormattedDateTime);

useEffect(() => {
const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
const userTimeZone = resolvedOptions.timeZone;
setLocalTimeZone(resolvedOptions.timeZone);
}, []);

if (realPrevDate) {
// Smart formatting based on whether date changed
setFormattedDateTime(
isSameDay(realDate, realPrevDate)
? formatTimeOnly(realDate, userTimeZone, locales)
: formatDateTimeAccurate(realDate, userTimeZone, locales)
);
} else {
// Default behavior when no previous date
setFormattedDateTime(formatDateTimeAccurate(realDate, userTimeZone, locales));
}
}, [locales, realDate, realPrevDate]);
// Smart formatting based on whether date changed
const formattedDateTime = realPrevDate
? isSameDay(realDate, realPrevDate)
? formatTimeOnly(realDate, localTimeZone, locales)
: formatDateTimeAccurate(realDate, localTimeZone, locales)
: formatDateTimeAccurate(realDate, localTimeZone, locales);

return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;
if (!showTooltip)
return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;

const tooltipContent = (
<TooltipContent
realDate={realDate}
timeZone={timeZone}
localTimeZone={localTimeZone}
locales={locales}
/>
);

return (
<SimpleTooltip
button={<Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>}
content={tooltipContent}
side="right"
/>
);
};

function formatDateTimeAccurate(date: Date, timeZone: string, locales: string[]): string {
Expand Down Expand Up @@ -333,3 +321,42 @@ function DateTimeTooltipContent({
</div>
);
}

function TooltipContent({
realDate,
timeZone,
localTimeZone,
locales,
}: {
realDate: Date;
timeZone?: string;
localTimeZone: string;
locales: string[];
}) {
return (
<div className="flex flex-col gap-1">
<div className="flex flex-col gap-2.5 pb-1">
{timeZone && timeZone !== "UTC" && (
<DateTimeTooltipContent
title={timeZone}
dateTime={formatDateTime(realDate, timeZone, locales, true, true)}
isoDateTime={formatDateTimeISO(realDate, timeZone)}
icon={<GlobeAmericasIcon className="size-4 text-purple-500" />}
/>
)}
<DateTimeTooltipContent
title="UTC"
dateTime={formatDateTime(realDate, "UTC", locales, true, true)}
isoDateTime={formatDateTimeISO(realDate, "UTC")}
icon={<GlobeAltIcon className="size-4 text-blue-500" />}
/>
<DateTimeTooltipContent
title="Local"
dateTime={formatDateTime(realDate, localTimeZone, locales, true, true)}
isoDateTime={formatDateTimeISO(realDate, localTimeZone)}
icon={<Laptop className="size-4 text-green-500" />}
/>
</div>
</div>
);
}
Loading