Skip to content

Gets0ul community app issue 2664 #146

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

Merged
merged 4 commits into from
Jan 26, 2020
Merged

Gets0ul community app issue 2664 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b8f746
hide white secondary menus when empty
gets0ul Jan 18, 2020
856d909
Hide white space for mobile sub menu
gets0ul Jan 22, 2020
8b5a5bf
Merge branch 'community_app_issue-2664' of https://github.com/gets0ul…
luizrrodrigues Jan 25, 2020
d70565b
Remove submenu area and arrow when submenu not present.
luizrrodrigues Jan 26, 2020
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
10 changes: 5 additions & 5 deletions dist/dev/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/prod/index.js
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions src/components/TopNav/MobileMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@ import styles from './MobileMenu.module.scss'

const MobileMenu = ({ menu, activeChildId, createHandleClickItem }) => (
<div className={styles.secondaryNavMobile}>
{menu.subMenu && menu.subMenu.map((level2, i) => (
<a
className={cn(styles.secondaryNavMobileItem, level2.id === activeChildId && styles.secondaryNavMobileItemOpen)}
href={level2.href}
key={`level2-${i}`}
onClick={createHandleClickItem(level2.id)}
>
{level2.title}
</a>
))}
{menu.subMenu && menu.subMenu.map((level2, i) => {
if ((level2.subMenu && level2.subMenu.length > 0) || level2.href) {
return (
<a
className={cn(styles.secondaryNavMobileItem, level2.id === activeChildId && styles.secondaryNavMobileItemOpen)}
href={level2.href}
key={`level2-${i}`}
onClick={level2.subMenu && level2.subMenu.length > 0 ? createHandleClickItem(level2.id) : null}
>
{level2.title}
</a>
)
}
})}
</div>
)

Expand Down
48 changes: 29 additions & 19 deletions src/components/TopNav/MobileSubNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,35 @@ const MobileSubNav = ({ open, menu, isSecondaryMenu, activeChildId, onClick, cre
className={cn(styles.mobileSubNav, open && styles.mobileSubNavOpen)}
>
<div className={styles.mobileSubNavMask} />
<button className={styles.mobileSubNavHeader} onClick={onClick}>
<span>{menu.title}</span>
{open && <IconArrowSmallup />}
{!open && <IconArrowSmalldown />}
</button>
{open && (
<div className={styles.mobileSubNavContent}>
{(isSecondaryMenu ? menu.secondaryMenu : menu.subMenu) && (isSecondaryMenu ? menu.secondaryMenu : menu.subMenu).map((level3, i) => (
<a
className={cn(styles.mobileSubNavChild, level3.id === activeChildId && styles.mobileSubNavChildOpen)}
href={level3.href}
key={`level3-${i}`}
onClick={createHandleClickItem(level3.id)}
>
{level3.title}
</a>
))}
</div>
)}
{(((!isSecondaryMenu && menu.subMenu && menu.subMenu.length > 0) ||
(menu.secondaryMenu && menu.secondaryMenu.length > 0)) &&
<>
<button className={styles.mobileSubNavHeader} onClick={onClick}>
<span>{menu.title}</span>
{open ? <IconArrowSmallup /> : <IconArrowSmalldown />}
</button>
{open && (
<div className={styles.mobileSubNavContent}>
{(isSecondaryMenu ? menu.secondaryMenu : menu.subMenu).map((level3, i) => (
<a
className={cn(styles.mobileSubNavChild, level3.id === activeChildId && styles.mobileSubNavChildOpen)}
href={level3.href}
key={`level3-${i}`}
onClick={createHandleClickItem(level3.id)}
>
{level3.title}
</a>
))}
</div>
)}
</>
) ||
<>
<dev className={styles.mobileSubNavHeader}>
<span>{menu.title}</span>
</dev>
</>
}
</div>
)

Expand Down
26 changes: 15 additions & 11 deletions src/components/TopNav/PrimaryNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,21 @@ const PrimaryNav = ({
key={`level2-${i}-container`}
ref={createSetRef(`level2Container${i}`)}
>
{level1.subMenu.filter(filterNotInMore).map((level2, i) => (
<a
className={cn(styles.primaryLevel2, level2.id === activeLevel2Id && styles.primaryLevel2Open)}
href={level2.href}
key={`level2-${i}`}
onClick={createHandleClickLevel2(level2.id, true)}
ref={createSetRef(level2.id)}
>
{level2.title}
</a>
))}
{level1.subMenu.filter(filterNotInMore).map((level2, i) => {
if ((level2.subMenu && level2.subMenu.length > 0) || level2.href) {
return (
<a
className={cn(styles.primaryLevel2, level2.id === activeLevel2Id && styles.primaryLevel2Open)}
href={level2.href}
key={`level2-${i}`}
onClick={level2.subMenu && level2.subMenu.length > 0 ? createHandleClickLevel2(level2.id, true) : null}
ref={createSetRef(level2.id)}
>
{level2.title}
</a>
)
}
})}
{/* The More menu */}
{level1.id === activeLevel1Id && moreMenu && moreMenu.length > 0 && (
<div className={cn(styles.moreBtnContainer, openMore && styles.moreOpen)}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopNav/SubNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const SubNav = ({
}) => (
<div className={cn(styles.secondaryNav, open && styles.secondaryNavOpen)}>
<div className={styles.secondaryNavLinkContainer}>
{menu && (isSecondaryMenu ? menu.secondaryMenu : menu.subMenu) && (isSecondaryMenu ? menu.secondaryMenu : menu.subMenu).map((level3, i) => {
{menu && (isSecondaryMenu ? menu.secondaryMenu : menu.subMenu).map((level3, i) => {
const to = _.isEmpty(level3.link) ? level3.href : level3.link
return (
<Link
Expand Down
25 changes: 14 additions & 11 deletions src/components/TopNav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,17 +532,20 @@ const TopNav = ({
/>

{/* Level 3 menu */}
<SubNav
open={forceHideLevel3 ? false : showLevel3}
menu={activeMenu2 || activeMenu1}
isResize={isResize}
isSecondaryMenu={!activeMenu2}
activeChildId={activeLevel3Id}
showIndicator={showIconSelect}
indicatorX={iconSelectX}
createHandleClickItem={createHandleClickLevel3}
createSetRef={createSetRef}
/>
{((activeMenu2 && activeMenu2.subMenu && activeMenu2.subMenu.length > 0) ||
(!activeMenu2 && activeMenu1 && activeMenu1.secondaryMenu && activeMenu1.secondaryMenu.length > 0)) &&
<SubNav
open={forceHideLevel3 ? false : showLevel3}
menu={activeMenu2 || activeMenu1}
isResize={isResize}
isSecondaryMenu={!activeMenu2}
activeChildId={activeLevel3Id}
showIndicator={showIconSelect}
indicatorX={iconSelectX}
createHandleClickItem={createHandleClickLevel3}
createSetRef={createSetRef}
/>
}

{/* Mobile level 2 menu */}
{showLeftMenu && activeMenu1 && (
Expand Down