fix: fixed setConfig config update (#78)

gravity-ui · Jul 4, 2023 · 0c43ac1 · 0c43ac1
1 parent b07eb94
commit 0c43ac1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/demo/examples/hooks.html b/demo/examples/hooks.html
@@ -140,8 +140,20 @@ <h1>Hooks</h1>
                                 max: 15,
                             },
                         },
+                        processing: {
+                            interpolation: {
+                                value: 'x',
+                                type: 'left',
+                            },
+                        },
                         series: [
-                            {data: new Array(20).fill().map((_, i) => Math.random() * 6), color: 'red', id: '1'},
+                            {
+                                data: new Array(20)
+                                    .fill()
+                                    .map((_, i) => (Math.random() * 6 > 2 ? 'x' : Math.random() * 6)),
+                                color: 'red',
+                                id: '1',
+                            },
                             {data: new Array(20).fill().map((_, i) => Math.random() * 6), color: 'orange', id: '2'},
                         ],
                     });

diff --git a/src/YagrCore/mixins/create-options.ts b/src/YagrCore/mixins/create-options.ts
@@ -45,7 +45,9 @@ export class CreateUplotOptionsMixin<T extends MinimalValidConfig> {
             this.plugins.tooltip = tooltipInstance;
         }
 
-        if (!reOpt) {
+        if (reOpt) {
+            this.plugins.plotLines && plugins.push(this.plugins.plotLines.uplot);
+        } else {
             const plotLinesPluginInstance = this.initPlotLinesPlugin(config);
             this.plugins.plotLines = plotLinesPluginInstance;
             plugins.push(plotLinesPluginInstance.uplot);

diff --git a/src/YagrCore/mixins/dynamic-updates.ts b/src/YagrCore/mixins/dynamic-updates.ts
@@ -232,10 +232,7 @@ function setConfigImpl(yagr: Yagr, batch: Batch, newConfig: Partial<YagrConfig>)
     }
 
     batch.reopt = true;
-
-    batch.fns.push(() => {
-        yagr.config = {...yagr.config, ...newConfig};
-    });
+    yagr.config = {...yagr.config, ...newConfig};
 }
 
 function setSeriesImpl(

diff --git a/src/YagrCore/utils/scales.ts b/src/YagrCore/utils/scales.ts
@@ -196,10 +196,7 @@ export function configureScales(yagr: Yagr, scales: UPlot.Scales, config: YagrCo
         }
 
         if (yagr.isEmpty) {
-            scale.range = [
-                forceMin === null ? (isLogScale ? 1 : 0) : forceMin, // eslint-disable-line no-nested-ternary
-                forceMax === null ? 100 : forceMax,
-            ];
+            scale.range = [forceMin === null ? (isLogScale ? 1 : 0) : forceMin, forceMax === null ? 100 : forceMax];
             return;
         }