Fix intermittent layout problem when View contains a Content Control.…

… Also remove IsTabStop from ScrollViewer.

RNWCPP/ReactUWP/Views/ScrollViewManager.cpp

@@ -77,9 +77,6 @@ XamlView ScrollViewManager::CreateViewCore(int64_t tag)
   winrt::ScrollViewer scrollViewer;
 
   AddHandlers(scrollViewer, tag);
-  // Enable as tabstop so clicks inside don't move focus to the first element.
-  // FUTURE: expose prop to control this
-  scrollViewer.IsTabStop(true);
 
   return scrollViewer;
 }

RNWCPP/ReactUWP/Views/ViewPanel.cpp

@@ -169,15 +169,21 @@ void ViewPanel::SetLeft(winrt::Windows::UI::Xaml::UIElement& element, double val
 
 winrt::Size ViewPanel::MeasureOverride(winrt::Size availableSize)
 {
+  // All children are given as much size as they'd like
+  winrt::Size childConstraint(INFINITY, INFINITY);
+
   for (winrt::UIElement child : Children())
   {
-    child.Measure(winrt::Size(INFINITY, INFINITY));
+    child.Measure(childConstraint);
 
     auto width = child.DesiredSize().Width;
     auto height = child.DesiredSize().Height;
+
+    width = width;
   }
 
-  return winrt::Size(availableSize.Width == INFINITY ? 0.0f : availableSize.Width, availableSize.Height == INFINITY ? 0.0f : availableSize.Height);
+  // ViewPanels never choose their size, that is completely up to the parent - so return no size
+  return winrt::Size(0, 0);
 }
 
 winrt::Size ViewPanel::ArrangeOverride(winrt::Size finalSize)
@@ -187,9 +193,6 @@ winrt::Size ViewPanel::ArrangeOverride(winrt::Size finalSize)
     float left = (float)ViewPanel::GetLeft(child);
     float top =  (float)ViewPanel::GetTop(child);
 
-    auto width = child.DesiredSize().Width;
-    auto height = child.DesiredSize().Height;
-
     if ((child != m_border) && (child != m_innerElement))
       child.Arrange(winrt::Rect(left, top, child.DesiredSize().Width, child.DesiredSize().Height));
     else

RNWCPP/ReactUWP/Views/ViewViewManager.cpp

@@ -401,4 +401,20 @@ void ViewViewManager::ReplaceView(ViewShadowNode* pViewShadowNode, bool useContr
     }
 }
 
+void ViewViewManager::SetLayoutProps(ShadowNodeBase& nodeToUpdate, XamlView viewToUpdate, float left, float top, float width, float height)
+{
+  // When the View has a ContentControl the ViewPanel must also have the Width & Height set
+  // Do this first so that it is setup properly before any events are fired by the Super implementation
+  auto* pViewShadowNode = static_cast<ViewShadowNode*>(&nodeToUpdate);
+  if (pViewShadowNode->IsControl())
+  {
+    auto* pPanel = pViewShadowNode->GetViewPanel();
+    pPanel->Width(width);
+    pPanel->Height(height);
+  }
+
+  Super::SetLayoutProps(nodeToUpdate, viewToUpdate, left, top, width, height);
+}
+
+
 } }

RNWCPP/ReactUWP/Views/ViewViewManager.h

@@ -23,6 +23,9 @@ class ViewViewManager : public FrameworkElementViewManager
 
   void UpdateProperties(ShadowNodeBase* nodeToUpdate, folly::dynamic reactDiffMap) override;
 
+  // Yoga Layout
+  void SetLayoutProps(ShadowNodeBase& nodeToUpdate, XamlView viewToUpdate, float left, float top, float width, float height) override;
+
 protected:
   XamlView CreateViewCore(int64_t tag) override;
   void ReplaceView(ViewShadowNode* viewShadowNode, bool useControl);