From 417ee660f4cef751044814ab78bc20eb0d3ad967 Mon Sep 17 00:00:00 2001
From: Avishai Dernis <avid29@live.com>
Date: Sat, 10 Jan 2026 01:15:15 +0200
Subject: [PATCH 1/4] Changed Binding to x:Bind in WrapLayoutSample
 DataTemplates

---
 .../Primitives/samples/WrapLayoutSample.xaml  | 20 +++++++++----------
 .../samples/WrapLayoutSample.xaml.cs          |  8 +++++++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/components/Primitives/samples/WrapLayoutSample.xaml b/components/Primitives/samples/WrapLayoutSample.xaml
index 316232999..6ca087b90 100644
--- a/components/Primitives/samples/WrapLayoutSample.xaml
+++ b/components/Primitives/samples/WrapLayoutSample.xaml
@@ -10,31 +10,29 @@
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       mc:Ignorable="d">
     <Page.Resources>
-        <DataTemplate x:Key="WrapTemplate">
-            <Border Width="{Binding Width}"
+        <DataTemplate x:Key="WrapTemplate" x:DataType="local:ColorItem">
+            <Border Width="{x:Bind Width}"
                     Height="48"
                     CornerRadius="{StaticResource ControlCornerRadius}">
                 <Border.Background>
-                    <SolidColorBrush Color="{Binding Color}" />
+                    <SolidColorBrush Color="{x:Bind Color}" />
                 </Border.Background>
                 <TextBlock Margin="6,4,4,4"
                            FontSize="16"
-                           Text="{Binding Index}" />
+                           Text="{x:Bind Index}" />
             </Border>
         </DataTemplate>
     </Page.Resources>
 
     <Grid>
-        <ScrollViewer x:Name="WrapScrollParent">
-            <muxc:ItemsRepeater x:Name="WrapRepeater"
+        <muxc:ItemsRepeater x:Name="WrapRepeater"
                                 ItemTemplate="{StaticResource WrapTemplate}"
                                 ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
-                <muxc:ItemsRepeater.Layout>
-                    <controls:WrapLayout x:Name="Wrap"
+            <muxc:ItemsRepeater.Layout>
+                <controls:WrapLayout x:Name="Wrap"
                                          HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
                                          VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
-                </muxc:ItemsRepeater.Layout>
-            </muxc:ItemsRepeater>
-        </ScrollViewer>
+            </muxc:ItemsRepeater.Layout>
+        </muxc:ItemsRepeater>
     </Grid>
 </Page>
diff --git a/components/Primitives/samples/WrapLayoutSample.xaml.cs b/components/Primitives/samples/WrapLayoutSample.xaml.cs
index 6b8c4cd6a..15f8ab957 100644
--- a/components/Primitives/samples/WrapLayoutSample.xaml.cs
+++ b/components/Primitives/samples/WrapLayoutSample.xaml.cs
@@ -23,7 +23,13 @@ public WrapLayoutSample()
         random = new Random(DateTime.Now.Millisecond);
         for (int i = 0; i < random.Next(1000, 5000); i++)
         {
-            var item = new ColorItem { Index = i, Width = random.Next(50, 250), Height = random.Next(50, 250), Color = Color.FromArgb(255, (byte)random.Next(0, 255), (byte)random.Next(0, 255), (byte)random.Next(0, 255)) };
+            var item = new ColorItem
+            {
+                Index = i,
+                Width = random.Next(50, 250),
+                Height = random.Next(50, 250),
+                Color = Color.FromArgb(255, (byte)random.Next(0, 255), (byte)random.Next(0, 255), (byte)random.Next(0, 255))
+            };
             ColorsCollection.Add(item);
         }
     }

From 551e4ed15bcc654dc67ddfbc8d8ec7696d4564cc Mon Sep 17 00:00:00 2001
From: Avishai Dernis <avid29@live.com>
Date: Sat, 10 Jan 2026 01:19:33 +0200
Subject: [PATCH 2/4] XAML Styles

---
 components/Primitives/samples/WrapLayoutSample.xaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/Primitives/samples/WrapLayoutSample.xaml b/components/Primitives/samples/WrapLayoutSample.xaml
index 6ca087b90..d89a2682f 100644
--- a/components/Primitives/samples/WrapLayoutSample.xaml
+++ b/components/Primitives/samples/WrapLayoutSample.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="PrimitivesExperiment.Samples.WrapLayoutSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -10,7 +10,8 @@
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       mc:Ignorable="d">
     <Page.Resources>
-        <DataTemplate x:Key="WrapTemplate" x:DataType="local:ColorItem">
+        <DataTemplate x:Key="WrapTemplate"
+                      x:DataType="local:ColorItem">
             <Border Width="{x:Bind Width}"
                     Height="48"
                     CornerRadius="{StaticResource ControlCornerRadius}">
@@ -26,12 +27,12 @@
 
     <Grid>
         <muxc:ItemsRepeater x:Name="WrapRepeater"
-                                ItemTemplate="{StaticResource WrapTemplate}"
-                                ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
+                            ItemTemplate="{StaticResource WrapTemplate}"
+                            ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
             <muxc:ItemsRepeater.Layout>
                 <controls:WrapLayout x:Name="Wrap"
-                                         HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
-                                         VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
+                                     HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
+                                     VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
             </muxc:ItemsRepeater.Layout>
         </muxc:ItemsRepeater>
     </Grid>

From dbc60f2378d55123dd4ae9663077517565b76e3a Mon Sep 17 00:00:00 2001
From: Avishai Dernis <avid29@live.com>
Date: Tue, 2 Jun 2026 11:13:23 +0300
Subject: [PATCH 3/4] Added scroll viewer to WrapLayout sample

