-
Notifications
You must be signed in to change notification settings - Fork 12
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: navigation dropdown refactoring #392
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
64 changes: 64 additions & 0 deletions
64
src/navigation/components/DesktopNavigation/DesktopNavigation.tsx
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 |
---|---|---|
@@ -0,0 +1,64 @@ | ||
import React from 'react'; | ||
|
||
import _ from 'lodash'; | ||
|
||
import OverflowScroller from '../../../components/OverflowScroller/OverflowScroller'; | ||
import {block} from '../../../utils'; | ||
import {DesktopNavigationProps, ItemColumnName, NavigationLayout} from '../../models'; | ||
import Logo from '../Logo/Logo'; | ||
import {MobileMenuButton} from '../MobileMenuButton/MobileMenuButton'; | ||
import {NavigationList} from '../NavigationList/NavigationList'; | ||
|
||
import './DesktopNavigation.scss'; | ||
|
||
const b = block('desktop-navigation'); | ||
|
||
const DesktopNavigation: React.FC<DesktopNavigationProps> = ({ | ||
logo, | ||
leftItemsWithIconSize, | ||
rightItemsWithIconSize, | ||
isSidebarOpened, | ||
onSidebarOpenedChange, | ||
onActiveItemChange, | ||
activeItemId, | ||
}) => ( | ||
<div className={b('wrapper')}> | ||
{logo && ( | ||
<div className={b('left')}> | ||
<Logo {...logo} className={b('logo')} /> | ||
</div> | ||
)} | ||
<div className={b('navigation-container')}> | ||
<OverflowScroller className={b('navigation')} onScrollStart={onActiveItemChange}> | ||
<NavigationList | ||
items={leftItemsWithIconSize} | ||
onActiveItemChange={onActiveItemChange} | ||
className={b('links')} | ||
itemClassName={b('item')} | ||
column={ItemColumnName.Left} | ||
activeItemId={activeItemId} | ||
menuLayout={NavigationLayout.Desktop} | ||
/> | ||
</OverflowScroller> | ||
</div> | ||
<div className={b('right')}> | ||
<MobileMenuButton | ||
isSidebarOpened={isSidebarOpened} | ||
onSidebarOpenedChange={onSidebarOpenedChange} | ||
/> | ||
{rightItemsWithIconSize && ( | ||
<NavigationList | ||
onActiveItemChange={onActiveItemChange} | ||
column={ItemColumnName.Right} | ||
items={rightItemsWithIconSize} | ||
activeItemId={activeItemId} | ||
className={b('buttons')} | ||
itemClassName={b('item')} | ||
menuLayout={NavigationLayout.Desktop} | ||
/> | ||
)} | ||
</div> | ||
</div> | ||
); | ||
|
||
export default DesktopNavigation; |
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
src/navigation/components/MobileMenuButton/MobileMenuButton.scss
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 |
---|---|---|
@@ -0,0 +1,9 @@ | ||
@import '../../../../styles/mixins'; | ||
|
||
$block: '.#{$ns}mobile-menu-button'; | ||
|
||
#{$block} { | ||
@include add-specificity(&) { | ||
@include mobile-tablet-only(); | ||
} | ||
} |
Oops, something went wrong.
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.
Should Logo be inside of LeftDesktopNavigation and MobileMenuButton is inside of RightDesktopNavigation?
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.
I think "No, they should not". Both
Logo
andMobileMenuButton
are specific items: they are always visible on every screen, they are not a part of conceptNavigationItem
, adding this toLeft
andRight
components will make logic of ones complicated