Skip to content

fix issue #132 #122

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

Open
wants to merge 3 commits into
base: nav-bugbash-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions dist/dev/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/prod/index.js

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion src/components/LoginNav/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,17 @@ const LoginNav = ({
setOpenAccountMenu(false)
document.body.style.position = ''
}
const listener = event => {
if (event.code === 'Enter') {
event.target.click()
}
}
document.addEventListener('keydown', listener)
window.addEventListener('orientationchange', onOrientationChange)
return () => window.removeEventListener('orientationchange', onOrientationChange)
return () => {
document.removeEventListener('keydown', listener)
window.removeEventListener('orientationchange', onOrientationChange)
}
}, [])

useEffect(() => {
Expand Down Expand Up @@ -104,6 +113,7 @@ const LoginNav = ({
{loggedIn ? renderLoginPanel() : (
<a
href='javascript:void(0)'
tabIndex='0'
onClick={(event) => {
const retUrl = encodeURIComponent(window.location.href)
window.location = authURLs.location.replace('%S', retUrl).replace('member?', '#!/member?')
Expand Down
17 changes: 16 additions & 1 deletion src/components/TopNav/PrimaryNav.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { useEffect } from 'react'
import PropTypes from 'prop-types'
import cn from 'classnames'
import ResizeDetector from 'react-resize-detector'
Expand Down Expand Up @@ -39,11 +39,23 @@ const PrimaryNav = ({
const activeTrigger = {
bottom: 50 // The main nav head bottom Y
}
useEffect(() => {
const listener = event => {
if (event.code === 'Enter') {
event.target.click()
}
}
document.addEventListener('keydown', listener)
return () => {
document.removeEventListener('keydown', listener)
}
}, [])
return (
<div>
<div className={cn(styles.primaryNavContainer, showLeftMenu && styles.primaryNavContainerOpen)}>
<div className={styles.primaryNav} ref={createSetRef('primaryNav')}>
<a
tabIndex='0'
className={cn(styles.tcLogo, collapsed && styles.tcLogoPush)}
onClick={onClickLogo}
href='/'
Expand All @@ -54,6 +66,7 @@ const PrimaryNav = ({
<span className={styles.primaryLevel1Separator} key={`separator-${i}`} />,
/* Level 1 menu item */
<a
tabIndex='0'
className={cn(styles.primaryLevel1, (!activeLevel2Id || showLeftMenu) && level1.id === activeLevel1Id && styles.primaryLevel1Open, level1.mobileOnly && styles.mobileOnly)}
href={level1.href}
key={`level1-${i}`}
Expand All @@ -71,6 +84,7 @@ const PrimaryNav = ({
>
{level1.subMenu.filter(filterNotInMore).map((level2, i) => (
<a
tabIndex='0'
className={cn(styles.primaryLevel2, level2.id === activeLevel2Id && styles.primaryLevel2Open)}
href={level2.href}
key={`level2-${i}`}
Expand All @@ -97,6 +111,7 @@ const PrimaryNav = ({
<div className={styles.moreContentContainer}>
{moreMenu.map((menu, i) => (
<a
tabIndex='0'
className={cn(styles.primaryLevel2, menu.id === activeLevel2Id && styles.primaryLevel2Open)}
href={menu.href}
key={`more-item-${i}`}
Expand Down
53 changes: 34 additions & 19 deletions src/components/UserInfo/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { useEffect } from 'react'
import PropTypes from 'prop-types'
import cn from 'classnames'
import IconAvatar from '../../assets/images/ico-user-default.svg'
Expand All @@ -7,26 +7,41 @@ import IconArrowSmallup from '../../assets/images/arrow-small-up.svg'
import styles from './styles.module.scss'
import _ from 'lodash'

const UserInfo = ({ profile, onClick, open, newNotifications, domRef }) => (
<div
ref={domRef}
className={styles.userInfoContainer}
role='button'
onClick={onClick}
>
<div className={cn(styles.avatarContainer, newNotifications && styles.newNotifications)}>
{
(_.isEmpty(profile) || _.isEmpty(profile.photoURL)) ? (<IconAvatar width='60' className={styles['avatar']} />) : (<img className={styles.avatar} src={profile.photoURL} alt='avatar' />)
const UserInfo = ({ profile, onClick, open, newNotifications, domRef }) => {
useEffect(() => {
const listener = event => {
if (event.code === 'Enter') {
event.target.click()
}
}
document.addEventListener('keydown', listener)
return () => {
document.removeEventListener('keydown', listener)
}
}, [])

return (
<div
ref={domRef}
tabIndex='0'
className={styles.userInfoContainer}
role='button'
onClick={onClick}
>
<div className={cn(styles.avatarContainer, newNotifications && styles.newNotifications)}>
{
(_.isEmpty(profile) || _.isEmpty(profile.photoURL)) ? (<IconAvatar width='60' className={styles['avatar']} />) : (<img className={styles.avatar} src={profile.photoURL} alt='avatar' />)
}
</div>
<div className={styles.handleContainer}>
<span className={styles.handle}>{_.isEmpty(profile) ? '' : profile.handle}</span>
<span className={styles.dropdownIcon}>
{ open ? <IconArrowSmallup /> : <IconArrowSmalldown /> }
</span>
</div>
</div>
<div className={styles.handleContainer}>
<span className={styles.handle}>{_.isEmpty(profile) ? '' : profile.handle}</span>
<span className={styles.dropdownIcon}>
{ open ? <IconArrowSmallup /> : <IconArrowSmalldown /> }
</span>
</div>
</div>
)
)
}

UserInfo.propTypes = {
profile: PropTypes.shape(),
Expand Down