From 4b7face72168efea8dc7c87ff52b6698025d0736 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 28 Jan 2022 09:28:33 -0800 Subject: [PATCH] Move pointerEvents from formsStacking -> formsView Summary: This was a bug, we are fixing it. Move pointerEvents from formsStacking -> formsView and we are also removing "onLayout" from formsStackingContext changelog: [internal] internal Reviewed By: sammy-SC Differential Revision: D33846660 fbshipit-source-id: 6b65a9a7815972e34dafbc48b3d732d9b02d5e9f --- .../react/renderer/components/view/ViewShadowNode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp index 81bbdca7e9e..661858cba13 100644 --- a/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp +++ b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp @@ -33,10 +33,9 @@ void ViewShadowNode::initialize() noexcept { bool formsStackingContext = !viewProps.collapsable || viewProps.pointerEvents == PointerEventsMode::None || - viewProps.onLayout || viewProps.pointerEnter || viewProps.pointerLeave || - viewProps.pointerMove || !viewProps.nativeId.empty() || - viewProps.accessible || viewProps.opacity != 1.0 || - viewProps.transform != Transform{} || viewProps.elevation != 0 || + !viewProps.nativeId.empty() || viewProps.accessible || + viewProps.opacity != 1.0 || viewProps.transform != Transform{} || + viewProps.elevation != 0 || (viewProps.zIndex.has_value() && viewProps.yogaStyle.positionType() != YGPositionTypeStatic) || viewProps.yogaStyle.display() == YGDisplayNone || @@ -49,7 +48,8 @@ void ViewShadowNode::initialize() noexcept { bool formsView = formsStackingContext || isColorMeaningful(viewProps.backgroundColor) || - isColorMeaningful(viewProps.foregroundColor) || + isColorMeaningful(viewProps.foregroundColor) || viewProps.pointerEnter || + viewProps.pointerLeave || viewProps.pointerMove || !(viewProps.yogaStyle.border() == YGStyle::Edges{}) || !viewProps.testId.empty();