handle hover_cols set as 'all'

hvplot/converter.py

@@ -2060,7 +2060,11 @@ def ohlc(self, x=None, y=None, data=None):
             o, h, l, c = y
         neg, pos = self.kwds.get('neg_color', 'red'), self.kwds.get('pos_color', 'green')
         color_exp = (dim(o)>dim(c)).categorize({True: neg, False: pos})
-        ds = Dataset(data, [x], [o, h, l, c] + self.hover_cols)
+        ohlc_cols = [o, h, l, c]
+        if x in self.hover_cols:
+            self.hover_cols.remove(x)
+        vdims = list(dict.fromkeys(ohlc_cols + self.hover_cols))
+        ds = Dataset(data, [x], vdims)
         if ds.data[x].dtype.kind in 'SUO':
             rects = Rectangles(ds, [x, o, x, c])
         else:
@@ -2080,7 +2084,7 @@ def ohlc(self, x=None, y=None, data=None):
             tools[tools.index('hover')] = HoverTool(tooltips=[
                 (x, f'@{x}'), ('Open', f'@{o}'), ('High', f'@{h}'),
                 ('Low', f'@{l}'), ('Close', f'@{c}')
-            ] + [(hc, f'@{hc}') for hc in self.hover_cols])
+            ] + [(hc, f'@{hc}') for hc in vdims[4:]])
         seg_cur_opts['tools'] = tools
         seg_cur_opts ['color'] = self.kwds.get('line_color', 'black')
         if 'xlabel' not in seg_cur_opts:

hvplot/tests/plotting/testohlc.py

@@ -18,4 +18,14 @@ def test_ohlc_hover_cols():
     segments = plot.Segments.I
     assert 'Volume' in segments
     tooltips = segments.opts.get('plot').kwargs['tools'][0].tooltips
-    assert ('Volume', '@Volume') in tooltips
+    assert len(tooltips) == len(df.columns) + 1
+    assert tooltips[-1] == ('Volume', '@Volume')
+
+
+def test_ohlc_hover_cols_all():
+    plot = df.hvplot.ohlc(y=ohlc_cols, hover_cols='all')
+    segments = plot.Segments.I
+    assert 'Volume' in segments
+    tooltips = segments.opts.get('plot').kwargs['tools'][0].tooltips
+    assert len(tooltips) == len(df.columns) + 1
+    assert tooltips[-1] == ('Volume', '@Volume')