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

Commit 9c5ce9f

Browse files
committed
[iOS] Fix merge
1 parent 9878900 commit 9c5ce9f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Xamarin.Forms.Platform.iOS/PageLifecycleManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ public void HandlePageDisappearing()
8181
_pageController.SendDisappearing();
8282
}
8383

84+
public bool Appeared => _appeared;
85+
8486
bool CheckIfWeAreTheCurrentPage()
8587
{
8688
if (_pageController.RealParent is IPageContainer<Page> multipage)

Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ bool ShouldUseSafeArea()
378378

379379
void UpdateUseSafeArea()
380380
{
381-
if (Element == null)
381+
if (Element == null || _pageLifecycleManager == null)
382382
return;
383383

384384
if (_userOverriddenSafeArea)
@@ -387,7 +387,7 @@ void UpdateUseSafeArea()
387387
if (!IsPartOfShell && !Forms.IsiOS11OrNewer)
388388
return;
389389

390-
if (IsPartOfShell && !_appeared)
390+
if (IsPartOfShell && !_pageLifecycleManager.Appeared)
391391
return;
392392

393393
var tabThickness = _tabThickness;

0 commit comments

Comments
 (0)