Skip to content

Handle multi day event start end time #265

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

Merged
rumesh-di merged 2 commits into from
Jan 14, 2026
Merged

Handle multi day event start end time #265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a2a42
handle multi day event start end time
rumesh-di Jan 14, 2026
4a4426a
modify design
rumesh-di Jan 14, 2026
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
76 changes: 54 additions & 22 deletions packages/web-shared/components/ContentSingle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ const infoDivider = (
</BodyText>
);

const timeDivider = (
<BodyText color="text.tertiary" mx="xs" display={{ xs: 'none', sm: 'block' }}>
-
</BodyText>
);

const CalendarIconWrapper = styled.span`
margin-right: ${({ theme }) => theme.space.xxs};
display: inline-flex;
Expand All @@ -56,7 +62,26 @@ const FlexBodyText = styled(BodyText)`
align-items: center;
`;

function CalendarData({ start, end, location }) {
function CalendarData({ start, end, startTime, endTime, location }) {
const [formatEndDateTime, setFormatEndDateTime] = useState(null);
const [formatStartDateTime, setFormatStartDateTime] = useState(null);

useEffect(() => {
if (start === end) {
setFormatEndDateTime(endTime);
} else {
setFormatEndDateTime(end + ' | ' + endTime);
}
}, [start, end, endTime]);

useEffect(() => {
if (startTime) {
setFormatStartDateTime(start + ' | ' + startTime);
} else {
setFormatEndDateTime(start);
}
}, [start, startTime]);

return (
<>
{location ? (
Expand All @@ -65,19 +90,23 @@ function CalendarData({ start, end, location }) {
{location}
</FlexBodyText>
) : null}
{start && location ? infoDivider : null}
{start ? (
<FlexBodyText color="text.secondary" mb={'xxs'}>
<CalendarIcon name="calendar" />
{start}
</FlexBodyText>
) : null}
{end && start ? infoDivider : null}
{end ? (
<FlexBodyText color="text.secondary" mb={'xxs'}>
<CalendarIcon name="clock" />
{end}
</FlexBodyText>
{(formatStartDateTime || formatEndDateTime) && location ? infoDivider : null}
{formatStartDateTime || formatEndDateTime ? (
<Box display="flex" flexDirection={'row'} alignItems="flex-start" width="100%">
{formatStartDateTime ? (
<FlexBodyText color="text.secondary" mb={'xxs'}>
<CalendarIcon name="calendar" />
{formatStartDateTime}
</FlexBodyText>
) : null}
{formatStartDateTime && formatEndDateTime ? timeDivider : null}
{formatEndDateTime ? (
<FlexBodyText color="text.secondary" mb={'xxs'}>
<CalendarIcon name="clock" />
{formatEndDateTime}
</FlexBodyText>
) : null}
</Box>
) : null}
</>
);
Expand Down Expand Up @@ -184,13 +213,14 @@ function ContentSingle(props = {}) {
const formattedStartDate = props?.data?.start
? format(parseISO(props.data.start), 'eee, MMMM do, yyyy')
: null;
const formattedStartToEnd =
props?.data?.start && props?.data?.end
? `${format(parseISO(props.data.start), 'hh:mm a')} — ${format(
parseISO(props.data.end),
'hh:mm a'
)}`
: null;
const formattedStartTime = props?.data?.start
? format(parseISO(props.data.start), 'hh:mm a')
: null;
const formattedEndDate = props?.data?.end
? format(parseISO(props.data.end), 'eee, MMMM do, yyyy')
: null;
const formattedEndTime = props?.data?.end ? format(parseISO(props.data.end), 'hh:mm a') : null;

const handleActionPress = (item) => {
if (idFromParams !== getURLFromType(item)) {
navigate({
Expand Down Expand Up @@ -283,7 +313,9 @@ function ContentSingle(props = {}) {

<CalendarData
start={formattedStartDate}
end={formattedStartToEnd}
end={formattedEndDate}
startTime={formattedStartTime}
endTime={formattedEndTime}
location={props?.data?.location}
/>
</Box>
Expand Down
Loading