Skip to content

Fixes for shiny.express.ui.card() #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixes for shiny.express.ui.card() #983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions shiny/ui/_card.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def _card_impl(
wrapper = card_body

attrs, children = consolidate_attrs(*args, class_=class_, **kwargs)
children = _wrap_children_in_card(*children, wrapper=wrapper)
children = _as_card_items(*children, wrapper=wrapper)

tag = div(
{
Expand Down Expand Up @@ -202,9 +202,9 @@ def __call__(self, *args: TagChild) -> CardItem:


def _as_card_items(
*children: TagChild | CardItem | None, # `TagAttrs` are not allowed here
*children: TagChild, # `TagAttrs` are not allowed here
wrapper: WrapperCallable | None,
) -> list[CardItem]:
) -> list[TagChild]:
# We don't want `None`s creating empty card bodies
children_vals = [child for child in children if child is not None]

Expand All @@ -213,9 +213,9 @@ def _as_card_items(
raise ValueError("`TagAttrs` are not allowed in `_as_card_items(*children=)`.")

if not callable(wrapper):
ret: list[CardItem] = []
ret: list[TagChild] = []
for child in children_vals:
if isinstance(child, CardItem):
if is_card_item(child):
ret.append(child)
else:
ret.append(CardItem(child))
Expand All @@ -225,7 +225,7 @@ def _as_card_items(
# children that are not, should be wrapped in card_body(). Consecutive children
# that are not card_item, should be wrapped in a single card_body().
state = "asis" # "wrap" | "asis"
new_children: list[CardItem] = []
new_children: list[TagChild] = []
children_to_wrap: list[TagChild] = []

def wrap_children():
Expand All @@ -235,7 +235,7 @@ def wrap_children():
children_to_wrap = []

for child in children_vals:
if isinstance(child, CardItem):
if is_card_item(child):
if state == "wrap":
wrap_children()
state = "asis"
Expand All @@ -250,13 +250,18 @@ def wrap_children():
return new_children


def _wrap_children_in_card(
*children: TagChild | CardItem | None, # `TagAttrs` are not allowed here
wrapper: WrapperCallable | None,
) -> list[TagChild]:
card_items = _as_card_items(*children, wrapper=wrapper)
tag_children = [card_item.resolve() for card_item in card_items]
return tag_children
def is_card_item(x: object) -> bool:
if isinstance(x, CardItem):
return True

# This is for express' RecallContextManager[CardItem]
# which we want to treat like a CardItem.
fn = getattr(x, "fn", None)
if callable(fn):
ann = getattr(fn, "__annotations__", {})
return ann.get("return", None) == "CardItem"

return False


# TODO-maindocs; @add_example()
Expand Down Expand Up @@ -394,17 +399,6 @@ def __init__(
):
self._item = item

def resolve(self) -> TagChild:
"""
Resolves an object with the `CardItem` class by returning the `item` provided at initialization.

Returns
-------
:
The `item` provided at initialization.
"""
return self._item

def tagify(self) -> TagList:
"""
Tagify the `item`
Expand All @@ -414,7 +408,7 @@ def tagify(self) -> TagList:
:
A tagified :class:`~htmltools.TagList` object.
"""
return TagList(self.resolve()).tagify()
return TagList(self._item).tagify()


@add_example()
Expand Down