diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/BaseLine.vue | 4 | ||||
| -rw-r--r-- | src/components/TimeLine.vue | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/components/BaseLine.vue b/src/components/BaseLine.vue index e2cf7c8..82507c1 100644 --- a/src/components/BaseLine.vue +++ b/src/components/BaseLine.vue @@ -81,8 +81,8 @@ function spanStyles(range: TimelineRange){ let styles: Record<string,string>; let availLen = props.vert ? height.value : width.value; // Determine positions in full timeline - let startFrac = (range.startYear - MIN_DATE.year) / (MAX_DATE.year - MIN_DATE.year); - let lenFrac = (range.endYear - range.startYear) / (MAX_DATE.year - MIN_DATE.year); + let startFrac = (range.start.year - MIN_DATE.year) / (MAX_DATE.year - MIN_DATE.year); + let lenFrac = (range.end.year - range.start.year) / (MAX_DATE.year - MIN_DATE.year); let startPx = Math.max(0, availLen * startFrac); // Prevent negatives due to end-padding let lenPx = Math.min(availLen - startPx, availLen * lenFrac); lenPx = Math.max(1, lenPx); // Prevent zero length diff --git a/src/components/TimeLine.vue b/src/components/TimeLine.vue index d8978e4..a99b05e 100644 --- a/src/components/TimeLine.vue +++ b/src/components/TimeLine.vue @@ -599,7 +599,7 @@ function onPointerMove(evt: PointerEvent){ } function onPointerUp(evt: PointerEvent){ // Ignore if dragging between div elements - if (evt.relatedTarget != null && rootRef.value.contains(evt.relatedTarget)){ + if (evt.relatedTarget != null && rootRef.value!.contains(evt.relatedTarget as HTMLElement)){ return; } // Remove from event cache @@ -634,13 +634,13 @@ function onShiftWheel(evt: WheelEvent){ // For bound-change signalling watch(startDate, () => { - let startYear = startDate.value.year; - let endYear = endDate.value.year; + let start = startDate.value.clone(); + let end = endDate.value.clone(); if (scale.value != MONTH_SCALE && scale.value != DAY_SCALE){ // Possibly incorporate offsets - startYear -= startOffset.value * scale.value; - endYear += endOffset.value * scale.value; + stepDate(start, 1, {forward: false, count: Math.floor(startOffset.value * scale.value)}); + stepDate(end, 1, {count: Math.floor(endOffset.value * scale.value)}); } - emit('range-chg', [startYear, endYear]); + emit('range-chg', [start, end]); }); // For skipping transitions on startup (and on horz/vert swap) |