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

[TimelineScale]: timeline scale custom height. #2618

Merged
merged 4 commits into from
Nov 7, 2024
Merged

[TimelineScale]: timeline scale custom height. #2618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c1e76d
[TimelineScale]: draft version.
Nov 6, 2024
acd8edb
[TimelineScale]: fixed years animation.
Nov 7, 2024
0c3a85b
Merge branch 'feature/rc-version' into fix/timeline-scale-custom-height
Nov 7, 2024
0de7ca8
[TimelineScale]: fixed height.
Nov 7, 2024
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
3 changes: 0 additions & 3 deletions uui-timeline/src/TimelineScale.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ canvas {

.timelineHeader {
position: relative;
height: 61px;
background-color: #FFF;
border-top: 1px solid #EEE; // temp
}
Expand All @@ -23,11 +22,9 @@ canvas {
.arrow {
display: inline-block;
width: 36px;
height: 60px;
position: absolute;
text-align: center;
vertical-align: middle;
line-height: 60px;
margin: auto;
color: rgba(102, 102, 102, 0.7);
cursor: pointer;
Expand Down
13 changes: 9 additions & 4 deletions uui-timeline/src/TimelineScale.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ export function TimelineScale({
...props
}: TimelineScaleProps) {
const [isMouseDown, setIsMouseDown] = useState(false);

const canvasHeight = props.canvasHeight ?? 60;

const handleWindowMouseUp = useCallback(() => {
if (isMouseDown) {
setIsMouseDown(false);
Expand Down Expand Up @@ -211,6 +212,10 @@ export function TimelineScale({
return (
<div
className={ cx(styles.arrow, direction == 'left' ? styles.arrowLeft : styles.arrowRight) }
style={ {
height: `${canvasHeight}px`,
lineHeight: `${canvasHeight}px`,
} }
onClick={ handleClick }
>
{(props.renderArrowIcon ?? renderArrowIcon)(direction)}
Expand All @@ -219,16 +224,15 @@ export function TimelineScale({
};

const draw = (context: CanvasRenderingContext2D, t: TimelineTransform) => {
const canvasHeight = 60;
context.clearRect(0, 0, t.widthMs, canvasHeight);

const fonts = { currentPeriodFont, periodFont, meridiemFont };
const commonProps = {
context,
timelineTransform: t,
periodTextColor,
canvasHeight,
cellBackgroundColor,
canvasHeight,
...fonts,
};

Expand Down Expand Up @@ -279,14 +283,15 @@ export function TimelineScale({
}, [handleWindowMouseUp]);

return (
<div className={ styles.timelineHeader } style={ { width: timelineTransform.widthPx } }>
<div className={ styles.timelineHeader } style={ { width: timelineTransform.widthPx, height: `${canvasHeight}px` } }>
{!isMouseDown && (props.renderArrow ?? renderArrow)('left')}
{!isMouseDown && (props.renderArrow ?? renderArrow)('right')}
<TimelineCanvas
className={ isMouseDown ? styles.timelineScaleGrabbing : styles.timelineScale }
onMouseDown={ isDraggable && handleMouseDown }
onWheel={ isScaleChangeOnWheel && handleWheel }
draw={ props.draw ?? draw }
canvasHeight={ canvasHeight }
timelineController={ timelineController }
/>
</div>
Expand Down
54 changes: 43 additions & 11 deletions uui-timeline/src/draw/scale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
CanvasDrawWeekendHoursCell,
CanvasDrawBottomMonthProps,
CanvasDrawTopMonthProps,
CanvasDrawProps,
} from './types';

const defaultFonts = {
Expand All @@ -41,12 +42,9 @@ const defaultWidth = {
todayLineHeight: 4,
};

const moveAmount = 0.7;
const topLineMoveAmount = 0.8;

const isCurrentPeriod = (leftDate: Date, rightDate: Date) => new Date() >= leftDate && new Date() <= rightDate;

const getCanvasVerticalCenter = (canvasHeight: number) => canvasHeight / 2 - 1;
const getCanvasVerticalCenter = (canvasHeight: number) => canvasHeight / 2;
const getBottomCellY = (canvasHeight: number) => getCanvasVerticalCenter(canvasHeight);
const getTopMonth = (month: number) => months[month]?.toUpperCase() ?? '';
const getBottomMonth = (month: number) => months[month] ?? '';
Expand Down Expand Up @@ -130,13 +128,29 @@ const drawPeriod = (
context.restore();
};

const calculateTextLine = ({
context,
text,
canvasHeight,
line,
}: CanvasDrawProps & { canvasHeight: number, line: number, text: string }) => {
const { actualBoundingBoxAscent, actualBoundingBoxDescent } = context.measureText(text);
const headerTextHeight = Math.abs(actualBoundingBoxAscent) + Math.abs(actualBoundingBoxDescent);

const lineHeight = canvasHeight / 2;
const textCenter = lineHeight / 2;
const baseTextLine = textCenter + headerTextHeight / 2;
return baseTextLine + lineHeight * (line - 1);
};

const drawPeriodText = ({
context,
timelineTransform,
text,
x,
width,
line,
canvasHeight,
isCurPeriod,
textColor = defaultColors.periodTextColor,
superscript,
Expand All @@ -148,7 +162,8 @@ const drawPeriodText = ({
context.fillStyle = textColor;

const padding = 12;
const headerTextWidth = context.measureText(text).width;
const { width: headerTextWidth } = context.measureText(text);

const textWidth = headerTextWidth + padding * 2;
const center = x + width / 2;
let left = center - textWidth / 2;
Expand All @@ -175,16 +190,19 @@ const drawPeriodText = ({
}
}

context.fillText(text, left + padding, line * 24);
const textLine = calculateTextLine({ context, text, canvasHeight, line });

context.fillText(text, left + padding, textLine);

if (superscript) {
context.font = meridiemFont;
context.fillText(superscript, left + padding + headerTextWidth + (text.length === 1 ? 3 : 4), line * 24);
const superscriptTextLine = calculateTextLine({ context, text: superscript, canvasHeight, line });
context.fillText(superscript, left + padding + headerTextWidth + (text.length === 1 ? 3 : 4), superscriptTextLine);
}
};

const getBottomLine = (visibility: number) => 2 + (1 - visibility) * moveAmount;
const getTopLine = (visibility: number) => visibility * topLineMoveAmount;
const getBottomLine = (visibility: number) => 2 + (1 - visibility) * 1;
const getTopLine = (visibility: number) => visibility * 1;

const drawMinutes = ({
context,
Expand Down Expand Up @@ -214,6 +232,7 @@ const drawMinutes = ({
line: getBottomLine(visibility),
isCurPeriod,
textColor: periodTextColor,
canvasHeight,
...restProps,
});
drawBottomGridLine({ context, canvasHeight, scaleBar: w, width: cellBorderWidth, color: cellBorderColor });
Expand Down Expand Up @@ -333,6 +352,7 @@ const drawRemainingHours = ({
isCurPeriod,
textColor: periodTextColor,
superscript,
canvasHeight,
...restProps,
});
});
Expand Down Expand Up @@ -375,6 +395,7 @@ const drawHours = ({
isCurPeriod,
textColor: periodTextColor,
superscript,
canvasHeight,
...restProps,
});
});
Expand Down Expand Up @@ -427,6 +448,7 @@ const drawTopDays = ({
line: getTopLine(visibility),
isCurPeriod,
textColor,
canvasHeight,
...restProps,
});
(customDrawToday ?? drawToday)({ context, scaleBar: w, todayLineColor, todayLineHeight, canvasHeight });
Expand Down Expand Up @@ -471,6 +493,7 @@ const drawDays = ({
width: w.right - w.left,
line: getBottomLine(visibility),
isCurPeriod,
canvasHeight,
...restProps,
});
});
Expand Down Expand Up @@ -508,6 +531,7 @@ const drawTopMonths = ({
line: getTopLine(visibility),
isCurPeriod,
textColor: periodTextColor,
canvasHeight,
...restProps,
});
});
Expand Down Expand Up @@ -544,6 +568,7 @@ const drawWeeks = ({
line: getBottomLine(visibility),
isCurPeriod,
textColor: periodTextColor,
canvasHeight,
...restProps,
});
});
Expand Down Expand Up @@ -578,6 +603,7 @@ const drawBottomMonths = ({
line: getBottomLine(visibility),
isCurPeriod,
textColor: periodTextColor,
canvasHeight,
...restProps,
});
(customDrawToday ?? drawToday)({ context, scaleBar: w, todayLineColor, todayLineHeight, canvasHeight });
Expand Down Expand Up @@ -605,8 +631,13 @@ const drawYears = ({
timelineTransform.getVisibleYears().forEach((w) => {
const text = w.leftDate.getFullYear().toString().toUpperCase();
const isCurPeriod = isCurrentPeriod(w.leftDate, w.rightDate);
const textMoveAmount = isBottom ? moveAmount : topLineMoveAmount;
const line = (visibility + isBottom) * textMoveAmount;

const bottomAnimationThreshold = 0.4;
const bottomTextMoveMount = 0.74;
const textMoveAmount = isBottom > bottomAnimationThreshold ? bottomTextMoveMount : 1;
let line = (visibility + isBottom) * textMoveAmount;
line = isBottom < bottomAnimationThreshold ? Math.min(line, 1) : line;

if (isBottom) {
const y = canvasHeight;
timelinePrimitives.drawHorizontalLine({ context, x1: w.left, x2: w.right + 1, y: y - 1, color: cellBorderColor, width: cellBorderWidth });
Expand All @@ -631,6 +662,7 @@ const drawYears = ({
line,
isCurPeriod,
textColor: periodTextColor,
canvasHeight,
...restProps,
});
});
Expand Down