jingrow/gantt
1
0
Fork 0
Code Pull Requests Activity

fix: today highlight bug

Browse Source
This commit is contained in:
Safwan Samsudeen 2024-09-11 20:40:08 +05:30
parent 0074a092a5
commit f8d77b2a73
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/date_utils.js
View File

@ -25,7 +25,6 @@ export default {
parse_duration(duration) { parse_duration(duration) {
const regex = /([0-9]+)(y|m|d|h|min|s|ms)/gm; const regex = /([0-9]+)(y|m|d|h|min|s|ms)/gm;
const matches = regex.exec(duration); const matches = regex.exec(duration);
console.log(matches);
if (matches !== null) { if (matches !== null) {
if (matches[2] === 'y') { if (matches[2] === 'y') {
return { duration: parseInt(matches[1]), scale: `year` }; return { duration: parseInt(matches[1]), scale: `year` };

17
src/index.js
View File

@ -516,7 +516,6 @@ export default class Gantt {
const { left, y } = this.$header.getBoundingClientRect(); const { left, y } = this.$header.getBoundingClientRect();
// Check if the button is scrolled out of the container vertically // Check if the button is scrolled out of the container vertically
console.log('heyy');
if ( if (
buttonRect.top < containerRect.top || buttonRect.top < containerRect.top ||
buttonRect.bottom > containerRect.bottom buttonRect.bottom > containerRect.bottom
@ -640,12 +639,18 @@ export default class Gantt {
} }
} }
//compute the horizontal x distance /**
* Compute the horizontal x-axis distance and associated date for the current date and view.
*
* @returns Object containing the x-axis distance and date of the current date, or null if the current date is out of the gantt range.
*/
computeGridHighlightDimensions(view_mode) { computeGridHighlightDimensions(view_mode) {
const todayDate = new Date();
if (todayDate < this.gantt_start || todayDate > this.gantt_end) return null;
let x = this.options.column_width / 2; let x = this.options.column_width / 2;
if (this.view_is(VIEW_MODE.DAY)) { if (this.view_is(VIEW_MODE.DAY)) {
let today = date_utils.today();
return { return {
x: x:
x + x +
@ -689,9 +694,9 @@ export default class Gantt {
this.view_is(VIEW_MODE.YEAR) this.view_is(VIEW_MODE.YEAR)
) { ) {
// Used as we must find the _end_ of session if view is not Day // Used as we must find the _end_ of session if view is not Day
const { x: left, date } = this.computeGridHighlightDimensions( const highlightDimensions = this.computeGridHighlightDimensions(this.options.view_mode);
this.options.view_mode, if (!highlightDimensions) return;
); const { x: left, date } = highlightDimensions;
if (!this.dates.find((d) => d.getTime() == date.getTime())) return; if (!this.dates.find((d) => d.getTime() == date.getTime())) return;
const top = this.options.header_height + this.options.padding / 2; const top = this.options.header_height + this.options.padding / 2;
const height = const height =