Use resolve_id instead of session.ns for id resolution in navs_dynamic

posit-dev · May 22, 2023 · 9048478 · 9048478
1 parent d761a5d
commit 9048478
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/shiny/session/_session.py b/shiny/session/_session.py
@@ -561,7 +561,7 @@ def send_input_message(self, id: str, message: dict[str, object]) -> None:
         message
             The message to send.
         """
-        msg: dict[str, object] = {"id": id, "message": message}
+        msg: dict[str, object] = {"id": self.ns(id), "message": message}
         self._outbound_message_queues["input_messages"].append(msg)
         self._request_flush()
 

diff --git a/shiny/ui/_navs_dynamic.py b/shiny/ui/_navs_dynamic.py
@@ -14,6 +14,7 @@
     from typing_extensions import Literal
 
 from .._docstring import add_example
+from .._namespaces import resolve_id
 from .._utils import run_coro_sync
 from ..session import Session, require_active_session
 from ..types import NavSetArg
@@ -76,7 +77,7 @@ def nav_insert(
     )
 
     msg = {
-        "inputId": session.ns(id),
+        "inputId": resolve_id(id),
         "liTag": session._process_ui(li_tag),
         "divTag": session._process_ui(div_tag),
         "menuName": None,
@@ -115,7 +116,7 @@ def nav_remove(id: str, target: str, session: Optional[Session] = None) -> None:
 
     session = require_active_session(session)
 
-    msg = {"inputId": session.ns(id), "target": target}
+    msg = {"inputId": resolve_id(id), "target": target}
 
     def callback() -> None:
         run_coro_sync(session._send_message({"shiny-remove-tab": msg}))
@@ -156,10 +157,11 @@ def nav_show(
 
     session = require_active_session(session)
 
+    id = resolve_id(id)
     if select:
         update_navs(id, selected=target)
 
-    msg = {"inputId": session.ns(id), "target": target, "type": "show"}
+    msg = {"inputId": id, "target": target, "type": "show"}
 
     def callback() -> None:
         run_coro_sync(session._send_message({"shiny-change-tab-visibility": msg}))
@@ -191,7 +193,7 @@ def nav_hide(id: str, target: str, session: Optional[Session] = None) -> None:
 
     session = require_active_session(session)
 
-    msg = {"inputId": session.ns(id), "target": target, "type": "hide"}
+    msg = {"inputId": resolve_id(id), "target": target, "type": "hide"}
 
     def callback() -> None:
         run_coro_sync(session._send_message({"shiny-change-tab-visibility": msg}))