From 31a379bb56940cd979ed3957d196fc6ce9c058f7 Mon Sep 17 00:00:00 2001
From: george haff <george.haff@gmail.com>
Date: Wed, 17 Jul 2024 21:58:44 -0400
Subject: [PATCH 1/7] revert Chart.svelte

---
 src/components/Chart.svelte | 46 ++++++-------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
index d697600..98cb702 100644
--- a/src/components/Chart.svelte
+++ b/src/components/Chart.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import type DataSet from '../data/DataSet';
-  import type DataGroup from '../data/DataSet';
   import { DEFAULT_VIEWPORT } from '../data/DataSet';
   import EpiDate from '../data/EpiDate';
   import { Align, contains, isTouchEvent, NavMode, zeroPad } from './chartUtils';
@@ -381,47 +380,16 @@
     return { x: x + dx, y: y + dy - h, w: w, h: h };
   }
 
-  // Fit viewport to the currently available datasets.
-  // Since there is a delay to new changes propagating to the datasets variable, the
-  // include and exclude arguments are used to make sure a recently selected
-  // or de-selected dataset is properly accounted for.
-  export function fitData(
-    shouldAnimate = false,
-    include: DataSet | DataGroup | null = null,
-    exclude: DataSet | DataGroup | null = null,
-  ): void {
-    // No data, nothing to fit
-    if (datasets.length === 0 && !include) {
-      return;
-    }
-    // Just deselected the only dataset, nothing to fit
-    if (datasets.length === 1 && exclude) {
+  export function fitData(shouldAnimate = false): void {
+    if (datasets.length === 0) {
       return;
     }
-    let temp = null;
-    if (datasets.length === 0 && include) {
-      // If no previous data, set dataset to the new one
-      temp = include;
-    } else if (datasets[0] && datasets[0] == exclude) {
-      // If we just deselected the first dataset, don't fit to that one
-      temp = datasets[1];
-    } else {
-      // Generally fit to the first dataset
-      temp = datasets[0];
-    }
-    let _xMin = temp.data[0].getDate().getIndex() - 0.5;
-    let _xMax = temp.data[temp.data.length - 1].getDate().getIndex() + 0.5;
-    let _yMin = temp.getPointValue(0);
+    const temp = datasets[0].data;
+    let _xMin = temp[0].getDate().getIndex() - 0.5;
+    let _xMax = temp[temp.length - 1].getDate().getIndex() + 0.5;
+    let _yMin = datasets[0].getPointValue(0);
     let _yMax = _yMin;
-    let dss = null;
-    if (include) {
-      dss = [...datasets, include];
-    } else if (exclude) {
-      dss = datasets.filter((d) => d !== exclude);
-    } else {
-      dss = datasets;
-    }
-    for (const ds of dss) {
+    for (const ds of datasets) {
       const data = ds.data;
       _xMin = Math.min(_xMin, data[0].getDate().getIndex() - 0.5);
       _xMax = Math.max(_xMax, data[data.length - 1].getDate().getIndex() + 0.5);

From 443556c4a853b6697f1a57bf0edbf082aa8d8312 Mon Sep 17 00:00:00 2001
From: george haff <george.haff@gmail.com>
Date: Wed, 17 Jul 2024 22:05:26 -0400
Subject: [PATCH 2/7] remove 'datasets' argument from Chart component, replace
 with reactive reference to 'activeDatasets' store

---
 src/App.svelte              | 1 -
 src/components/Chart.svelte | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index ccef497..0582684 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -50,5 +50,4 @@
   bind:showPoints={$isShowingPoints}
   bind:navMode={$navMode}
   initialViewport={$initialViewport}
-  datasets={$activeDatasets}
 />
diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
index 98cb702..45fcb99 100644
--- a/src/components/Chart.svelte
+++ b/src/components/Chart.svelte
@@ -8,6 +8,7 @@
   import { tweened } from 'svelte/motion';
   import { cubicInOut } from 'svelte/easing';
   // import { writable } from 'svelte/store';
+  import activeDatasets from '../store';
 
   export let style: string | undefined = undefined;
   export let className: string | undefined = undefined;
@@ -81,7 +82,8 @@
   export let showPoints = false;
   export let interpolate = false;
   export let highlightedDate: EpiDate | null = null;
-  export let datasets: DataSet[] = [];
+
+  $: datasets = $activeDatasets;
 
   function date2x(date: number): number {
     return ((date - xMin) / (xMax - xMin)) * width;

From 81ec377eb57fd839c6e20263f8cc7723707f485a Mon Sep 17 00:00:00 2001
From: george haff <george.haff@gmail.com>
Date: Wed, 17 Jul 2024 22:10:24 -0400
Subject: [PATCH 3/7] revert chart.fitData() calls in TreeLeafNode component

---
 src/components/tree/TreeLeafNode.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/tree/TreeLeafNode.svelte b/src/components/tree/TreeLeafNode.svelte
index 26a6c53..ec867d0 100644
--- a/src/components/tree/TreeLeafNode.svelte
+++ b/src/components/tree/TreeLeafNode.svelte
@@ -12,12 +12,12 @@
     if (selected) {
       $activeDatasets = $activeDatasets.filter((d) => d !== node);
       if (chart && $autoFit === true) {
-        chart.fitData(true, null, node);
+        chart.fitData(true);
       }
     } else {
       $activeDatasets = [node, ...$activeDatasets];
       if (chart && $autoFit === true) {
-        chart.fitData(true, node);
+        chart.fitData(true);
       }
     }
   }

From 953d0617bb55dae514617b478e372d23f1375ed4 Mon Sep 17 00:00:00 2001
From: george haff <george.haff@gmail.com>
Date: Wed, 17 Jul 2024 22:47:55 -0400
Subject: [PATCH 4/7] stabbing in the dark to fix build

---
 src/App.svelte              | 2 +-
 src/components/Chart.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 0582684..047c4d7 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -34,7 +34,7 @@
           // reset active datasets to fluview -> ili
           $activeDatasets = [ds.datasets[1]];
           if (chart) {
-            chart.fitData(true, ds.datasets[1]);
+            chart.fitData(true);
           }
         }
       });
diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
index 45fcb99..281dba2 100644
--- a/src/components/Chart.svelte
+++ b/src/components/Chart.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
+  import { activeDatasets } from '../store';
   import type DataSet from '../data/DataSet';
   import { DEFAULT_VIEWPORT } from '../data/DataSet';
   import EpiDate from '../data/EpiDate';
@@ -8,7 +9,6 @@
   import { tweened } from 'svelte/motion';
   import { cubicInOut } from 'svelte/easing';
   // import { writable } from 'svelte/store';
-  import activeDatasets from '../store';
 
   export let style: string | undefined = undefined;
   export let className: string | undefined = undefined;

From 46910be010003f102b19a11789fa5117bf620494 Mon Sep 17 00:00:00 2001
From: george haff <george.haff@gmail.com>
Date: Wed, 17 Jul 2024 23:05:30 -0400
Subject: [PATCH 5/7] poking netlify

---
 src/components/Chart.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
index 281dba2..5c93114 100644
--- a/src/components/Chart.svelte
+++ b/src/components/Chart.svelte
@@ -1,4 +1,4 @@
-<script lang="ts">
+<script lang="ts"> 
   import { onMount } from 'svelte';
   import { activeDatasets } from '../store';
   import type DataSet from '../data/DataSet';

From f9a2bd403475104c5cc00dfd5709d6d0a7b3bb37 Mon Sep 17 00:00:00 2001
From: george haff <george.haff@gmail.com>
Date: Wed, 17 Jul 2024 23:07:10 -0400
Subject: [PATCH 6/7] poking netlify again

---
 src/components/Chart.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
index 5c93114..281dba2 100644
--- a/src/components/Chart.svelte
+++ b/src/components/Chart.svelte
@@ -1,4 +1,4 @@
-<script lang="ts"> 
+<script lang="ts">
   import { onMount } from 'svelte';
   import { activeDatasets } from '../store';
   import type DataSet from '../data/DataSet';

From 0daec6f314b45735d81476681acb2aa5d906dfe3 Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Thu, 18 Jul 2024 18:09:37 +0300
Subject: [PATCH 7/7] Force reactive updates

---
 src/components/Chart.svelte             |  1 +
 src/components/tree/TreeLeafNode.svelte | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
index 281dba2..bf42e96 100644
--- a/src/components/Chart.svelte
+++ b/src/components/Chart.svelte
@@ -383,6 +383,7 @@
   }
 
   export function fitData(shouldAnimate = false): void {
+    datasets = $activeDatasets; // force an update
     if (datasets.length === 0) {
       return;
     }
diff --git a/src/components/tree/TreeLeafNode.svelte b/src/components/tree/TreeLeafNode.svelte
index ec867d0..f217766 100644
--- a/src/components/tree/TreeLeafNode.svelte
+++ b/src/components/tree/TreeLeafNode.svelte
@@ -11,14 +11,14 @@
   function toggleSelected() {
     if (selected) {
       $activeDatasets = $activeDatasets.filter((d) => d !== node);
-      if (chart && $autoFit === true) {
-        chart.fitData(true);
-      }
     } else {
       $activeDatasets = [node, ...$activeDatasets];
-      if (chart && $autoFit === true) {
-        chart.fitData(true);
-      }
+    }
+  }
+  $: {
+    // runs whenever $activeDatasets is updated
+    if ($activeDatasets && chart && $autoFit === true) {
+      chart.fitData(true);
     }
   }
   $: selected = $activeDatasets.includes(node);