fix(maleo-core/server): unique header and head

give unique header and head for server
airyrooms · Jul 30, 2019 · e27c3c1 · e27c3c1
1 parent cd5ce2f
commit e27c3c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/packages/Maleo.js/src/head/head.tsx b/packages/Maleo.js/src/head/head.tsx
@@ -61,7 +61,7 @@ const METATYPES = ['name', 'httpEquiv', 'charSet', 'itemProp'];
  which shouldn't be duplicated, like <title/>
  Also adds support for deduplicated `key` properties
 */
-function unique() {
+export function unique() {
   const keys = new Set();
   const tags = new Set();
   const metaTypes = new Set();

diff --git a/packages/Maleo.js/src/render/_document.tsx b/packages/Maleo.js/src/render/_document.tsx
@@ -4,6 +4,7 @@ import { stringify } from 'flatted';
 
 import { HeaderProps, DocumentProps, DocumentContext } from '@interfaces/render';
 import { SERVER_INITIAL_DATA, DIV_MALEO_ID } from '@constants/index';
+import { unique } from '@head/head';
 
 // Extendable document
 export default class Document extends React.Component<DocumentProps, {}> {
@@ -60,14 +61,11 @@ export class Header extends React.Component<HeaderProps, {}> {
     const { head } = this.context;
     const { children } = this.props;
 
+    const uniqueHead = [...head, ...React.Children.toArray(children)].filter(unique());
+
     return (
       <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1.0" />
-        <meta httpEquiv="X-UA-Compatible" content="ie=edge" />
-
-        {children}
-        {head}
+        {uniqueHead}
 
         {this.preloadScripts()}
       </head>