feat: make array mutations re-renders work for el and scope variables

reallygoodsoftware · Mar 20, 2024 · 7e03b93 · 7e03b93
1 parent f7ef980
commit 7e03b93
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/lib/entity/events.js b/lib/entity/events.js
@@ -482,7 +482,22 @@ export class Events {
     const state = this.entity.base.state
     engine._arrayVariables.forEach((variable) => {
       if (!this.entity.data.variables.includes(variable)) return
-      state.evaluateDependencies(variable)
+
+      if (State.isElState(variable) || State.isScopeState(variable)) {
+        const [type, object] = variable.split('.')
+
+        if (!object) return
+
+        if (type === State.EL_STATE) {
+          const varName = `${this.entity.id}.${object}`
+          state.evaluateDependencies(varName)
+        } else if (type === State.SCOPE_STATE) {
+          if (!this.entity.scope) return
+          const varName = `${this.entity.scope.id}.${object}`
+          state.evaluateDependencies(varName)
+        }
+      } else
+        state.evaluateDependencies(variable)
     })
   }
 

diff --git a/lib/generators/lexer.js b/lib/generators/lexer.js
@@ -230,11 +230,18 @@ export class Lexer {
         const hasMutateArrayMethods = MiniArray.mutateMethods.some((method) =>
           properties.includes(method)
         )
+
+        const isEntityVariable = Lexer.ENTITY_KEYS.some((key) => object.startsWith(key))
 
         if (hasMutateArrayMethods)
-          this._arrayVariables.push(object) 
-
-        if (object.length && Lexer.ENTITY_KEYS.includes(object)) {
+        {
+          if (isEntityVariable)
+            this._arrayVariables.push([object, properties[0]].join('.'))
+          else
+            this._arrayVariables.push(object)
+        }
+
+        if (object.length && isEntityVariable) {
           this._identifiers.push(object)
           this._identifiers.push([object, properties[0]].join('.'))
         }