---
 .../Primitives/samples/WrapLayoutSample.xaml  | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/components/Primitives/samples/WrapLayoutSample.xaml b/components/Primitives/samples/WrapLayoutSample.xaml
index d89a2682f..a9170b2de 100644
--- a/components/Primitives/samples/WrapLayoutSample.xaml
+++ b/components/Primitives/samples/WrapLayoutSample.xaml
@@ -1,39 +1,43 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<Page x:Class="PrimitivesExperiment.Samples.WrapLayoutSample"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:attributes="using:CommunityToolkit.Tooling.SampleGen.Attributes"
-      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:PrimitivesExperiment.Samples"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<Page
+    x:Class="PrimitivesExperiment.Samples.WrapLayoutSample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:attributes="using:CommunityToolkit.Tooling.SampleGen.Attributes"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:PrimitivesExperiment.Samples"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d">
     <Page.Resources>
-        <DataTemplate x:Key="WrapTemplate"
-                      x:DataType="local:ColorItem">
-            <Border Width="{x:Bind Width}"
-                    Height="48"
-                    CornerRadius="{StaticResource ControlCornerRadius}">
+        <DataTemplate x:Key="WrapTemplate" x:DataType="local:ColorItem">
+            <Border
+                Width="{x:Bind Width}"
+                Height="48"
+                CornerRadius="{StaticResource ControlCornerRadius}">
                 <Border.Background>
                     <SolidColorBrush Color="{x:Bind Color}" />
                 </Border.Background>
-                <TextBlock Margin="6,4,4,4"
-                           FontSize="16"
-                           Text="{x:Bind Index}" />
+                <TextBlock
+                    Margin="6,4,4,4"
+                    FontSize="16"
+                    Text="{x:Bind Index}" />
             </Border>
         </DataTemplate>
     </Page.Resources>
 
-    <Grid>
-        <muxc:ItemsRepeater x:Name="WrapRepeater"
-                            ItemTemplate="{StaticResource WrapTemplate}"
-                            ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
+    <ScrollViewer>
+        <muxc:ItemsRepeater
+            x:Name="WrapRepeater"
+            ItemTemplate="{StaticResource WrapTemplate}"
+            ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
             <muxc:ItemsRepeater.Layout>
-                <controls:WrapLayout x:Name="Wrap"
-                                     HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
-                                     VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
+                <controls:WrapLayout
+                    x:Name="Wrap"
+                    HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
+                    VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
             </muxc:ItemsRepeater.Layout>
         </muxc:ItemsRepeater>
-    </Grid>
+    </ScrollViewer>
 </Page>

From f76dde2d643348468314272e757591f5be14832d Mon Sep 17 00:00:00 2001
From: Avishai Dernis <avid29@live.com>
Date: Tue, 2 Jun 2026 11:18:45 +0300
Subject: [PATCH 4/4] Apply XAML Styles

---
 .../Primitives/samples/WrapLayoutSample.xaml  | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/components/Primitives/samples/WrapLayoutSample.xaml b/components/Primitives/samples/WrapLayoutSample.xaml
index a9170b2de..e7c4e3a06 100644
--- a/components/Primitives/samples/WrapLayoutSample.xaml
+++ b/components/Primitives/samples/WrapLayoutSample.xaml
@@ -1,42 +1,38 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<Page
-    x:Class="PrimitivesExperiment.Samples.WrapLayoutSample"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:attributes="using:CommunityToolkit.Tooling.SampleGen.Attributes"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:PrimitivesExperiment.Samples"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<Page x:Class="PrimitivesExperiment.Samples.WrapLayoutSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:attributes="using:CommunityToolkit.Tooling.SampleGen.Attributes"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:PrimitivesExperiment.Samples"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+      mc:Ignorable="d">
     <Page.Resources>
-        <DataTemplate x:Key="WrapTemplate" x:DataType="local:ColorItem">
-            <Border
-                Width="{x:Bind Width}"
-                Height="48"
-                CornerRadius="{StaticResource ControlCornerRadius}">
+        <DataTemplate x:Key="WrapTemplate"
+                      x:DataType="local:ColorItem">
+            <Border Width="{x:Bind Width}"
+                    Height="48"
+                    CornerRadius="{StaticResource ControlCornerRadius}">
                 <Border.Background>
                     <SolidColorBrush Color="{x:Bind Color}" />
                 </Border.Background>
-                <TextBlock
-                    Margin="6,4,4,4"
-                    FontSize="16"
-                    Text="{x:Bind Index}" />
+                <TextBlock Margin="6,4,4,4"
+                           FontSize="16"
+                           Text="{x:Bind Index}" />
             </Border>
         </DataTemplate>
     </Page.Resources>
 
     <ScrollViewer>
-        <muxc:ItemsRepeater
-            x:Name="WrapRepeater"
-            ItemTemplate="{StaticResource WrapTemplate}"
-            ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
+        <muxc:ItemsRepeater x:Name="WrapRepeater"
+                            ItemTemplate="{StaticResource WrapTemplate}"
+                            ItemsSource="{x:Bind ColorsCollection, Mode=OneWay}">
             <muxc:ItemsRepeater.Layout>
-                <controls:WrapLayout
-                    x:Name="Wrap"
-                    HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
-                    VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
+                <controls:WrapLayout x:Name="Wrap"
+                                     HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
+                                     VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}" />
             </muxc:ItemsRepeater.Layout>
         </muxc:ItemsRepeater>
     </ScrollViewer>