Merge branch 'master' into users/joemay/fix-build-and-inner-dev-loop

src/Persistence.Tests/Yaml/DeserializerValidTests.cs

@@ -515,4 +515,25 @@ public void Deserialize_ShouldParse_Lists_of_Controls(string path, bool isContro
         list.First().Should().BeOfType(expectedType);
         list.First().Name.Should().Be(expectedName);
     }
+
+    [TestMethod]
+    [DataRow(@"_TestData/ValidYaml{0}/BuiltInControl/with-style.pa.yaml", true, "this is my style")]
+    [DataRow(@"_TestData/ValidYaml{0}/BuiltInControl/with-style.pa.yaml", false, "this is my style")]
+    public void Deserialize_ShouldParse_StyleName(
+            string path,
+            bool isControlIdentifiers,
+            string expectedStyleName)
+    {
+        // Arrange
+        var deserializer = CreateDeserializer(isControlIdentifiers);
+        using var yamlStream = File.OpenRead(GetTestFilePath(path, isControlIdentifiers));
+        using var yamlReader = new StreamReader(yamlStream);
+
+        // Act
+        var control = deserializer.Deserialize<BuiltInControl>(yamlReader);
+
+        // Assert
+        control.ShouldNotBeNull();
+        control.StyleName.Should().Be(expectedStyleName);
+    }
 }

src/Persistence.Tests/Yaml/ValidSerializerTests.cs

@@ -385,4 +385,19 @@ public void Serialize_ShouldCreateValidYamlForComponentInstance(string expectedP
         var expectedYaml = File.ReadAllText(GetTestFilePath(expectedPath, isControlIdentifiers)).NormalizeNewlines();
         serializedGraph.Should().Be(expectedYaml);
     }
+
+    [TestMethod]
+    [DataRow(@"_TestData/ValidYaml{0}/BuiltInControl/with-style.pa.yaml", true)]
+    [DataRow(@"_TestData/ValidYaml{0}/BuiltInControl/with-style.pa.yaml", false)]
+    public void Serialize_ShouldWriteStyle(string expectedPath, bool isControlIdentifiers)
+    {
+        var graph = ControlFactory.Create("myControl1", template: "Button");
+        graph.StyleName = "this is my style";
+
+        var serializer = CreateSerializer(isControlIdentifiers);
+
+        var sut = serializer.SerializeControl(graph).NormalizeNewlines();
+        var expectedYaml = File.ReadAllText(GetTestFilePath(expectedPath, isControlIdentifiers)).NormalizeNewlines();
+        sut.Should().Be(expectedYaml);
+    }
 }

src/Persistence.Tests/_TestData/ValidYaml-CI/BuiltInControl/with-style.pa.yaml

@@ -0,0 +1,3 @@
+myControl1:
+  Control: Button
+  StyleName: this is my style

src/Persistence.Tests/_TestData/ValidYaml/BuiltInControl/with-style.pa.yaml

@@ -0,0 +1,3 @@
+Control: Button
+Name: myControl1
+StyleName: this is my style

src/Persistence/Models/Control.cs

@@ -84,6 +84,8 @@ public int ZIndex
         }
     }
 
+    [YamlMember(Order = 60)]
+    public string StyleName { get; set; } = string.Empty;
 
     internal virtual void AfterCreate(Dictionary<string, object?> controlDefinition)
     {

src/Persistence/Templates/ControlFactory.cs

@@ -52,6 +52,7 @@ public Control Create(string name, string template,
     {
         string? variant = null;
         string? layout = null;
+        string? styleName = null;
         ControlPropertiesCollection? properties = null;
         IList<Control>? children = null;
 
@@ -61,6 +62,7 @@ public Control Create(string name, string template,
             controlDefinition.TryGetValue(nameof(Control.Properties), out properties);
             controlDefinition.TryGetValue(nameof(Control.Children), out children);
             controlDefinition.TryGetValue(nameof(Control.Layout), out layout);
+            controlDefinition.TryGetValue(nameof(Control.StyleName), out styleName);
         }
 
         if (TryCreateComponent(name, template, componentDefinitionName, componentLibraryUniqueName, variant, properties, children, controlDefinition, out var control))
@@ -70,22 +72,25 @@ public Control Create(string name, string template,
         {
             if (TryCreateFirstClassControl(name, controlTemplate.Name, variant ?? string.Empty, properties, children, controlDefinition, out control))
             {
+                control.StyleName = styleName ?? string.Empty;
                 return control;
             }
 
             return new BuiltInControl(name, variant ?? string.Empty, controlTemplate)
             {
                 Properties = properties ?? new(),
                 Children = children,
-                Layout = layout ?? string.Empty
+                Layout = layout ?? string.Empty,
+                StyleName = styleName ?? string.Empty,
             };
         }
 
         return new CustomControl(name, variant ?? string.Empty, new ControlTemplate(template))
         {
             Properties = properties ?? new(),
             Children = children,
-            Layout = layout ?? string.Empty
+            Layout = layout ?? string.Empty,
+            StyleName = styleName ?? string.Empty,
         };
     }
 

src/Persistence/Yaml/ControlConverter.cs

@@ -203,6 +203,7 @@ public virtual void OnWriteAfterName(IEmitter emitter, Control control)
     {
         emitter.Emit(nameof(Control.Variant), control.Variant);
         emitter.Emit(nameof(Control.Layout), control.Layout);
+        emitter.Emit(nameof(Control.StyleName), control.StyleName);
 
         if (control.Properties != null && control.Properties.Count > 0)
         {