Allow multiple tooltip entries by cloning

bokeh · Feb 27, 2024 · fe501ce · fe501ce
1 parent 32d00b2
commit fe501ce
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/bokehjs/src/lib/models/dom/value_of.ts b/bokehjs/src/lib/models/dom/value_of.ts
@@ -1,12 +1,10 @@
-import {DOMNode, DOMNodeView} from "./dom_node"
+import {DOMElement, DOMElementView} from "./dom_element"
 import {HasProps} from "core/has_props"
-import {empty} from "core/dom"
 import {to_string} from "core/util/pretty"
 import type * as p from "core/properties"
 
-export class ValueOfView extends DOMNodeView {
+export class ValueOfView extends DOMElementView {
   declare model: ValueOf
-  declare el: HTMLElement
 
   override connect_signals(): void {
     super.connect_signals()
@@ -17,8 +15,8 @@ export class ValueOfView extends DOMNodeView {
     }
   }
 
-  render(): void {
-    empty(this.el)
+  override render(): void {
+    super.render()
     this.el.style.display = "contents"
 
     const text = (() => {
@@ -37,15 +35,15 @@ export class ValueOfView extends DOMNodeView {
 
 export namespace ValueOf {
   export type Attrs = p.AttrsOf<Props>
-  export type Props = DOMNode.Props & {
+  export type Props = DOMElement.Props & {
     obj: p.Property<HasProps>
     attr: p.Property<string>
   }
 }
 
 export interface ValueOf extends ValueOf.Attrs {}
 
-export class ValueOf extends DOMNode {
+export class ValueOf extends DOMElement {
   declare properties: ValueOf.Props
   declare __view_type__: ValueOfView
 

diff --git a/bokehjs/src/lib/models/tools/inspectors/hover_tool.ts b/bokehjs/src/lib/models/tools/inspectors/hover_tool.ts
@@ -626,7 +626,7 @@ export class HoverToolView extends InspectToolView {
       const {_template_view} = this
       assert(_template_view != null)
       this._update_template(_template_view, ds, i, vars)
-      return _template_view.el
+      return _template_view.el.cloneNode(true)
     } else if (tooltips != null) {
       const template = this._template_el ?? (this._template_el = this._create_template(tooltips))
       return this._render_template(template, tooltips, ds, vars)

diff --git a/src/bokeh/models/dom.py b/src/bokeh/models/dom.py
@@ -139,7 +139,7 @@ def __init__(self, *args, **kwargs) -> None:
     groups = List(Instance(".models.renderers.RendererGroup"))
 
 @abstract
-class Placeholder(DOMNode):
+class Placeholder(DOMElement):
 
     # explicit __init__ to support Init signatures
     def __init__(self, *args, **kwargs) -> None:

diff --git a/tests/baselines/defaults.json5 b/tests/baselines/defaults.json5
@@ -2266,7 +2266,7 @@
     __extends__: "bokeh.models.dom.Placeholder",
   },
   "bokeh.models.dom.Placeholder": {
-    __extends__: "bokeh.models.dom.DOMNode",
+    __extends__: "bokeh.models.dom.DOMElement",
   },
   "bokeh.models.dom.Span": {
     __extends__: "bokeh.models.dom.DOMElement",