-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
add: related object name to favorite in navigation drawer #8659
Open
harshrajeevsingh
wants to merge
6
commits into
twentyhq:main
Choose a base branch
from
harshrajeevsingh:add/object-name-drawer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fdd3af5
add: object name in fav drawer
harshrajeevsingh cbac100
remove unused code
harshrajeevsingh bdefe59
fix: StyledItemObjectName
harshrajeevsingh 8dd5345
Merge remote-tracking branch 'upstream/main' into add/object-name-drawer
ehconitin 0542fbb
fix: max-width only for fav items
harshrajeevsingh ff35f19
Merge remote-tracking branch 'upstream/main' into add/object-name-drawer
ehconitin 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
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
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
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 |
---|---|---|
|
@@ -26,6 +26,7 @@ export type NavigationDrawerItemIndentationLevel = 1 | 2; | |
export type NavigationDrawerItemProps = { | ||
className?: string; | ||
label: string; | ||
objectName?: string; | ||
indentationLevel?: NavigationDrawerItemIndentationLevel; | ||
subItemState?: NavigationDrawerSubItemState; | ||
to?: string; | ||
|
@@ -123,10 +124,34 @@ const StyledItemElementsContainer = styled.span` | |
width: 100%; | ||
`; | ||
|
||
const StyledItemLabel = styled.span` | ||
const StyledLabelParent = styled.span` | ||
display: flex; | ||
gap: ${({ theme }) => theme.spacing(1)}; | ||
overflow: hidden; | ||
`; | ||
|
||
const StyledItemLabel = styled.span<{ hasObjectName: boolean }>` | ||
font-weight: ${({ theme }) => theme.font.weight.medium}; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
white-space: nowrap; | ||
${({ hasObjectName }) => | ||
hasObjectName && | ||
` | ||
max-width: 12ch; | ||
`} | ||
`; | ||
|
||
const StyledItemObjectName = styled.span` | ||
display: block; | ||
color: ${({ theme }) => theme.font.color.light}; | ||
font-weight: ${({ theme }) => theme.font.weight.regular}; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
white-space: nowrap; | ||
.navigation-drawer-item:hover & { | ||
display: none; | ||
} | ||
`; | ||
|
||
const StyledItemCount = styled.span` | ||
|
@@ -187,6 +212,7 @@ const StyledRightOptionsContainer = styled.div<{ | |
export const NavigationDrawerItem = ({ | ||
className, | ||
label, | ||
objectName, | ||
indentationLevel = DEFAULT_INDENTATION_LEVEL, | ||
Icon, | ||
to, | ||
|
@@ -252,9 +278,17 @@ export const NavigationDrawerItem = ({ | |
/> | ||
)} | ||
|
||
<NavigationDrawerAnimatedCollapseWrapper> | ||
<StyledItemLabel>{label}</StyledItemLabel> | ||
</NavigationDrawerAnimatedCollapseWrapper> | ||
<StyledLabelParent> | ||
<StyledItemLabel hasObjectName={!!objectName}> | ||
{label} | ||
</StyledItemLabel> | ||
{objectName ? ( | ||
<StyledItemObjectName> | ||
{' · '} | ||
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. style: Non-breaking space should be used instead of regular space for better typography |
||
{objectName.charAt(0).toUpperCase() + objectName.slice(1)} | ||
</StyledItemObjectName> | ||
) : null} | ||
</StyledLabelParent> | ||
|
||
<StyledSpacer /> | ||
|
||
|
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
Oops, something went wrong.
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.
logic: Hiding content on hover may cause accessibility issues for keyboard/screen reader users