Skip to content

Commit 6b6e57f

Browse files
Merge pull request #196 from topcoder-platform/level2-new-tab
Level2 new tab
2 parents ee6ce20 + c56d2dc commit 6b6e57f

File tree

6 files changed

+41
-28
lines changed

6 files changed

+41
-28
lines changed

dist/dev/index.js

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/prod/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/IconSelect/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const IconSelect = ({ show, x, isResize }) => {
1010
// is window is on resize, stop animation
1111
if (isResize) {
1212
styleObj['transition'] = 'auto'
13-
styleObj['-webkit-transition'] = 'auto'
13+
styleObj['WebkitTransition'] = 'auto'
1414
}
1515
return <span
1616
className={styles.iconSelect}

src/components/TopNav/MobileMenu.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const MobileMenu = ({ menu, activeChildId, createHandleClickItem }) => (
1313
href={level2.href}
1414
key={`level2-${i}`}
1515
onClick={level2.subMenu && level2.subMenu.length > 0 ? createHandleClickItem(level2.id) : null}
16+
target={level2.openNewTab ? '_blank' : ''}
1617
>
1718
{level2.title}
1819
</a>

src/components/TopNav/PrimaryNav.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,14 @@ const PrimaryNav = ({
8989
if ((level2.subMenu && level2.subMenu.length > 0) || level2.href) {
9090
return (
9191
level2.href
92-
? <Link
92+
? <a
9393
{...level2Params}
94-
to={level2.href}
95-
innerRef={createSetRef(level2.id)}
94+
href={level2.href}
95+
ref={createSetRef(level2.id)}
96+
target={level2.openNewTab ? '_blank' : ''}
9697
>
9798
{level2.title}
98-
</Link>
99+
</a>
99100
: <span
100101
{...level2Params}
101102
ref={createSetRef(level2.id)}
@@ -129,8 +130,10 @@ const PrimaryNav = ({
129130
return (
130131
menu.href
131132
? <Link
132-
{...menuParams}
133+
className={styles.primaryLevel2}
134+
key={`more-item-${i}`}
133135
to={menu.href}
136+
openNewTab={menu.openNewTab}
134137
>
135138
{menu.title}
136139
</Link>

src/components/TopNav/PrimaryNav.module.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@
174174
justify-content: center;
175175
align-items: center;
176176

177+
svg {
178+
padding-left: 5px;
179+
}
180+
177181
.moreBtnMask {
178182
position: absolute;
179183
left: 0;
@@ -231,6 +235,11 @@
231235
@include transformVertical;
232236
}
233237
}
238+
239+
.primaryLevel2,
240+
a.primaryLevel2 {
241+
margin: 0;
242+
}
234243
}
235244

236245
.searchIcon {

0 commit comments

Comments
 (0)