PopupRenderer: check for isDisposed in OnElementPropertyChanged befor…

…e taking action. Fixes xamarin#1947
mfeingol · May 4, 2023 · 8329323 · 8329323
1 parent ecbc831
commit 8329323
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
@@ -93,7 +93,7 @@ public override void Show()
 
  protected virtual void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs args)
  {
- if (Element is BasePopup basePopup)
+ if (Element is BasePopup basePopup && !isDisposed)
  {
  if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName
  || args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -87,12 +87,15 @@ protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup?> e)
 
  protected virtual void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs args)
  {
- if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
- args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName ||
- args.PropertyName == BasePopup.SizeProperty.PropertyName ||
- args.PropertyName == BasePopup.ColorProperty.PropertyName)
+ if (Element is BasePopup basePopup && !isDisposed)
  {
- ConfigureControl();
+ if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
+ args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName ||
+ args.PropertyName == BasePopup.SizeProperty.PropertyName ||
+ args.PropertyName == BasePopup.ColorProperty.PropertyName)
+ {
+ ConfigureControl();
+ }
  }
 
  ElementPropertyChanged?.Invoke(this, args);

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -108,18 +108,21 @@ protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup?> e)
 
  protected virtual void OnElementPropertyChanged(object? sender, PropertyChangedEventArgs args)
  {
- if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
- args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName)
+ if (Element is BasePopup basePopup && !isDisposed)
  {
- SetLayout();
- }
- else if (args.PropertyName == BasePopup.SizeProperty.PropertyName)
- {
- SetSize();
- }
- else if (args.PropertyName == BasePopup.ColorProperty.PropertyName)
- {
- SetBackgroundColor();
+ if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
+ args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName)
+ {
+ SetLayout();
+ }
+ else if (args.PropertyName == BasePopup.SizeProperty.PropertyName)
+ {
+ SetSize();
+ }
+ else if (args.PropertyName == BasePopup.ColorProperty.PropertyName)
+ {
+ SetBackgroundColor();
+ }
  }
 
  ElementPropertyChanged?.Invoke(this, args);