🐛 Use the correct renderer/element when reactively updating properties

11ways · Jun 14, 2024 · f6fd7a0 · f6fd7a0
1 parent cf950f4
commit f6fd7a0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/core/base.js b/lib/core/base.js
@@ -466,6 +466,7 @@ function logLog(type, args) {
 // Some Symbols
 Hawkejs.RENDER_INSTRUCTION = Symbol('render_instruction');
 Hawkejs.DELAY_SYNC_RENDER = Symbol('delay_sync_render');
+Hawkejs.ANCESTOR_ELEMENT = Symbol('ancestor_element');
 Hawkejs.CREATED_MANUALLY = Symbol('created_manually');
 Hawkejs.REACTIVE_VALUES = Symbol('reactive_values');
 Hawkejs.APPLIED_OPTIONS = Symbol('applied_options');

diff --git a/lib/core/renderer.js b/lib/core/renderer.js
@@ -312,7 +312,17 @@ const updateElementProperty = (element, setter, getter, optional, key, config) =
 
 	// We have to execute the expression to get the new value
 	let renderer = new Hawkejs.Renderer(element.hawkejs);
-	renderer.active_variables = element[Hawkejs.VARIABLES];
+	renderer[Hawkejs.ANCESTOR_ELEMENT] = element;
+
+	let variables = element[Hawkejs.VARIABLES];
+
+	if (variables) {
+		renderer.active_variables = variables;
+
+		// The variables instance might still be holding on to an old renderer
+		// Make sure it's this new one!
+		variables.hawkejs_renderer = renderer;
+	}
 
 	let new_value = renderer.parseRuntimeExpression(config.expression);
 
@@ -720,6 +730,11 @@ Renderer.setProperty(function theme() {
 Renderer.setProperty(function current_element() {
 
 	if (this.on_template_root_level) {
+
+		if (this[Hawkejs.ANCESTOR_ELEMENT]) {
+			return this[Hawkejs.ANCESTOR_ELEMENT];
+		}
+
 		if (this.current_variables.has('$ancestor_element')) {
 			return this.current_variables.get('$ancestor_element');
 		}
@@ -2320,7 +2335,7 @@ Renderer.setMethod(function ensureElementOptions(element) {
 		}
 
 		// Manually created elements will have already called this
-		if (!element[Hawkejs.CREATED_MANUALLY]) {
+		if (!element[Hawkejs.CREATED_MANUALLY] && !element[Hawkejs.CONSTRUCTED]) {
 			Hawkejs.CustomElementConstructor.call(element);
 			ElClass.call(element);
 		}

diff --git a/lib/core/variables.js b/lib/core/variables.js
@@ -127,6 +127,8 @@ Variables.setProperty(function length() {
  */
 Variables.setProperty(function hawkejs_renderer() {
 	return this[RENDERER];
+}, function setHawkejsRenderer(value) {
+	this[RENDERER] = value;
 });
 
 /**