Merge pull request #397 from wieslawsoltes/FixControlRecycling

Fix control recycling

Author: wieslawsoltes

samples/DockXamlSample/MainView.axaml

@@ -67,15 +67,15 @@
                       <TextBlock Text="Title"/>
                       <TextBox Text="{Binding Title}"/>
                       <TextBlock Text="Context"/>
-                      <TextBox Text="{Binding Context}"/>
+                      <TextBox Text="{Binding Context}" AcceptsReturn="True"/>
                     </StackPanel>
                   </DocumentTemplate>
                 </DocumentDock.DocumentTemplate>
-                <Document x:Name="Document1" Id="Document1" Title="Program.cs" x:DataType="Document">
-                  <TextBlock Text="{Binding Title}"/>
+                <Document x:Name="Document1" Id="Document1" Title="Program.cs" Context="" x:DataType="Document">
+                  <TextBox Text="{Binding Context}" AcceptsReturn="True"/>
                 </Document>
-                <Document x:Name="Document2" Id="Document2" Title="App.axaml" x:DataType="Document">
-                  <TextBlock Text="{Binding Title}"/>
+                <Document x:Name="Document2" Id="Document2" Title="App.axaml" Context="" x:DataType="Document">
+                  <TextBox Text="{Binding Context}" AcceptsReturn="True"/>
                 </Document>
               </DocumentDock>
 

src/Avalonia.Controls.Recycling/ControlRecycling.cs

@@ -82,9 +82,9 @@ public void Add(object data, object control)
             return control;
         }
 
-        var dataTemplate = (parent as Control)?.FindDataTemplate(key);
+        var dataTemplate = (parent as Control)?.FindDataTemplate(data);
 
-        control = dataTemplate?.Build(key);
+        control = dataTemplate?.Build(data);
         if (control is null)
         {
             return null;