feat: Implemented XamlReader support for succinct syntax.

unoplatform · Apr 11, 2022 · 8057b0c · 8057b0c
1 parent ab87f00
commit 8057b0c
Showing 1 changed file with 34 additions and 1 deletion.
diff --git a/src/Uno.UI/UI/Xaml/Markup/Reader/XamlObjectBuilder.cs b/src/Uno.UI/UI/Xaml/Markup/Reader/XamlObjectBuilder.cs
@@ -280,7 +280,40 @@ private void ProcessNamedMember(
 							|| IsResourcesProperty(propertyInfo)
 						)
 						{
-							// Empty collection
+							// New grid succinct syntax.
+							if (instance is Grid grid &&
+								(member.Member.Name == "ColumnDefinitions" || member.Member.Name == "RowDefinitions") &&
+								member.Member.PreferredXamlNamespace == XamlConstants.PresentationXamlXmlNamespace &&
+								member.Value is string definitions)
+							{
+								var values = definitions
+									.Split(',')
+									.Select(static definition => definition.Trim())
+									.ToArray();
+
+								foreach (var value in values)
+								{
+									var gridLength = GridLength.ParseGridLength(value).FirstOrDefault();
+									if (member.Member.Name == "ColumnDefinitions")
+									{
+										grid.ColumnDefinitions.Add(new ColumnDefinition
+										{
+											Width = gridLength,
+										});
+									}
+									else
+									{
+										grid.RowDefinitions.Add(new RowDefinition
+										{
+											Height = gridLength,
+										});
+									}
+								}
+							}
+							else
+							{
+								// Empty collection
+							}
 						}
 						else
 						{