chore: change test codes

emako · Sep 22, 2024 · 313a218 · 313a218
1 parent 1469ed4
commit 313a218
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git a/src/Wpf.Ui.Test/MainWindow.xaml b/src/Wpf.Ui.Test/MainWindow.xaml
@@ -632,7 +632,7 @@
                             FontWeight="Black"
                             Text="TreeListView" />
                         <StackPanel Margin="0,8,0,0">
-                            <ui:TreeListView
+                            <!--<ui:TreeListView
                                 Height="300"
                                 Margin="0,8,90,0"
                                 Model="{Binding TreeFileModel}">
@@ -655,8 +655,8 @@
                                             Header="FullName" />
                                     </ui:GridView.Columns>
                                 </ui:GridView>
-                            </ui:TreeListView>
-                            <ui:TreeListView
+                            </ui:TreeListView>-->
+                            <!--<ui:TreeListView
                                 Height="300"
                                 Margin="0,8,90,0"
                                 Model="{Binding TreeRegistryModel}"
@@ -680,7 +680,7 @@
                                             Header="Data" />
                                     </ui:GridView.Columns>
                                 </ui:GridView>
-                            </ui:TreeListView>
+                            </ui:TreeListView>-->
                             <ui:TreeListView
                                 Height="200"
                                 Margin="0,8,90,0"

diff --git a/src/Wpf.Ui.Test/MainWindow.xaml.cs b/src/Wpf.Ui.Test/MainWindow.xaml.cs
@@ -176,6 +176,20 @@ private void AddTreeTestModel()
             Column2 = "Test Added " + DateTime.Now,
             Column3 = "Test Added " + DateTime.Now,
         });
+
+        TreeTestModel.Children[0].Children.Add(new TreeTestModel()
+        {
+            Column1 = "Test Added " + DateTime.Now,
+            Column2 = "Test Added " + DateTime.Now,
+            Column3 = "Test Added " + DateTime.Now,
+        });
+
+        TreeTestModel.Children[0].Children[0].Children.Add(new TreeTestModel()
+        {
+            Column1 = "Test Added " + DateTime.Now,
+            Column2 = "Test Added " + DateTime.Now,
+            Column3 = "Test Added " + DateTime.Now,
+        });
     }
 
     [RelayCommand]

diff --git a/src/Wpf.Ui.Violeta/Controls/TreeListView/TreeListView.cs b/src/Wpf.Ui.Violeta/Controls/TreeListView/TreeListView.cs
@@ -93,7 +93,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
         if (element is TreeListViewItem { } ti && item is TreeNode { } node)
         {
             ti.Node = item as TreeNode;
-            base.PrepareContainerForItemOverride(element, node.Tag);
+            base.PrepareContainerForItemOverride(element, node.Text);
         }
     }
 
@@ -130,10 +130,11 @@ internal void CreateChildrenNodes(TreeNode node)
             foreach (object obj in children)
             {
                 TreeNode child = new(this, obj);
+                child.ChildrenSource = (GetChildren(child) as INotifyCollectionChanged)!;
                 child.HasChildren = HasChildren(child);
                 node.Children.Add(child);
             }
-            Rows.InsertRange(rowIndex + 1, node.Children.ToArray());
+            Rows.InsertRange(rowIndex + 1, [.. node.Children]);
         }
     }
 
@@ -170,7 +171,7 @@ internal void DropChildrenRows(TreeNode node, bool removeParent)
     {
         if (Model != null)
         {
-            return Model.GetChildren(parent?.Tag!);
+            return Model.GetChildren(parent?.Text!);
         }
         else
         {
@@ -186,7 +187,7 @@ private bool HasChildren(TreeNode parent)
         }
         else if (Model != null)
         {
-            return Model.HasChildren(parent?.Tag!);
+            return Model.HasChildren(parent?.Text!);
         }
         else
         {

diff --git a/src/Wpf.Ui.Violeta/Controls/TreeListView/TreeNode.cs b/src/Wpf.Ui.Violeta/Controls/TreeListView/TreeNode.cs
@@ -58,10 +58,7 @@ protected override void RemoveItem(int index)
 
         protected override void SetItem(int index, TreeNode item)
         {
-            if (item == null)
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
+            _ = item ?? throw new ArgumentNullException(nameof(item));
 
             RemoveAt(index);
             InsertItem(index, item);
@@ -139,8 +136,8 @@ public bool IsExpanded
             if (value != IsExpanded)
             {
                 Tree.SetIsExpanded(this, value);
-                OnPropertyChanged("IsExpanded");
-                OnPropertyChanged("IsExpandable");
+                OnPropertyChanged(nameof(IsExpanded));
+                OnPropertyChanged(nameof(IsExpandable));
             }
         }
     }
@@ -162,7 +159,7 @@ public bool IsSelected
             if (value != _isSelected)
             {
                 _isSelected = value;
-                OnPropertyChanged("IsSelected");
+                OnPropertyChanged(nameof(IsSelected));
             }
         }
     }
@@ -255,9 +252,9 @@ public IEnumerable<TreeNode> AllVisibleChildren
         }
     }
 
-    private object? _tag = null;
+    private object? _text = null;
 
-    public object? Tag => _tag;
+    public object? Text => _text;
 
     private Collection<TreeNode> _children = null!;
 
@@ -274,12 +271,12 @@ internal TreeNode(TreeListView tree, object tag)
         _tree = tree;
         _children = new NodeCollection(this);
         _nodes = new ReadOnlyCollection<TreeNode>(_children);
-        _tag = tag;
+        _text = tag;
     }
 
     public override string ToString()
     {
-        return Tag != null ? Tag.ToString()! : base.ToString()!;
+        return Text != null ? Text.ToString()! : base.ToString()!;
     }
 
     private void ChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)