Skip to content
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

Jump to bottom

fix: fix ProjectTimeline style with no single scrollbar. #20

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: fix ProjectTimeline style with no single scrollbar. #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
915b6f4
fix: fix ProjectTimeline style with no single scrollbar.
rmdwe Apr 28, 2023
b914623
refactor: use grid to element to draw today vertical line.
rmdwe May 3, 2023
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
44 changes: 27 additions & 17 deletions src/components/ProjectTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ const Timeline = (props: SystemProps) => {
borderRadius="20px"
justifyContent="space-between"
alignItems="center"
zIndex={-1}
>
<Flex ml={2} flexDirection="column" alignItems="start">
<Text fontSize="md" noOfLines={1}>
Expand Down Expand Up @@ -187,8 +188,7 @@ const Timeline = (props: SystemProps) => {
position: 'absolute',
left: '11px',
top: 0,
// height: cards.length * 42 + 28,
height: '400px',
height: '32px',
width: '2px',
backgroundColor: 'red.500',
zIndex: -1,
Expand All @@ -201,23 +201,37 @@ const Timeline = (props: SystemProps) => {
return <Center>{dayNumber}</Center>;
};

const renderWeekendGrids = (displayDates: string[]) => {
const weekendBgItems: ReactNode[] = [];
const renderDayGrids = (displayDates: string[]) => {
const dayGridBgItems: ReactNode[] = [];
displayDates.forEach((date, index) => {
const isToday = moment(date).isSame(moment(), 'day');
if (moment(date).isoWeekday() === 6 || moment(date).isoWeekday() === 7)
weekendBgItems.push(
dayGridBgItems.push(
<GridItem
key={date}
colStart={index + 1}
colEnd={index + 2}
rowStart={1}
rowEnd={cards.length + 1}
backgroundColor={weekendGridBgColor}
zIndex="-3"
/>
);
if (isToday)
dayGridBgItems.push(
<GridItem
key={date}
colStart={index + 1}
rowStart={1}
rowEnd={cards.length + 1}
zIndex="-3"
display="flex"
justifyContent="center"
>
<Box borderRight="2px solid" borderColor="red.500"></Box>
</GridItem>
);
});
return weekendBgItems;
return dayGridBgItems;
};

const renderMonthIndicatorGrids = (displayDates: string[]) => {
Expand All @@ -233,7 +247,7 @@ const Timeline = (props: SystemProps) => {
key={monthYearStr}
rowStart={renderConfig.monthIndicatorRowNum}
colStart={index + 1}
colSpan={3}
colSpan={31}
h="40px"
>
<Flex
Expand All @@ -242,6 +256,8 @@ const Timeline = (props: SystemProps) => {
justifyContent="flex-start"
ml="12px"
fontWeight="bold"
flex={1}
zIndex={3}
_before={{
content: '""',
position: 'absolute',
Expand Down Expand Up @@ -317,23 +333,17 @@ const Timeline = (props: SystemProps) => {
>
Delivery Timeline
</Heading>
<Box w={displayDates.length * renderConfig.gridWidth}>
<Grid
w={displayDates.length * renderConfig.gridWidth}
templateColumns={`repeat(${displayDates.length}, 1fr)`}
>
<Box w={displayDates.length * renderConfig.gridWidth} overflowY="scroll">
<Grid templateColumns={`repeat(${displayDates.length}, 1fr)`} position="sticky" top={0}>
{renderMonthIndicatorGrids(displayDates)}
{renderDateIndicatorGrids(displayDates)}
</Grid>
</Box>
<Box flex="1" w={displayDates.length * renderConfig.gridWidth} overflowY="scroll">
{cards.length > 0 ? (
<Grid
h={cards.length * renderConfig.gridWidth}
w={displayDates.length * renderConfig.gridWidth}
templateColumns={`repeat(${displayDates.length}, 1fr)`}
>
{renderWeekendGrids(displayDates)}
{renderDayGrids(displayDates)}
{lines.map((cards, index) => renderTimeline(cards, index))}
</Grid>
) : (
Expand Down