Merge branch 'master' of tig:PowerShell/GraphicalTools into master

Author: tig

README.md

@@ -3,7 +3,7 @@
 The GraphicalTools repo contains several different graphical-related PowerShell modules including:
 
 * `Microsoft.PowerShell.GraphicalTools` - A module that provides GUI experiences based on Avalonia.
-* `Microsoft.PowerShell.ConsoleGuiTools` - A module that provides console-based GUI experiences based on gui.cs.
+* `Microsoft.PowerShell.ConsoleGuiTools` - A module that provides console-based GUI experiences based on [Terminal.Gui (gui.cs)](https://github.com/migueldeicaza/gui.cs).
 
 ## Installation
 
@@ -23,6 +23,8 @@ Install-Module Microsoft.PowerShell.ConsoleGuiTools
 
 ### Microsoft.PowerShell.GraphicalTools
 
+[Out-GridView documentation](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-GridView.md)
+
 #### Cross-Platform
 |Linux   |Windows   |Mac   |
 |---|---|---|
@@ -34,7 +36,9 @@ Install-Module Microsoft.PowerShell.ConsoleGuiTools
 
 ### Microsoft.PowerShell.ConsoleGuiTools
 
-![screenshot of Out-ConsoleGridView](https://pbs.twimg.com/media/ESyWfiqUYAA_t6q?format=jpg&name=medium)
+[Out-ConsoleGridView documentation](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md)
+
+![screenshot of Out-ConsoleGridView](docs/Microsoft.PowerShell.ConsoleGuiTools/ocgv.gif)
 
 #### Cross-Platform
 
@@ -116,7 +120,6 @@ In the Powershell session run your commands; breakpoints will be hit, etc...
 
 When done, run `exit` to exit the nested PowerShell and run `pwsh` again. This unloads the DLL. Repeat.
 
-
 ## Contributions Welcome!
 
 We would love to incorporate community contributions into this project.  If you would like to

docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md

@@ -15,14 +15,8 @@ Sends output to an interactive table in the same console window.
 
 ## SYNTAX
 
-### PassThru (Default)
-```
-Out-ConsoleGridView [-InputObject <PSObject>] [-Title <String>] [-PassThru] [<CommonParameters>]
-```
-
-### OutputMode
-```
-Out-ConsoleGridView [-InputObject <PSObject>] [-Title <String>] [-OutputMode <OutputModeOption>] [<CommonParameters>]
+```PowerShell
+Out-ConsoleGridView [-InputObject <psobject>] [-Title <string>] [-OutputMode {None | Single | Multiple}] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -40,14 +34,14 @@ For instructions for using these features, type `Get-Help Out-ConsoleGridView -F
 ## EXAMPLES
 
 ### Example 1: Output processes to a grid view
-```
+```PowerShell
 PS C:\> Get-Process | Out-ConsoleGridView
 ```
 
 This command gets the processes running on the local computer and sends them to a grid view window.
 
 ### Example 2: Use a variable to output processes to a grid view
-```
+```PowerShell
 PS C:\> $P = Get-Process
 PS C:\> $P | Out-ConsoleGridView
 ```
@@ -124,6 +118,24 @@ The processes that you select are passed to the **Export-Csv** command and writt
 The command uses the *PassThru* parameter of **Out-ConsoleGridView**, which lets you send multiple items down the pipeline.
 The *PassThru* parameter is equivalent to using the Multiple value of the *OutputMode* parameter.
 
+### Example 8: Use F7 as "Show Command History"
+
+```PowerShell
+$parameters = @{
+  Key = 'F7'
+  BriefDescription = 'ShowHistoryOcgv'
+  LongDescription = 'Show History using Out-ConsoleGridView'
+  ScriptBlock = {
+    param($key, $arg)   # The arguments are ignored in this example
+    $history = Get-History -Count 100 | Out-ConsoleGridView -Title "Select Command" -OutputMode Single
+    if (-Not [string]::IsNullOrWhiteSpace($history)){
+        [Microsoft.PowerShell.PSConsoleReadLine]::Insert($history)
+    }
+  }
+}
+Set-PSReadLineKeyHandler @parameters
+```
+
 ## PARAMETERS
 
 ### -InputObject

docs/Microsoft.PowerShell.ConsoleGuiTools/ocgv.gif

@@ -48,6 +48,7 @@ public HashSet<int> Start(ApplicationData applicationData)
 
             // Run the GUI.
             Application.Run();
+            Application.Shutdown();
 
             // Return results of selection if required.
             HashSet<int> selectedIndexes = new HashSet<int>();
@@ -106,7 +107,7 @@ private void AddStatusBar()
                                 Accept();
                             }
                             else if (Application.Top.MostFocused == _filterField){
-                                Application.Top.SetFocus(_listView);
+                                _listView.SetFocus();
                             }
                         }),
                         new StatusItem(Key.Esc, "~ESC~ Close", () => Close())
@@ -193,11 +194,10 @@ private void AddFilter(Window win)
                 Width = Dim.Fill() - filterLabel.Text.Length
             };
 
-            _filterField.Changed += (object sender, ustring e) =>
+            _filterField.TextChanged += (str) =>
             {
-                // NOTE: `ustring e` seems to contain the text _before_ the added character...
-                // so we convert the `sender` into a TextField and grab the text from that.
-                string filterText = (sender as TextField)?.Text?.ToString();
+                // str is the OLD value
+                string filterText = _filterField.Text?.ToString();
                 try
                 {
                     filterErrorLabel.Text = " ";

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using NStack;
 using Terminal.Gui;
@@ -32,6 +33,11 @@ public void SetMark(int item, bool value)
             GridViewRowList[item].IsMarked = value;
         }
 
+        public IList ToList()
+        {
+            return GridViewRowList;
+        }
+        
         // A slightly adapted method from gui.cs: https://github.com/migueldeicaza/gui.cs/blob/fc1faba7452ccbdf49028ac49f0c9f0f42bbae91/Terminal.Gui/Views/ListView.cs#L433-L461
         private void RenderUstr(ConsoleDriver driver, ustring ustr, int col, int line, int width)
         {

src/Microsoft.PowerShell.ConsoleGuiTools/GridViewDataSource.cs

@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="Nstack.Core" Version="0.14.0" />
-        <PackageReference Include="Terminal.Gui" Version="0.81.0" />
+        <PackageReference Include="Terminal.Gui" Version="0.89.4" />
         <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.1" />
     </ItemGroup>