-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
feat: disclosure #1068
base: main
Are you sure you want to change the base?
feat: disclosure #1068
Changes from all commits
fe13317
4fc622b
75f56e6
62e0693
bd2e99e
e110db9
f1050d4
36bd679
ef23d44
389e3ff
84ccde6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,85 @@ | ||||||||||||||||||||||||||||||||||||
# Disclosure | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
A collapsible section of content with a heading that toggles the visibility of a panel. | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
## Example | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
```python | ||||||||||||||||||||||||||||||||||||
from deephaven import ui | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
my_disclosure_basic = ui.disclosure(title="Heading", panel="Content") | ||||||||||||||||||||||||||||||||||||
``` | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
## Events | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
Disclosure accepts an `on_expanded_change` prop which triggers when it is expanded or collapsed. | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
```python | ||||||||||||||||||||||||||||||||||||
from deephaven import ui | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
@ui.component | ||||||||||||||||||||||||||||||||||||
def ui_toggle_disclosure(): | ||||||||||||||||||||||||||||||||||||
is_expanded, set_is_expanded = ui.use_state(False) | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
return ui.flex( | ||||||||||||||||||||||||||||||||||||
ui.disclosure( | ||||||||||||||||||||||||||||||||||||
title="Heading", | ||||||||||||||||||||||||||||||||||||
panel="Content", | ||||||||||||||||||||||||||||||||||||
on_expanded_change=lambda: set_is_expanded( | ||||||||||||||||||||||||||||||||||||
True if is_expanded == False else False | ||||||||||||||||||||||||||||||||||||
), | ||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should pass
Suggested change
|
||||||||||||||||||||||||||||||||||||
), | ||||||||||||||||||||||||||||||||||||
ui.text("Expanded" if is_expanded == True else "Collapsed"), | ||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You don't need the
Suggested change
|
||||||||||||||||||||||||||||||||||||
direction="column", | ||||||||||||||||||||||||||||||||||||
) | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
my_toggle_disclosure = ui_toggle_disclosure() | ||||||||||||||||||||||||||||||||||||
``` | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
## Variants | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
```python | ||||||||||||||||||||||||||||||||||||
from deephaven import ui | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
@ui.component | ||||||||||||||||||||||||||||||||||||
def ui_disclosure_variants(): | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
return [ | ||||||||||||||||||||||||||||||||||||
ui.disclosure("Or", variant="or"), | ||||||||||||||||||||||||||||||||||||
ui.disclosure("And", variant="and"), | ||||||||||||||||||||||||||||||||||||
] | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
my_disclosure_variants = ui_disclosure_variants() | ||||||||||||||||||||||||||||||||||||
``` | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
Comment on lines
+41
to
+58
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think bad copy/paste
Suggested change
|
||||||||||||||||||||||||||||||||||||
## Disabled state | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
```python | ||||||||||||||||||||||||||||||||||||
from deephaven import ui | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
my_disclosure_disabled = ui.disclosure( | ||||||||||||||||||||||||||||||||||||
title="Heading", panel="Content", is_disabled=True | ||||||||||||||||||||||||||||||||||||
) | ||||||||||||||||||||||||||||||||||||
``` | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
## Quiet state | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
```python | ||||||||||||||||||||||||||||||||||||
from deephaven import ui | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
my_disclosure_disabled = ui.disclosure(title="Heading", panel="Content", is_quiet=True) | ||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why doesn't the little arrow appear when it's collapsed? It does in Spectrum's example.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like the issue is in the version of Spectrum we're using: adobe/react-spectrum#7456 |
||||||||||||||||||||||||||||||||||||
``` | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
## Expanded state | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
```python | ||||||||||||||||||||||||||||||||||||
from deephaven import ui | ||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||
my_disclosure_disabled = ui.disclosure( | ||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||||
title="Heading", panel="Content", default_expanded=True | ||||||||||||||||||||||||||||||||||||
) | ||||||||||||||||||||||||||||||||||||
``` | ||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add some examples using |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,185 @@ | ||
from __future__ import annotations | ||
from typing import Any, Callable | ||
from .types import ( | ||
AlignSelf, | ||
CSSProperties, | ||
DimensionValue, | ||
JustifySelf, | ||
LayoutFlex, | ||
Position, | ||
) | ||
from .basic import component_element | ||
from ..elements import Element | ||
|
||
|
||
def disclosure( | ||
title: Any, | ||
panel: Any, | ||
*, | ||
is_quiet: bool | None = None, | ||
is_disabled: bool | None = None, | ||
is_expanded: bool | None = None, | ||
default_expanded: bool | None = None, | ||
on_expanded_change: Callable[[bool], None] | None = None, | ||
flex: LayoutFlex | None = None, | ||
flex_grow: float | None = None, | ||
flex_shrink: float | None = None, | ||
flex_basis: DimensionValue | None = None, | ||
align_self: AlignSelf | None = None, | ||
justify_self: JustifySelf | None = None, | ||
order: int | None = None, | ||
grid_area: str | None = None, | ||
grid_row: str | None = None, | ||
grid_column: str | None = None, | ||
grid_column_start: str | None = None, | ||
grid_column_end: str | None = None, | ||
grid_row_start: str | None = None, | ||
grid_row_end: str | None = None, | ||
slot: str | None = None, | ||
margin: DimensionValue | None = None, | ||
margin_top: DimensionValue | None = None, | ||
margin_bottom: DimensionValue | None = None, | ||
margin_start: DimensionValue | None = None, | ||
margin_end: DimensionValue | None = None, | ||
margin_x: DimensionValue | None = None, | ||
margin_y: DimensionValue | None = None, | ||
width: DimensionValue | None = None, | ||
height: DimensionValue | None = None, | ||
min_width: DimensionValue | None = None, | ||
min_height: DimensionValue | None = None, | ||
max_width: DimensionValue | None = None, | ||
max_height: DimensionValue | None = None, | ||
position: Position | None = None, | ||
top: DimensionValue | None = None, | ||
bottom: DimensionValue | None = None, | ||
left: DimensionValue | None = None, | ||
right: DimensionValue | None = None, | ||
start: DimensionValue | None = None, | ||
end: DimensionValue | None = None, | ||
z_index: int | None = None, | ||
is_hidden: bool | None = None, | ||
id: str | None = None, | ||
aria_label: str | None = None, | ||
aria_labelledby: str | None = None, | ||
aria_describedby: str | None = None, | ||
aria_details: str | None = None, | ||
UNSAFE_class_name: str | None = None, | ||
UNSAFE_style: CSSProperties | None = None, | ||
key: str | None = None, | ||
) -> Element: | ||
""" | ||
A collapsible section of content with a heading that toggles the visibility of a panel. | ||
|
||
Args: | ||
title: The title of the disclosure. | ||
panel: The content of the disclosure. | ||
is_quiet: Whether the element is displayed with a quiet style. | ||
is_disabled: Whether the element is disabled. | ||
is_expanded: Whether the element is expanded (controlled). | ||
default_expanded: Whether the element is expanded by default (uncontrolled). | ||
on_expanded_change: Handler that is called when the element's expanded state changes. | ||
flex: When used in a flex layout, specifies how the element will grow or shrink to fit the space available. | ||
flex_grow: When used in a flex layout, specifies how the element will grow to fit the space available. | ||
flex_shrink: When used in a flex layout, specifies how the element will shrink to fit the space available. | ||
flex_basis: When used in a flex layout, specifies the initial main size of the element. | ||
align_self: Overrides the alignItems property of a flex or grid container. | ||
justify_self: Species how the element is justified inside a flex or grid container. | ||
order: The layout order for the element within a flex or grid container. | ||
grid_area: When used in a grid layout specifies, specifies the named grid area that the element should be placed in within the grid. | ||
grid_row: When used in a grid layout, specifies the row the element should be placed in within the grid. | ||
grid_column: When used in a grid layout, specifies the column the element should be placed in within the grid. | ||
grid_row_start: When used in a grid layout, specifies the starting row to span within the grid. | ||
grid_row_end: When used in a grid layout, specifies the ending row to span within the grid. | ||
grid_column_start: When used in a grid layout, specifies the starting column to span within the grid. | ||
grid_column_end: When used in a grid layout, specifies the ending column to span within the grid. | ||
slot: Slot name for the element. Slows enable components to receive props from a parent component. An explicit null indicates that local props override parent props. | ||
margin: The margin for all four sides of the element. | ||
margin_top: The margin for the top side of the element. | ||
margin_bottom: The margin for the bottom side of the element. | ||
margin_start: The margin for the logical start side of the element, depending on layout direction. | ||
margin_end: The margin for the logical end side of the element, depending on layout direction. | ||
margin_x: The margin for the left and right sides of the element. | ||
margin_y: The margin for the top and bottom sides of the element. | ||
width: The width of the element. | ||
height: The height of the element. | ||
min_width: The minimum width of the element. | ||
min_height: The minimum height of the element. | ||
max_width: The maximum width of the element. | ||
max_height: The maximum height of the element. | ||
position: Specifies how the element is position. | ||
top: The top position of the element. | ||
bottom: The bottom position of the element. | ||
left: The left position of the element. | ||
right: The right position of the element. | ||
start: The logical start position of the element, depending on layout direction. | ||
end: The logical end position of the element, depending on layout direction. | ||
z_index: The stacking order for the element | ||
is_hidden: Hides the element. | ||
id: The unique identifier of the element. | ||
aria_label: Defines a string value that labels the current element. | ||
aria_labelledby: Identifies the element (or elements) that labels the current element. | ||
aria_describedby: Identifies the element (or elements) that describes the object. | ||
aria_details: Identifies the element (or elements) that provide a detailed, extended description for the object. | ||
UNSAFE_class_name: Set the CSS className for the element. Only use as a last resort. Use style props instead. | ||
UNSAFE_style: Set the inline style for the element. Only use as a last resort. Use style props instead. | ||
key: A unique identifier used by React to render elements in a list. | ||
|
||
Returns: | ||
The rendered disclosure component. | ||
|
||
""" | ||
return component_element( | ||
"Disclosure", | ||
title=title, | ||
panel=panel, | ||
is_quiet=is_quiet, | ||
is_disabled=is_disabled, | ||
is_expanded=is_expanded, | ||
default_expanded=default_expanded, | ||
on_expanded_change=on_expanded_change, | ||
flex=flex, | ||
flex_grow=flex_grow, | ||
flex_shrink=flex_shrink, | ||
flex_basis=flex_basis, | ||
align_self=align_self, | ||
justify_self=justify_self, | ||
order=order, | ||
grid_area=grid_area, | ||
grid_row=grid_row, | ||
grid_column=grid_column, | ||
grid_column_start=grid_column_start, | ||
grid_column_end=grid_column_end, | ||
grid_row_start=grid_row_start, | ||
grid_row_end=grid_row_end, | ||
slot=slot, | ||
margin=margin, | ||
margin_top=margin_top, | ||
margin_bottom=margin_bottom, | ||
margin_start=margin_start, | ||
margin_end=margin_end, | ||
margin_x=margin_x, | ||
margin_y=margin_y, | ||
width=width, | ||
height=height, | ||
min_width=min_width, | ||
min_height=min_height, | ||
max_width=max_width, | ||
max_height=max_height, | ||
position=position, | ||
top=top, | ||
bottom=bottom, | ||
left=left, | ||
right=right, | ||
start=start, | ||
end=end, | ||
z_index=z_index, | ||
is_hidden=is_hidden, | ||
id=id, | ||
aria_label=aria_label, | ||
aria_labelledby=aria_labelledby, | ||
aria_describedby=aria_describedby, | ||
aria_details=aria_details, | ||
UNSAFE_class_name=UNSAFE_class_name, | ||
UNSAFE_style=UNSAFE_style, | ||
key=key, | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In Python instead of writing something like
!is_expanded
like you would in JS, you writenot is_expanded
to toggle something. Better than what you've got now.