feat(v2): automatically add base url to logo link #2818
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lex111
added
pr: new feature
|
Deploy preview for docusaurus-2 ready! Built with commit ca2f8e3 |
yangshun
reviewed
May 27, 2020
| @@ -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); | |||
There was a problem hiding this comment.
Wouldn't the useBaseUrl(baseUrl) case result in duplication in the case of non-/ baseUrls?
There was a problem hiding this comment.
Should we just be wrapping around logo.href?
const logoLink = logo.href ? useBaseUrl(logo.href) : baseUrl;
There was a problem hiding this comment.
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
yangshun
approved these changes
May 27, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
This is a request from Discord chat, I think we should take care to add the base url to the logo link automatically, this is the expected behavior I suppose.
Have you read the Contributing Guidelines on pull requests?
Yes
Test Plan
Set document id to
navbar.logo.hrefand make sure base url has been added to it.By default a slash (
/) will be added (standard base url).Nevertheless, this is BC, because previously users had to manually specify the base url (in the case of using non-standard base url)
Related PRs
(If this PR adds or changes functionality, please take some time to update the docs at https://github.com/facebook/docusaurus, and link to your PR here.)