Merge branch 'main' into add-deprecation-warnings-for-output_txt_verbatim

Author: karangattu

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * `ui.output_text_verbatim()` is deprecated. Please use `ui.output_text()` if you want to create an output container for some text, or `ui.output_code()` if you want to create an output container for code (monospaced text). (#2097)
 
+### Bug fixes
+
+* Fixed `ui.tooltip()`'s `options` parameter to properly pass Bootstrap tooltip options to the underlying web component. (#2101)
+
 ## [1.5.0] - 2025-09-11
 
 ### New features

shiny/ui/_tooltip.py

@@ -144,7 +144,7 @@ def fa_info_circle(title: str):
         {
             "id": resolve_id_or_none(id),
             "placement": placement,
-            "options": json.dumps(options) if options else None,
+            "bsOptions": json.dumps(options) if options else None,
         },
         attrs,
         # Use display:none instead of <template> since shiny.js

tests/pytest/test_ui.py

@@ -189,3 +189,36 @@ def test__update_options():
     assert _update_options(d4, remove_button=True, multiple=True) == d4
     assert _update_options(d4, remove_button=True, multiple=False) == d4
     assert _update_options(d4, remove_button=False, multiple=False) == d4
+
+
+def test_tooltip_options():
+    """Test that tooltip renders options as bsOptions attribute."""
+    # Test with options parameter
+    options_dict: dict[str, object] = {"offset": [0, 100]}
+    t = ui.tooltip(
+        ui.input_action_button("btn", "Test"),
+        "A message",
+        id="test_tooltip",
+        placement="right",
+        options=options_dict,
+    )
+
+    t_str = str(t)
+
+    # Should contain bsOptions attribute with JSON-encoded options
+    assert "bsoptions" in t_str.lower(), "bsOptions attribute should be present"
+    # Check that the JSON content is present (HTML entities are encoded, so " becomes ")
+    assert ""offset"" in t_str and (
+        "[0, 100]" in t_str or "[0,100]" in t_str
+    ), "Options should be JSON-encoded with offset value"
+
+    # Test without options parameter
+    t2 = ui.tooltip(
+        ui.input_action_button("btn2", "Test2"),
+        "Another message",
+        id="test_tooltip2",
+    )
+
+    t2_str = str(t2)
+    # Should still render properly
+    assert "bslib-tooltip" in t2_str, "Tooltip should render without options"