Model variable access must work in procedures as well.

JMS-1 · Oct 14, 2024 · 318ad74 · 318ad74
1 parent ded0d98
commit 318ad74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Library/Extensions/ReadFromModel.cs b/Library/Extensions/ReadFromModel.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Reflection;
+using BlocklyNet.Core.Blocks;
 using BlocklyNet.Core.Blocks.Lists;
 using BlocklyNet.Core.Model;
 using BlocklyNet.Extensions.Builder;
@@ -67,7 +68,8 @@ public class ReadFromModel : Block
     /// <inheritdoc/>
     public override async Task<object?> EvaluateAsync(Context context)
     {
-        var data = context.Variables[Fields["VAR"]];
+        var varName = Fields["VAR"];
+        var data = context.Variables.TryGetValue(varName, out var local) ? local : context.GetRootContext().Variables[varName];
         var path = await Values.EvaluateAsync<string>("PATH", context) ?? "";
         var rawIndexes = await Values.EvaluateAsync<IEnumerable>("INDEXES", context, false);
         var indexes = rawIndexes?.Cast<object>().ToArray() ?? [];

diff --git a/Library/Extensions/UpdateModel.cs b/Library/Extensions/UpdateModel.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Reflection;
+using BlocklyNet.Core.Blocks;
 using BlocklyNet.Core.Blocks.Lists;
 using BlocklyNet.Core.Model;
 using BlocklyNet.Extensions.Builder;
@@ -77,7 +78,8 @@ public class UpdateModelProperty : Block
     /// <inheritdoc/>
     public override async Task<object?> EvaluateAsync(Context context)
     {
-        var data = context.Variables[Fields["VAR"]];
+        var varName = Fields["VAR"];
+        var data = context.Variables.TryGetValue(varName, out var local) ? local : context.GetRootContext().Variables[varName];
         var value = await Values.EvaluateAsync("VALUE", context);
         var path = await Values.EvaluateAsync<string>("PATH", context) ?? "";
         var rawIndexes = await Values.EvaluateAsync<IEnumerable>("INDEXES", context, false);