fix: prevent clearing existing title (#259)

* test: added test to exemplify bug * fix: prevent clearing existing title * test: check for empty title * Bump version
nfl · Mar 28, 2017 · 549b603 · 549b603
1 parent 2cc70de
commit 549b603
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-helmet",
   "description": "A document head manager for React",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "main": "./lib/Helmet.js",
   "author": "NFL <engineers@nfl.com>",
   "contributors": [

diff --git a/src/HelmetUtils.js b/src/HelmetUtils.js
@@ -35,7 +35,7 @@ const getTitleFromPropsList = (propsList) => {
 
     const innermostDefaultTitle = getInnermostProperty(propsList, HELMET_PROPS.DEFAULT_TITLE);
 
-    return innermostTitle || innermostDefaultTitle || "";
+    return innermostTitle || innermostDefaultTitle || undefined;
 };
 
 const getOnChangeClientState = (propsList) => {
@@ -301,7 +301,7 @@ const handleClientStateChange = (newState) => {
 };
 
 const updateTitle = (title, attributes) => {
-    if (document.title !== title) {
+    if (typeof title === "string" && document.title !== title) {
         document.title = title;
     }
 
@@ -508,7 +508,7 @@ const mapStateOnServer = ({
     noscriptTags,
     scriptTags,
     styleTags,
-    title,
+    title = "",
     titleAttributes
 }) => ({
     base: getMethodsForTag(TAG_NAMES.BASE, baseTag, encode),

diff --git a/test/HelmetDeclarativeTest.js b/test/HelmetDeclarativeTest.js
@@ -260,6 +260,50 @@ describe("Helmet - Declarative API", () => {
                     done();
                 });
             });
+
+            it("retains existing title tag when no title tag is defined", (done) => {
+                headElement.innerHTML = `<title>Existing Title</title>`;
+
+                ReactDOM.render(
+                    <Helmet>
+                        <meta name="keywords" content="stuff" />
+                    </Helmet>,
+                    container
+                );
+
+                requestIdleCallback(() => {
+                    expect(document.title).to.equal("Existing Title");
+
+                    done();
+                });
+            });
+
+            it("clears title tag if empty title is defined", (done) => {
+                ReactDOM.render(
+                    <Helmet>
+                        <title>Existing Title</title>
+                        <meta name="keywords" content="stuff" />
+                    </Helmet>,
+                    container
+                );
+
+                requestIdleCallback(() => {
+                    expect(document.title).to.equal("Existing Title");
+
+                    ReactDOM.render(
+                        <Helmet>
+                            <title>{" "}</title>
+                            <meta name="keywords" content="stuff" />
+                        </Helmet>,
+                        container
+                    );
+
+                    requestIdleCallback(() => {
+                        expect(document.title).to.equal("");
+                        done();
+                    });
+                });
+            });
         });
 
         describe("title attributes", () => {
@@ -3076,7 +3120,7 @@ describe("Helmet - Declarative API", () => {
                 <Helmet>
                     <title>Test Title</title>
                     <Helmet>
-                        <title>Title you'll never see</title>
+                        <title>Title you will never see</title>
                     </Helmet>
                 </Helmet>,
                 container
@@ -3102,7 +3146,7 @@ describe("Helmet - Declarative API", () => {
                 <Helmet>
                     <title>Test Title</title>
                     <div>
-                        <title>Title you'll never see</title>
+                        <title>Title you will never see</title>
                     </div>
                 </Helmet>,
                 container
@@ -3163,7 +3207,7 @@ describe("Helmet - Declarative API", () => {
                     <Helmet>
                         <title>Test Title</title>
                         <script>
-                            <title>Title you'll never see</title>
+                            <title>Title you will never see</title>
                         </script>
                     </Helmet>,
                     container