Move trait setting to updateYogaProps

Author: j-piasecki

packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp

@@ -89,7 +89,6 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
   updateYogaProps();
   updateYogaChildren();
 
-  initialize();
   ensureConsistency();
 }
 
@@ -159,18 +158,9 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
     updateYogaChildren();
   }
 
-  initialize();
   ensureConsistency();
 }
 
-void YogaLayoutableShadowNode::initialize() {
-  if (yogaNode_.style().display() == yoga::Display::Contents) {
-    ShadowNode::traits_.set(ShadowNodeTraits::ForceFlattenView);
-  } else {
-    ShadowNode::traits_.unset(ShadowNodeTraits::ForceFlattenView);
-  }
-}
-
 void YogaLayoutableShadowNode::cleanLayout() {
   yogaNode_.setDirty(false);
 }
@@ -398,6 +388,12 @@ void YogaLayoutableShadowNode::updateYogaProps() {
         !viewProps.filter.empty();
     YGNodeSetAlwaysFormsContainingBlock(&yogaNode_, alwaysFormsContainingBlock);
   }
+    
+  if (yogaNode_.style().display() == yoga::Display::Contents) {
+    ShadowNode::traits_.set(ShadowNodeTraits::ForceFlattenView);
+  } else {
+    ShadowNode::traits_.unset(ShadowNodeTraits::ForceFlattenView);
+  }
 }
 
 /*static*/ yoga::Style YogaLayoutableShadowNode::applyAliasedProps(

packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h

@@ -101,11 +101,6 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode {
   mutable yoga::Node yogaNode_;
 
  private:
-  /*
-   * Sets initial traits on the node.
-   */
-  void initialize();
-    
   /*
    * Goes over `yogaNode_.getChildren()` and in case child's owner is
    * equal to address of `yogaNode_`, it sets child's owner address