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

feat: S2 treeview #7343

Merged
merged 44 commits into from
Jan 29, 2025
+1,030 −56
Merged

feat: S2 treeview #7343

Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
81aa028
Render a TreeView
snowystinger Nov 5, 2024
8dbce27
Correct styles
snowystinger Nov 8, 2024
b297017
update styles to better fix s2
snowystinger Nov 8, 2024
f8b7353
Merge branch 'main' into s2-treeview
snowystinger Nov 12, 2024
4f69394
fix install
snowystinger Nov 12, 2024
98654db
fix lint, add preliminary test
snowystinger Nov 12, 2024
dec417a
fix lint
snowystinger Nov 12, 2024
6b8f9ab
Add tests and test util
snowystinger Nov 13, 2024
1b72a1d
Merge branch 'main' into s2-treeview
snowystinger Nov 21, 2024
8bdfb54
save point
snowystinger Nov 21, 2024
10b40f4
Add emptyState
snowystinger Nov 21, 2024
e9e4bf2
fix lint
snowystinger Nov 21, 2024
5fcfd47
detached styles
snowystinger Nov 21, 2024
2e0a38e
Merge branch 'main' into s2-treeview
snowystinger Nov 26, 2024
cada78a
Merge branch 'main' into s2-treeview
snowystinger Nov 26, 2024
9699bc0
detached styling with actions
snowystinger Nov 27, 2024
3ea307f
fix disabled, icon placement, and add examples
snowystinger Dec 2, 2024
bc54a0d
Merge branch 'main' into s2-treeview
snowystinger Dec 2, 2024
9197b9b
Merge branch 'main' into s2-treeview
snowystinger Dec 2, 2024
4c58a3c
fix lint
snowystinger Dec 2, 2024
52d8a40
update snapshots
snowystinger Dec 2, 2024
7f19c7a
fix lint and tests
snowystinger Dec 3, 2024
aa3b45e
fix imports
snowystinger Dec 3, 2024
159948f
Match row selection to table
snowystinger Dec 3, 2024
02d6af0
Merge branch 'main' into s2-treeview
snowystinger Dec 3, 2024
d97a79f
fix lint, again
snowystinger Dec 3, 2024
738c775
Merge branch 'main' into s2-treeview
snowystinger Jan 13, 2025
31083d8
feat: S2 treeview virtualized (#7465)
snowystinger Jan 14, 2025
10419df
fix height for docs
snowystinger Jan 14, 2025
e2c7a01
Merge branch 'main' into s2-treeview
snowystinger Jan 15, 2025
11ddb5d
default tree disabled behavior to all to match our other components
snowystinger Jan 15, 2025
d5c2b1c
fix tests
snowystinger Jan 15, 2025
02f8244
Merge branch 'main' into s2-treeview
snowystinger Jan 16, 2025
7b01fd6
Merge branch 'main' into s2-treeview
snowystinger Jan 20, 2025
75f8ade
update snapshots
snowystinger Jan 20, 2025
783b78a
fix lint
snowystinger Jan 20, 2025
bf7365d
fix alignment and remove minwidth
snowystinger Jan 22, 2025
d814ccb
increase gap between detached items
snowystinger Jan 22, 2025
7c84032
remove restriction for isDetached and isEmphasized
snowystinger Jan 23, 2025
c76f762
fix border radius
snowystinger Jan 23, 2025
5d282b3
Merge branch 'main' into s2-treeview
snowystinger Jan 23, 2025
e495ef1
Merge branch 'main' into s2-treeview
snowystinger Jan 28, 2025
7806b6e
review comments
snowystinger Jan 29, 2025
685e7af
fix lint
snowystinger Jan 29, 2025
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
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,12 @@
"jest": "^29.5.0"
},
"dependencies": {
"@react-aria/button": "^3.11.1",
snowystinger marked this conversation as resolved.
Show resolved Hide resolved
"@react-aria/collections": "3.0.0-alpha.7",
"@react-aria/i18n": "^3.12.5",
"@react-aria/interactions": "^3.23.0",
"@react-aria/live-announcer": "^3.4.1",
"@react-aria/tree": "3.0.0-beta.3",
"@react-aria/utils": "^3.27.0",
"@react-spectrum/utils": "^3.12.1",
"@react-stately/layout": "^4.1.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/@react-spectrum/s2/src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
SubmenuTrigger as AriaSubmenuTrigger,
SubmenuTriggerProps as AriaSubmenuTriggerProps,
ContextValue,
DEFAULT_SLOT,
Provider,
Separator,
SeparatorProps
Expand Down Expand Up @@ -490,6 +491,7 @@ export function MenuItem(props: MenuItemProps) {
}],
[TextContext, {
slots: {
[DEFAULT_SLOT]: {styles: label({size})},
label: {styles: label({size})},
description: {styles: description({...renderProps, size})},
value: {styles: value}
Expand Down
Loading