-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Breadcrumb collapse #6892
Merged
Merged
Breadcrumb collapse #6892
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
859b93d
Breadcrumb collapse
snowystinger 75bc99a
use a custom renderer
snowystinger a621923
forward link props
snowystinger 8950a4c
Merge branch 'main' into breadcrumb-menu
snowystinger 7978d78
Merge branch 'main' into breadcrumb-menu
snowystinger f7326f6
don't need to specify branch
snowystinger 068c3bb
measuring
snowystinger dacb2be
fix warnings and onAction
snowystinger 05abcb3
more stories
snowystinger 8f829f6
Merge branch 'main' into breadcrumb-menu
snowystinger 488e9fd
Fix our use of context in TagGroup
snowystinger 14a48fe
Merge branch 'main' into breadcrumb-menu
snowystinger b735798
Fix types
snowystinger 9e16f3a
Merge branch 'main' into breadcrumb-menu
snowystinger aaa99e6
Merge branch 'breadcrumb-menu' of github.com:adobe/react-spectrum int…
snowystinger fc19c58
Merge branch 'main' into breadcrumb-menu
snowystinger e1d738d
fix TS
snowystinger 2253530
fix taggroup
snowystinger a9b7ab2
review comments
snowystinger 5869486
Fixed the TS error apparently
snowystinger 16f5a5a
remove dead code
snowystinger 647f75a
detect link out on menu item
snowystinger ac304c9
Fix bugs
snowystinger 2988241
remove testing stories
snowystinger 95c60c8
Merge branch 'main' into breadcrumb-menu
snowystinger 96d3cb5
Update packages/@react-spectrum/s2/src/Breadcrumbs.tsx
snowystinger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Merge branch 'main' into breadcrumb-menu
# Conflicts: # packages/@react-spectrum/s2/src/Breadcrumbs.tsx # packages/@react-spectrum/s2/src/TagGroup.tsx
- Loading branch information
commit 8f829f60f091d93371c9d806afa2bfc28f6fbf43
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -138,7 +138,7 @@ let BreadcrumbMenu = (props: {items: Array<Node<any>>, onAction: Pick<Breadcrumb | |
<li className={breadcrumbStyles({size, isDisabled, isMenu: true})}> | ||
<MenuTrigger> | ||
<S2ActionButton isDisabled={isDisabled} isQuiet aria-label="See more"><FolderIcon /></S2ActionButton> | ||
{/** @ts-ignore - how are these onAction's not compatible? */} | ||
{/* @ts-ignore - how are these onAction's not compatible? */} | ||
<Menu items={items} onAction={onAction}> | ||
{(item: Node<any>) => ( | ||
<MenuItem | ||
|
@@ -456,6 +456,7 @@ let useCollectionRender = (collection: Collection<Node<unknown>>) => { | |
{visibleItems < collection.size ? ( | ||
<> | ||
{children[0].render?.(children[0])} | ||
{/* @ts-ignore - how are these onAction's not compatible? */} | ||
<BreadcrumbMenu items={children.slice(1, sliceIndex)} onAction={onAction} /> | ||
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. 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. fixed, see storybook from ac304c9 where i temporarily added some new stories to hit the edge cases |
||
{children.slice(sliceIndex).map(node => <Fragment key={node.key}>{node.render?.(node)}</Fragment >)} | ||
</> | ||
|
You are viewing a condensed version of this merge commit. You can view the full changes here.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Do we want to keep the
showRoot
option from v3?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.
following up with spectrum