dont hide graph series label in compare view #445

ruuvi · Sep 29, 2024 · 8aa777d · 8aa777d
1 parent a413434
commit 8aa777d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/TimeHelper.js b/src/TimeHelper.js
@@ -19,6 +19,7 @@ export function getTimestamp(date) {
 }
 
 export function secondsToUserDateString(seconds) {
+    if (!seconds) return "-"
     return new Date(seconds * 1000).toLocaleString(navigator.language || "fi-FI")
 }
 

diff --git a/src/components/CompareView.jsx b/src/components/CompareView.jsx
@@ -171,7 +171,7 @@ function CompareView(props) {
                 : (
                     <UplotReact
                         options={{
-                            plugins: [UplotTouchZoomPlugin(getXRange()), UplotLegendHider],
+                            plugins: [UplotTouchZoomPlugin(getXRange())],
                             padding: [10, 10, 0, -10],
                             width: width,
                             height: 450,
@@ -185,6 +185,7 @@ function CompareView(props) {
                                     return {
                                         label: x.name || x.sensor,
                                         points: { show: true, size: 2, fill: getGraphColor(i) },
+                                        class: "graphLabel",
                                         stroke: getGraphColor(i),
                                     }
                                 })

diff --git a/src/components/Graph.jsx b/src/components/Graph.jsx
@@ -200,7 +200,7 @@ class Graph extends Component {
         var plugins = [];
         if (!this.props.cardView) {
             plugins.push(UplotTouchZoomPlugin(this.getXRange()))
-            plugins.push(UplotLegendHider)
+            plugins.push(UplotLegendHider())
         }
         let colorMode = this.props.overrideColorMode ? this.props.overrideColorMode : this.props.colorMode.colorMode;
         let height = this.props.height || 300;

diff --git a/src/components/uplotPlugins/UplotLegendHider.jsx b/src/components/uplotPlugins/UplotLegendHider.jsx
@@ -1,16 +1,18 @@
-export default {
-    hooks: {
-        init(u, opts) {
-            const legend = document.getElementsByClassName("u-legend")[0];
-            legend.style.visibility = 'hidden';
-
-            u.over.addEventListener("mouseleave", () => {
+export default function (hideClass = "u-legend") {
+    return {
+        hooks: {
+            init(u, opts) {
+                const legend = document.getElementsByClassName(hideClass)[0];
                 legend.style.visibility = 'hidden';
-            });
 
-            u.over.addEventListener("mousemove", () => {
-                legend.style.visibility = '';
-            });
+                u.over.addEventListener("mouseleave", () => {
+                    legend.style.visibility = 'hidden';
+                });
+
+                u.over.addEventListener("mousemove", () => {
+                    legend.style.visibility = '';
+                });
+            }
         }
     }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ export function getTimestamp(date) { @@
     }
     export function secondsToUserDateString(seconds) {
+        if (!seconds) return "-"
         return new Date(seconds * 1000).toLocaleString(navigator.language || "fi-FI")
     }
@@ Expand Down @@