Skip to content
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

Jump to bottom

feat: Add width support for copyable text #2282 #2284

Merged
merged 1 commit into from
Mar 7, 2024
Merged

feat: Add width support for copyable text #2282 #2284

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions py/h2o_lightwave/h2o_lightwave/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7113,12 +7113,14 @@ def __init__(
name: Optional[str] = None,
multiline: Optional[bool] = None,
height: Optional[str] = None,
width: Optional[str] = None,
):
_guard_scalar('CopyableText.value', value, (str,), False, False, False)
_guard_scalar('CopyableText.label', label, (str,), False, False, False)
_guard_scalar('CopyableText.name', name, (str,), False, True, False)
_guard_scalar('CopyableText.multiline', multiline, (bool,), False, True, False)
_guard_scalar('CopyableText.height', height, (str,), False, True, False)
_guard_scalar('CopyableText.width', width, (str,), False, True, False)
self.value = value
"""Text to be displayed inside the component."""
self.label = label
Expand All @@ -7129,6 +7131,8 @@ def __init__(
"""True if the component should allow multi-line text entry."""
self.height = height
"""Custom height in px (e.g. '200px') or '1' to fill the remaining card space. Requires `multiline` to be set."""
self.width = width
"""The width of the copyable text , e.g. '100px'."""

def dump(self) -> Dict:
"""Returns the contents of this object as a dict."""
Expand All @@ -7137,12 +7141,14 @@ def dump(self) -> Dict:
_guard_scalar('CopyableText.name', self.name, (str,), False, True, False)
_guard_scalar('CopyableText.multiline', self.multiline, (bool,), False, True, False)
_guard_scalar('CopyableText.height', self.height, (str,), False, True, False)
_guard_scalar('CopyableText.width', self.width, (str,), False, True, False)
return _dump(
value=self.value,
label=self.label,
name=self.name,
multiline=self.multiline,
height=self.height,
width=self.width,
)

@staticmethod
Expand All @@ -7158,17 +7164,21 @@ def load(__d: Dict) -> 'CopyableText':
_guard_scalar('CopyableText.multiline', __d_multiline, (bool,), False, True, False)
__d_height: Any = __d.get('height')
_guard_scalar('CopyableText.height', __d_height, (str,), False, True, False)
__d_width: Any = __d.get('width')
_guard_scalar('CopyableText.width', __d_width, (str,), False, True, False)
value: str = __d_value
label: str = __d_label
name: Optional[str] = __d_name
multiline: Optional[bool] = __d_multiline
height: Optional[str] = __d_height
width: Optional[str] = __d_width
return CopyableText(
value,
label,
name,
multiline,
height,
width,
)


Expand Down
3 changes: 3 additions & 0 deletions py/h2o_lightwave/h2o_lightwave/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,6 +2632,7 @@ def copyable_text(
name: Optional[str] = None,
multiline: Optional[bool] = None,
height: Optional[str] = None,
width: Optional[str] = None,
) -> Component:
"""Create a copyable text component.
Use this component when you want to enable your users to quickly copy paste sections of text.
Expand All @@ -2642,6 +2643,7 @@ def copyable_text(
name: An identifying name for this component.
multiline: True if the component should allow multi-line text entry.
height: Custom height in px (e.g. '200px') or '1' to fill the remaining card space. Requires `multiline` to be set.
width: The width of the copyable text , e.g. '100px'.
Returns:
A `h2o_wave.types.CopyableText` instance.
"""
Expand All @@ -2651,6 +2653,7 @@ def copyable_text(
name,
multiline,
height,
width,
))


