terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Remove dublicate className from head (#5026)

Browse source 
This PR:

* Removes dublicate `className` in: `<meta charSet="utf-8" class="next-head"/>`
* Refactores head reducer

Special thanks to @udanpe for reporting and @geoffRGWilliams for bringing me on the right tack! 🙌

Closes #4745, #4802
This commit is contained in:
HaNdTriX 2018-08-25 00:19:54 +02:00 committed by Tim Neutkens
parent 1babde1026
commit 267cff3b81
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/head.js
View file

@ -12,14 +12,15 @@ class Head extends React.Component {
} }
} }
export function defaultHead () { const NEXT_HEAD_IDENTIFIER = 'next-head'
return [<meta charSet='utf-8' className='next-head' />]
export function defaultHead (className = NEXT_HEAD_IDENTIFIER) {
return [<meta charSet='utf-8' className={className} />]
} }
function reduceComponents (components) { function reduceComponents (components) {
return components return components
.map((c) => c.props.children) .map((component) => React.Children.toArray(component.props.children))
.map((children) => React.Children.toArray(children))
.reduce((a, b) => a.concat(b), []) .reduce((a, b) => a.concat(b), [])
.reduce((a, b) => { .reduce((a, b) => {
if (React.Fragment && b.type === React.Fragment) { if (React.Fragment && b.type === React.Fragment) {
@ -28,12 +29,12 @@ function reduceComponents (components) {
return a.concat(b) return a.concat(b)
}, []) }, [])
.reverse() .reverse()
.concat(...defaultHead()) .concat(defaultHead())
.filter((c) => !!c) .filter(Boolean)
.filter(unique()) .filter(unique())
.reverse() .reverse()
.map((c) => { .map((c) => {
const className = (c.props && c.props.className ? c.props.className + ' ' : '') + 'next-head' const className = (c.props && c.props.className ? c.props.className + ' ' : '') + NEXT_HEAD_IDENTIFIER
return React.cloneElement(c, { className }) return React.cloneElement(c, { className })
}) })
} }