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

Jump to bottom

Remove incorrect call to DisconnectHandler #15036

Merged
merged 2 commits into from
May 18, 2023
Merged

Remove incorrect call to DisconnectHandler #15036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330a88e
Clear out the renderer on VCR when disconnected
PureWeen May 11, 2023
fe8935b
- remove extra disconnect
PureWeen May 15, 2023
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
1 change: 0 additions & 1 deletion src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/CellTableViewCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ internal static UITableViewCell GetPlatformCell(UITableView tableView, Cell cell
else
reusableCell = tableView.DequeueReusableCell(id);

cell.Handler?.DisconnectHandler();
cell.ReusableCell = reusableCell;
cell.TableView = tableView;
var handler = cell.ToHandler(cell.FindMauiContext());
Expand Down
11 changes: 10 additions & 1 deletion src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ViewCellRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ IPlatformViewHandler GetNewRenderer()

var newRenderer = _viewCell.View.ToHandler(_viewCell.View.FindMauiContext());
_rendererRef = new WeakReference<IPlatformViewHandler>(newRenderer);
ContentView.AddSubview(newRenderer.PlatformView);
ContentView.ClearSubviews();
ContentView.AddSubview(newRenderer.VirtualView.ToPlatform());
return (IPlatformViewHandler)newRenderer;
}

Expand All @@ -187,6 +188,14 @@ void UpdateCell(ViewCell cell)
}

_viewCell = cell;

if (cell is null)
{
_rendererRef = null;
ContentView.ClearSubviews();
return;
}

_viewCell.PropertyChanged += ViewCellPropertyChanged;
BeginInvokeOnMainThread(_viewCell.SendAppearing);

Expand Down