Support opening logo url in same tab

REDMINE-20930
codevise · Jan 28, 2025 · 5617769 · 5617769
1 parent 7c12cc3
commit 5617769
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/entry_types/scrolled/package/spec/widgets/defaultNavigation/Defaultnavigation-spec.js b/entry_types/scrolled/package/spec/widgets/defaultNavigation/Defaultnavigation-spec.js
@@ -50,9 +50,32 @@ describe('DefaultNavigation', () => {
 
     expect(getByRole('link', {name: 'My logo'})).toBeInTheDocument();
     expect(getByRole('link', {name: 'My logo'})).toHaveAttribute('href', 'https://example.com');
+    expect(getByRole('link', {name: 'My logo'})).toHaveAttribute('target', '_blank');
     expect(getByRole('img', {name: 'My logo'})).toHaveAttribute('src', 'logo-desktop.png');
   });
 
+  it('supports opening logo link in same tab', () => {
+    const {getByRole} = renderInEntry(
+      <DefaultNavigation configuration={{}} />,
+      {
+        seed: {
+          themeAssets: {
+            logoDesktop: 'logo-desktop.png'
+          },
+          themeOptions: {
+            logoUrl: 'https://example.com',
+            logoAltText: 'My logo',
+            logoOpenInSameTab: true
+          }
+        }
+      }
+    );
+
+    expect(getByRole('link', {name: 'My logo'})).toBeInTheDocument();
+    expect(getByRole('link', {name: 'My logo'})).toHaveAttribute('href', 'https://example.com');
+    expect(getByRole('link', {name: 'My logo'})).not.toHaveAttribute('target');
+  });
+
   it('takes logo props', () => {
     const {getByRole} = renderInEntry(
       <DefaultNavigation configuration={{}}

diff --git a/entry_types/scrolled/package/src/widgets/defaultNavigation/Logo.js b/entry_types/scrolled/package/src/widgets/defaultNavigation/Logo.js
@@ -18,7 +18,7 @@ export function Logo({srcMobile, srcDesktop, url, altText}) {
     (darkWidgets ? theme.assets.logoDarkVariantMobile : theme.assets.logoMobile);
 
   return (
-    <a target="_blank"
+    <a target={theme.options.logoOpenInSameTab ? null : "_blank"}
        rel="noopener noreferrer"
        href={url || theme.options.logoUrl}
        className={classNames(