diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index 9064bb15e1a346..fa8ceb0a9fbd03 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -291,15 +291,6 @@ type IOSProps = $ReadOnly<{| | 'never' | 'always' ), - /** - * When true, ScrollView will emit updateChildFrames data in scroll events, - * otherwise will not compute or emit child frame data. This only exists - * to support legacy issues, `onLayout` should be used instead to retrieve - * frame data. - * The default value is false. - * @platform ios - */ - DEPRECATED_sendUpdatedChildFrames?: ?boolean, |}>; type AndroidProps = $ReadOnly<{| @@ -1147,9 +1138,6 @@ class ScrollView extends React.Component { ? this.props.alwaysBounceVertical : !this.props.horizontal; - const DEPRECATED_sendUpdatedChildFrames = !!this.props - .DEPRECATED_sendUpdatedChildFrames; - const baseStyle = this.props.horizontal === true ? styles.baseHorizontal @@ -1197,7 +1185,6 @@ class ScrollView extends React.Component { this.props.onMomentumScrollBegin || this.props.onMomentumScrollEnd ? true : false, - DEPRECATED_sendUpdatedChildFrames, // default to true snapToStart: this.props.snapToStart !== false, // default to true diff --git a/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js b/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js index 4004a6bfb9dc9e..a6366e8b62b347 100644 --- a/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js +++ b/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js @@ -77,7 +77,6 @@ export type ScrollViewNativeProps = $ReadOnly<{ snapToOffsets?: ?$ReadOnlyArray, snapToStart?: ?boolean, zoomScale?: ?number, - DEPRECATED_sendUpdatedChildFrames?: ?boolean, // Overrides style?: {...ViewStyleProp, ...} | DangerouslyImpreciseStyle, onResponderGrant?: ?(e: any) => void | boolean, diff --git a/Libraries/Components/ScrollView/ScrollViewViewConfig.js b/Libraries/Components/ScrollView/ScrollViewViewConfig.js index 90adc39f12883a..b2a3a9246b343b 100644 --- a/Libraries/Components/ScrollView/ScrollViewViewConfig.js +++ b/Libraries/Components/ScrollView/ScrollViewViewConfig.js @@ -69,8 +69,6 @@ const ScrollViewViewConfig = { snapToOffsets: true, snapToStart: true, zoomScale: true, - - DEPRECATED_sendUpdatedChildFrames: true, }, }; diff --git a/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap b/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap index 084148d5792d17..1afba0ee035cd2 100644 --- a/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap +++ b/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap @@ -14,7 +14,6 @@ exports[` should render as expected: should deep render when mocke exports[` should render as expected: should deep render when not mocked (please verify output manually) 1`] = ` 0 && _scrollEventThrottle < MAX(0.017, now - _lastScrollDispatchTime))) { - if (_DEPRECATED_sendUpdatedChildFrames) { - // Calculate changed frames - RCT_SEND_SCROLL_EVENT(onScroll, (@{@"updatedChildFrames" : [self calculateChildFramesData]})); - } else { - RCT_SEND_SCROLL_EVENT(onScroll, nil); - } - + RCT_SEND_SCROLL_EVENT(onScroll, nil); // Update dispatch time _lastScrollDispatchTime = now; _allowNextScrollNoMatterWhat = NO; diff --git a/React/Views/ScrollView/RCTScrollViewManager.m b/React/Views/ScrollView/RCTScrollViewManager.m index dc895745db0175..2ac06cebca82fe 100644 --- a/React/Views/ScrollView/RCTScrollViewManager.m +++ b/React/Views/ScrollView/RCTScrollViewManager.m @@ -109,7 +109,6 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(onScrollEndDrag, RCTDirectEventBlock) RCT_EXPORT_VIEW_PROPERTY(onMomentumScrollBegin, RCTDirectEventBlock) RCT_EXPORT_VIEW_PROPERTY(onMomentumScrollEnd, RCTDirectEventBlock) -RCT_EXPORT_VIEW_PROPERTY(DEPRECATED_sendUpdatedChildFrames, BOOL) RCT_EXPORT_VIEW_PROPERTY(inverted, BOOL) #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */ RCT_EXPORT_VIEW_PROPERTY(contentInsetAdjustmentBehavior, UIScrollViewContentInsetAdjustmentBehavior)