scroll changes + hour view fix
This commit is contained in:
1 parent
84298ecda6
commit
0aed9cbe72
15 files changed
+13658
-35773
No files matched your search
@@ -241,16 +241,17 @@ export const Calendar: React.FC<CalendarProps> = ({
|
||||
{bottomValue}
|
||||
</text>
|
||||
);
|
||||
if (i === 0 || date.getDate() !== dates[i - 1].getDate()) {
|
||||
if (i !== 0 && date.getDate() !== dates[i - 1].getDate()) {
|
||||
const displayDate = dates[i - 1];
|
||||
const topValue = `${getLocalDayOfWeek(
|
||||
date,
|
||||
displayDate,
|
||||
locale,
|
||||
"long"
|
||||
)}, ${date.getDate()} ${getLocaleMonth(date, locale)}`;
|
||||
)}, ${displayDate.getDate()} ${getLocaleMonth(displayDate, locale)}`;
|
||||
const topPosition = (date.getHours() - 24) / 2;
|
||||
topValues.push(
|
||||
<TopPartOfCalendar
|
||||
key={topValue + date.getFullYear()}
|
||||
key={topValue + displayDate.getFullYear()}
|
||||
value={topValue}
|
||||
x1Line={columnWidth * i}
|
||||
y1Line={0}
|
||||
|
||||
@@ -183,6 +183,7 @@ export const Gantt: React.FunctionComponent<GanttProps> = ({
|
||||
viewDate,
|
||||
columnWidth,
|
||||
dateSetup.dates,
|
||||
dateSetup.viewMode,
|
||||
viewMode,
|
||||
currentViewDate,
|
||||
setCurrentViewDate,
|
||||
@@ -245,7 +246,7 @@ export const Gantt: React.FunctionComponent<GanttProps> = ({
|
||||
} else {
|
||||
setSvgContainerHeight(tasks.length * rowHeight + headerHeight);
|
||||
}
|
||||
}, [ganttHeight, tasks]);
|
||||
}, [ganttHeight, tasks, headerHeight, rowHeight]);
|
||||
|
||||
// scroll events
|
||||
useEffect(() => {
|
||||
@@ -287,20 +288,32 @@ export const Gantt: React.FunctionComponent<GanttProps> = ({
|
||||
wrapperRef.current.removeEventListener("wheel", handleWheel);
|
||||
}
|
||||
};
|
||||
}, [wrapperRef.current, scrollY, scrollX, ganttHeight, svgWidth, rtl]);
|
||||
}, [
|
||||
wrapperRef,
|
||||
scrollY,
|
||||
scrollX,
|
||||
ganttHeight,
|
||||
svgWidth,
|
||||
rtl,
|
||||
ganttFullHeight,
|
||||
]);
|
||||
|
||||
const handleScrollY = (event: SyntheticEvent<HTMLDivElement>) => {
|
||||
if (scrollY !== event.currentTarget.scrollTop && !ignoreScrollEvent) {
|
||||
setScrollY(event.currentTarget.scrollTop);
|
||||
setIgnoreScrollEvent(true);
|
||||
} else {
|
||||
setIgnoreScrollEvent(false);
|
||||
}
|
||||
setIgnoreScrollEvent(false);
|
||||
};
|
||||
|
||||
const handleScrollX = (event: SyntheticEvent<HTMLDivElement>) => {
|
||||
if (scrollX !== event.currentTarget.scrollLeft && !ignoreScrollEvent) {
|
||||
setScrollX(event.currentTarget.scrollLeft);
|
||||
setIgnoreScrollEvent(true);
|
||||
} else {
|
||||
setIgnoreScrollEvent(false);
|
||||
}
|
||||
setIgnoreScrollEvent(false);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -186,6 +186,10 @@ export const TaskGanttContent: React.FC<TaskGanttContentProps> = ({
|
||||
onDateChange,
|
||||
svg,
|
||||
isMoving,
|
||||
point,
|
||||
rtl,
|
||||
setFailedTask,
|
||||
setGanttEvent,
|
||||
]);
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,4 +1,32 @@
|
||||
.scroll {
|
||||
.scrollWrapper {
|
||||
overflow: auto;
|
||||
max-width: 100%;
|
||||
}
|
||||
.scrollWrapper::-webkit-scrollbar {
|
||||
width: 1.1rem;
|
||||
height: 1.1rem;
|
||||
}
|
||||
.scrollWrapper::-webkit-scrollbar-corner {
|
||||
background: transparent;
|
||||
}
|
||||
.scrollWrapper::-webkit-scrollbar-thumb {
|
||||
border: 6px solid transparent;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
background: var(--palette-black-alpha-20, rgba(0, 0, 0, 0.2));
|
||||
border-radius: 10px;
|
||||
background-clip: padding-box;
|
||||
}
|
||||
.scrollWrapper::-webkit-scrollbar-thumb:hover {
|
||||
border: 4px solid transparent;
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
background: var(--palette-black-alpha-30, rgba(0, 0, 0, 0.3));
|
||||
background-clip: padding-box;
|
||||
}
|
||||
@media only screen and (max-device-width: 1024px) and (-webkit-min-device-pixel-ratio: 2) {
|
||||
.scrollWrapper {
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
}
|
||||
.scroll {
|
||||
height: 1px;
|
||||
}
|
||||
@@ -24,11 +24,11 @@ export const HorizontalScroll: React.FC<{
|
||||
? `0px ${taskListWidth}px 0px 0px`
|
||||
: `0px 0px 0px ${taskListWidth}px`,
|
||||
}}
|
||||
className={styles.scroll}
|
||||
className={styles.scrollWrapper}
|
||||
onScroll={onScroll}
|
||||
ref={scrollRef}
|
||||
>
|
||||
<div style={{ width: svgWidth, height: 1 }} />
|
||||
<div style={{ width: svgWidth }} className={styles.scroll} />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -84,7 +84,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
|
||||
setRelatedX(newRelatedX);
|
||||
}
|
||||
}, [
|
||||
tooltipRef.current,
|
||||
tooltipRef,
|
||||
task,
|
||||
arrowIndent,
|
||||
scrollX,
|
||||
@@ -94,6 +94,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
|
||||
rowHeight,
|
||||
svgContainerHeight,
|
||||
svgContainerWidth,
|
||||
rtl,
|
||||
]);
|
||||
|
||||
return (
|
||||
|
||||
@@ -3,3 +3,23 @@
|
||||
width: 17px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.scroll::-webkit-scrollbar {
|
||||
width: 1.1rem;
|
||||
height: 1.1rem;
|
||||
}
|
||||
.scroll::-webkit-scrollbar-corner {
|
||||
background: transparent;
|
||||
}
|
||||
.scroll::-webkit-scrollbar-thumb {
|
||||
border: 6px solid transparent;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
background: var(--palette-black-alpha-20, rgba(0, 0, 0, 0.2));
|
||||
border-radius: 10px;
|
||||
background-clip: padding-box;
|
||||
}
|
||||
.scroll::-webkit-scrollbar-thumb:hover {
|
||||
border: 4px solid transparent;
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
background: var(--palette-black-alpha-30, rgba(0, 0, 0, 0.3));
|
||||
background-clip: padding-box;
|
||||
}
|
||||
Reference in new issue
Block a user