Resolved conflicts

naveenkumar-sanjeevirayan · naveenkumar-sanjeevirayan · commit 75ccf4dec3bd · 2025-03-13T19:56:54.000+05:30
diff --git a/maui/src/BottomSheet/SfBottomSheet.cs b/maui/src/BottomSheet/SfBottomSheet.cs
@@ -1565,13 +1565,7 @@ void UpdateStateChanged(BottomSheetState oldState, BottomSheetState newState)
 		    {
 		        _stateChangedEventArgs.OldState = oldState;
 		        _stateChangedEventArgs.NewState = newState;
-
-		        if (_overlayGrid is not null)
-		        {
-		            _overlayGrid.IsVisible = (State is BottomSheetState.Collapsed) ? false : IsModal;
-		        }
-
-				    OnStateChanged(_stateChangedEventArgs);
+				OnStateChanged(_stateChangedEventArgs);
 		    }
 		}
 
@@ -1658,11 +1652,6 @@ double GetFullExpandedPosition()
 		double GetCollapsedPosition()
 		{
 		    double targetPosition = Height - CollapsedHeight;
-
-			if (_overlayGrid is not null)
-			{
-				_overlayGrid.IsVisible = false;
-			}
 			return targetPosition;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1565,13 +1565,7 @@ void UpdateStateChanged(BottomSheetState oldState, BottomSheetState newState)`
`1565`	`1565`	`{`
`1566`	`1566`	`_stateChangedEventArgs.OldState = oldState;`
`1567`	`1567`	`_stateChangedEventArgs.NewState = newState;`
`1568`		`-`
`1569`		`- if (_overlayGrid is not null)`
`1570`		`- {`
`1571`		`- _overlayGrid.IsVisible = (State is BottomSheetState.Collapsed) ? false : IsModal;`
`1572`		`- }`
`1573`		`-`
`1574`		`- OnStateChanged(_stateChangedEventArgs);`
	`1568`	`+ OnStateChanged(_stateChangedEventArgs);`
`1575`	`1569`	`}`
`1576`	`1570`	`}`
`1577`	`1571`
`@@ -1658,11 +1652,6 @@ double GetFullExpandedPosition()`
`1658`	`1652`	`double GetCollapsedPosition()`
`1659`	`1653`	`{`
`1660`	`1654`	`double targetPosition = Height - CollapsedHeight;`
`1661`		`-`
`1662`		`- if (_overlayGrid is not null)`
`1663`		`- {`
`1664`		`- _overlayGrid.IsVisible = false;`
`1665`		`- }`
`1666`	`1655`	`return targetPosition;`
`1667`	`1656`	`}`
`1668`	`1657`