Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions src/modules/TimeScale.js
Original file line number Diff line number Diff line change
Expand Up @@ -659,10 +659,7 @@ class TimeScale {
}

let year = this._getYear(currentYear, month, yrCounter)
pos =
hour === 0 && i === 0
? remainingMins * minutesWidthOnXAxis
: 60 * minutesWidthOnXAxis + pos
pos = 60 * minutesWidthOnXAxis + pos
let val = hour === 0 ? date : hour
this.timeScaleArray.push({
position: pos,
Expand Down
28 changes: 28 additions & 0 deletions tests/unit/timescale.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,34 @@ describe('Generate TimeScale', () => {
})
])
})

it('should generate an hour timescale with no overlapping ticks', () => {
const chart = createChart('line', [
{
data: [0, 1]
}
])
const timeScale = new TimeScale(chart)
timeScale.generateHourScale({
firstVal: {
minSecond: 0,
minMinute: 30,
minHour: 22
},
currentDate: 22,
currentMonth: 11,
currentYear: 2022,
minutesWidthOnXAxis: 0.4,
numberOfHours: 24
})

const generatedScale = timeScale.timeScaleArray
for (let i = 0; i < generatedScale.length - 1; i++) {
expect(generatedScale[i].position).not.toEqual(
generatedScale[i + 1].position
)
}
})
})

describe('createRawDateString', () => {
Expand Down