Account for overlaid elements when using subcoordinates_y (#5950)

Co-authored-by: Demetris Roumis <roumis.d@gmail.com>
holoviz · Oct 24, 2023 · bb81fe0 · bb81fe0
1 parent ad31eda
commit bb81fe0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
@@ -605,7 +605,7 @@ def _create_extra_axes(self, plots, subplots, element, ranges):
                     'axis_label_text_font_size': sp._fontsize('ylabel').get('fontsize'),
                     'major_label_text_font_size': sp._fontsize('yticks').get('fontsize')
                 },
-                'subcoordinate_y': subcoordinate_axes-1 if self._subcoord_overlaid else None
+                'subcoordinate_y': (subcoordinate_axes - 1) if self._subcoord_overlaid else None
             }
 
         for ydim, info in yaxes.items():
@@ -893,10 +893,12 @@ def _axis_properties(self, axis, key, plot, dimension=None,
                     axis_props['major_label_overrides'] = dict(zip(ticks, labels))
             elif self._subcoord_overlaid and axis == 'y':
                 ticks, labels = [], []
-                for i, (el, sp) in enumerate(zip(self.current_frame, self.subplots.values())):
+                idx = 0
+                for el, sp in zip(self.current_frame, self.subplots.values()):
                     if not sp.subcoordinate_y:
                         continue
-                    ycenter = i if isinstance(sp.subcoordinate_y, bool) else 0.5 * sum(sp.subcoordinate_y)
+                    ycenter = idx if isinstance(sp.subcoordinate_y, bool) else 0.5 * sum(sp.subcoordinate_y)
+                    idx += 1
                     ticks.append(ycenter)
                     labels.append(el.label)
                 axis_props['ticker'] = FixedTicker(ticks=ticks)

diff --git a/holoviews/tests/plotting/bokeh/test_subcoordy.py b/holoviews/tests/plotting/bokeh/test_subcoordy.py
@@ -76,6 +76,20 @@ def test_overlaid_without_label_no_error(self):
         with_span = overlay * VSpan(1, 2)
         bokeh_renderer.get_plot(with_span)
 
+    def test_underlaid_ytick_alignment(self):
+        overlay = Overlay([Curve(range(10), label=f'Data {i}').opts(subcoordinate_y=True) for i in range(2)])
+        with_span = VSpan(1, 2) * overlay
+        plot = bokeh_renderer.get_plot(with_span)
+        # the yticks are aligned with their subcoordinate_y axis
+        assert plot.state.yaxis.ticker.ticks == [0, 1]
+
+    def test_overlaid_ytick_alignment(self):
+        overlay = Overlay([Curve(range(10), label=f'Data {i}').opts(subcoordinate_y=True) for i in range(2)])
+        with_span = overlay * VSpan(1, 2)
+        plot = bokeh_renderer.get_plot(with_span)
+        # the yticks are aligned with their subcoordinate_y axis
+        assert plot.state.yaxis.ticker.ticks == [0, 1]
+
     def test_custom_ylabel(self):
         overlay = Overlay([Curve(range(10), label=f'Data {i}').opts(subcoordinate_y=True) for i in range(2)])
         overlay.opts(ylabel='Y label')