From feba333db53e9baef1b8ececedb00a3b6d3fa08e Mon Sep 17 00:00:00 2001
From: Nayan Gautam <gtmnayan@gmail.com>
Date: Wed, 15 Jun 2022 06:18:56 +0000
Subject: [PATCH] first attempt

---
 .../render_dom/wrappers/Element/index.ts      | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 8a8f59810b..2bba1bf285 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -151,6 +151,7 @@ export default class ElementWrapper extends Wrapper {
 	bindings: Binding[];
 	event_handlers: EventHandler[];
 	class_dependencies: string[];
+	dynamic_style_dependencies: Set<string>;
 
 	select_binding_dependencies?: Set<string>;
 
@@ -202,6 +203,16 @@ export default class ElementWrapper extends Wrapper {
 			return;
 		}
 
+		this.var = {
+			type: 'Identifier',
+			name: node.name.replace(/[^a-zA-Z0-9_$]/g, '_')
+		};
+
+		this.void = is_void(node.name);
+
+		this.class_dependencies = [];
+		this.dynamic_style_dependencies = new Set();
+
 		if (this.node.children.length) {
 			this.node.lets.forEach(l => {
 				extract_names(l.value || l.name).forEach(name => {
@@ -757,11 +768,19 @@ export default class ElementWrapper extends Wrapper {
 	}
 
 	add_attributes(block: Block) {
-		// Get all the class dependencies first
+		// Get all the class and style dependencies first
 		this.attributes.forEach((attribute) => {
 			if (attribute.node.name === 'class') {
 				const dependencies = attribute.node.get_dependencies();
 				push_array(this.class_dependencies, dependencies);
+			} else if (attribute.node.name === 'style') {
+				// TODO Is there a better way to handle this?
+				const dependencies = attribute.node.get_dependencies();
+
+				for (const dep of dependencies) {
+					const variable = this.renderer.component.var_lookup.get(dep);
+					if (!variable || is_dynamic(variable)) this.dynamic_style_dependencies.add(dep);
+				}
 			}
 		});
 
@@ -1119,19 +1138,27 @@ export default class ElementWrapper extends Wrapper {
 
 			block.chunks.hydrate.push(updater);
 
-			const dependencies = expression.dynamic_dependencies();
+			const dependencies = [
+				...this.dynamic_style_dependencies,
+				...expression.dynamic_dependencies(),
+			];
+
+			// Assume that style has changed through the spread attribute
 			if (has_spread) {
 				block.chunks.update.push(updater);
 			} else if (dependencies.length > 0) {
+				// Any dyn dep of this style directive or of the style attribute is dirty
+				const condition = block.renderer.dirty(dependencies);
+
 				if (should_cache) {
 					block.chunks.update.push(b`
-							if (${block.renderer.dirty(dependencies)} && (${cached_snippet} !== (${cached_snippet} = ${snippet}))) {
-								${updater}
-							}
+						if (${condition} && (${cached_snippet} !== (${cached_snippet} = ${snippet}))) {
+							${updater}
+						}
 					`);
 				} else {
 					block.chunks.update.push(b`
-						if (${block.renderer.dirty(dependencies)}) {
+						if (${condition}) {
 							${updater}
 						}
 					`);