Small api change on Dialog service

TheXDS · Mar 17, 2024 · fa7c0cb · fa7c0cb
1 parent b050504
commit fa7c0cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/Core/Ganymede/Ganymede.csproj b/src/Core/Ganymede/Ganymede.csproj
@@ -7,8 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="TheXDS.MCART.Mvvm" Version="0.17.2-alpha.11" />
-		<PackageReference Include="TheXDS.MCART.UI" Version="0.17.2-alpha.11" />
+		<PackageReference Include="TheXDS.MCART.Mvvm" Version="0.17.2-alpha.16" />
+		<PackageReference Include="TheXDS.MCART.UI" Version="0.17.2-alpha.16" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Core/Ganymede/Services/IDialogService_Input.cs b/src/Core/Ganymede/Services/IDialogService_Input.cs
@@ -89,7 +89,11 @@ public partial interface IDialogService
     /// options may contain several items.
     /// </remarks>
     /// <see cref="GetOption(string?, string, string[])"/>
-    Task<int> SelectOption(string? title, string prompt, params string[] options) => GetOption(title, prompt, options);
+    async Task<InputResult<int>> SelectOption(string? title, string prompt, params string[] options)
+    {
+        var result = await GetOption(title, prompt, options);
+        return new(result >= 0, result);
+    }
 
     /// <summary>
     /// Gets a value from the user.
@@ -265,7 +269,7 @@ Task<InputResult<string>> GetFileOpenPath(string? title, string message)
     /// </returns>
     Task<InputResult<string>> GetFileOpenPath(string? title, string message, string? defaultPath)
     {
-        return GetFileOpenPath(title, message, new[] { FileFilterItem.AllFiles }, defaultPath);
+        return GetFileOpenPath(title, message, [FileFilterItem.AllFiles], defaultPath);
     }
 
     /// <summary>

diff --git a/src/Core/Ganymede/Services/NavigatingDialogService_Input.cs b/src/Core/Ganymede/Services/NavigatingDialogService_Input.cs
@@ -36,14 +36,14 @@ public Task<int> GetOption(string? title, string prompt, params string[] options
     }
 
     /// <inheritdoc/>
-    public async Task<int> SelectOption(string? title, string prompt, params string[] options)
+    public async Task<InputResult<int>> SelectOption(string? title, string prompt, params string[] options)
     {
         TaskCompletionSource<bool> dialogAwaiter = new();
         var vm = CreateInputDialogVm<SelectionDialogViewModel>(title, prompt, dialogAwaiter);
         vm.Options = options;
         Navigate(vm);
         var result = await dialogAwaiter.Task;
-        return result ? options.FindIndexOf(vm.Value) : -1;
+        return new(result, result ? options.FindIndexOf(vm.Value) : -1);
     }
 
     /// <inheritdoc/>

diff --git a/src/Platform/Ganymede.Wpf/Ganymede.Wpf.csproj b/src/Platform/Ganymede.Wpf/Ganymede.Wpf.csproj
@@ -8,10 +8,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="TheXDS.MCART.Mvvm" Version="0.17.2-alpha.11" />
-		<PackageReference Include="TheXDS.MCART.UI" Version="0.17.2-alpha.11" />
-		<PackageReference Include="TheXDS.MCART.Wpf.Common" Version="0.17.2-alpha.11" />
-		<PackageReference Include="TheXDS.MCART.Wpf.Controls" Version="0.17.2-alpha.11" />
+		<PackageReference Include="TheXDS.MCART.Mvvm" Version="0.17.2-alpha.16" />
+		<PackageReference Include="TheXDS.MCART.UI" Version="0.17.2-alpha.16" />
+		<PackageReference Include="TheXDS.MCART.Wpf.Common" Version="0.17.2-alpha.16" />
+		<PackageReference Include="TheXDS.MCART.Wpf.Controls" Version="0.17.2-alpha.16" />
 	</ItemGroup>
 
 	<ItemGroup>