[NUI] Fix Layouter to handle empty group case.

everLEEst · Nov 25, 2022 · 0364f0c · 0364f0c
1 parent 1b55db4
commit 0364f0c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
@@ -210,11 +210,19 @@ public override void Initialize(RecyclerView view)
 
             bool failed = false;
             //Final Check of FirstIndex
-            while (colView.InternalItemSource.IsHeader(firstIndex) ||
+            if (colView.InternalItemSource.Count - 1 < firstIndex)
+            {
+                StepCandidate = 0F;
+                failed = true;
+            }
+
+            while (!failed &&
+                   (colView.InternalItemSource.IsHeader(firstIndex) ||
                     colView.InternalItemSource.IsGroupHeader(firstIndex) ||
-                    colView.InternalItemSource.IsGroupFooter(firstIndex))
+                    colView.InternalItemSource.IsGroupFooter(firstIndex)))
             {
-                if (colView.InternalItemSource.IsFooter(firstIndex))
+                if (colView.InternalItemSource.IsFooter(firstIndex)
+                    || ((colView.InternalItemSource.Count - 1) <= firstIndex))
                 {
                     StepCandidate = 0F;
                     failed = true;
@@ -509,7 +517,7 @@ public override void NotifyItemInserted(IItemSource source, int startIndex)
             // Insert Single item.
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (colView == null) return;
-            if (isSourceEmpty)
+            if (isSourceEmpty || StepCandidate == 0)
             {
                 Initialize(colView);
             }
@@ -661,7 +669,7 @@ public override void NotifyItemRangeInserted(IItemSource source, int startIndex,
              // Insert Group
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (colView == null) return;
-            if (isSourceEmpty)
+            if (isSourceEmpty || StepCandidate == 0)
             {
                 Initialize(colView);
             }

diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs
@@ -204,10 +204,19 @@ public override void Initialize(RecyclerView view)
             bool failed = false;
 
             //Final Check of FirstIndex
-            while (colView.InternalItemSource.IsHeader(firstIndex) ||
+
+            if (colView.InternalItemSource.Count - 1 < firstIndex)
+            {
+                StepCandidate = 0F;
+                failed = true;
+            }
+
+            while (!failed &&
+                   (colView.InternalItemSource.IsHeader(firstIndex) ||
                     colView.InternalItemSource.IsGroupHeader(firstIndex) ||
-                    colView.InternalItemSource.IsGroupFooter(firstIndex))
+                    colView.InternalItemSource.IsGroupFooter(firstIndex)))
             {
+
                 if (colView.InternalItemSource.IsFooter(firstIndex)
                     || ((colView.InternalItemSource.Count - 1) <= firstIndex))
                 {
@@ -557,7 +566,7 @@ public override void NotifyItemInserted(IItemSource source, int startIndex)
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (colView == null) return;
 
-            if (isSourceEmpty)
+            if (isSourceEmpty || StepCandidate == 0)
             {
                 Initialize(colView);
             }
@@ -725,7 +734,7 @@ public override void NotifyItemRangeInserted(IItemSource source, int startIndex,
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (colView == null) return;
 
-            if (isSourceEmpty)
+            if (isSourceEmpty || StepCandidate == 0)
             {
                 Initialize(colView);
             }