Skip to content

Commit 451d2cf

Browse files
committed
make _element a weak reference directly
1 parent d17bd1b commit 451d2cf

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public class PhoneFlyoutPageRenderer : UIViewController, IPlatformViewHandler
1717
{
1818
UIView _clickOffView;
1919
UIViewController _detailController;
20-
WeakReference<VisualElement> element;
21-
VisualElement _element => element?.GetTargetOrDefault();
20+
WeakReference<VisualElement> _element;
2221
bool _disposed;
2322

2423
UIViewController _flyoutController;
@@ -76,7 +75,7 @@ bool Presented
7675
get { return _presented; }
7776
}
7877

79-
public VisualElement Element => _viewHandlerWrapper.Element ?? _element;
78+
public VisualElement Element => _viewHandlerWrapper.Element ?? _element?.GetTargetOrDefault();
8079

8180
public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
8281

@@ -101,7 +100,7 @@ public void SetElement(VisualElement element)
101100
_clickOffView = new UIView();
102101
_clickOffView.BackgroundColor = new Color(0, 0, 0, 0).ToPlatform();
103102
_viewHandlerWrapper.SetVirtualView(element, OnElementChanged, false);
104-
this.element = new(element);
103+
_element = new(element);
105104

106105
if (_intialLayoutFinished)
107106
{
@@ -270,7 +269,7 @@ protected override void Dispose(bool disposing)
270269
}
271270

272271
EmptyContainers();
273-
element = null;
272+
_element = null;
274273
_disposed = true;
275274
}
276275

0 commit comments

Comments
 (0)