Allow page_sidebar and page_navbar to take sidebars as unnamed args
#942
+38
−21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schloerke
reviewed
Jan 3, 2024
| *args | ||
| UI elements. | ||
| UI elements. One of the elements must be a sidebar. |
There was a problem hiding this comment.
Suggested change
| UI elements. One of the elements must be a sidebar. | |
| UI elements. One of the elements must be a :class:`shiny.ui.Sidebar`. |
schloerke
reviewed
Jan 3, 2024
Comment on lines
+90
to
+94
| "page_sidebar() requires one sidebar, but no sidebars were found in args. Use `ui.sidebar(...)` to create one." | ||
| ) | ||
| elif len(sidebars) > 1: | ||
| raise ValueError( | ||
| "page_sidebar() requires exactly one sidebar, but more sidebars were found in args." |
There was a problem hiding this comment.
Suggested change
| "page_sidebar() requires one sidebar, but no sidebars were found in args. Use `ui.sidebar(...)` to create one." | |
| ) | |
| elif len(sidebars) > 1: | |
| raise ValueError( | |
| "page_sidebar() requires exactly one sidebar, but more sidebars were found in args." | |
| "`page_sidebar()` requires one `Sidebar`, but no sidebars were found in `*args`. Use `ui.sidebar(...)` to create one." | |
| ) | |
| elif len(sidebars) > 1: | |
| raise ValueError( | |
| "`page_sidebar()` requires exactly one `Sidebar`, but more sidebars were found in `*args`." |
schloerke
reviewed
Jan 3, 2024
| "page_sidebar() requires exactly one sidebar, but more sidebars were found in args." | ||
| ) | ||
| sidebar = sidebars[0] | ||
| args = tuple([x for x in args if x not in sidebars]) |
There was a problem hiding this comment.
Remove here. Update above.
Suggested change
| args = tuple([x for x in args if x not in sidebars]) |
schloerke
reviewed
Jan 3, 2024
| @@ -85,6 +83,19 @@ def page_sidebar( | |||
| if isinstance(title, str): | |||
| title = tags.h1(title, class_="bslib-page-title") | |||
|
|
|||
| # Extract sidebar from args | |||
| sidebars = [x for x in args if isinstance(x, Sidebar)] | |||
There was a problem hiding this comment.
Make both tuples right away (without having to convert from list)
Suggested change
| sidebars = [x for x in args if isinstance(x, Sidebar)] | |
| sidebars = (x for x in args if isinstance(x, Sidebar)) | |
| args = (x for x in args if not isinstance(x, Sidebar)) |
schloerke
reviewed
Jan 3, 2024
| "`sidebar=` is not a `Sidebar` instance. Use `ui.sidebar(...)` to create one." | ||
| if sidebar is None: | ||
| # Extract sidebar from args | ||
| sidebars = [x for x in args if isinstance(x, Sidebar)] |
There was a problem hiding this comment.
Use tuple...
Suggested change
| sidebars = [x for x in args if isinstance(x, Sidebar)] | |
| sidebars = (x for x in args if isinstance(x, Sidebar)) |
schloerke
reviewed
Jan 3, 2024
| sidebars = [x for x in args if isinstance(x, Sidebar)] | ||
| if len(sidebars) == 1: | ||
| sidebar = sidebars[0] | ||
| args = tuple([x for x in args if x not in sidebars]) |
There was a problem hiding this comment.
Suggested change
| args = tuple([x for x in args if x not in sidebars]) | |
| args = (x for x in args if not isinstance(x, Sidebar)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This closes #939.
I didn't do this for the
navset_functions (likenavset_card_tab) but I think they probably should have similar modifications.