Updates from Thu 26 Mar

- [React Native] Fix incorrect if-statement in RCTGeolocation | Alex Akers - [ReactNative] s/ReactKit/React/g | Tadeu Zagallo - [React Native] View border support | Nick Lockwood - [Assets] Allow scripts to override assetRoots | Amjad Masad - [ReactNative] Navigator docs | Eric Vicenti - [ReactNative] License headers and renaming | Eric Vicenti - [React Native] Add CocoaPods spec | Tadeu Zagallo - Added explicit types for all view properties | Nick Lockwood - [ReactNative] s/ReactNavigator/Navigator/ | Tadeu Zagallo - [ReactNative] Add copyright header for code copied from the jQuery UI project | Martin Konicek - [ReactNative] PanResponder documentation | Eric Vicenti
2026-03-26 07:04:05 +08:00 · 2015-03-26 06:32:01 -07:00
parent d6c9648aea
commit 6500ba7bfb
182 changed files with 2094 additions and 1780 deletions
--- a/React/Views/RCTWrapperViewController.m
+++ b/React/Views/RCTWrapperViewController.m
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "RCTWrapperViewController.h"
+
+#import <UIKit/UIScrollView.h>
+
+#import "RCTEventDispatcher.h"
+#import "RCTNavItem.h"
+#import "RCTUtils.h"
+#import "RCTViewControllerProtocol.h"
+#import "UIView+React.h"
+
+@implementation RCTWrapperViewController
+{
+  UIView *_wrapperView;
+  UIView *_contentView;
+  RCTEventDispatcher *_eventDispatcher;
+  CGFloat _previousTopLayout;
+  CGFloat _previousBottomLayout;
+}
+
+@synthesize currentTopLayoutGuide = _currentTopLayoutGuide;
+@synthesize currentBottomLayoutGuide = _currentBottomLayoutGuide;
+
+- (instancetype)initWithContentView:(UIView *)contentView
+                    eventDispatcher:(RCTEventDispatcher *)eventDispatcher
+{
+  if (self = [super initWithNibName:nil bundle:nil]) {
+    _contentView = contentView;
+    _eventDispatcher = eventDispatcher;
+    self.automaticallyAdjustsScrollViewInsets = NO;
+  }
+  return self;
+}
+
+- (instancetype)initWithNavItem:(RCTNavItem *)navItem
+                eventDispatcher:(RCTEventDispatcher *)eventDispatcher
+{
+  if (self = [self initWithContentView:navItem eventDispatcher:eventDispatcher]) {
+    _navItem = navItem;
+  }
+  return self;
+}
+
+- (void)viewWillLayoutSubviews
+{
+  [super viewWillLayoutSubviews];
+
+  _currentTopLayoutGuide = self.topLayoutGuide;
+  _currentBottomLayoutGuide = self.bottomLayoutGuide;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+  [super viewWillAppear:animated];
+
+  // TODO: find a way to make this less-tightly coupled to navigation controller
+  if ([self.parentViewController isKindOfClass:[UINavigationController class]])
+  {
+
+    [self.navigationController setNavigationBarHidden:!_navItem animated:animated];
+    if (!_navItem) {
+      return;
+    }
+
+    self.navigationItem.title = _navItem.title;
+
+    UINavigationBar *bar = self.navigationController.navigationBar;
+    if (_navItem.barTintColor) {
+      bar.barTintColor = _navItem.barTintColor;
+    }
+    if (_navItem.tintColor) {
+      BOOL canSetTintColor = _navItem.barTintColor == nil;
+      if (canSetTintColor) {
+        bar.tintColor = _navItem.tintColor;
+      }
+    }
+    if (_navItem.titleTextColor) {
+      [bar setTitleTextAttributes:@{NSForegroundColorAttributeName : _navItem.titleTextColor}];
+    }
+
+    if (_navItem.rightButtonTitle.length > 0) {
+      self.navigationItem.rightBarButtonItem =
+      [[UIBarButtonItem alloc] initWithTitle:_navItem.rightButtonTitle
+                                       style:UIBarButtonItemStyleDone
+                                      target:self
+                                      action:@selector(handleNavRightButtonTapped)];
+    }
+
+    if (_navItem.backButtonTitle.length > 0) {
+      self.navigationItem.backBarButtonItem =
+      [[UIBarButtonItem alloc] initWithTitle:_navItem.backButtonTitle
+                                       style:UIBarButtonItemStylePlain
+                                      target:nil
+                                      action:nil];
+    }
+  }
+}
+
+- (void)loadView
+{
+  // Add a wrapper so that the wrapper view managed by the
+  // UINavigationController doesn't end up resetting the frames for
+  //`contentView` which is a react-managed view.
+  _wrapperView = [[UIView alloc] initWithFrame:_contentView.bounds];
+  [_wrapperView addSubview:_contentView];
+  self.view = _wrapperView;
+}
+
+- (void)handleNavRightButtonTapped
+{
+  [_eventDispatcher sendInputEventWithName:@"topNavRightButtonTap"
+                                      body:@{@"target":_navItem.reactTag}];
+}
+
+- (void)didMoveToParentViewController:(UIViewController *)parent
+{
+  // There's no clear setter for navigation controllers, but did move to parent
+  // view controller provides the desired effect. This is called after a pop
+  // finishes, be it a swipe to go back or a standard tap on the back button
+  [super didMoveToParentViewController:parent];
+  if (parent == nil || [parent isKindOfClass:[UINavigationController class]]) {
+    [self.navigationListener wrapperViewController:self didMoveToNavigationController:(UINavigationController *)parent];
+  }
+}
+
+@end