From 2c3de17c746bdb9884af52da21af062b8f17ab31 Mon Sep 17 00:00:00 2001
From: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
Date: Wed, 26 Feb 2020 22:09:56 +0300
Subject: [PATCH] fix: open universal nav links on the same tab (#38273)

---
 client/src/components/Header/components/NavLinks.js | 4 ++--
 client/src/components/helpers/Link.js               | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Header/components/NavLinks.js b/client/src/components/Header/components/NavLinks.js
index a689a3fcd6..3ec792a6c3 100644
--- a/client/src/components/Header/components/NavLinks.js
+++ b/client/src/components/Header/components/NavLinks.js
@@ -15,12 +15,12 @@ function NavLinks({ displayMenu }) {
         role='menu'
       >
         <li className='nav-news' role='menuitem'>
-          <Link external={true} to='/news'>
+          <Link external={true} sameTab={true} to='/news'>
             /news
           </Link>
         </li>
         <li className='nav-forum' role='menuitem'>
-          <Link external={true} to='/forum'>
+          <Link external={true} sameTab={true} to='/forum'>
             /forum
           </Link>
         </li>
diff --git a/client/src/components/helpers/Link.js b/client/src/components/helpers/Link.js
index 379a3f26f1..f5f9988ae9 100644
--- a/client/src/components/helpers/Link.js
+++ b/client/src/components/helpers/Link.js
@@ -5,16 +5,23 @@ import { Link as GatsbyLink } from 'gatsby';
 const propTypes = {
   children: PropTypes.any,
   external: PropTypes.bool,
+  sameTab: PropTypes.bool,
   to: PropTypes.string.isRequired
 };
 
-const Link = ({ children, to, external, ...other }) => {
+const Link = ({ children, to, external, sameTab, ...other }) => {
   if (!external && /^\/(?!\/)/.test(to)) {
     return (
       <GatsbyLink to={to} {...other}>
         {children}
       </GatsbyLink>
     );
+  } else if (sameTab && external) {
+    return (
+      <a href={to} {...other}>
+        {children}
+      </a>
+    );
   }
 
   return (