Add real legend_cols support for Bokeh

holoviz · Mar 23, 2023 · 0408a24 · 0408a24
1 parent 0b837fc
commit 0408a24
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
@@ -2174,8 +2174,8 @@ def _init_glyph(self, plot, mapping, properties):
 
 class LegendPlot(ElementPlot):
 
-    legend_cols = param.Integer(default=False, doc="""
-        Whether to lay out the legend as columns.""")
+    legend_cols = param.Integer(default=0, bounds=(0, None), doc="""
+        Number of columns for legend.""")
 
     legend_labels = param.Dict(default=None, doc="""
         Label overrides.""")
@@ -2218,12 +2218,16 @@ def _process_legend(self, plot=None):
             or not self.show_legend):
             legend.items[:] = []
         else:
-            plot.legend.orientation = 'horizontal' if self.legend_cols else 'vertical'
+            if bokeh3 and self.legend_cols:
+                plot.legend.nrows = self.legend_cols
+            else:
+                plot.legend.orientation = 'horizontal' if self.legend_cols else 'vertical'
+
             pos = self.legend_position
             if pos in self.legend_specs:
                 plot.legend[:] = []
                 legend.location = self.legend_offset
-                if pos in ['top', 'bottom']:
+                if pos in ['top', 'bottom'] and not self.legend_cols:
                     plot.legend.orientation = 'horizontal'
                 plot.add_layout(legend, self.legend_specs[pos])
             else:
@@ -2311,17 +2315,19 @@ def _process_legend(self, overlay):
             options[k] = v
 
         pos = self.legend_position
-        orientation = 'horizontal' if self.legend_cols else 'vertical'
-        if pos in ['top', 'bottom']:
-            orientation = 'horizontal'
-        options['orientation'] = orientation
+        if not bokeh3:
+            options['orientation'] = 'horizontal' if self.legend_cols else 'vertical'
+        if pos in ['top', 'bottom'] and not self.legend_cols:
+            options['orientation'] = 'horizontal'
 
         if overlay is not None and overlay.kdims:
             title = ', '.join([d.label for d in overlay.kdims])
             options['title'] = title
 
         options.update(self._fontsize('legend', 'label_text_font_size'))
         options.update(self._fontsize('legend_title', 'title_text_font_size'))
+        if bokeh3 and self.legend_cols:
+            options.update({"ncols": self.legend_cols})
         legend.update(**options)
 
         if pos in self.legend_specs: