Fix Issue 10718: Add iOS support for progressViewOffset

Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js

@@ -10,7 +10,11 @@
 
 'use strict';
 
-import type {DirectEventHandler, WithDefault} from '../../Types/CodegenTypes';
+import type {
+  DirectEventHandler,
+  Float,
+  WithDefault,
+} from '../../Types/CodegenTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import * as React from 'react';
@@ -34,6 +38,10 @@ type NativeProps = $ReadOnly<{|
    * The title displayed under the refresh indicator.
    */
   title?: WithDefault<string, null>,
+  /**
+   * Progress view top offset
+   */
+  progressViewOffset?: WithDefault<Float, 0>,
 
   /**
    * Called when the view starts refreshing.

Libraries/Components/RefreshControl/RefreshControl.js

@@ -69,10 +69,6 @@ type AndroidProps = $ReadOnly<{|
     | typeof RefreshLayoutConsts.SIZE.DEFAULT
     | typeof RefreshLayoutConsts.SIZE.LARGE
   ),
-  /**
-   * Progress view top offset
-   */
-  progressViewOffset?: ?number,
 |}>;
 
 export type RefreshControlProps = $ReadOnly<{|
@@ -89,6 +85,11 @@ export type RefreshControlProps = $ReadOnly<{|
    * Whether the view should be indicating an active refresh.
    */
   refreshing: boolean,
+
+  /**
+   * Progress view top offset
+   */
+  progressViewOffset?: ?number,
 |}>;
 
 /**
@@ -181,7 +182,6 @@ class RefreshControl extends React.Component<RefreshControlProps> {
         colors,
         progressBackgroundColor,
         size,
-        progressViewOffset,
         ...props
       } = this.props;
       return (

Libraries/Lists/VirtualizedList.js

@@ -248,7 +248,6 @@ type OptionalProps = {|
   persistentScrollbar?: ?boolean,
   /**
    * Set this when offset is needed for the loading indicator to show correctly.
-   * @platform android
    */
   progressViewOffset?: number,
   /**

React/Views/RefreshControl/RCTRefreshControl.m

@@ -21,6 +21,7 @@ @implementation RCTRefreshControl {
   BOOL _refreshingProgrammatically;
   NSString *_title;
   UIColor *_titleColor;
+  float _progressViewOffset;
 }
 
 - (instancetype)init
@@ -40,6 +41,7 @@ - (instancetype)init
 - (void)layoutSubviews
 {
   [super layoutSubviews];
+  [self applyProgressViewOffset];
 
   // If the control is refreshing when mounted we need to call
   // beginRefreshing in layoutSubview or it doesn't work.
@@ -108,6 +110,19 @@ - (void)endRefreshingProgrammatically
   }
 }
 
+- (void)applyProgressViewOffset
+{
+  // progressViewOffset must be converted from the ScrollView parent's coordinate space to
+  // the coordinate space of the RefreshControl. This ensures that the control respects any
+  // offset in the view hierarchy, and that progressViewOffset is not inadvertently applied
+  // multiple times.
+  UIView *scrollView = self.superview;
+  UIView *target = scrollView == nil ? nil : scrollView.superview;
+  CGPoint rawOffset = CGPointMake(0, _progressViewOffset);
+  CGPoint converted = [self convertPoint:rawOffset fromView:target];
+  self.frame = CGRectOffset(self.frame, 0, converted.y);
+}
+
 - (NSString *)title
 {
   return _title;
@@ -160,6 +175,12 @@ - (void)setCurrentRefreshingState:(BOOL)refreshing
   _currentRefreshingStateTimestamp = _currentRefreshingStateClock++;
 }
 
+- (void)setProgressViewOffset:(float)offset
+{
+  _progressViewOffset = offset;
+  [self applyProgressViewOffset];
+}
+
 - (void)refreshControlValueChanged
 {
   [self setCurrentRefreshingState:super.refreshing];

React/Views/RefreshControl/RCTRefreshControlManager.m

@@ -25,6 +25,7 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(title, NSString)
 RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(progressViewOffset, float)
 
 RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing : (BOOL)refreshing)
 {