Merge pull request #834 from enisn/dialogs-scrolling

Scrolling for AutoFormView inside Dialogs
enisn · Dec 12, 2024 · 0650f5d · 0650f5d
2 parents c2473bb + 2079fdf
commit 0650f5d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/UraniumUI.Dialogs.CommunityToolkit/CommunityToolkitDialogService.cs b/src/UraniumUI.Dialogs.CommunityToolkit/CommunityToolkitDialogService.cs
@@ -531,12 +531,12 @@ public Task<TViewModel> DisplayFormViewAsync<TViewModel>(string title, TViewMode
         {
             { submit, new Command(() =>
             {
-                tcs.SetResult(viewModel);
+                tcs.TrySetResult(viewModel);
                 popup.Close();
             }) },
             { cancel, new Command(() =>
             {
-                tcs.SetResult(null);
+                tcs.TrySetResult(null);
             }) }
         });
 

diff --git a/src/UraniumUI.Dialogs.Mopups/MopupsDialogService.cs b/src/UraniumUI.Dialogs.Mopups/MopupsDialogService.cs
@@ -371,7 +371,7 @@ public Task<TViewModel> DisplayFormViewAsync<TViewModel>(string title, TViewMode
             Children =
             {
                 GetHeader(title),
-                formView,
+                new ScrollView { Content = formView, MaximumHeightRequest = Page.Height * .8 },
                 GetDivider(),
                 GetFooter( new Dictionary<string, Command>
                 {

diff --git a/src/UraniumUI/Dialogs/DefaultDialogAnimatedContentPage.cs b/src/UraniumUI/Dialogs/DefaultDialogAnimatedContentPage.cs
@@ -37,6 +37,6 @@ public async Task CloseAsync()
 
         await Task.WhenAll(tasks);
 
-        await Navigation.PopModalAsync();
+        await Navigation.PopModalAsync(animated: false);
     }
 }
diff --git a/src/UraniumUI/Dialogs/DefaultDialogService.cs b/src/UraniumUI/Dialogs/DefaultDialogService.cs
@@ -424,12 +424,12 @@ public Task<TViewModel> DisplayFormViewAsync<TViewModel>(string title, TViewMode
         var popupPage = new DefaultDialogAnimatedContentPage
         {
             BackgroundColor = GetBackdropColor(),
-            Content = GetFrame(Page.Width, new ScrollView
+            Content = GetFrame(Page.Width, new VerticalStackLayout
             {
                 Children =
                 {
                     GetHeader(title),
-                    new VerticalStackLayout { Content = formView },
+                    new ScrollView { Content = formView, MaximumHeightRequest = Page.Height * .8 },
                     GetDivider(),
                     GetFooter(new Dictionary<string, Command>
                     {