Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Fix NullReferenceException thrown in PopupRenderer.SetViewController #1762

Merged
merged 8 commits into from
Dec 20, 2021
Merged

Fix NullReferenceException thrown in PopupRenderer.SetViewController #1762

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c49a01c
NullReferenceException thrown in PopupRenderer.SetViewController when…
VladislavAntonyuk Dec 10, 2021
d275087
Merge branch 'main' into 1758-popup-nre
VladislavAntonyuk Dec 10, 2021
bd0c7ce
Merge branch 'main' into 1758-popup-nre
VladislavAntonyuk Dec 17, 2021
dc9d5fa
remove Null Forgiving Operator
VladislavAntonyuk Dec 20, 2021
ee0ab69
Merge branch '1758-popup-nre' of https://github.com/xamarin/XamarinCo…
VladislavAntonyuk Dec 20, 2021
4ee8a2c
Merge branch 'main' into 1758-popup-nre
VladislavAntonyuk Dec 20, 2021
1dcdcb8
Fix Null Forgiving Operator
VladislavAntonyuk Dec 20, 2021
4c2fbfe
Fix Null Forgiving Operator
VladislavAntonyuk Dec 20, 2021
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
27 changes: 21 additions & 6 deletions src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ public PopupRenderer()
{
}

[Preserve(Conditional = true)]
public PopupRenderer(UIViewController viewController)
{
ViewController = viewController;
}

public void SetElementSize(Size size) =>
Control?.SetElementSize(size);

Expand Down Expand Up @@ -134,18 +140,27 @@ void CreateControl()
void SetViewController()
{
IVisualElementRenderer currentPageRenderer;
var modalStackCount = Application.Current.MainPage?.Navigation?.ModalStack?.Count ?? 0;
var mainPage = Application.Current.MainPage;
if (modalStackCount > 0)
var page = Application.Current.MainPage;
var modalStackCount = page?.Navigation.ModalStack.Count ?? 0;
if (modalStackCount > 0 && page is not null)
{
var index = modalStackCount - 1;
currentPageRenderer = Platform.GetRenderer(mainPage!.Navigation!.ModalStack![index]);
page = page.Navigation.ModalStack[index];
currentPageRenderer = Platform.GetRenderer(page);
}
else
{
currentPageRenderer = Platform.GetRenderer(page);
}

if (currentPageRenderer == null)
{
ViewController ??= page?.CreateViewController();
}
else
{
currentPageRenderer = Platform.GetRenderer(mainPage);
ViewController ??= currentPageRenderer.ViewController;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure that we just want to set the ViewController if it's null?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

previously, we always set it. it was done by CreateControl. it was the only 1 place where we set it.
now we also set ViewController in ctor. we do not want to set it here again.
hope I correctly understand your question.

}
ViewController = currentPageRenderer.ViewController;
}

void SetEvents()
Expand Down