From 9a560f4d6f8f6c334d9487dacdd58123f7f6f464 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Sun, 7 Mar 2021 11:53:05 -0800 Subject: [PATCH 1/3] format --- .../windows/ReactNativeXaml/XamlMetadata.cpp | 48 +++++++++---------- .../windows/ReactNativeXaml/XamlMetadata.h | 6 +-- .../ReactNativeXaml/XamlViewManager.cpp | 5 +- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/package/windows/ReactNativeXaml/XamlMetadata.cpp b/package/windows/ReactNativeXaml/XamlMetadata.cpp index 944d739c..71f013f6 100644 --- a/package/windows/ReactNativeXaml/XamlMetadata.cpp +++ b/package/windows/ReactNativeXaml/XamlMetadata.cpp @@ -84,7 +84,7 @@ winrt::Windows::Foundation::IInspectable XamlMetadata::Create(const std::string& if (!e) { e = Wrap(obj); } - std::for_each(EventInfo::xamlEventMap, EventInfo::xamlEventMap + ARRAYSIZE(EventInfo::xamlEventMap), [e, context, wrapped](const EventInfo& entry) {entry.attachHandler(e, context, wrapped); }); + std::for_each(EventInfo::xamlEventMap, EventInfo::xamlEventMap + ARRAYSIZE(EventInfo::xamlEventMap), [e, context, wrapped](const EventInfo& entry) {entry.attachHandler(e, context, wrapped); }); return e; } @@ -97,21 +97,21 @@ T Unwrap(const winrt::Windows::Foundation::IInspectable& i) { } // FlyoutBase.IsOpen is read-only but we need a way to call ShowAt/Hide, so this hooks it up -void SetIsOpen_FlyoutBase(xaml::DependencyObject o, xaml::DependencyProperty prop, const winrt::Microsoft::ReactNative::JSValue& v) { - auto flyout = Unwrap(o); - if (flyout && v.Type() == JSValueType::Boolean) { - if (v.AsBoolean()) { - auto target = flyout.Target(); - - // TODO: Need to figure out the parent element, but the content control isn't parented to anything anymore - if (!target) target = o.as().DataContext().as(); - auto cn = winrt::get_class_name(target); - flyout.ShowAt(target); - } - else { - flyout.Hide(); - } - } +void SetIsOpen_FlyoutBase(xaml::DependencyObject o, xaml::DependencyProperty prop, const winrt::Microsoft::ReactNative::JSValue& v) { + auto flyout = Unwrap(o); + if (flyout && v.Type() == JSValueType::Boolean) { + if (v.AsBoolean()) { + auto target = flyout.Target(); + + // TODO: Need to figure out the parent element, but the content control isn't parented to anything anymore + if (!target) target = o.as().DataContext().as(); + auto cn = winrt::get_class_name(target); + flyout.ShowAt(target); + } + else { + flyout.Hide(); + } + } } template bool IsWrapped(const winrt::Windows::Foundation::IInspectable& i) { @@ -134,7 +134,7 @@ const PropInfo* FindFirstMatch(const stringKey& key, const winrt::Windows::Found } const struct { - const PropInfo* map; + const PropInfo* map; size_t size; } propertyMaps[] = { { xamlPropertyMap, ARRAYSIZE(xamlPropertyMap) }, @@ -181,7 +181,7 @@ namespace winrt::Microsoft::ReactNative { WriteIInspectable(writer, cc.Content()); } else if (auto mfi = item.try_as()) { - writer.WriteObjectBegin(); + writer.WriteObjectBegin(); WriteProperty(writer, L"text", mfi.Text()); writer.WriteObjectEnd(); } @@ -235,16 +235,16 @@ namespace winrt::Microsoft::ReactNative { template void Serialize(winrt::Microsoft::ReactNative::IJSValueWriter const& writer, const winrt::IInspectable& sender, const T& args) { -// assert(false); + // assert(false); } template<> void Serialize(winrt::Microsoft::ReactNative::IJSValueWriter const& writer, const winrt::IInspectable& sender, const xaml::RoutedEventArgs& args) { - writer.WriteObjectBegin(); - if (auto originalSource = args.OriginalSource()) { - WriteProperty(writer, L"originalSource", originalSource); - } - writer.WriteObjectEnd(); + writer.WriteObjectBegin(); + if (auto originalSource = args.OriginalSource()) { + WriteProperty(writer, L"originalSource", originalSource); + } + writer.WriteObjectEnd(); } template<> diff --git a/package/windows/ReactNativeXaml/XamlMetadata.h b/package/windows/ReactNativeXaml/XamlMetadata.h index 9152385c..b32e4e68 100644 --- a/package/windows/ReactNativeXaml/XamlMetadata.h +++ b/package/windows/ReactNativeXaml/XamlMetadata.h @@ -49,7 +49,7 @@ template bool IsType(const winrt::Windows::Foundation::IInspectable template winrt::IInspectable MakeEnum(const std::string& value) noexcept; template::value, int> = 0> -void SetPropValue (xaml::DependencyObject o, xaml::DependencyProperty prop, const winrt::Microsoft::ReactNative::JSValue& v) { +void SetPropValue(xaml::DependencyObject o, xaml::DependencyProperty prop, const winrt::Microsoft::ReactNative::JSValue& v) { auto str = v.AsString(); auto valueEnum = MakeEnum(str); o.SetValue(prop, winrt::box_value(valueEnum)); @@ -87,10 +87,10 @@ void SetPropValue(xaml::DependencyObject o, xaml::DependencyProperty prop, const struct PropInfo { stringKey propName; - + using isType_t = bool (*) (const winrt::Windows::Foundation::IInspectable&); isType_t isType; - + using xamlPropertyGetter_t = xaml::DependencyProperty(*)(); xamlPropertyGetter_t xamlPropertyGetter; diff --git a/package/windows/ReactNativeXaml/XamlViewManager.cpp b/package/windows/ReactNativeXaml/XamlViewManager.cpp index d682094d..27fd3fd4 100644 --- a/package/windows/ReactNativeXaml/XamlViewManager.cpp +++ b/package/windows/ReactNativeXaml/XamlViewManager.cpp @@ -113,7 +113,8 @@ namespace winrt::ReactNativeXaml { childAsCC.DataContext(e); if (auto button = e.try_as