Ignore script/style when searching for strings; make sure 'void' elem…

…ents don't produce extra spaces
posit-dev · Apr 27, 2022 · 893cf99 · 893cf99
1 parent 28e4bb6
commit 893cf99
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/shiny/ui/_utils.py b/shiny/ui/_utils.py
@@ -32,8 +32,11 @@ def get_window_title(
 
 
 def _find_child_strings(x: Union[Tag, TagList, TagChild]) -> str:
-    if isinstance(x, Tag):
+    if isinstance(x, Tag) and x.name not in ("script", "style"):
         x = x.children
     if isinstance(x, TagList):
-        return " ".join([_find_child_strings(y) for y in x])
-    return x if isinstance(x, str) else ""
+        strings = [_find_child_strings(y) for y in x]
+        return " ".join(filter(lambda x: x != "", strings))
+    if isinstance(x, str):
+        return x
+    return ""
diff --git a/tests/test_ui.py b/tests/test_ui.py
@@ -1,7 +1,7 @@
 import textwrap
 
 from shiny import ui
-from htmltools import HTMLDocument
+from htmltools import HTMLDocument, TagList, tags
 
 
 def test_panel_title():
@@ -20,3 +20,32 @@ def test_panel_title():
           </body>
         </html>"""
     )
+
+    title = TagList(
+        tags.h1("A title"),
+        tags.script("foo"),
+        tags.style("foo"),
+        tags.h5(tags.script("foo"), "A subtitle"),
+    )
+
+    x = HTMLDocument(ui.panel_title(title)).render()["html"]
+    assert x == textwrap.dedent(
+        """\
+        <!DOCTYPE html>
+        <html>
+          <head>
+            <meta charset="utf-8"/>
+            <script type="application/html-dependencies">headcontent_9e055af8ef9fa0fb1ba72eeba8053498fbc0d075[0.0]</script>
+            <title>A title A subtitle</title>
+          </head>
+          <body>
+            <h1>A title</h1>
+            <script>foo</script>
+            <style>foo</style>
+            <h5>
+              <script>foo</script>
+              A subtitle
+            </h5>
+          </body>
+        </html>"""
+    )