From 2c6b4b4c5209c1e690758791cc9966be70678ffe Mon Sep 17 00:00:00 2001 From: Ajay Bura <32841439+ajbura@users.noreply.github.com> Date: Sat, 23 Mar 2024 20:55:03 +0530 Subject: [PATCH] allow Text props in Time component --- src/app/components/message/Time.tsx | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/app/components/message/Time.tsx b/src/app/components/message/Time.tsx index de11cf89..a5126015 100644 --- a/src/app/components/message/Time.tsx +++ b/src/app/components/message/Time.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { ComponentProps } from 'react'; import { Text, as } from 'folds'; import { timeDayMonYear, timeHourMinute, today, yesterday } from '../../utils/time'; @@ -7,21 +7,23 @@ export type TimeProps = { ts: number; }; -export const Time = as<'span', TimeProps>(({ compact, ts, ...props }, ref) => { - let time = ''; - if (compact) { - time = timeHourMinute(ts); - } else if (today(ts)) { - time = timeHourMinute(ts); - } else if (yesterday(ts)) { - time = `Yesterday ${timeHourMinute(ts)}`; - } else { - time = `${timeDayMonYear(ts)} ${timeHourMinute(ts)}`; - } +export const Time = as<'span', TimeProps & ComponentProps>( + ({ compact, ts, ...props }, ref) => { + let time = ''; + if (compact) { + time = timeHourMinute(ts); + } else if (today(ts)) { + time = timeHourMinute(ts); + } else if (yesterday(ts)) { + time = `Yesterday ${timeHourMinute(ts)}`; + } else { + time = `${timeDayMonYear(ts)} ${timeHourMinute(ts)}`; + } - return ( - - {time} - - ); -}); + return ( + + {time} + + ); + } +);