diff --git a/windows/RNSVG/SvgView.cpp b/windows/RNSVG/SvgView.cpp index a73821ab..d57a3693 100644 --- a/windows/RNSVG/SvgView.cpp +++ b/windows/RNSVG/SvgView.cpp @@ -85,6 +85,10 @@ void SvgView::UpdateProperties(IJSValueReader const &reader, bool forceUpdate, b auto const &propertyName{pair.first}; auto const &propertyValue{pair.second}; + if (propertyValue.IsNull()) { + continue; + } + if (propertyName == "name") { if (m_parent && m_group) { m_group.SvgRoot().Templates().Remove(m_id); @@ -140,16 +144,16 @@ Size SvgView::ArrangeOverride(Size const &finalSize) { return finalSize; } -void SvgView::Panel_Loaded(IInspectable const &sender, xaml::RoutedEventArgs const & ) { - if (auto const &svgView{sender.try_as()}) { - if (!m_loaded) { - m_loaded = true; +void SvgView::Panel_Loaded(IInspectable const &sender, xaml::RoutedEventArgs const &) { + if (auto const &svgView{sender.try_as()}) { + if (!m_loaded) { + m_loaded = true; svgView.CreateResources(); } } } -void SvgView::Panel_Unloaded(IInspectable const &sender, xaml::RoutedEventArgs const & ) { +void SvgView::Panel_Unloaded(IInspectable const &sender, xaml::RoutedEventArgs const &) { if (auto const &svgView{sender.try_as()}) { svgView.Unload(); }