ValidatingFileTypeFilterVector

Author: DinahK-2SO

dev/Interop/StoragePickers/FileOpenPicker.cpp

@@ -13,14 +13,14 @@
 #include "PickerCommon.h"
 #include "PickFileResult.h"
 #include "PickerLocalization.h"
+#include "ValidatingFileTypeFilterVector.h"
 
 namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
 {
     FileOpenPicker::FileOpenPicker(winrt::Microsoft::UI::WindowId const& windowId)
-        : m_windowId(windowId)
+        : m_windowId(windowId), m_fileTypeFilter(make<ValidatingFileTypeFilterVector>())
     {
         THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers::IsEnabled());
-        m_fileTypeFilter.VectorChanged({ this, &FileOpenPicker::OnFileTypeFilterChanged });
     }
 
     winrt::Microsoft::Windows::Storage::Pickers::PickerViewMode FileOpenPicker::ViewMode()
@@ -59,14 +59,7 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
     }
     winrt::Windows::Foundation::Collections::IVector<hstring> FileOpenPicker::FileTypeFilter()
     {
-        return m_fileTypeFilter.as<winrt::Windows::Foundation::Collections::IVector<hstring>>();
-    }
-
-    void FileOpenPicker::OnFileTypeFilterChanged(
-        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> const&,
-        winrt::Windows::Foundation::Collections::IVectorChangedEventArgs const&)
-    {
-        PickerCommon::ValidateFileTypeFilter(m_fileTypeFilter.GetView());
+        return m_fileTypeFilter;
     }
 
     void FileOpenPicker::CaptureParameters(PickerCommon::PickerParameters& parameters)

dev/Interop/StoragePickers/FileOpenPicker.h

@@ -37,16 +37,11 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
         PickerLocationId m_suggestedStartLocation{ PickerLocationId::Unspecified };
         winrt::hstring m_commitButtonText{};
 
-        winrt::Windows::Foundation::Collections::IObservableVector<hstring> m_fileTypeFilter{
-            winrt::single_threaded_observable_vector<hstring>()
-        };
+        winrt::Windows::Foundation::Collections::IVector<hstring> m_fileTypeFilter;
 
         StoragePickersTelemetryHelper m_telemetryHelper{};
 
         void CaptureParameters(PickerCommon::PickerParameters& parameters);
-        void OnFileTypeFilterChanged(
-            winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> const&,
-            winrt::Windows::Foundation::Collections::IVectorChangedEventArgs const&);
     };
 }
 namespace winrt::Microsoft::Windows::Storage::Pickers::factory_implementation

dev/Interop/StoragePickers/StoragePickers.vcxitems

@@ -18,6 +18,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)PickerLocalization.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)PickFileResult.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)PickFolderResult.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ValidatingFileTypeFilterVector.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)PickerCommon.h" />
@@ -26,6 +27,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)PickFolderResult.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)StoragePickersTelemetry.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)StoragePickersTelemetryHelper.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ValidatingFileTypeFilterVector.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)FileOpenPicker.cpp" />

dev/Interop/StoragePickers/ValidatingFileTypeFilterVector.cpp

@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "ValidatingFileTypeFilterVector.h"
+#include "PickerCommon.h"
+
+namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
+{
+    ValidatingFileTypeFilterVector::ValidatingFileTypeFilterVector()
+    {
+    }
+
+    void ValidatingFileTypeFilterVector::SetAt(uint32_t index, hstring const& value)
+    {
+        PickerCommon::ValidateSingleFileTypeFilterElement(value);
+        m_innerVector.SetAt(index, value);
+    }
+
+    void ValidatingFileTypeFilterVector::InsertAt(uint32_t index, hstring const& value)
+    {
+        PickerCommon::ValidateSingleFileTypeFilterElement(value);
+        m_innerVector.InsertAt(index, value);
+    }
+
+    void ValidatingFileTypeFilterVector::Append(hstring const& value)
+    {
+        PickerCommon::ValidateSingleFileTypeFilterElement(value);
+        m_innerVector.Append(value);
+    }
+
+    void ValidatingFileTypeFilterVector::ReplaceAll(array_view<hstring const> items)
+    {
+        // Validate all items before replacing
+        for (auto const& item : items)
+        {
+            PickerCommon::ValidateSingleFileTypeFilterElement(item);
+        }
+        m_innerVector.ReplaceAll(items);
+    }
+
+    hstring ValidatingFileTypeFilterVector::GetAt(uint32_t index) const
+    {
+        return m_innerVector.GetAt(index);
+    }
+
+    uint32_t ValidatingFileTypeFilterVector::Size() const
+    {
+        return m_innerVector.Size();
+    }
+
+    winrt::Windows::Foundation::Collections::IVectorView<hstring> ValidatingFileTypeFilterVector::GetView() const
+    {
+        return m_innerVector.GetView();
+    }
+
+    bool ValidatingFileTypeFilterVector::IndexOf(hstring const& value, uint32_t& index) const
+    {
+        return m_innerVector.IndexOf(value, index);
+    }
+
+    void ValidatingFileTypeFilterVector::RemoveAt(uint32_t index)
+    {
+        m_innerVector.RemoveAt(index);
+    }
+
+    void ValidatingFileTypeFilterVector::RemoveAtEnd()
+    {
+        m_innerVector.RemoveAtEnd();
+    }
+
+    void ValidatingFileTypeFilterVector::Clear()
+    {
+        m_innerVector.Clear();
+    }
+
+    uint32_t ValidatingFileTypeFilterVector::GetMany(uint32_t startIndex, array_view<hstring> items) const
+    {
+        return m_innerVector.GetMany(startIndex, items);
+    }
+
+    winrt::Windows::Foundation::Collections::IIterator<hstring> ValidatingFileTypeFilterVector::First() const
+    {
+        return m_innerVector.First();
+    }
+}

dev/Interop/StoragePickers/ValidatingFileTypeFilterVector.h

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#pragma once
+#include <winrt/Windows.Foundation.Collections.h>
+// #include "PickerCommon.h"
+
+namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
+{
+    struct ValidatingFileTypeFilterVector : implements<ValidatingFileTypeFilterVector, 
+        winrt::Windows::Foundation::Collections::IVector<hstring>, 
+        winrt::Windows::Foundation::Collections::IIterable<hstring>>
+    {
+        ValidatingFileTypeFilterVector();
+
+        // IVector<hstring>
+        hstring GetAt(uint32_t index) const;
+        uint32_t Size() const;
+        winrt::Windows::Foundation::Collections::IVectorView<hstring> GetView() const;
+        bool IndexOf(hstring const& value, uint32_t& index) const;
+        void SetAt(uint32_t index, hstring const& value);
+        void InsertAt(uint32_t index, hstring const& value);
+        void RemoveAt(uint32_t index);
+        void Append(hstring const& value);
+        void RemoveAtEnd();
+        void Clear();
+        uint32_t GetMany(uint32_t startIndex, array_view<hstring> items) const;
+        void ReplaceAll(array_view<hstring const> items);
+
+        // IIterable<hstring>
+        winrt::Windows::Foundation::Collections::IIterator<hstring> First() const;
+
+    private:
+        winrt::Windows::Foundation::Collections::IVector<hstring> m_innerVector{ single_threaded_vector<hstring>() };
+    };
+}