fix bug #1

Author: 2534290808

ios/RCTMJRefreshHeader/RCTMJRefreshHeader/RCTMJScrollContentShadowView.h

@@ -0,0 +1,15 @@
+//
+//  RCTMJScrollContentShadowView.h
+//  RCTMJRefreshHeader
+//
+//  Created by Macbook on 2018/7/6.
+//  Copyright © 2018年 Macbook. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTShadowView.h>
+
+@interface RCTMJScrollContentShadowView : RCTShadowView
+
+@end

ios/RCTMJRefreshHeader/RCTMJRefreshHeader/RCTMJScrollContentShadowView.m

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTMJScrollContentShadowView.h"
+
+#import <yoga/Yoga.h>
+
+#import <React/RCTUtils.h>
+
+@implementation RCTMJScrollContentShadowView
+
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
+{
+    if (layoutMetrics.layoutDirection == UIUserInterfaceLayoutDirectionRightToLeft) {
+        // Motivation:
+        // Yoga place `contentView` on the right side of `scrollView` when RTL layout is enfoced.
+        // That breaks everything; it is completely pointless to (re)position `contentView`
+        // because it is `contentView`'s job. So, we work around it here.
+        
+        layoutContext.absolutePosition.x += layoutMetrics.frame.size.width;
+        layoutMetrics.frame.origin.x = 0;
+    }
+    
+    [super layoutWithMetrics:layoutMetrics layoutContext:layoutContext];
+}
+
+@end

ios/RCTMJRefreshHeader/RCTMJRefreshHeader/RCTMJScrollContentView.h

@@ -0,0 +1,12 @@
+//
+//  RCTMJScrollContentView.h
+//  RCTMJRefreshHeader
+//
+//  Created by Macbook on 2018/7/6.
+//  Copyright © 2018年 Macbook. All rights reserved.
+//
+#import <React/RCTView.h>
+@interface RCTMJScrollContentView : RCTView
+
+@end
+

ios/RCTMJRefreshHeader/RCTMJRefreshHeader/RCTMJScrollContentView.m

@@ -0,0 +1,36 @@
+//
+//  RCTMJScrollContentView.m
+//  RCTMJRefreshHeader
+//
+//  Created by Macbook on 2018/7/6.
+//  Copyright © 2018年 Macbook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTView.h>
+#import <React/RCTAssert.h>
+#import <React/UIView+React.h>
+
+#import "RCTMJScrollView.h"
+#import "RCTMJScrollContentView.h"
+
+
+@implementation RCTMJScrollContentView
+
+- (void)reactSetFrame:(CGRect)frame
+{
+    [super reactSetFrame:frame];
+    
+    RCTMJScrollView *scrollView = (RCTMJScrollView *)self.superview.superview;
+    
+    if (!scrollView) {
+        return;
+    }
+    
+    RCTAssert([scrollView isKindOfClass:[RCTMJScrollView class]],
+              @"Unexpected view hierarchy of RCTScrollView component.");
+    
+    [scrollView updateContentOffsetIfNeeded];
+}
+
+@end

ios/RCTMJRefreshHeader/RCTMJRefreshHeader/RCTMJScrollContentViewMananger.m

@@ -0,0 +1,34 @@
+//
+//  RCTMJScrollContentViewMananger.m
+//  RCTMJRefreshHeader
+//
+//  Created by Macbook on 2018/7/6.
+//  Copyright © 2018年 Macbook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTViewManager.h>
+
+#import "RCTMJScrollContentShadowView.h"
+#import "RCTMJScrollContentView.h"
+
+@interface RCTMJScrollContentViewManager : RCTViewManager
+
+@end
+
+
+@implementation RCTMJScrollContentViewManager
+
+RCT_EXPORT_MODULE()
+
+- (RCTMJScrollContentView *)view
+{
+    return [RCTMJScrollContentView new];
+}
+
+- (RCTShadowView *)shadowView
+{
+    return [RCTMJScrollContentShadowView new];
+}
+
+@end

ios/RCTMJRefreshHeader/RCTMJRefreshHeader/RCTMJScrollView.h

@@ -1,12 +1,75 @@
-//
-//  RCTMJScrollView.h
-//  React
-//
-//  Created by Macbook on 2018/6/22.
-//  Copyright © 2018年 Facebook. All rights reserved.
-//
-#import <React/RCTScrollView.h>
-
-@interface RCTMJScrollView:RCTScrollView
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIScrollView.h>
+
+#import <React/RCTAutoInsetsProtocol.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTScrollableProtocol.h>
+#import <React/RCTView.h>
+
+@protocol UIScrollViewDelegate;
+
+@interface RCTMJScrollView : RCTView <UIScrollViewDelegate, RCTScrollableProtocol, RCTAutoInsetsProtocol>
+
 - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;
+
+/**
+ * The `RCTScrollView` may have at most one single subview. This will ensure
+ * that the scroll view's `contentSize` will be efficiently set to the size of
+ * the single subview's frame. That frame size will be determined somewhat
+ * efficiently since it will have already been computed by the off-main-thread
+ * layout system.
+ */
+@property (nonatomic, readonly) UIView *contentView;
+
+/**
+ * If the `contentSize` is not specified (or is specified as {0, 0}, then the
+ * `contentSize` will automatically be determined by the size of the subview.
+ */
+@property (nonatomic, assign) CGSize contentSize;
+
+/**
+ * The underlying scrollView (TODO: can we remove this?)
+ */
+@property (nonatomic, readonly) UIScrollView *scrollView;
+
+@property (nonatomic, assign) UIEdgeInsets contentInset;
+@property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
+@property (nonatomic, assign) BOOL DEPRECATED_sendUpdatedChildFrames;
+@property (nonatomic, assign) NSTimeInterval scrollEventThrottle;
+@property (nonatomic, assign) BOOL centerContent;
+@property (nonatomic, copy) NSDictionary *maintainVisibleContentPosition;
+@property (nonatomic, assign) int snapToInterval;
+@property (nonatomic, copy) NSString *snapToAlignment;
+
+// NOTE: currently these event props are only declared so we can export the
+// event names to JS - we don't call the blocks directly because scroll events
+// need to be coalesced before sending, for performance reasons.
+@property (nonatomic, copy) RCTDirectEventBlock onScrollBeginDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onScroll;
+@property (nonatomic, copy) RCTDirectEventBlock onScrollEndDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onMomentumScrollBegin;
+@property (nonatomic, copy) RCTDirectEventBlock onMomentumScrollEnd;
+
+@end
+
+@interface RCTMJScrollView (Internal)
+
+- (void)updateContentOffsetIfNeeded;
+
 @end
+
+@interface RCTEventDispatcher (RCTMJScrollView)
+
+/**
+ * Send a fake scroll event.
+ */
+- (void)sendFakeScrollEvent:(NSNumber *)reactTag;
+
+@end
+