@funnest/charts 0.6.2 → 0.6.3

package/dist/chart.d.ts

@@ -209,6 +209,14 @@ export declare class Chart {
     private connectionState;
     private readonly displayTimezone;
     private loadingHistory;
+    /**
+     * Bumped by every data replacement (setData) and history request: a page answers only if it
+     * is still the latest request for the bars on screen. (The load token alone isn't enough — a
+     * page requested while setSymbol() awaits carries the new token but the old symbol's bars.)
+     */
+    private historyRequest;
+    /** setSymbol() is between its request and setData(). */
+    private symbolLoading;
     private noMoreHistory;
     private historyRequestedFor;
     private countdownLabel;

package/dist/index.js

@@ -2684,6 +2684,14 @@ var Chart = class {
   connectionState = null;
   displayTimezone;
   loadingHistory = false;
+  /**
+   * Bumped by every data replacement (setData) and history request: a page answers only if it
+   * is still the latest request for the bars on screen. (The load token alone isn't enough — a
+   * page requested while setSymbol() awaits carries the new token but the old symbol's bars.)
+   */
+  historyRequest = 0;
+  /** setSymbol() is between its request and setData(). */
+  symbolLoading = false;
   noMoreHistory = false;
   historyRequestedFor = Number.NaN;
   countdownLabel = null;
@@ -2765,6 +2773,8 @@ var Chart = class {
     this.volumeScale.autoScale = true;
     this.noMoreHistory = false;
     this.historyRequestedFor = Number.NaN;
+    this.historyRequest++;
+    this.loadingHistory = false;
     this.dataVersion++;
     this.invalidate();
   }
@@ -2817,6 +2827,7 @@ var Chart = class {
       this.quoteSymbol = null;
     }
     this.emitter.emit("loadingChange", true);
+    this.symbolLoading = true;
     let info;
     let result;
     try {
@@ -2831,7 +2842,10 @@ var Chart = class {
       });
       if (token !== this.loadToken) return;
     } finally {
-      if (token === this.loadToken) this.emitter.emit("loadingChange", false);
+      if (token === this.loadToken) {
+        this.symbolLoading = false;
+        this.emitter.emit("loadingChange", false);
+      }
     }
     const previous = this.symbol?.symbol ?? "";
     if (previous !== info.symbol) {
@@ -4036,6 +4050,7 @@ var Chart = class {
   requestHistory() {
     const oldest = this.store.first();
     if (!oldest || this.loadingHistory || this.noMoreHistory || oldest.time === this.historyRequestedFor) return;
+    if (this.symbolLoading) return;
     this.historyRequestedFor = oldest.time;
     const feed = this.datafeed;
     if (!feed || !this.symbol || !this.resolution) {
@@ -4043,6 +4058,8 @@ var Chart = class {
       return;
     }
     const token = this.loadToken;
+    const request = ++this.historyRequest;
+    const current = () => token === this.loadToken && request === this.historyRequest;
     this.loadingHistory = true;
     const to = oldest.time - 1;
     feed.getBars(this.symbol, this.resolution, {
@@ -4050,13 +4067,13 @@ var Chart = class {
       to,
       countBack: this.historyBatchSize
     }).then((result) => {
-      if (token !== this.loadToken) return;
+      if (!current()) return;
       this.prependData(result.bars, { noMoreData: result.noMoreData || result.bars.length === 0 });
       const first = this.store.first();
       if (first) void this.tradingSync.loadOlder(first.time);
       for (const entry of this.compares.values()) void this.loadOlderCompare(entry);
     }).catch((error) => this.emitter.emit("error", error)).finally(() => {
-      if (token === this.loadToken) this.loadingHistory = false;
+      if (current()) this.loadingHistory = false;
     });
   }
   // ── Crosshair ──────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnest/charts",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Canvas charting engine for financial charts",
   "keywords": [
     "chart",