Merge branch 'main' into fix/chat-update-user-message

Author: cpsievert

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+* Fixed an issue where the `<main>` areas of `ui.page_sidebar()` and `ui.page_navbar()` (with a `sidebar`) were made to be a fillable containers even when `fillable=False`. (#1816)
+
 * Fixed an issue where the `.update_user_input()` method on `ui.Chat()` isn't working in shinylive.  (#1891)
 
 ## [1.3.0] - 2025-03-03

scripts/_pkg-sources.R

@@ -1,5 +1,5 @@
 list(
-  bslib = "rstudio/bslib@main",
+  bslib = "rstudio/bslib@fix/page-main-container-fillable",
   shiny = "rstudio/shiny@main",
   sass = "sass",
   htmltools = "rstudio/htmltools@main"

shiny/ui/_navs.py

@@ -1365,7 +1365,9 @@ def layout(self, nav: Tag, content: Tag) -> TagList:
                 # TODO-future: This could also be applied to the non-sidebar page layout above
                 from ._page import page_main_container
 
-                tab_content = page_main_container(*contents)
+                tab_content = page_main_container(
+                    *contents, fillable=self.fillable is not False
+                )
 
             content_div = div(
                 # In the fluid case, the sidebar layout should be flush (i.e.,

shiny/ui/_page.py

@@ -134,7 +134,7 @@ def page_sidebar(
         navbar_title,
         layout_sidebar(
             sidebar,
-            page_main_container(*children),
+            page_main_container(*children, fillable=fillable),
             attrs,
             fillable=fillable,
             border=False,
@@ -149,8 +149,10 @@ def page_sidebar(
     )
 
 
-def page_main_container(*args: TagChild) -> Tag:
+def page_main_container(*args: TagChild, fillable: bool = True) -> Tag:
     main = tags.main({"class": "bslib-page-main bslib-gap-spacing"}, *args)
+    if not fillable:
+        return main
     return as_fillable_container(as_fill_item(main))
 
 

shiny/www/shared/_version.json

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "shiny",
-  "version": "1.10.0.9000 (rstudio/shiny@531f31b66f0d83d07341b5e88e33386e4dc10f3e)"
+  "version": "1.10.0.9000 (rstudio/shiny@f55c26af4a0493b082d2967aca6d36b90795adf1)"
 }

shiny/www/shared/bootstrap/_version.json

@@ -1,7 +1,7 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
-  "shiny_version": "1.10.0.9000 (rstudio/shiny@531f31b66f0d83d07341b5e88e33386e4dc10f3e)",
-  "bslib_version": "0.9.0.9000 (rstudio/bslib@ee34398b1d93056c302560512a090c1326aff7cf)",
+  "shiny_version": "1.10.0.9000 (rstudio/shiny@f55c26af4a0493b082d2967aca6d36b90795adf1)",
+  "bslib_version": "0.9.0.9000 (rstudio/bslib@142b19053fed81b42a4efa90c497ab2682383b86)",
   "htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
   "bootstrap_version": "5.3.1"
 }

shiny/www/shared/bootstrap/bootstrap.min.css

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "bslib",
-  "version": "0.9.0.9000 (rstudio/bslib@ee34398b1d93056c302560512a090c1326aff7cf)"
+  "version": "0.9.0.9000 (rstudio/bslib@142b19053fed81b42a4efa90c497ab2682383b86)"
 }

shiny/www/shared/bslib/_version.json

@@ -44,15 +44,15 @@ $bslib-sidebar-padding: $spacer * 1.5 !default;
   // Ensure the page-level main area has a minimum height and width to prevent
   // overly squished content in small screens, like IDE preview panels.
   .bslib-sidebar-layout {
-    .bslib-page-main {
+    .bslib-page-main.html-fill-container {
       min-height: var(--bslib-page-main-min-height, #{$bslib-page-main-min-height});
     }
 
     // But only apply the width constraint when the sidebar expanded (i.e.
     // not collapsed or in transition) to prevent overlap with toggle button.
     &:not(.sidebar-collapsed),
     &.transitioning {
-      .bslib-page-main {
+      .bslib-page-main.html-fill-container {
         min-width: var(--bslib-page-main-min-width, #{$bslib-page-main-min-width});
       }
     }