Fixed oneOfType and fast-rendering issues

aksonov · Dec 28, 2017 · b89bcf5 · b89bcf5
1 parent 1bd104f
commit b89bcf5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/RNTableView/RNTableView.m b/RNTableView/RNTableView.m
@@ -588,6 +588,11 @@ -(BOOL)hasCustomCells:(NSInteger)section {
 #pragma mark - Scrolling
 
 -(void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    if (!self.onScroll) {
+        // When rendering, `self.tableView.delegate` may be set before `onScroll` is passed in.
+        return;
+    }
+
     self.onScroll(@{
                     @"target": self.reactTag,
                     @"contentOffset": @{

diff --git a/src/TableView.js b/src/TableView.js
@@ -36,7 +36,7 @@ class TableView extends React.Component {
     onAccessoryPress: PropTypes.func,
     onWillDisplayCell: PropTypes.func,
     onEndDisplayingCell: PropTypes.func,
-    selectedValue: PropTypes.oneOf([PropTypes.string, PropTypes.number]), // string or integer basically
+    selectedValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), // string or integer basically
     autoFocus: PropTypes.bool,
     autoFocusAnimate: PropTypes.bool,
     alwaysBounceVertical: PropTypes.bool,

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -211,7 +211,7 @@ interface TableViewProps {
   showsHorizontalScrollIndicator?: boolean
   showsVerticalScrollIndicator?: boolean
   moveWithinSectionOnly?: boolean
-  selectedValue?: any
+  selectedValue?: string | number
   json?: string
   filter?: string
   contentInset?: EdgeInsetsPropType