Blindly, what if TaskViewModel was a FilteredCommand?

microsoft · Feb 21, 2024 · 69cb545 · 69cb545
1 parent def6630
commit 69cb545
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 154 deletions.
diff --git a/enc_temp_folder/5b479cd52f87a783d65d9ac223e3f1b/TasksPaneContent.xaml b/enc_temp_folder/5b479cd52f87a783d65d9ac223e3f1b/TasksPaneContent.xaml
diff --git a/src/cascadia/TerminalApp/FilteredCommand.idl b/src/cascadia/TerminalApp/FilteredCommand.idl
@@ -6,7 +6,7 @@ import "HighlightedTextControl.idl";
 
 namespace TerminalApp
 {
-    [default_interface] runtimeclass FilteredCommand : Windows.UI.Xaml.Data.INotifyPropertyChanged
+    [default_interface] unsealed runtimeclass FilteredCommand : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         FilteredCommand();
         FilteredCommand(PaletteItem item);

diff --git a/src/cascadia/TerminalApp/TasksPaneContent.cpp b/src/cascadia/TerminalApp/TasksPaneContent.cpp
@@ -6,6 +6,7 @@
 #include "PaneArgs.h"
 #include "TasksPaneContent.g.cpp"
 #include "TaskViewModel.g.cpp"
+#include "FilteredTask.g.cpp"
 
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Microsoft::Terminal::Settings;
@@ -44,10 +45,10 @@ namespace winrt::TerminalApp::implementation
         // huh. now that's a thought.
 
         const auto tasks = _settings.GlobalSettings().ActionMap().FilterToSendInput(L""); // IVector<Model::Command>
-        auto itemSource = winrt::single_threaded_observable_vector<TerminalApp::TaskViewModel>();
+        auto itemSource = winrt::single_threaded_observable_vector<TerminalApp::FilteredTask>();
         for (const auto& t : tasks)
         {
-            itemSource.Append(winrt::make<TaskViewModel>(t));
+            itemSource.Append(winrt::make<FilteredTask>(t));
         }
 
         _treeView().ItemsSource(itemSource);

diff --git a/src/cascadia/TerminalApp/TasksPaneContent.h b/src/cascadia/TerminalApp/TasksPaneContent.h
@@ -4,6 +4,9 @@
 #pragma once
 #include "TasksPaneContent.g.h"
 #include "TaskViewModel.g.h"
+#include "FilteredTask.g.h"
+#include "FilteredCommand.h"
+#include "ActionPaletteItem.h"
 
 namespace winrt::TerminalApp::implementation
 {
@@ -70,6 +73,7 @@ namespace winrt::TerminalApp::implementation
                 }
             }
         }
+
         winrt::hstring Name() { return _command.Name(); }
         winrt::hstring IconPath() { return _command.IconPath(); }
         winrt::hstring Input()
@@ -87,6 +91,62 @@ namespace winrt::TerminalApp::implementation
         winrt::Microsoft::Terminal::Settings::Model::Command _command{ nullptr };
         winrt::Windows::Foundation::Collections::IObservableVector<TerminalApp::TaskViewModel> _children{ nullptr };
     };
