IComponentConnector2 doesn't exist in WinUI

cppwinrt/code_writers.h

@@ -3272,11 +3272,11 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
         }
         else if (namespace_name == "Windows.UI.Xaml.Markup")
         {
-            w.write(strings::base_xaml_component_connector, "Windows");
+            w.write(strings::base_xaml_component_connector);
         }
         else if (namespace_name == "Microsoft.UI.Xaml.Markup")
         {
-            w.write(strings::base_xaml_component_connector, "Microsoft");
+            w.write(strings::base_xaml_component_connector_winui);
         }
     }
 

cppwinrt/cppwinrt.vcxproj

@@ -89,6 +89,7 @@
     <ClInclude Include="..\strings\base_weak_ref.h" />
     <ClInclude Include="..\strings\base_windows.h" />
     <ClInclude Include="..\strings\base_xaml_component_connector.h" />
+    <ClInclude Include="..\strings\base_xaml_component_connector_winui.h" />
     <ClInclude Include="..\strings\base_xaml_typename.h" />
     <ClInclude Include="cmd_reader.h" />
     <ClInclude Include="code_writers.h" />

cppwinrt/cppwinrt.vcxproj.filters

@@ -178,6 +178,9 @@
     <ClInclude Include="..\strings\base_coroutine_system_winui.h">
       <Filter>strings</Filter>
     </ClInclude>
+    <ClInclude Include="..\strings\base_xaml_component_connector_winui.h">
+      <Filter>strings</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="$(OutDir)version.rc" />

strings/base_xaml_component_connector.h

@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::%::UI::Xaml::Markup
+WINRT_EXPORT namespace winrt::Windows::UI::Xaml::Markup
 {
     template <typename D>
     struct ComponentConnectorT : D

strings/base_xaml_component_connector_winui.h

@@ -0,0 +1,52 @@
+
+WINRT_EXPORT namespace winrt::Microsoft::UI::Xaml::Markup
+{
+    template <typename D>
+    struct ComponentConnectorT : D
+    {
+        using composable_base = typename D::composable_base;
+
+        void InitializeComponent()
+        {
+            if constexpr (m_has_connectable_base)
+            {
+                m_dispatch_base = true;
+                composable_base::InitializeComponent();
+                m_dispatch_base = false;
+            }
+            D::InitializeComponent();
+        }
+
+        void Connect(int32_t connectionId, Windows::Foundation::IInspectable const& target)
+        {
+            if constexpr (m_has_connectable_base)
+            {
+                if (m_dispatch_base)
+                {
+                    composable_base::Connect(connectionId, target);
+                    return;
+                }
+            }
+            D::Connect(connectionId, target);
+        }
+
+        auto GetBindingConnector(int32_t connectionId, Windows::Foundation::IInspectable const& target)
+        {
+            if constexpr (m_has_connectable_base)
+            {
+                if (m_dispatch_base)
+                {
+                    return composable_base::GetBindingConnector(connectionId, target);
+                }
+            }
+            return D::GetBindingConnector(connectionId, target);
+        }
+
+    private:
+        static constexpr bool m_has_connectable_base{
+            impl::has_initializer<composable_base>::value &&
+            impl::has_interface<D, IComponentConnector>() };
+
+        bool m_dispatch_base{};
+    };
+}