diff --git a/dist/react-meta-tags.es.js b/dist/react-meta-tags.es.js index a581257e2dc94d233335514e3cdb6185a993a257..d1b95416d1a01b3dde4ffdf739dff84b8fe2377a 100644 --- a/dist/react-meta-tags.es.js +++ b/dist/react-meta-tags.es.js @@ -372,7 +372,13 @@ function (_Component) { if (extract) { extract(this.props.children); - return; + } + } + }, { + key: "componentWillUnmount", + value: function componentWillUnmount() { + if (this.temporaryElement) { + ReactDOM.unmountComponentAtNode(this.temporaryElement); } } }, { @@ -389,16 +395,15 @@ function (_Component) { var headComponent = React.createElement("div", { className: "react-head-temp" }, children); - var temp = document.createElement("div"); - ReactDOM.render(headComponent, temp, function () { - var childStr = temp.innerHTML; //if html is not changed return + ReactDOM.render(headComponent, this.temporaryElement, function () { + var childStr = _this.temporaryElement.innerHTML; //if html is not changed return if (_this.lastChildStr === childStr) { return; } _this.lastChildStr = childStr; - var childNodes = Array.prototype.slice.call(temp.querySelector('.react-head-temp').children); + var childNodes = Array.prototype.slice.call(_this.temporaryElement.querySelector('.react-head-temp').children); var head = document.head; var headHtml = head.innerHTML; //filter children remove if children has not been changed @@ -426,6 +431,7 @@ function (_Component) { }, { key: "componentDidMount", value: function componentDidMount() { + this.temporaryElement = document.createElement('div'); this.handleChildrens(); } }, { diff --git a/dist/react-meta-tags.js b/dist/react-meta-tags.js index d0aa47e4aaa84a73d7a201e4c49fe385d1377d57..236ca26a58c8d2d2fb665e5ca0c7bb814de08b0a 100644 --- a/dist/react-meta-tags.js +++ b/dist/react-meta-tags.js @@ -378,7 +378,13 @@ if (extract) { extract(this.props.children); - return; + } + } + }, { + key: "componentWillUnmount", + value: function componentWillUnmount() { + if (this.temporaryElement) { + ReactDOM.unmountComponentAtNode(this.temporaryElement); } } }, { @@ -395,16 +401,15 @@ var headComponent = React__default.createElement("div", { className: "react-head-temp" }, children); - var temp = document.createElement("div"); - ReactDOM.render(headComponent, temp, function () { - var childStr = temp.innerHTML; //if html is not changed return + ReactDOM.render(headComponent, this.temporaryElement, function () { + var childStr = _this.temporaryElement.innerHTML; //if html is not changed return if (_this.lastChildStr === childStr) { return; } _this.lastChildStr = childStr; - var childNodes = Array.prototype.slice.call(temp.querySelector('.react-head-temp').children); + var childNodes = Array.prototype.slice.call(_this.temporaryElement.querySelector('.react-head-temp').children); var head = document.head; var headHtml = head.innerHTML; //filter children remove if children has not been changed @@ -432,6 +437,7 @@ }, { key: "componentDidMount", value: function componentDidMount() { + this.temporaryElement = document.createElement('div'); this.handleChildrens(); } }, { diff --git a/dist/react-meta-tags.min.js b/dist/react-meta-tags.min.js index f9a48ab6f0f25dabbbfeaec2deca9a50bc0a6059..73c9b01daf53bad8acb6c04702e13c8938d94a92 100644 --- a/dist/react-meta-tags.min.js +++ b/dist/react-meta-tags.min.js @@ -5,4 +5,4 @@ * https://github.com/s-yadav/react-meta-tags */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("react"),require("react-dom")):"function"==typeof define&&define.amd?define(["exports","react","react-dom"],t):t(e.MetaTags={},e.React,e.ReactDOM)}(this,function(e,n,r){"use strict";var i="default"in n?n.default:n;function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function c(e,t,n){return t&&a(e.prototype,t),n&&a(e,n),e}function t(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function f(e,t){return!t||"object"!=typeof t&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}r=r&&r.hasOwnProperty("default")?r.default:r;var s=Object.getOwnPropertySymbols,d=Object.prototype.hasOwnProperty,h=Object.prototype.propertyIsEnumerable;(function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}})()&&Object.assign;function y(){}var m,v=(function(e){e.exports=function(){function e(e,t,n,r,o,i){if("SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"!==i){var a=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw a.name="Invariant Violation",a}}function t(){return e}var n={array:e.isRequired=e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=y,n.PropTypes=n}()}(m={exports:{}},m.exports),m.exports),b=function(e){function t(){return o(this,t),f(this,l(t).apply(this,arguments))}return u(t,n.Component),c(t,[{key:"getChildContext",value:function(){return{extract:this.props.extract}}},{key:"render",value:function(){return n.Children.only(this.props.children)}}]),t}();t(b,"childContextTypes",{extract:v.func});var O=["property","name","itemprop"];function g(o){var i=document.head,e=o.id;return e?e&&i.querySelector("#".concat(e)):O.reduce(function(e,t){var n,r=o.getAttribute(t);return r?e.concat((n=i.querySelectorAll("[".concat(t,' = "').concat(r,'"]')),(n=Array.prototype.slice.call(n||[])).filter(function(e){return!e.id}))):e},[])}function j(e,t){void 0===t.length&&(t=[t]);for(var n=0,r=t.length;n<r;n++)e.removeChild(t[n])}var C=function(e){function t(){return o(this,t),f(this,l(t).apply(this,arguments))}return u(t,n.Component),c(t,[{key:"extractChildren",value:function(){var e=this.context.extract;e&&e(this.props.children)}},{key:"handleChildrens",value:function(){var n=this,e=this.props.children;if(!this.context.extract){var t=i.createElement("div",{className:"react-head-temp"},e),o=document.createElement("div");r.render(t,o,function(){var e=o.innerHTML;if(n.lastChildStr!==e){n.lastChildStr=e;var t=Array.prototype.slice.call(o.querySelector(".react-head-temp").children),i=document.head,r=i.innerHTML;(t=t.filter(function(e){return-1===r.indexOf((t=e,(n=document.createElement("div")).appendChild(t),n.innerHTML));var t,n})).forEach(function(e){var t=e.tagName.toLowerCase();if("title"===t){var n=document.head.querySelectorAll("title");n&&j(i,n)}else if("meta"===t){var r=g(e);r&&j(i,r)}else if("link"===t&&"canonical"===e.rel){var o=document.head.querySelectorAll('link[rel="canonical"]');o&&j(i,o)}}),function(e,t){void 0===t.length&&(t=[t]);for(var n=document.createDocumentFragment(),r=0,o=t.length;r<o;r++)n.appendChild(t[r]);e.appendChild(n)}(document.head,t)}})}}},{key:"componentDidMount",value:function(){this.handleChildrens()}},{key:"componentDidUpdate",value:function(e){e.children!==this.props.children&&this.handleChildrens()}},{key:"render",value:function(){return this.extractChildren(),null}}]),t}();t(C,"contextTypes",{extract:v.func});var x=function(e){function t(){return o(this,t),f(this,l(t).apply(this,arguments))}return u(t,n.Component),c(t,[{key:"render",value:function(){return i.createElement(C,null,i.createElement("title",null,this.props.title))}}]),t}();t(x,"propTypes",{title:v.string}),e.default=C,e.MetaTags=C,e.MetaTagsContext=b,e.ReactTitle=x,Object.defineProperty(e,"__esModule",{value:!0})}); +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("react"),require("react-dom")):"function"==typeof define&&define.amd?define(["exports","react","react-dom"],t):t(e.MetaTags={},e.React,e.ReactDOM)}(this,function(e,n,r){"use strict";var o="default"in n?n.default:n;function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function c(e,t,n){return t&&a(e.prototype,t),n&&a(e,n),e}function t(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function f(e,t){return!t||"object"!=typeof t&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}r=r&&r.hasOwnProperty("default")?r.default:r;var s=Object.getOwnPropertySymbols,d=Object.prototype.hasOwnProperty,h=Object.prototype.propertyIsEnumerable;(function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}})()&&Object.assign;function y(){}var m,v=(function(e){e.exports=function(){function e(e,t,n,r,o,i){if("SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"!==i){var a=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw a.name="Invariant Violation",a}}function t(){return e}var n={array:e.isRequired=e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t};return n.checkPropTypes=y,n.PropTypes=n}()}(m={exports:{}},m.exports),m.exports),b=function(e){function t(){return i(this,t),f(this,l(t).apply(this,arguments))}return u(t,n.Component),c(t,[{key:"getChildContext",value:function(){return{extract:this.props.extract}}},{key:"render",value:function(){return n.Children.only(this.props.children)}}]),t}();t(b,"childContextTypes",{extract:v.func});var O=["property","name","itemprop"];function g(o){var i=document.head,e=o.id;return e?e&&i.querySelector("#".concat(e)):O.reduce(function(e,t){var n,r=o.getAttribute(t);return r?e.concat((n=i.querySelectorAll("[".concat(t,' = "').concat(r,'"]')),(n=Array.prototype.slice.call(n||[])).filter(function(e){return!e.id}))):e},[])}function C(e,t){void 0===t.length&&(t=[t]);for(var n=0,r=t.length;n<r;n++)e.removeChild(t[n])}var j=function(e){function t(){return i(this,t),f(this,l(t).apply(this,arguments))}return u(t,n.Component),c(t,[{key:"extractChildren",value:function(){var e=this.context.extract;e&&e(this.props.children)}},{key:"componentWillUnmount",value:function(){this.temporaryElement&&r.unmountComponentAtNode(this.temporaryElement)}},{key:"handleChildrens",value:function(){var n=this,e=this.props.children;if(!this.context.extract){var t=o.createElement("div",{className:"react-head-temp"},e);r.render(t,this.temporaryElement,function(){var e=n.temporaryElement.innerHTML;if(n.lastChildStr!==e){n.lastChildStr=e;var t=Array.prototype.slice.call(n.temporaryElement.querySelector(".react-head-temp").children),i=document.head,r=i.innerHTML;(t=t.filter(function(e){return-1===r.indexOf((t=e,(n=document.createElement("div")).appendChild(t),n.innerHTML));var t,n})).forEach(function(e){var t=e.tagName.toLowerCase();if("title"===t){var n=document.head.querySelectorAll("title");n&&C(i,n)}else if("meta"===t){var r=g(e);r&&C(i,r)}else if("link"===t&&"canonical"===e.rel){var o=document.head.querySelectorAll('link[rel="canonical"]');o&&C(i,o)}}),function(e,t){void 0===t.length&&(t=[t]);for(var n=document.createDocumentFragment(),r=0,o=t.length;r<o;r++)n.appendChild(t[r]);e.appendChild(n)}(document.head,t)}})}}},{key:"componentDidMount",value:function(){this.temporaryElement=document.createElement("div"),this.handleChildrens()}},{key:"componentDidUpdate",value:function(e){e.children!==this.props.children&&this.handleChildrens()}},{key:"render",value:function(){return this.extractChildren(),null}}]),t}();t(j,"contextTypes",{extract:v.func});var x=function(e){function t(){return i(this,t),f(this,l(t).apply(this,arguments))}return u(t,n.Component),c(t,[{key:"render",value:function(){return o.createElement(j,null,o.createElement("title",null,this.props.title))}}]),t}();t(x,"propTypes",{title:v.string}),e.default=j,e.MetaTags=j,e.MetaTagsContext=b,e.ReactTitle=x,Object.defineProperty(e,"__esModule",{value:!0})}); diff --git a/lib/meta_tags.js b/lib/meta_tags.js index 493822f92d537a27a3f3e06121dfa3ba2ab0ae96..c283de1735eb411ba300ee3e0f7a548d5cb8dcb6 100644 --- a/lib/meta_tags.js +++ b/lib/meta_tags.js @@ -56,7 +56,13 @@ function (_Component) { if (extract) { extract(this.props.children); - return; + } + } + }, { + key: "componentWillUnmount", + value: function componentWillUnmount() { + if (this.temporaryElement) { + _reactDom.default.unmountComponentAtNode(this.temporaryElement); } } }, { @@ -74,17 +80,15 @@ function (_Component) { className: "react-head-temp" }, children); - var temp = document.createElement("div"); - - _reactDom.default.render(headComponent, temp, function () { - var childStr = temp.innerHTML; //if html is not changed return + _reactDom.default.render(headComponent, this.temporaryElement, function () { + var childStr = _this.temporaryElement.innerHTML; //if html is not changed return if (_this.lastChildStr === childStr) { return; } _this.lastChildStr = childStr; - var childNodes = Array.prototype.slice.call(temp.querySelector('.react-head-temp').children); + var childNodes = Array.prototype.slice.call(_this.temporaryElement.querySelector('.react-head-temp').children); var head = document.head; var headHtml = head.innerHTML; //filter children remove if children has not been changed @@ -112,6 +116,7 @@ function (_Component) { }, { key: "componentDidMount", value: function componentDidMount() { + this.temporaryElement = document.createElement('div'); this.handleChildrens(); } }, { diff --git a/src/meta_tags.js b/src/meta_tags.js index c3c4af2c2d41456cc92f28580acf1c4ee2e0b815..320f640c9f21fe9983a036a0a7a285ba7e19621b 100644 --- a/src/meta_tags.js +++ b/src/meta_tags.js @@ -8,13 +8,17 @@ import {getDuplicateTitle, getDuplicateCanonical, getDuplicateMeta, appendChild, class MetaTags extends Component { static contextTypes = { extract: PropTypes.func - } + }; extractChildren() { const {extract} = this.context; if (extract) { extract(this.props.children); - return; + } + } + componentWillUnmount() { + if (this.temporaryElement) { + ReactDOM.unmountComponentAtNode(this.temporaryElement); } } handleChildrens() { @@ -26,9 +30,8 @@ class MetaTags extends Component { const headComponent = <div className="react-head-temp">{children}</div>; - const temp = document.createElement("div"); - ReactDOM.render(headComponent, temp, () => { - const childStr = temp.innerHTML; + ReactDOM.render(headComponent, this.temporaryElement, () => { + const childStr = this.temporaryElement.innerHTML; //if html is not changed return if(this.lastChildStr === childStr){ @@ -37,7 +40,7 @@ class MetaTags extends Component { this.lastChildStr = childStr; - let childNodes = Array.prototype.slice.call(temp.querySelector('.react-head-temp').children); + let childNodes = Array.prototype.slice.call(this.temporaryElement.querySelector('.react-head-temp').children); const head = document.head; const headHtml = head.innerHTML; @@ -67,6 +70,7 @@ class MetaTags extends Component { } componentDidMount() { + this.temporaryElement = document.createElement('div'); this.handleChildrens(); } componentDidUpdate(oldProps) {