v2.3.0 #180

.prettierignore

@@ -0,0 +1 @@
+package.json

README.md

@@ -346,6 +346,8 @@ The following style props are supported:
 * `contentInset`
 * `contentOffset`
 * `scrollIndicatorInsets`
+* `cellLayoutMargins`
+* `cellSeparatorInset`
 
 Colors:
 

RNTableView.podspec

@@ -1,14 +1,15 @@
-Pod::Spec.new do |s|
+require "json"
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
+Pod::Spec.new do |s|
   s.name         = "RNTableView"
-  s.version      = "2.2.0"
+  s.version      = package["version"]
   s.authors      = "Pavel Aksonov"
-  s.summary      = "Native iOS UITableView for React Native with JSON support and more"
-  s.license      = "BSD 2-Clause"
-  s.homepage     = "https://github.com/aksonov/react-native-tableview"
+  s.summary      = package["description"]
+  s.license      = package["license"]
+  s.homepage     = package["homepage"]
   s.platform     = :ios, "7.0"
-  s.source       = { :git => "https://github.com/aksonov/react-native-tableview.git",
-                     :tag => "2.2.0" }
+  s.source       = { :git => package["repository"]["url"] }
   s.source_files = 'RNTableView/*.{h,m}'
   s.preserve_paths = "**/*.js"
   s.dependency 'React'

RNTableView/RNTableView.h

@@ -36,13 +36,16 @@
 @property(nonatomic) float headerHeight;
 @property(nonatomic) BOOL customCells;
 @property(nonatomic) BOOL editing;
-@property(nonatomic) BOOL emptyInsets;
 @property(nonatomic) BOOL moveWithinSectionOnly;
 @property(nonatomic, assign) UIEdgeInsets contentInset;
 @property(nonatomic, assign) CGPoint contentOffset;
 @property(nonatomic, assign) UIEdgeInsets scrollIndicatorInsets;
 @property(nonatomic, assign) BOOL showsHorizontalScrollIndicator;
 @property(nonatomic, assign) BOOL showsVerticalScrollIndicator;
+@property(nonatomic, assign) UIEdgeInsets cellSeparatorInset;
+@property(nonatomic, assign) BOOL hasCellSeparatorInset;
+@property(nonatomic, assign) UIEdgeInsets cellLayoutMargins;
+@property(nonatomic, assign) BOOL hasCellLayoutMargins;
 @property(nonatomic, assign) BOOL canRefresh;
 @property(nonatomic, assign) BOOL refreshing;
 

RNTableView/RNTableView.m

@@ -53,6 +53,12 @@ - (void)setScrollEnabled:(BOOL)scrollEnabled {
     [self.tableView setScrollEnabled:scrollEnabled];
 }
 
