assert app has set the global bridge if it's using RNReactModuleCell's

aksonov · Feb 11, 2016 · 971653e · 971653e
1 parent eaf71ed
commit 971653e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/RNTableView/RNTableView.h b/RNTableView/RNTableView.h
@@ -8,7 +8,6 @@
 
 #import <UIKit/UIKit.h>
 @class RCTEventDispatcher;
-@class RCTBridge;
 
 @protocol RNTableViewDatasource <NSObject>
 
@@ -22,7 +21,7 @@
 
 @interface RNTableView : UIView
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher bridge:(RCTBridge*) bridge NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;
 
 @property (nonatomic, copy) NSMutableArray *sections;
 @property (nonatomic, copy) NSArray *additionalItems;

diff --git a/RNTableView/RNTableView.m b/RNTableView/RNTableView.m
@@ -70,12 +70,12 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
     }
 }
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher bridge:(RCTBridge*)bridge
+- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
 {
     RCTAssertParam(eventDispatcher);
 
     if ((self = [super initWithFrame:CGRectZero])) {
-        _bridge = [[RNAppGlobals sharedInstance] appBridge] ?: bridge;
+        _bridge = [[RNAppGlobals sharedInstance] appBridge];
         _eventDispatcher = eventDispatcher;
         _cellHeight = 44;
         _cells = [NSMutableArray array];
@@ -286,7 +286,6 @@ - (void)setSections:(NSArray *)sections
                 if(selectedIndex == -1)
                     selectedIndex = [items count];
                 itemData[@"selected"] = @YES;
-
                 found = YES;
             }
             [items addObject:itemData];
@@ -322,6 +321,9 @@ -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)
 }
 
 -(UITableViewCell*)setupReactModuleCell:(UITableView *)tableView data:(NSDictionary*)data indexPath:(NSIndexPath *)indexPath {
+    RCTAssert(_bridge, @"Must set global bridge in AppDelegate, e.g. \n\
+              #import <RNTableView/RNAppGlobals.h>\n\
+              [[RNAppGlobals sharedInstance] setAppBridge:rootView.bridge]");
     RNReactModuleCell *cell = [tableView dequeueReusableCellWithIdentifier:_reactModuleCellReuseIndentifier];
     if (cell == nil) {
         cell = [[RNReactModuleCell alloc] initWithStyle:self.tableViewCellStyle reuseIdentifier:_reactModuleCellReuseIndentifier bridge: _bridge data:data indexPath:indexPath reactModule:_reactModuleForCell];

diff --git a/RNTableView/RNTableViewManager.m b/RNTableView/RNTableViewManager.m
@@ -16,7 +16,7 @@ @implementation RNTableViewManager
 RCT_EXPORT_MODULE()
 - (UIView *)view
 {
-    return [[RNTableView alloc] initWithEventDispatcher:self.bridge.eventDispatcher bridge:self.bridge];
+    return [[RNTableView alloc] initWithEventDispatcher:self.bridge.eventDispatcher];
 }
 
 RCT_EXPORT_VIEW_PROPERTY(sections, NSArray)

diff --git a/examples/TableViewDemo/index.ios.js b/examples/TableViewDemo/index.ios.js
@@ -186,7 +186,6 @@ class FirebaseExample extends React.Component {
         this.propPrefix = "dinosaur";
     }
     componentDidMount() {
-        var dinData = null;
         var self = this;
         this.ref = new Firebase(this.firebaseLocation);
         this.ref.on('value', function(snapshot) {