Make auto-ranging configurable in data renderers

bokehjs/src/lib/core/util/bbox.ts

@@ -16,6 +16,24 @@ export function empty(): Rect {
   }
 }
 
+export function x_only(x0: number, x1: number): Rect {
+  return {
+    x0,
+    x1,
+    y0:  Infinity,
+    y1: -Infinity,
+  }
+}
+
+export function y_only(y0: number, y1: number): Rect {
+  return {
+    x0:  Infinity,
+    x1: -Infinity,
+    y0,
+    y1,
+  }
+}
+
 export function positive_x(): Rect {
   return {
     x0:  Number.MIN_VALUE,

bokehjs/src/lib/models/annotations/box_annotation.ts

@@ -1,14 +1,14 @@
 import {Annotation, AnnotationView} from "./annotation"
 import type {Scale} from "../scales/scale"
-import type {AutoRanged} from "../ranges/data_range1d"
-import {auto_ranged} from "../ranges/data_range1d"
+import type {AutoRanged} from "../ranges/auto_ranged"
+import {auto_ranged} from "../ranges/auto_ranged"
 import * as mixins from "core/property_mixins"
 import type * as visuals from "core/visuals"
 import type {SerializableState} from "core/view"
 import {CoordinateUnits} from "core/enums"
 import type * as p from "core/properties"
 import type {LRTB, Corners, CoordinateMapper} from "core/util/bbox"
-import {BBox, empty} from "core/util/bbox"
+import {BBox} from "core/util/bbox"
 import type {PanEvent, PinchEvent, Pannable, Pinchable, MoveEvent, Moveable, KeyModifiers} from "core/ui_events"
 import {Enum} from "../../core/kinds"
 import {Signal} from "core/signaling"
@@ -87,10 +87,6 @@ export class BoxAnnotationView extends AnnotationView implements Pannable, Pinch
     return {x0, x1, y0, y1}
   }
 
-  log_bounds(): Rect {
-    return empty()
-  }
-
   get mappers(): LRTB<CoordinateMapper> {
     function mapper(units: CoordinateUnits, scale: Scale, view: CoordinateMapper, canvas: CoordinateMapper) {
       switch (units) {

bokehjs/src/lib/models/annotations/poly_annotation.ts

@@ -1,7 +1,7 @@
 import {Annotation, AnnotationView} from "./annotation"
 import type {Scale} from "../scales/scale"
-import type {AutoRanged} from "../ranges/data_range1d"
-import {auto_ranged} from "../ranges/data_range1d"
+import type {AutoRanged} from "../ranges/auto_ranged"
+import {auto_ranged} from "../ranges/auto_ranged"
 import * as mixins from "core/property_mixins"
 import type * as visuals from "core/visuals"
 import type {SerializableState} from "core/view"
@@ -127,10 +127,6 @@ export class PolyAnnotationView extends AnnotationView implements Pannable, Move
       return empty()
   }
 
-  log_bounds(): Rect {
-    return empty()
-  }
-
   protected _mappers(): {x: CoordinateMapper, y: CoordinateMapper} {
     const mapper = (units: CoordinateUnits, scale: Scale,
         view: CoordinateMapper, canvas: CoordinateMapper): CoordinateMapper => {

bokehjs/src/lib/models/plots/plot_canvas.ts

@@ -15,8 +15,8 @@ import type {Axis} from "../axes/axis"
 import {AxisView} from "../axes/axis"
 import type {ToolbarPanelView} from "../annotations/toolbar_panel"
 import {ToolbarPanel} from "../annotations/toolbar_panel"
-import type {AutoRanged} from "../ranges/data_range1d"
-import {is_auto_ranged} from "../ranges/data_range1d"
+import type {AutoRanged} from "../ranges/auto_ranged"
+import {is_auto_ranged} from "../ranges/auto_ranged"
 
 import {Reset} from "core/bokeh_events"
 import type {ViewStorage, IterViews} from "core/build_views"

bokehjs/src/lib/models/plots/range_manager.ts

@@ -3,8 +3,10 @@ import type {Bounds} from "../ranges/data_range1d"
 import {DataRange1d} from "../ranges/data_range1d"
 import type {CartesianFrame} from "../canvas/cartesian_frame"
 import type {CoordinateMapping} from "../coordinates/coordinate_mapping"
+import type {Dimensions} from "../ranges/auto_ranged"
 import type {PlotView} from "./plot_canvas"
-import type {Interval} from "core/types"
+import type {Interval, Rect} from "core/types"
+import * as bbox from "core/util/bbox"
 import {logger} from "core/logging"
 
 export type RangeInfo = {
@@ -68,12 +70,23 @@ export class RangeManager {
         calculate_log_bounds = true
     }
 
+    function restrict(bounds: Rect, dimensions: Dimensions): Rect {
+      switch (dimensions) {
+        case "both": return bounds
+        case "x":    return bbox.x_only(bounds.x0, bounds.x1)
+        case "y":    return bbox.y_only(bounds.y0, bounds.y1)
+        case "none": return bbox.empty()
+      }
+    }
+
     for (const renderer of this.parent.auto_ranged_renderers) {
-      const bds = renderer.bounds()
+      const dimensions = renderer.bounds_dimensions?.() ?? "both"
+
+      const bds = restrict(renderer.bounds(), dimensions)
       bounds.set(renderer.model, bds)
 
       if (calculate_log_bounds) {
-        const log_bds = renderer.log_bounds()
+        const log_bds = restrict(renderer.log_bounds?.() ?? bbox.empty(), dimensions)
         log_bounds.set(renderer.model, log_bds)
       }
     }

bokehjs/src/lib/models/ranges/auto_ranged.ts

@@ -0,0 +1,19 @@
+import type {RendererView} from "../renderers/renderer"
+import type {Rect} from "core/types"
+import {Enum} from "../../core/kinds"
+
+export const Dimensions = Enum("both", "x", "y", "none")
+export type Dimensions = typeof Dimensions["__type__"]
+
+export const auto_ranged = Symbol("auto_ranged")
+
+export interface AutoRanged {
+  readonly [auto_ranged]: true
+  bounds_dimensions?(): Dimensions
+  bounds(): Rect
+  log_bounds?(): Rect
+}
+
+export function is_auto_ranged<T extends RendererView>(r: T): r is T & AutoRanged {
+  return auto_ranged in r
+}

bokehjs/src/lib/models/ranges/data_range1d.ts

@@ -1,5 +1,5 @@
 import {DataRange} from "./data_range"
-import type {Renderer, RendererView} from "../renderers/renderer"
+import type {Renderer} from "../renderers/renderer"
 import {PaddingUnits, StartEnd} from "core/enums"
 import type {Rect} from "core/types"
 import {flat_map} from "core/util/iterator"
@@ -9,18 +9,6 @@ import * as bbox from "core/util/bbox"
 import type {PlotView} from "../plots/plot"
 import {compute_renderers} from "../util"
 
-export const auto_ranged = Symbol("auto_ranged")
-
-export interface AutoRanged {
-  readonly [auto_ranged]: true
-  bounds(): Rect
-  log_bounds(): Rect
-}
-
-export function is_auto_ranged<T extends RendererView>(r: T): r is T & AutoRanged {
-  return auto_ranged in r
-}
-
 export type Dim = 0 | 1
 export type Bounds = Map<Renderer, Rect>
 

bokehjs/src/lib/models/renderers/data_renderer.ts

@@ -1,8 +1,8 @@
 import {Renderer, RendererView} from "./renderer"
 import type {GlyphView} from "../glyphs/glyph"
 import type {Scale} from "../scales/scale"
-import type {AutoRanged} from "../ranges/data_range1d"
-import {auto_ranged} from "../ranges/data_range1d"
+import type {AutoRanged} from "../ranges/auto_ranged"
+import {Dimensions, auto_ranged} from "../ranges/auto_ranged"
 import type {SelectionManager} from "core/selection_manager"
 import type * as p from "core/properties"
 import type {Rect} from "core/types"
@@ -23,6 +23,10 @@ export abstract class DataRendererView extends RendererView implements AutoRange
 
   readonly [auto_ranged] = true
 
+  bounds_dimensions(): Dimensions {
+    return this.model.auto_ranging
+  }
+
   bounds(): Rect {
     return this.glyph_view.bounds()
   }
@@ -35,7 +39,9 @@ export abstract class DataRendererView extends RendererView implements AutoRange
 export namespace DataRenderer {
   export type Attrs = p.AttrsOf<Props>
 
-  export type Props = Renderer.Props
+  export type Props = Renderer.Props & {
+    auto_ranging: p.Property<Dimensions>
+  }
 
   export type Visuals = Renderer.Visuals
 }
@@ -51,6 +57,10 @@ export abstract class DataRenderer extends Renderer {
   }
 
   static {
+    this.define<DataRenderer.Props>(() => ({
+      auto_ranging: [ Dimensions, "both" ],
+    }))
+
     this.override<DataRenderer.Props>({
       level: "glyph",
     })

src/bokeh/models/annotations/geometry.py

@@ -395,8 +395,12 @@ def _build_glyph_renderer(model: type[Glyph], kwargs: dict[str, Any]) -> GlyphRe
     if data_source is Undefined:
         data_source = ColumnDataSource()
 
-    glyph = model(**kwargs)
-    return GlyphRenderer(data_source=data_source, glyph=glyph, **glyph_renderer_kwargs)
+    return GlyphRenderer(
+        data_source=data_source,
+        glyph=model(**kwargs),
+        auto_ranging="none",
+        **glyph_renderer_kwargs,
+    )
 
 #-----------------------------------------------------------------------------
 # Code

src/bokeh/models/glyphs.py

@@ -7,8 +7,6 @@
 ''' Display a variety of visual shapes whose attributes can be associated
 with data columns from ``ColumnDataSources``.
 
-
-
 The full list of glyphs is below:
 
 .. toctree::

src/bokeh/models/renderers/renderer.py

@@ -114,6 +114,17 @@ class DataRenderer(Renderer):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
+    auto_ranging = Enum("both", "x", "y", "none", default="both", help="""
+    Defines which dimensions will participate in auto-ranging.
+
+    .. note::
+        Note that a renderer can be removed from auto-ranging for a given
+        range that supports auto-ranging, by not including it that range's
+        ``renderers`` list and when ``renderers`` isn't set to ``"auto"``
+        mode.
+
+    """).accepts(Bool, lambda value: "both" if value else "none")
+
     level = Override(default="glyph")
 
 @abstract

tests/baselines/defaults.json5

@@ -3171,6 +3171,7 @@
   DataRenderer: {
     __extends__: "Renderer",
     level: "glyph",
+    auto_ranging: "both",
   },
   GuideRenderer: {
     __extends__: "Renderer",

tests/unit/bokeh/models/test_annotations.py

@@ -532,6 +532,7 @@ def test_legacy_Band() -> None:
     assert band.data_source == data_source
     assert band.name == "band_annotation"
     assert band.level == "annotation"
+    assert band.auto_ranging == "none"
 
 def test_legacy_Whisker() -> None:
     data_source = ColumnDataSource()
@@ -542,6 +543,7 @@ def test_legacy_Whisker() -> None:
     assert whisker.data_source == data_source
     assert whisker.name == "whisker_annotation"
     assert whisker.level == "annotation"
+    assert whisker.auto_ranging == "none"
 
 #-----------------------------------------------------------------------------
 # Dev API