Skip to content

Commit

Permalink
v5.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
novykh committed Jul 18, 2024
1 parent cea06b2 commit feffc81
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netdata/charts",
"version": "5.3.8",
"version": "5.3.9",
"description": "Netdata frontend SDK and chart utilities",
"main": "dist/index.js",
"module": "dist/es6/index.js",
Expand Down
25 changes: 15 additions & 10 deletions src/chartLibraries/dygraph/hoverX.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import getOffsets from "@/helpers/eventOffset"

export default chartUI => {
const findClosest = (event, points) => {
if (!Array.isArray(points)) return {}

const { offsetY } = event
const { offsetX, offsetY } = getOffsets(event)

if (offsetY > chartUI.getDygraph().getArea().h - 10) return { seriesName: "ANNOTATIONS" }
if (offsetY < 15) return { seriesName: "ANOMALY_RATE" }

if (chartUI.chart.getAttribute("chartType"))
return chartUI.getDygraph().findStackedPoint(event.offsetX, event.offsetY)
return chartUI.getDygraph().findStackedPoint(offsetX, offsetY)

return chartUI.getDygraph().findClosestPoint(event.offsetX, event.offsetY)
return chartUI.getDygraph().findClosestPoint(offsetX, offsetY)
}

let lastX
Expand Down Expand Up @@ -39,8 +41,9 @@ export default chartUI => {
lastPoints = points
lastTimestamp = x

lastX = event.offsetX
lastY = event.offsetY
const offsets = getOffsets(event)
lastX = offsets.offsetX
lastY = offsets.offsetY

const dimensionId = getDimension(event, points)

Expand All @@ -56,8 +59,9 @@ export default chartUI => {
lastPoints = points
lastTimestamp = x

lastX = event.offsetX
lastY = event.offsetY
const offsets = getOffsets(event)
lastX = offsets.offsetX
lastY = offsets.offsetY

const dimensionId = getDimension(event, points)

Expand All @@ -66,10 +70,11 @@ export default chartUI => {
}

const mousemove = event => {
if (Math.abs(event.offsetX - lastX) < 5 && Math.abs(event.offsetY - lastY) < 5) return
const { offsetX, offsetY } = getOffsets(event)
if (Math.abs(offsetX - lastX) < 5 && Math.abs(offsetY - lastY) < 5) return

lastX = event.offsetX
lastY = event.offsetY
lastX = offsetX
lastY = offsetY

const dimensionId = getDimension(event, lastPoints)

Expand Down
5 changes: 5 additions & 0 deletions src/helpers/eventOffset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export default e => {
const target = e.target || e.srcElement
const rect = target.getBoundingClientRect()
return { offsetX: e.clientX - rect.left, offsetY: e.clientY - rect.top }
}

0 comments on commit feffc81

Please sign in to comment.