Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cell parenting when using Retain Caching #4636

Merged
merged 1 commit into from
Feb 14, 2022
Merged

Fix cell parenting when using Retain Caching #4636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions src/Compatibility/Core/src/Handlers/ListView/Android/ListViewAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal class ListViewAdapter : CellAdapter
protected readonly ListView _listView;
readonly AListView _realListView;
readonly Dictionary<DataTemplate, int> _templateToId = new Dictionary<DataTemplate, int>();
readonly List<ConditionalFocusLayout> _layoutsCreated = new List<ConditionalFocusLayout>();
readonly Dictionary<int, ConditionalFocusLayout> _layoutsCreated = new Dictionary<int, ConditionalFocusLayout>();
int _dataTemplateIncrementer = 2; // lets start at not 0 because ...

// We will use _dataTemplateIncrementer to get the proper ViewType key for the item's DataTemplate and store these keys in _templateToId.
Expand Down Expand Up @@ -244,10 +244,23 @@ public override AView GetView(int position, AView convertView, ViewGroup parent)
}
else
{
layout = new ConditionalFocusLayout(_context) { Orientation = Orientation.Vertical };
_layoutsCreated.Add(layout);
// This means the cell was already created during the measuring phase
// so we just reuse the layout already created for the cell
// This only ever happens if the ListView is forced to measure itself because
// it has infinite height
if (convertView == null && cell.Handler?.NativeView is AView aView &&
aView.Parent is ConditionalFocusLayout cfl)
{
layout = cfl;
}
else
{
layout = new ConditionalFocusLayout(_context) { Orientation = Orientation.Vertical };
_layoutsCreated[position] = layout;
}
}


if (((cachingStrategy & ListViewCachingStrategy.RecycleElement) != 0) && convertView != null)
{
var boxedCell = convertView as INativeElementView;
Expand Down Expand Up @@ -310,7 +323,12 @@ public override AView GetView(int position, AView convertView, ViewGroup parent)
}
}
else
layout.AddView(view, 0);
{
if (view.Parent != layout)
{
layout.AddView(view, 0);
}
}

Performance.Stop(reference, "AddView");

Expand Down Expand Up @@ -493,11 +511,9 @@ protected override void HandleItemClick(AdapterView parent, AView view, int posi

void DisposeCells()
{
var cellCount = _layoutsCreated.Count;

for (int i = 0; i < cellCount; i++)
foreach(var key in _layoutsCreated)
{
var layout = _layoutsCreated[i];
var layout = key.Value;

if (layout.IsDisposed())
continue;
Expand Down
10 changes: 9 additions & 1 deletion src/Compatibility/Core/src/Handlers/ListView/Android/ListViewRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,15 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
continue;
}

AView listItem = _adapter.GetView(i, null, Control);
// If the parent is already set then we'll just pass
// that in as the convert view so that GetView doesn't create
// an additional ConditionalFocusLayout
// We're basically faking re-use to the GetView call
AView currentParent = null;
if(cell.Handler?.NativeView is AView aView)
currentParent = aView.Parent as AView;

AView listItem = _adapter.GetView(i, currentParent, Control);
int widthSpec;

if (double.IsInfinity(widthConstraint))
Expand Down