Merge pull request #458 from brettwinters/main

Fixed bug in PlotlyConverter regex for subplot

Author: sean-mcl

Plotly.Blazor.Tests/ConverterTests.cs

@@ -59,6 +59,20 @@ public class TestSubplotClass : ITestClass
 
         [Subplot]
         public IList<TestClass> Items { get; set; }
+        
+        // ensure that the regex does not match "items"
+        [JsonPropertyName("notItems")]
+        public string NotItems { get; set; }
+    }
+
+    [JsonConverter(typeof(PlotlyConverter))]
+    public class TestSubplotClass2
+    {
+        [JsonPropertyName("someItems")]
+        public string SomeItems { get; set; }
+
+        [Subplot]
+        public IList<TestClass> Items { get; set; }
     }
 
     public class TestPolymorphicClass
@@ -182,7 +196,12 @@ public void PlotlyConverterTest()
                 TestProperty = "Test",
                 TestProperty2 = "Test2",
                 TestProperty3 = "Test3",
-                Items = new []{new TestClass{TestFlag = TestFlag.All}, new TestClass()},
+                Items = new []
+                {
+	                new TestClass{TestFlag = TestFlag.All}, 
+	                new TestClass()
+                },
+                NotItems = "Test4"
             };
 
             var serialized = JsonSerializer.Serialize(expected, serializerOptions);

Plotly.Blazor/PlotlyConverter.cs

@@ -66,7 +66,7 @@ public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerial
                     string.Equals(p.Name, $"{propertyName}Array", StringComparison.OrdinalIgnoreCase));
 
                 var subplotProperty = subplotProperties.FirstOrDefault(p =>
-                    Regex.IsMatch(propertyName, $"{p.Name}\\d*", RegexOptions.IgnoreCase));
+                    Regex.IsMatch(propertyName, $"^{p.Name}\\d*", RegexOptions.IgnoreCase));
 
                 var otherProperty = otherProperties.FirstOrDefault(p =>
                     string.Equals(p.Name, propertyName, StringComparison.OrdinalIgnoreCase));