diff --git a/py/h2o_lightwave/h2o_lightwave/types.py b/py/h2o_lightwave/h2o_lightwave/types.py index aea7fa964b1..ab389e6acd7 100644 --- a/py/h2o_lightwave/h2o_lightwave/types.py +++ b/py/h2o_lightwave/h2o_lightwave/types.py @@ -9608,11 +9608,13 @@ def __init__( title: str, content: str, data: Optional[PackedRecord] = None, + compact: Optional[bool] = None, commands: Optional[List[Command]] = None, ): _guard_scalar('MarkdownCard.box', box, (str,), False, False, False) _guard_scalar('MarkdownCard.title', title, (str,), False, False, False) _guard_scalar('MarkdownCard.content', content, (str,), False, False, False) + _guard_scalar('MarkdownCard.compact', compact, (bool,), False, True, False) _guard_vector('MarkdownCard.commands', commands, (Command,), False, True, False) self.box = box """A string indicating how to place this component on the page.""" @@ -9622,6 +9624,8 @@ def __init__( """The markdown content. Supports Github Flavored Markdown (GFM): https://guides.github.com/features/mastering-markdown/""" self.data = data """Additional data for the card.""" + self.compact = compact + """In compact mode markdown content takes less screen space. Defaults to True.""" self.commands = commands """Contextual menu commands for this component.""" @@ -9630,6 +9634,7 @@ def dump(self) -> Dict: _guard_scalar('MarkdownCard.box', self.box, (str,), False, False, False) _guard_scalar('MarkdownCard.title', self.title, (str,), False, False, False) _guard_scalar('MarkdownCard.content', self.content, (str,), False, False, False) + _guard_scalar('MarkdownCard.compact', self.compact, (bool,), False, True, False) _guard_vector('MarkdownCard.commands', self.commands, (Command,), False, True, False) return _dump( view='markdown', @@ -9637,6 +9642,7 @@ def dump(self) -> Dict: title=self.title, content=self.content, data=self.data, + compact=self.compact, commands=None if self.commands is None else [__e.dump() for __e in self.commands], ) @@ -9650,18 +9656,22 @@ def load(__d: Dict) -> 'MarkdownCard': __d_content: Any = __d.get('content') _guard_scalar('MarkdownCard.content', __d_content, (str,), False, False, False) __d_data: Any = __d.get('data') + __d_compact: Any = __d.get('compact') + _guard_scalar('MarkdownCard.compact', __d_compact, (bool,), False, True, False) __d_commands: Any = __d.get('commands') _guard_vector('MarkdownCard.commands', __d_commands, (dict,), False, True, False) box: str = __d_box title: str = __d_title content: str = __d_content data: Optional[PackedRecord] = __d_data + compact: Optional[bool] = __d_compact commands: Optional[List[Command]] = None if __d_commands is None else [Command.load(__e) for __e in __d_commands] return MarkdownCard( box, title, content, data, + compact, commands, ) diff --git a/py/h2o_lightwave/h2o_lightwave/ui.py b/py/h2o_lightwave/h2o_lightwave/ui.py index ed0db0823d8..a4a9a375c3b 100644 --- a/py/h2o_lightwave/h2o_lightwave/ui.py +++ b/py/h2o_lightwave/h2o_lightwave/ui.py @@ -3388,6 +3388,7 @@ def markdown_card( title: str, content: str, data: Optional[PackedRecord] = None, + compact: Optional[bool] = None, commands: Optional[List[Command]] = None, ) -> MarkdownCard: """Create a card that renders Markdown content. @@ -3402,6 +3403,7 @@ def markdown_card( title: The title for this card. content: The markdown content. Supports Github Flavored Markdown (GFM): https://guides.github.com/features/mastering-markdown/ data: Additional data for the card. + compact: In compact mode markdown content takes less screen space. Defaults to True. commands: Contextual menu commands for this component. Returns: A `h2o_wave.types.MarkdownCard` instance. @@ -3411,6 +3413,7 @@ def markdown_card( title, content, data, + compact, commands, ) diff --git a/py/h2o_wave/h2o_wave/types.py b/py/h2o_wave/h2o_wave/types.py index aea7fa964b1..ab389e6acd7 100644 --- a/py/h2o_wave/h2o_wave/types.py +++ b/py/h2o_wave/h2o_wave/types.py @@ -9608,11 +9608,13 @@ def __init__( title: str, content: str, data: Optional[PackedRecord] = None, + compact: Optional[bool] = None, commands: Optional[List[Command]] = None, ): _guard_scalar('MarkdownCard.box', box, (str,), False, False, False) _guard_scalar('MarkdownCard.title', title, (str,), False, False, False) _guard_scalar('MarkdownCard.content', content, (str,), False, False, False) + _guard_scalar('MarkdownCard.compact', compact, (bool,), False, True, False) _guard_vector('MarkdownCard.commands', commands, (Command,), False, True, False) self.box = box """A string indicating how to place this component on the page.""" @@ -9622,6 +9624,8 @@ def __init__( """The markdown content. Supports Github Flavored Markdown (GFM): https://guides.github.com/features/mastering-markdown/""" self.data = data """Additional data for the card.""" + self.compact = compact + """In compact mode markdown content takes less screen space. Defaults to True.""" self.commands = commands """Contextual menu commands for this component.""" @@ -9630,6 +9634,7 @@ def dump(self) -> Dict: _guard_scalar('MarkdownCard.box', self.box, (str,), False, False, False) _guard_scalar('MarkdownCard.title', self.title, (str,), False, False, False) _guard_scalar('MarkdownCard.content', self.content, (str,), False, False, False) + _guard_scalar('MarkdownCard.compact', self.compact, (bool,), False, True, False) _guard_vector('MarkdownCard.commands', self.commands, (Command,), False, True, False) return _dump( view='markdown', @@ -9637,6 +9642,7 @@ def dump(self) -> Dict: title=self.title, content=self.content, data=self.data, + compact=self.compact, commands=None if self.commands is None else [__e.dump() for __e in self.commands], ) @@ -9650,18 +9656,22 @@ def load(__d: Dict) -> 'MarkdownCard': __d_content: Any = __d.get('content') _guard_scalar('MarkdownCard.content', __d_content, (str,), False, False, False) __d_data: Any = __d.get('data') + __d_compact: Any = __d.get('compact') + _guard_scalar('MarkdownCard.compact', __d_compact, (bool,), False, True, False) __d_commands: Any = __d.get('commands') _guard_vector('MarkdownCard.commands', __d_commands, (dict,), False, True, False) box: str = __d_box title: str = __d_title content: str = __d_content data: Optional[PackedRecord] = __d_data + compact: Optional[bool] = __d_compact commands: Optional[List[Command]] = None if __d_commands is None else [Command.load(__e) for __e in __d_commands] return MarkdownCard( box, title, content, data, + compact, commands, ) diff --git a/py/h2o_wave/h2o_wave/ui.py b/py/h2o_wave/h2o_wave/ui.py index ed0db0823d8..a4a9a375c3b 100644 --- a/py/h2o_wave/h2o_wave/ui.py +++ b/py/h2o_wave/h2o_wave/ui.py @@ -3388,6 +3388,7 @@ def markdown_card( title: str, content: str, data: Optional[PackedRecord] = None, + compact: Optional[bool] = None, commands: Optional[List[Command]] = None, ) -> MarkdownCard: """Create a card that renders Markdown content. @@ -3402,6 +3403,7 @@ def markdown_card( title: The title for this card. content: The markdown content. Supports Github Flavored Markdown (GFM): https://guides.github.com/features/mastering-markdown/ data: Additional data for the card. + compact: In compact mode markdown content takes less screen space. Defaults to True. commands: Contextual menu commands for this component. Returns: A `h2o_wave.types.MarkdownCard` instance. @@ -3411,6 +3413,7 @@ def markdown_card( title, content, data, + compact, commands, ) diff --git a/r/R/ui.R b/r/R/ui.R index 7d81a35fb39..d16690246e2 100644 --- a/r/R/ui.R +++ b/r/R/ui.R @@ -3948,6 +3948,7 @@ ui_list_item1_card <- function( #' @param title The title for this card. #' @param content The markdown content. Supports Github Flavored Markdown (GFM): https://guides.github.com/features/mastering-markdown/ #' @param data Additional data for the card. +#' @param compact In compact mode markdown content takes less screen space. Defaults to True. #' @param commands Contextual menu commands for this component. #' @return A MarkdownCard instance. #' @export @@ -3956,17 +3957,20 @@ ui_markdown_card <- function( title, content, data = NULL, + compact = NULL, commands = NULL) { .guard_scalar("box", "character", box) .guard_scalar("title", "character", title) .guard_scalar("content", "character", content) # TODO Validate data: Rec + .guard_scalar("compact", "logical", compact) .guard_vector("commands", "WaveCommand", commands) .o <- list( box=box, title=title, content=content, data=data, + compact=compact, commands=commands, view='markdown') class(.o) <- append(class(.o), c(.wave_obj, "WaveMarkdownCard")) diff --git a/tools/intellij-plugin/src/main/resources/templates/wave-components.xml b/tools/intellij-plugin/src/main/resources/templates/wave-components.xml index b24c294face..149e668f93c 100644 --- a/tools/intellij-plugin/src/main/resources/templates/wave-components.xml +++ b/tools/intellij-plugin/src/main/resources/templates/wave-components.xml @@ -1667,11 +1667,12 @@