Enable pass attributes to script and link #937
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
wszgxa
force-pushed
the
add-attribut-for-style-script
branch
from
586b972
to
47eff81
Compare
|
Anyone help to click the rerun button in CI? 😆 |
|
Retried Netlify deploy! |
|
Deploy preview for docusaurus-preview ready! Built with commit fdb0297 |
endiliey
suggested changes
Sep 2, 2018
lib/core/Head.js
Outdated
| ))} | ||
| this.props.config.scripts.map(source => { | ||
| if (source instanceof Object) { | ||
| return source.src ? ( |
There was a problem hiding this comment.
Use Inline If with Logical && Operator
e.g:
return source.src && <script type="text/javascript" key={source.src} {...source} />
yangshun
suggested changes
Sep 2, 2018
docs/api-site-config.md
Outdated
| @@ -155,15 +155,15 @@ h1 { | |||
|
|
|||
| * `separate` - The secondary navigation is a separate pane defaulting on the right side of a document. See http://docusaurus.io/docs/en/translation.html for an example. | |||
|
|
|||
| `scripts` - Array of JavaScript sources to load. The script tag will be inserted in the HTML head. | |||
| `scripts` - Array of JavaScript sources to load. You can pass only src link as srting, or you can pass attributes as object. The script tag will be inserted in the HTML head. | |||
There was a problem hiding this comment.
Typo in srting. Use this instead:
Array of JavaScript sources to load. The values can be either strings or plain objects of attribute-value maps. Refer to the example below. The script tag will be inserted in the HTML head.
docs/api-site-config.md
Outdated
|
|
||
| `separateCss` - Directories inside which any `css` files will not be processed and concatenated to Docusaurus' styles. This is to support static `html` pages that may be separate from Docusaurus with completely separate styles. | ||
|
|
||
| `scrollToTop` - Set this to `true` if you want to enable the scroll to top button at the bottom of your site. | ||
|
|
||
| `scrollToTopOptions` - Optional options configuration for the scroll to top button. You do not need to use this, even if you set `scrollToTop` to `true`; it just provides you more configuration control of the button. You can find more options [here](https://github.com/vfeskov/vanilla-back-to-top/blob/v7.1.14/OPTIONS.md). By default, we set the zIndex option to 100. | ||
|
|
||
| `stylesheets` - Array of CSS sources to load. The link tag will be inserted in the HTML head. | ||
| `stylesheets` - Array of CSS sources to load. You can pass only href link as srting, or you can pass attributes as object. The link tag will be inserted in the HTML head. |
lib/core/Head.js
Outdated
| this.props.config.scripts.map(source => ( | ||
| <script type="text/javascript" key={source} src={source} /> | ||
| ))} | ||
| this.props.config.scripts.map(source => { |
There was a problem hiding this comment.
Better written as:
this.props.config.scripts.map(script => {
const scriptProps = Object.assign({},
{ type: 'text/javasript' },
script instanceOf 'Object' ? script : { src: source },
);
return <script {...source} />;
});There was a problem hiding this comment.
We need to include the key,
this.props.config.scripts &&
this.props.config.scripts.map(source => {
const scriptProps = Object.assign(
{type: 'text/javasript'},
source.src ? source : {src: source} // include key in this line is more complexity than use ?..: ...
);
return <script {...scriptProps} />;
})I guess if we don't need key, we can do as your example.
lib/core/Head.js
Outdated
| this.props.config.stylesheets.map(source => ( | ||
| <link rel="stylesheet" key={source} href={source} /> | ||
| ))} | ||
| this.props.config.stylesheets.map(source => { |
There was a problem hiding this comment.
Rewrote here in a similar fashion as well.
|
Will address comments at tonight. |
wszgxa
force-pushed
the
add-attribut-for-style-script
branch
2 times, most recently
from
74bdea4
to
e7b3d14
Compare
wszgxa
force-pushed
the
add-attribut-for-style-script
branch
from
e7b3d14
to
fdb0297
Compare
|
Hi, guys I have addressed comments. Because we need to pass down a unique key. I guess use ternary operator is more readable than use Object.assign. |
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
Github issue: #848
Enable pass attributes to script tag and link tag.
Have you read the Contributing Guidelines on pull requests?
Yes
Test Plan
I have tested this locally, it will apply the attributes to script and link.
Related PRs
nope