From dfe9337cb9473039b6a4dfa2e476f9630b713f76 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@posit.co>
Date: Wed, 24 Jan 2024 16:29:44 -0600
Subject: [PATCH 1/2] Add fill to __all__ in ui and express.ui

---
 shiny/express/ui/__init__.py |  6 ++++++
 shiny/ui/__init__.py         | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/shiny/express/ui/__init__.py b/shiny/express/ui/__init__.py
index 0920f6bac..12f215930 100644
--- a/shiny/express/ui/__init__.py
+++ b/shiny/express/ui/__init__.py
@@ -29,6 +29,10 @@
     strong,
 )
 
+from ...ui import (
+    fill,
+)
+
 from ...ui import (
     AccordionPanel,
     AnimationOptions,
@@ -169,6 +173,8 @@
     "span",
     "strong",
     "tags",
+    # Submodules
+    "fill",
     # Imports from ...ui
     "AccordionPanel",
     "AnimationOptions",
diff --git a/shiny/ui/__init__.py b/shiny/ui/__init__.py
index 5df1d08d1..ba15476b3 100644
--- a/shiny/ui/__init__.py
+++ b/shiny/ui/__init__.py
@@ -31,8 +31,12 @@
     tags,
 )
 
-# Expose the following modules for extended usage: ex: ui.fill.as_fill_item(x)
-from . import css, fill  # noqa: F401  # pyright: ignore[reportUnusedImport]
+from . import (
+    # The css module is for internal use, so we won't re-export it.
+    css,  # noqa: F401  # pyright: ignore[reportUnusedImport]
+    # Expose the fill module for extended usage: ex: ui.fill.as_fill_item(x).
+    fill,
+)
 from ._accordion import (
     AccordionPanel,
     accordion,
@@ -346,6 +350,8 @@
     "strong",
     "em",
     "hr",
+    # Submodules
+    "fill",
     # utils
     "js_eval",
 )

From 975e8d9fabc3570f570dfbe2791978d507b32e52 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@posit.co>
Date: Wed, 24 Jan 2024 16:47:45 -0600
Subject: [PATCH 2/2] Use separate imports

---
 shiny/ui/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shiny/ui/__init__.py b/shiny/ui/__init__.py
index ba15476b3..3142e3fc2 100644
--- a/shiny/ui/__init__.py
+++ b/shiny/ui/__init__.py
@@ -31,12 +31,12 @@
     tags,
 )
 
-from . import (
-    # The css module is for internal use, so we won't re-export it.
-    css,  # noqa: F401  # pyright: ignore[reportUnusedImport]
-    # Expose the fill module for extended usage: ex: ui.fill.as_fill_item(x).
-    fill,
-)
+# The css module is for internal use, so we won't re-export it.
+from . import css  # noqa: F401  # pyright: ignore[reportUnusedImport]
+
+# Expose the fill module for extended usage: ex: ui.fill.as_fill_item(x).
+from . import fill
+
 from ._accordion import (
     AccordionPanel,
     accordion,