diff --git a/vnext/ReactUWP/Views/ViewViewManager.cpp b/vnext/ReactUWP/Views/ViewViewManager.cpp index 48823aabba5..9633f98e7e1 100644 --- a/vnext/ReactUWP/Views/ViewViewManager.cpp +++ b/vnext/ReactUWP/Views/ViewViewManager.cpp @@ -103,6 +103,21 @@ class ViewShadowNode : public ShadowNodeBase void removeAllChildren() override { GetViewPanel()->Clear(); + + XamlView current = m_view; + + if (IsControl()) + { + auto control = m_view.as(); + current = control.Content().as(); + control.Content(nullptr); + } + + if (HasOuterBorder()) + { + auto border = current.try_as(); + border.Child(nullptr); + } } void ReplaceChild(XamlView oldChildView, XamlView newChildView) override