diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 54a14a0b864..14a08b49cb7 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -597,6 +597,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu metrics.containerSize = RCTSizeFromCGSize(_scrollView.bounds.size); metrics.zoomScale = _scrollView.zoomScale; metrics.timestamp = CACurrentMediaTime(); + metrics.responderIgnoreScroll = !_isUserTriggeredScrolling; if (_layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) { metrics.contentOffset.x = metrics.contentSize.width - metrics.containerSize.width - metrics.contentOffset.x; diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index bcda83e61ba..8f55121cd23 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -539,7 +539,9 @@ static NSSet *returnKeyTypesSet; - (void)scrollViewDidScroll:(UIScrollView *)scrollView { if (_eventEmitter) { - static_cast(*_eventEmitter).onScroll([self _textInputMetrics]); + auto metrics = [self _textInputMetrics]; + metrics.responderIgnoreScroll = !(scrollView.isDragging || scrollView.isDecelerating); + static_cast(*_eventEmitter).onScroll(metrics); } } diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp index 7adacc57527..5307df67ff6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp @@ -44,6 +44,7 @@ jsi::Value ScrollEvent::asJSIValue(jsi::Runtime& runtime) const { payload.setProperty(runtime, "zoomScale", zoomScale); payload.setProperty(runtime, "timestamp", timestamp * 1000); + payload.setProperty(runtime, "responderIgnoreScroll", responderIgnoreScroll); return payload; } @@ -67,7 +68,8 @@ folly::dynamic ScrollEvent::asDynamic() const { "contentInset", std::move(contentInsetObj))( "contentSize", std::move(contentSizeObj))( "layoutMeasurement", std::move(containerSizeObj))( - "zoomScale", zoomScale)("timestamp", timestamp * 1000); + "zoomScale", zoomScale)("timestamp", timestamp * 1000)( + "responderIgnoreScroll", responderIgnoreScroll); return metrics; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h index fb2cd8b44fd..c3fd9583828 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h @@ -21,6 +21,7 @@ struct ScrollEvent : public EventPayload { EdgeInsets contentInset; Size containerSize; Float zoomScale{}; + bool responderIgnoreScroll{false}; /* * The time in seconds when the touch occurred or when it was last mutated. diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp index 2982b12fe01..7da2622926d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp @@ -86,6 +86,9 @@ static jsi::Value textInputMetricsScrollPayload( "zoomScale", textInputMetrics.zoomScale != 0.0f ? textInputMetrics.zoomScale : 1); + payload.setProperty( + runtime, "responderIgnoreScroll", textInputMetrics.responderIgnoreScroll); + return payload; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h index d85b76e806b..8c1a443f9e5 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h @@ -29,6 +29,7 @@ class TextInputEventEmitter : public ViewEventEmitter { int eventCount; Size layoutMeasurement; Float zoomScale; + bool responderIgnoreScroll{false}; Tag target; }; diff --git a/packages/react-native/types_DEPRECATED/Libraries/Components/TextInput/TextInput.d.ts b/packages/react-native/types_DEPRECATED/Libraries/Components/TextInput/TextInput.d.ts index cc5dc34dd6b..21bb5c60658 100644 --- a/packages/react-native/types_DEPRECATED/Libraries/Components/TextInput/TextInput.d.ts +++ b/packages/react-native/types_DEPRECATED/Libraries/Components/TextInput/TextInput.d.ts @@ -440,6 +440,7 @@ export type TextInputFocusEvent = NativeSyntheticEvent; */ export interface TextInputScrollEventData { contentOffset: {x: number; y: number}; + responderIgnoreScroll?: boolean | undefined; } /** diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index 5eb6faa7d0f..2e6dc7e0b4e 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -5118,6 +5118,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { } struct facebook::react::TextInputEventEmitter::Metrics { + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Float zoomScale; @@ -7971,6 +7972,7 @@ struct facebook::react::ScrollEndDragEvent : public facebook::react::ScrollEvent struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Float timestamp; public facebook::react::Float zoomScale; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 33d2a212b96..7ec351405ee 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -4928,6 +4928,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { } struct facebook::react::TextInputEventEmitter::Metrics { + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Float zoomScale; @@ -7731,6 +7732,7 @@ struct facebook::react::ScrollEndDragEvent : public facebook::react::ScrollEvent struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Float timestamp; public facebook::react::Float zoomScale; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index f47b1abfdbb..6843410835c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -5109,6 +5109,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { } struct facebook::react::TextInputEventEmitter::Metrics { + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Float zoomScale; @@ -7962,6 +7963,7 @@ struct facebook::react::ScrollEndDragEvent : public facebook::react::ScrollEvent struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Float timestamp; public facebook::react::Float zoomScale; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index e1c2982613a..d6dc3f80a6a 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -7292,6 +7292,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { } struct facebook::react::TextInputEventEmitter::Metrics { + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Float zoomScale; @@ -9990,6 +9991,7 @@ struct facebook::react::ScrollEndDragEvent : public facebook::react::ScrollEvent struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Float timestamp; public facebook::react::Float zoomScale; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 95c65c5ed1b..da7a542fd69 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -7134,6 +7134,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { } struct facebook::react::TextInputEventEmitter::Metrics { + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Float zoomScale; @@ -9806,6 +9807,7 @@ struct facebook::react::ScrollEndDragEvent : public facebook::react::ScrollEvent struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Float timestamp; public facebook::react::Float zoomScale; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 0f9ef238b70..a92742d8c14 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -7283,6 +7283,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { } struct facebook::react::TextInputEventEmitter::Metrics { + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Float zoomScale; @@ -9981,6 +9982,7 @@ struct facebook::react::ScrollEndDragEvent : public facebook::react::ScrollEvent struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Float timestamp; public facebook::react::Float zoomScale; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 411d5c80a1c..763c902b2e2 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -3609,6 +3609,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { struct facebook::react::TextInputEventEmitter::Metrics { public Float zoomScale; + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Point contentOffset; @@ -6092,6 +6093,7 @@ struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public Float timestamp; public Float zoomScale; public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Point contentOffset; public facebook::react::Size containerSize; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index 1d027d31af2..abad9815f5c 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -3459,6 +3459,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { struct facebook::react::TextInputEventEmitter::Metrics { public Float zoomScale; + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Point contentOffset; @@ -5916,6 +5917,7 @@ struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public Float timestamp; public Float zoomScale; public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Point contentOffset; public facebook::react::Size containerSize; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index 937203e41aa..0c58351b5c0 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -3600,6 +3600,7 @@ struct facebook::react::TextInputEventEmitter::KeyPressMetrics { struct facebook::react::TextInputEventEmitter::Metrics { public Float zoomScale; + public bool responderIgnoreScroll; public facebook::react::AttributedString::Range selectionRange; public facebook::react::EdgeInsets contentInset; public facebook::react::Point contentOffset; @@ -6083,6 +6084,7 @@ struct facebook::react::ScrollEvent : public facebook::react::EventPayload { public Float timestamp; public Float zoomScale; public ScrollEvent() = default; + public bool responderIgnoreScroll; public facebook::react::EdgeInsets contentInset; public facebook::react::Point contentOffset; public facebook::react::Size containerSize;