Skip to content
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

feat(v2): automatically add base url to logo link #2818

Merged
merged 2 commits into from
May 27, 2020
+2 −2
Merged

feat(v2): automatically add base url to logo link #2818

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6450a8f
feat(v2): automatically add base url to logo link
lex111 May 27, 2020
ca2f8e3
Fix for docs non-root path
lex111 May 27, 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
2 changes: 1 addition & 1 deletion packages/docusaurus-theme-classic/src/theme/hooks/useLogo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const useLogo = () => {
siteConfig: {baseUrl, themeConfig: {navbar: {logo = {}} = {}}} = {},
} = useDocusaurusContext();
const {isDarkTheme} = useThemeContext();
const logoLink = logo.href || baseUrl;
const logoLink = useBaseUrl(logo.href || baseUrl);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't the useBaseUrl(baseUrl) case result in duplication in the case of non-/ baseUrls?

Copy link
Contributor

@yangshun yangshun May 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just be wrapping around logo.href?

const logoLink = logo.href ? useBaseUrl(logo.href) : baseUrl;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, fixed.
I set / as the default value which will be processed by useBaseUrl

docusaurus/packages/docusaurus/src/client/exports/useBaseUrl.ts

Lines 30 to 32 in be7367b

if (url.startsWith('/')) {
return baseUrl + url.slice(1);
}

let logoLinkProps = {};

if (logo.target) {
Expand Down