diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.cpp b/ReactCommon/fabric/components/view/ViewShadowNode.cpp index 0fa4674d00e..0796ac2af5c 100644 --- a/ReactCommon/fabric/components/view/ViewShadowNode.cpp +++ b/ReactCommon/fabric/components/view/ViewShadowNode.cpp @@ -11,24 +11,24 @@ namespace facebook { namespace react { -const char ViewComponentName[] = "View"; +char const ViewComponentName[] = "View"; ViewShadowNode::ViewShadowNode( ShadowNodeFragment const &fragment, ShadowNodeFamily::Shared const &family, ShadowNodeTraits traits) : ConcreteViewShadowNode(fragment, family, traits) { - updateTraits(); + initialize(); } ViewShadowNode::ViewShadowNode( ShadowNode const &sourceShadowNode, ShadowNodeFragment const &fragment) : ConcreteViewShadowNode(sourceShadowNode, fragment) { - updateTraits(); + initialize(); } -static bool isColorMeaningful(SharedColor const &color) { +static bool isColorMeaningful(SharedColor const &color) noexcept { if (!color) { return false; } @@ -36,9 +36,11 @@ static bool isColorMeaningful(SharedColor const &color) { return colorComponentsFromColor(color).alpha > 0; } -void ViewShadowNode::updateTraits() { +void ViewShadowNode::initialize() noexcept { auto &viewProps = static_cast(*props_); + orderIndex_ = viewProps.zIndex; + bool formsStackingContext = !viewProps.collapsable || viewProps.pointerEvents == PointerEventsMode::None || !viewProps.nativeId.empty() || viewProps.accessible || @@ -54,7 +56,7 @@ void ViewShadowNode::updateTraits() { formsView = formsView || formsStackingContext; #ifdef ANDROID - // Force `formsStackingContext` trait for nodes which have . + // Force `formsStackingContext` trait for nodes which have `formsView`. // TODO: T63560216 Investigate why/how `formsView` entangled with // `formsStackingContext`. formsStackingContext = formsStackingContext || formsView; diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.h b/ReactCommon/fabric/components/view/ViewShadowNode.h index 7e850b7df99..969c6267b2c 100644 --- a/ReactCommon/fabric/components/view/ViewShadowNode.h +++ b/ReactCommon/fabric/components/view/ViewShadowNode.h @@ -33,7 +33,7 @@ class ViewShadowNode final : public ConcreteViewShadowNode< ShadowNodeFragment const &fragment); private: - void updateTraits(); + void initialize() noexcept; }; } // namespace react