Expand Down
10 changes: 10 additions & 0 deletions py/h2o_wave/h2o_wave/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7113,12 +7113,14 @@ def __init__(
name: Optional[str] = None,
multiline: Optional[bool] = None,
height: Optional[str] = None,
width: Optional[str] = None,
):
_guard_scalar('CopyableText.value', value, (str,), False, False, False)
_guard_scalar('CopyableText.label', label, (str,), False, False, False)
_guard_scalar('CopyableText.name', name, (str,), False, True, False)
_guard_scalar('CopyableText.multiline', multiline, (bool,), False, True, False)
_guard_scalar('CopyableText.height', height, (str,), False, True, False)
_guard_scalar('CopyableText.width', width, (str,), False, True, False)
self.value = value
"""Text to be displayed inside the component."""
self.label = label
Expand All @@ -7129,6 +7131,8 @@ def __init__(
"""True if the component should allow multi-line text entry."""
self.height = height
"""Custom height in px (e.g. '200px') or '1' to fill the remaining card space. Requires `multiline` to be set."""
self.width = width
"""The width of the copyable text , e.g. '100px'."""

def dump(self) -> Dict:
"""Returns the contents of this object as a dict."""
Expand All @@ -7137,12 +7141,14 @@ def dump(self) -> Dict:
_guard_scalar('CopyableText.name', self.name, (str,), False, True, False)
_guard_scalar('CopyableText.multiline', self.multiline, (bool,), False, True, False)
_guard_scalar('CopyableText.height', self.height, (str,), False, True, False)
_guard_scalar('CopyableText.width', self.width, (str,), False, True, False)
return _dump(
value=self.value,
label=self.label,
name=self.name,
multiline=self.multiline,
height=self.height,
width=self.width,
)

@staticmethod
Expand All @@ -7158,17 +7164,21 @@ def load(__d: Dict) -> 'CopyableText':
_guard_scalar('CopyableText.multiline', __d_multiline, (bool,), False, True, False)
__d_height: Any = __d.get('height')
_guard_scalar('CopyableText.height', __d_height, (str,), False, True, False)
__d_width: Any = __d.get('width')
_guard_scalar('CopyableText.width', __d_width, (str,), False, True, False)
value: str = __d_value
label: str = __d_label
name: Optional[str] = __d_name
multiline: Optional[bool] = __d_multiline
height: Optional[str] = __d_height
width: Optional[str] = __d_width
return CopyableText(
value,
label,
name,
multiline,
height,
width,
)


Expand Down
3 changes: 3 additions & 0 deletions py/h2o_wave/h2o_wave/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,6 +2632,7 @@ def copyable_text(
name: Optional[str] = None,
multiline: Optional[bool] = None,
height: Optional[str] = None,
width: Optional[str] = None,
) -> Component:
"""Create a copyable text component.
Use this component when you want to enable your users to quickly copy paste sections of text.
Expand All @@ -2642,6 +2643,7 @@ def copyable_text(
name: An identifying name for this component.
multiline: True if the component should allow multi-line text entry.
height: Custom height in px (e.g. '200px') or '1' to fill the remaining card space. Requires `multiline` to be set.
width: The width of the copyable text , e.g. '100px'.
Returns:
A `h2o_wave.types.CopyableText` instance.
"""
Expand All @@ -2651,6 +2653,7 @@ def copyable_text(
name,
multiline,
height,
width,
))


Expand Down
8 changes: 6 additions & 2 deletions r/R/ui.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3066,25 +3066,29 @@ ui_facepile <- function(
#' @param name An identifying name for this component.
#' @param multiline True if the component should allow multi-line text entry.
#' @param height Custom height in px (e.g. '200px') or '1' to fill the remaining card space. Requires `multiline` to be set.
#' @param width The width of the copyable text , e.g. '100px'.
#' @return A CopyableText instance.
#' @export
ui_copyable_text <- function(
value,
label,
name = NULL,
multiline = NULL,
height = NULL) {
height = NULL,
width = NULL) {
.guard_scalar("value", "character", value)
.guard_scalar("label", "character", label)
.guard_scalar("name", "character", name)
.guard_scalar("multiline", "logical", multiline)
.guard_scalar("height", "character", height)
.guard_scalar("width", "character", width)
.o <- list(copyable_text=list(
value=value,
label=label,
name=name,
multiline=multiline,
height=height))
height=height,
width=width))
class(.o) <- append(class(.o), c(.wave_obj, "WaveComponent"))
return(.o)
}
Expand Down
3 changes: 2 additions & 1 deletion tools/intellij-plugin/src/main/resources/templates/wave-components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,12 +1249,13 @@
<option name="Python" value="true"/>
</context>
</template>
<template name="w_full_copyable_text" value="ui.copyable_text(value='$value$',label='$label$',name='$name$',multiline=$multiline$,height='$height$'),$END$" description="Create Wave CopyableText with full attributes." toReformat="true" toShortenFQNames="true">
<template name="w_full_copyable_text" value="ui.copyable_text(value='$value$',label='$label$',name='$name$',multiline=$multiline$,height='$height$',width='$width$'),$END$" description="Create Wave CopyableText with full attributes." toReformat="true" toShortenFQNames="true">
<variable name="value" expression="" defaultValue="" alwaysStopAt="true"/>
<variable name="label" expression="" defaultValue="" alwaysStopAt="true"/>
<variable name="name" expression="" defaultValue="" alwaysStopAt="true"/>
<variable name="multiline" expression="" defaultValue="&quot;False&quot;" alwaysStopAt="true"/>
<variable name="height" expression="" defaultValue="" alwaysStopAt="true"/>
<variable name="width" expression="" defaultValue="" alwaysStopAt="true"/>
<context>
<option name="Python" value="true"/>
</context>
Expand Down
2 changes: 1 addition & 1 deletion tools/vscode-extension/component-snippets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@
"Wave Full CopyableText": {
"prefix": "w_full_copyable_text",
"body": [
"ui.copyable_text(value='$1', label='$2', name='$3', multiline=${4:False}, height='$5'),$0"
"ui.copyable_text(value='$1', label='$2', name='$3', multiline=${4:False}, height='$5', width='$6'),$0"
],
"description": "Create a full Wave CopyableText."
},
Expand Down
2 changes: 2 additions & 0 deletions ui/src/copyable_text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ export interface CopyableText {
multiline?: B
/** Custom height in px (e.g. '200px') or '1' to fill the remaining card space. Requires `multiline` to be set. */
height?: S
/** The width of the copyable text , e.g. '100px'. */
width?: S
}

export const ClipboardCopyButton = ({ value }: { value: S }) => {
Expand Down
Loading