Merge pull request #5194 from Harsh3006/fix/reset-zoom-xaxis-labels

fix: x-axis labels not updating after zoom reset

Author: junedchhipa

src/modules/Toolbar.js

@@ -665,6 +665,9 @@ export default class Toolbar {
     charts.forEach((ch) => {
       const w = ch.w
 
+      // if user is hitting zoom reset button without zooming in first, then we should not fire zoom reset event
+      if (!w.interact.zoomed) return
+
       // forget lastXAxis min/max as reset button isn't resetting the x-axis completely if zoomX is called before
       w.globals.lastXAxis.min = w.globals.initialConfig.xaxis.min
       w.globals.lastXAxis.max = w.globals.initialConfig.xaxis.max
@@ -689,8 +692,6 @@ export default class Toolbar {
         })
       }
 
-      w.interact.zoomed = false
-
       // if user has some series collapsed before hitting zoom reset button,
       // those series should stay collapsed
       const series = ch.ctx.series.emptyCollapsedSeries(
@@ -701,6 +702,8 @@ export default class Toolbar {
         series,
         w.config.chart.animations.dynamicAnimation.enabled,
       )
+
+      w.interact.zoomed = false
     })
   }
 

src/modules/helpers/UpdateHelpers.js

@@ -186,6 +186,7 @@ export default class UpdateHelpers {
    * - Series count unchanged (grid column/row counts depend on it)
    * - No series currently collapsing (collapsed series changes visible data range)
    * - Not a combo chart (combo charts mix types and need coordinated axis recalc)
+   * - Not currently zoomed (zoomed charts have altered x-labels that need recalculation)
    * @param {any[]} newSeries
    * @param {number} prevSeriesCount
    * @param {import('../../types/internal').ChartStateW} w
@@ -196,6 +197,7 @@ export default class UpdateHelpers {
     if (newSeries.length !== prevSeriesCount) return false
     if (w.globals.collapsedSeries.length > 0) return false
     if (w.globals.comboCharts) return false
+    if (w.interact.zoomed) return false
     return true
   }
 

tests/unit/fast-update.spec.js

@@ -100,4 +100,22 @@ describe('fastUpdate() — partial updateSeries fast path', () => {
     expect(chart.getState().series).toEqual([[7, 8, 9]])
     expect(chart.getState().maxY).toBe(9)
   })
+
+  it('reset zoom should restore axis state using full update', async () => {
+    const chart = createChart('line', [{ data: [1, 2, 3, 4, 5] }])
+
+    const fastUpdateSpy = vi.spyOn(chart, 'fastUpdate')
+    const updateSpy = vi.spyOn(chart, 'update')
+
+    chart.zoomX(2, 4)
+    fastUpdateSpy.mockClear()
+    updateSpy.mockClear()
+
+    chart.ctx.toolbar.handleZoomReset()
+    expect(chart.w.interact.zoomed).toBe(false)
+    expect(chart.w.globals.minX).toBe(1)
+    expect(chart.w.globals.maxX).toBe(5)
+    expect(fastUpdateSpy).not.toHaveBeenCalled()
+    expect(updateSpy).toHaveBeenCalledOnce()
+  })
 })