+- (void)setAlwaysBounceVertical:(BOOL)alwaysBounceVertical {
+    _alwaysBounceVertical = alwaysBounceVertical;
+
+    [self.tableView setAlwaysBounceVertical:alwaysBounceVertical];
+}
+
 -(void)setSectionIndexTitlesEnabled:(BOOL)sectionIndexTitlesEnabled
 {
     _sectionIndexTitlesEnabled = sectionIndexTitlesEnabled;
@@ -222,6 +228,7 @@ - (void)createTableView {
     [_tableView registerClass:[RNReactModuleCell class] forCellReuseIdentifier:_reactModuleCellReuseIndentifier];
     [self addSubview:_tableView];
 }
+
 - (void)tableView:(UITableView *)tableView willDisplayFooterView:(nonnull UIView *)view forSection:(NSInteger)section {
     UITableViewHeaderFooterView *footer = (UITableViewHeaderFooterView *)view;
 
@@ -263,10 +270,10 @@ -(void)scrollToIndex: (NSInteger)index section:(NSInteger)section animated:(BOOL
     }
 }
 
-
 -(void)setHeaderHeight:(float)headerHeight {
     _headerHeight = headerHeight;
 }
+
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
     if (_sections[section][@"headerHeight"]){
         return [_sections[section][@"headerHeight"] floatValue] ? [_sections[section][@"headerHeight"] floatValue] : 0.000001;
@@ -303,21 +310,12 @@ - (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view
 
 -(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (self.emptyInsets){
-        // Remove separator inset
-        if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
-            [cell setSeparatorInset:UIEdgeInsetsZero];
-        }
-
-        // Prevent the cell from inheriting the Table View's margin settings
-        if ([cell respondsToSelector:@selector(setPreservesSuperviewLayoutMargins:)]) {
-            [cell setPreservesSuperviewLayoutMargins:NO];
-        }
-
-        // Explictly set your cell's layout margins
-        if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
-            [cell setLayoutMargins:UIEdgeInsetsZero];
-        }
+    if (self.hasCellLayoutMargins && [cell respondsToSelector:@selector(setLayoutMargins:)] && [cell respondsToSelector:@selector(setPreservesSuperviewLayoutMargins:)]) {
+        [cell setPreservesSuperviewLayoutMargins:NO];
+        [cell setLayoutMargins:self.cellLayoutMargins];
+    }
+    if (self.hasCellSeparatorInset && [cell respondsToSelector:@selector(setSeparatorInset:)]) {
+        [cell setSeparatorInset:self.cellSeparatorInset];
     }
     if (self.font){
         cell.detailTextLabel.font = self.font;
@@ -384,7 +382,6 @@ - (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell
     self.onEndDisplayingCell(@{@"target":self.reactTag, @"row":@(indexPath.row), @"section": @(indexPath.section)});
 }
 
-
 - (void)setSections:(NSArray *)sections
 {
     _sections = [NSMutableArray arrayWithCapacity:[sections count]];
@@ -491,8 +488,8 @@ -(UITableViewCell* )tableView:(UITableView *)tableView cellForRowAtIndexPath:(NS
     if ([item[@"transparent"] intValue]) {
         cell.backgroundColor = [UIColor clearColor];
     }
-    if (item[@"selectionStyle"]) {
-        cell.selectionStyle = [item[@"selectionStyle"] intValue];
+    if (item[@"selectionStyle"] != nil) {
+        cell.selectionStyle = [RCTConvert int:item[@"selectionStyle"]];
     }
     return cell;
 }

RNTableView/RNTableViewManager.m

@@ -41,7 +41,6 @@ - (NSArray *)customDirectEventTypes
 RCT_EXPORT_VIEW_PROPERTY(editing, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(autoFocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(autoFocusAnimate, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(emptyInsets, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(filter, NSString)
 RCT_EXPORT_VIEW_PROPERTY(selectedValue, id)
 RCT_EXPORT_VIEW_PROPERTY(filterArgs, NSArray)
@@ -133,6 +132,16 @@ - (NSArray *)customDirectEventTypes
     [view setShowsVerticalScrollIndicator:[RCTConvert BOOL:json]];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(cellSeparatorInset, UIEdgeInsets, RNTableView) {
+    view.hasCellSeparatorInset = YES;
+    view.cellSeparatorInset = [RCTConvert UIEdgeInsets:json];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(cellLayoutMargins, UIEdgeInsets, RNTableView) {
+    view.hasCellLayoutMargins = YES;
+    view.cellLayoutMargins = [RCTConvert UIEdgeInsets:json];
+}
+
 - (NSDictionary *)constantsToExport {
     return @{
              @"Constants": @{

example/.gitignore

@@ -51,3 +51,5 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+
+yarn.lock

example/package.json

@@ -4,14 +4,13 @@
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
-    "test": "jest",
-    "postinstall": "rm -rf node_modules/react-native-tableview/node_modules node_modules/react-native-tableview/example"
+    "test": "jest"
   },
   "dependencies": {
     "prop-types": "^15.6.0",
     "react": "16.0.0",
     "react-native": "0.50.4",
-    "react-native-tableview": "file:..",
+    "react-native-tableview": "latest",
     "react-navigation": "^2.0.4"
   },
   "devDependencies": {