+
+    // struct FilteredTask : public winrt::TerminalApp::implementation::FilteredCommand, FilteredTaskT<FilteredTask, FilteredCommand>
+    struct FilteredTask : FilteredTaskT<FilteredTask, TerminalApp::implementation::FilteredCommand>
+    {
+        FilteredTask() = default;
+
+        FilteredTask(const winrt::Microsoft::Terminal::Settings::Model::Command& command)
+        {
+            _command = command;
+            _Item = winrt::make<winrt::TerminalApp::implementation::ActionPaletteItem>(command);
+
+            // The Children() method must always return a non-null vector
+            _children = winrt::single_threaded_observable_vector<TerminalApp::FilteredTask>();
+            if (_command.HasNestedCommands())
+            {
+                for (const auto& [_, child] : _command.NestedCommands())
+                {
+                    auto vm{ winrt::make<FilteredTask>(child) };
+                    _children.Append(vm);
+                }
+            }
+        }
+
+        // FilteredCommand() = default;
+        // FilteredCommand(const winrt::TerminalApp::PaletteItem& item);
+
+        // void UpdateFilter(const winrt::hstring& filter);
+
+        // static int Compare(const winrt::TerminalApp::FilteredCommand& first, const winrt::TerminalApp::FilteredCommand& second);
+
+        // WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
+        // WINRT_OBSERVABLE_PROPERTY(winrt::TerminalApp::PaletteItem, Item, _PropertyChangedHandlers, nullptr);
+        // WINRT_OBSERVABLE_PROPERTY(winrt::hstring, Filter, _PropertyChangedHandlers);
+        // WINRT_OBSERVABLE_PROPERTY(winrt::TerminalApp::HighlightedText, HighlightedName, _PropertyChangedHandlers);
+        // WINRT_OBSERVABLE_PROPERTY(int, Weight, _PropertyChangedHandlers);
+
+        winrt::hstring Input()
+        {
+            if (const auto& actionItem{ _Item.try_as<winrt::TerminalApp::ActionPaletteItem>() })
+            {
+                if (const auto& command{ actionItem.Command() })
+                {
+                    if (const auto& sendInput{ command.ActionAndArgs().Args().try_as<winrt::Microsoft::Terminal::Settings::Model::SendInputArgs>() })
+                    {
+                        return sendInput.Input();
+                    }
+                }
+            }
+            return L"";
+        };
+        winrt::Windows::Foundation::Collections::IObservableVector<TerminalApp::FilteredTask> Children() { return _children; }
+
+    private:
+        winrt::Microsoft::Terminal::Settings::Model::Command _command{ nullptr };
+        winrt::Windows::Foundation::Collections::IObservableVector<TerminalApp::FilteredTask> _children{ nullptr };
+    };
 }
 
 namespace winrt::TerminalApp::factory_implementation

diff --git a/src/cascadia/TerminalApp/TasksPaneContent.xaml b/src/cascadia/TerminalApp/TasksPaneContent.xaml
@@ -31,7 +31,7 @@
                               FontSize="12" />
             </DataTemplate>
             <DataTemplate x:Key="TaskItemTemplate"
-                          x:DataType="local:TaskViewModel">
+                          x:DataType="local:FilteredTask">
                 <mux:TreeViewItem x:Name="rootItem"
                                   ItemsSource="{x:Bind Children}">
                     <Grid>
@@ -46,7 +46,7 @@
                         <ContentPresenter Grid.Column="0">
                             <IconSourceElement Width="16"
                                                Height="16"
-                                               IconSource="{x:Bind IconPath, Converter={StaticResource IconSourceConverter}}"
+                                               IconSource="{x:Bind Item.Icon, Converter={StaticResource IconSourceConverter}}"
                                                Visibility="Collapsed" />
                         </ContentPresenter>
                         <!-- <Ellipse x:Name="Ellipse"
@@ -110,7 +110,7 @@
                         <TextBlock Grid.Column="1"
                                    Margin="12,6,0,0"
                                    Style="{ThemeResource BaseTextBlockStyle}"
-                                   Text="{x:Bind Name, Mode=OneWay}"
+                                   Text="{x:Bind Item.Name, Mode=OneWay}"
                                    TextWrapping="WrapWholeWords" />
                         <TextBlock Grid.Row="1"
                                    Grid.Column="1"

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.idl b/src/cascadia/TerminalApp/TerminalPaneContent.idl
@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import "IPaneContent.idl";
+import "FilteredCommand.idl";
 
 namespace TerminalApp
 {
@@ -38,6 +39,11 @@ namespace TerminalApp
         Windows.Foundation.Collections.IObservableVector<TaskViewModel> Children { get; };
 
     }
+    [default_interface] runtimeclass FilteredTask : TerminalApp.FilteredCommand
+    {
+        String Input{ get; };
+        Windows.Foundation.Collections.IObservableVector<FilteredTask> Children { get; };
+    }
 
     [default_interface] runtimeclass TasksPaneContent : Windows.UI.Xaml.Controls.UserControl, IPaneContent
     {

diff --git a/src/cascadia/inc/cppwinrt_utils.h b/src/cascadia/inc/cppwinrt_utils.h
@@ -133,7 +133,7 @@ public:                                   \
         _##name = value;                  \
     }                                     \
                                           \
-private:                                  \
+protected:                                \
     type _##name{ __VA_ARGS__ };
 
 // Use this macro to quickly implement both the getter and setter for an
@@ -158,7 +158,7 @@ public:
         }                                                                                 \
     };                                                                                    \
                                                                                           \
-private:                                                                                  \
+protected:                                                                                \
     type _##name{ __VA_ARGS__ };                                                          \
     void _set##name(const type& value)                                                    \
     {                                                                                     \