diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm index 147dea34fab..ffe0a62363e 100644 --- a/React/Fabric/RCTSurfaceTouchHandler.mm +++ b/React/Fabric/RCTSurfaceTouchHandler.mm @@ -57,6 +57,11 @@ struct ActiveTouch { Touch touch; SharedTouchEventEmitter eventEmitter; + /* + * A component view on which the touch was begun. + */ + __strong UIView *componentView = nil; + struct Hasher { size_t operator()(const ActiveTouch &activeTouch) const { return std::hash()(activeTouch.touch.identifier); @@ -71,7 +76,7 @@ struct ActiveTouch { }; static void UpdateActiveTouchWithUITouch(ActiveTouch &activeTouch, UITouch *uiTouch, UIView *rootComponentView) { - CGPoint offsetPoint = [uiTouch locationInView:uiTouch.view]; + CGPoint offsetPoint = [uiTouch locationInView:activeTouch.componentView]; CGPoint screenPoint = [uiTouch locationInView:uiTouch.window]; CGPoint pagePoint = [uiTouch locationInView:rootComponentView]; @@ -97,6 +102,8 @@ static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponen activeTouch.touch.target = (Tag)componentView.tag; } + activeTouch.componentView = componentView; + UpdateActiveTouchWithUITouch(activeTouch, uiTouch, rootComponentView); return activeTouch; }