From f1e47e5faa005d62016b49b82d680047aae9b584 Mon Sep 17 00:00:00 2001
From: Cristian Necula <virusz@gmail.com>
Date: Sun, 12 Mar 2017 11:15:56 +0200
Subject: [PATCH] (fix:css) add the component's css using a render hook

We have to delay the appending of the css until the whole component tree has been added to the DOM, so that the `target.ownerDocument` property points to the correct document.
---
 src/generators/dom/index.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 51067279ac..0367243cbc 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -207,8 +207,19 @@ export default function dom ( parsed, source, options, names ) {
 		_set: new CodeBuilder()
 	};
 
-	if ( parsed.css && options.css !== false ) {
-		generator.current.builders.mount.addLine( `if ( !target.ownerDocument.__sveltecss_${parsed.hash} ) addCss( target.ownerDocument );` );
+	const includeCss = parsed.css && options.css !== false;
+
+	if ( includeCss ) {
+		generator.current.builders.mount.addBlock( deindent`
+			var _addCss = function() {
+				if ( !target.ownerDocument.__sveltecss_${parsed.hash} ) addCss( target.ownerDocument );
+			}
+			if ( component._root ) {
+				component._root._renderHooks.push({ fn: _addCss, context: this });
+			} else {
+				component._renderHooks.push({ fn: _addCss, context: this })
+			}
+		` );
 
 		builders.main.addBlock( deindent`
 			function addCss ( document ) {
@@ -272,7 +283,7 @@ export default function dom ( parsed, source, options, names ) {
 
 	builders.init.addLine( `this._torndown = false;` );
 
-	if ( generator.hasComponents ) {
+	if ( generator.hasComponents || includeCss ) {
 		builders.init.addLine( `this._renderHooks = [];` );
 	}
 
@@ -292,11 +303,13 @@ export default function dom ( parsed, source, options, names ) {
 		` );
 	}
 
-	if ( generator.hasComponents ) {
+	if ( generator.hasComponents || includeCss ) {
 		const statement = `this._flush();`;
 
 		builders.init.addBlock( statement );
-		builders._set.addBlock( statement );
+		if ( generator.hasComponents ) {
+			builders._set.addBlock( statement );
+		}
 	}
 
 	if ( templateProperties.oncreate ) {