更新返回的 IndexPath 替换成局部的索引

josercc · josercc · commit 7498d574a6d5 · 2018-01-26T16:50:48.000+08:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/ZHTableViewGroup/.DS_Store b/ZHTableViewGroup/.DS_Store
diff --git a/ZHTableViewGroup/Assets/.gitkeep b/ZHTableViewGroup/Assets/.gitkeep
diff --git a/ZHTableViewGroup/Classes/.gitkeep b/ZHTableViewGroup/Classes/.gitkeep
diff --git a/ZHTableViewGroup/Classes/ZHAutoConfigurationTableViewDelegate.h b/ZHTableViewGroup/Classes/ZHAutoConfigurationTableViewDelegate.h
@@ -6,7 +6,7 @@
 //
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSUInteger, ZHTableViewCustomHeightType) {
     ZHTableViewCustomHeightTypeCell,
diff --git a/ZHTableViewGroup/Classes/ZHAutoConfigurationTableViewDelegate.m b/ZHTableViewGroup/Classes/ZHAutoConfigurationTableViewDelegate.m
@@ -25,7 +25,7 @@ - (ZHTableViewDataSourceCustomHeightCompletionHandle)completionHandleWithTableVi
         if (!model.customHeightCompletionHandle) {
             return model.height;
         }
-        return model.customHeightCompletionHandle(tableView,indexPath,model);
+        return model.customHeightCompletionHandle(tableView,[ZHTableViewDataSource indexPathWithDataSource:_dataSource indexPath:indexPath],model);
     };
     return completionHandle;
 }
diff --git a/ZHTableViewGroup/Classes/ZHTableViewBaseModel.h b/ZHTableViewGroup/Classes/ZHTableViewBaseModel.h
@@ -5,7 +5,6 @@
 //  Created by 张行 on 2017/3/18.
 //
 //
-#import <UIKit/UIKit.h>
 
 @class ZHTableViewBaseModel;
 
diff --git a/ZHTableViewGroup/Classes/ZHTableViewCell.h b/ZHTableViewGroup/Classes/ZHTableViewCell.h
@@ -5,7 +5,7 @@
 //  Created by 张行 on 2017/3/18.
 //
 //
-#import <UIKit/UIKit.h>
+
 #import "ZHTableViewBaseModel.h"
 
 /**
diff --git a/ZHTableViewGroup/Classes/ZHTableViewDataSource.h b/ZHTableViewGroup/Classes/ZHTableViewDataSource.h
@@ -6,7 +6,7 @@
 //
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 #import "ZHTableViewGroup.h"
 #import "ZHTableViewGroup.h"
 #import "ZHTableViewCell.h"
@@ -144,4 +144,6 @@ typedef CGFloat (^ZHTableViewDataSourceCustomHeightCompletionHandle)(ZHTableView
  */
 - (void)clearData;
 
++ (NSIndexPath *)indexPathWithDataSource:(ZHTableViewDataSource *)dataSource indexPath:(NSIndexPath *)indexPath;
+
 @end
diff --git a/ZHTableViewGroup/Classes/ZHTableViewDataSource.m b/ZHTableViewGroup/Classes/ZHTableViewDataSource.m
@@ -84,6 +84,11 @@ + (CGFloat)heightForRowAtDataSource:(ZHTableViewDataSource *)dataSource
     if (!cell) {
         return 0;
     }
+    UITableViewCell *automaticHeightCell = [self cellForRowAtWithDataSource:dataSource indexPath:indexPath];
+    CGFloat automaticHeight = [automaticHeightCell sizeThatFits:CGSizeMake([UIScreen mainScreen].bounds.size.width, CGFLOAT_MAX)].height;
+    if (cell.height == NSNotFound && automaticHeight != CGFLOAT_MAX) {
+        cell.height = automaticHeight;
+    }
     return [self heightWithCustomHandle:cell.height customCompletionHandle:customHeightCompletionHandle baseModel:cell];
 }
 
@@ -94,7 +99,8 @@ + (void)didSelectRowAtWithDataSource:(ZHTableViewDataSource *)dataSource
         return;
     }
     UITableViewCell *cell = [self cellForRowAtWithDataSource:dataSource indexPath:indexPath];
-    [tableViewCell didSelectRowAtWithCell:cell indexPath:indexPath];
+	ZHTableViewGroup *group = [self groupForSectionWithDataSource:dataSource section:indexPath.section];
+    [tableViewCell didSelectRowAtWithCell:cell indexPath:[group indexPathWithCell:tableViewCell indexPath:indexPath]];
 }
 
 + (CGFloat)heightForHeaderInSectionWithDataSource:(ZHTableViewDataSource *)dataSource
@@ -139,10 +145,13 @@ + (CGFloat)heightForHeaderFooterInSectionWithDataSource:(ZHTableViewDataSource *
     }
     NSInteger height = 0;
     ZHTableViewBaseModel *baseModel;
+    UITableViewHeaderFooterView *headFooter = [self viewHeaderFooterInSectionWithDtaSource:dataSource section:section style:style];
+    CGFloat automaticHeight = [headFooter sizeThatFits:CGSizeMake([UIScreen mainScreen].bounds.size.width, CGFLOAT_MAX)].height;
     switch (style) {
         case ZHTableViewHeaderFooterStyleHeader: {
             height = group.header.height;
             baseModel = group.header;
+            
         }
             break;
         case  ZHTableViewHeaderFooterStyleFooter: {
@@ -151,19 +160,22 @@ + (CGFloat)heightForHeaderFooterInSectionWithDataSource:(ZHTableViewDataSource *
         }
             break;
     }
+    if (height == NSNotFound && automaticHeight != CGFLOAT_MAX) {
+        height = automaticHeight;
+    }
     return [self heightWithCustomHandle:height customCompletionHandle:customHeightCompletionHandle baseModel:baseModel];
 }
 
 + (CGFloat)heightWithCustomHandle:(CGFloat)height
            customCompletionHandle:(ZHTableViewDataSourceCustomHeightCompletionHandle)customCompletionHandle
                         baseModel:(ZHTableViewBaseModel *)baseModel {
-    if (height == NSNotFound) {
-        if (customCompletionHandle) {
-            return customCompletionHandle(baseModel);
-        }
-        return 0;
-    }
-    return height;
+	if (customCompletionHandle) {
+		return customCompletionHandle(baseModel);
+	}
+	if (height != 0) {
+		return height;
+	}
+    return 44;
 }
 
 
@@ -187,6 +199,12 @@ + (ZHTableViewCell *)cellForIndexPath:(ZHTableViewDataSource *)dataSource
     return [group tableViewCellForIndexPath:indexPath];
 }
 
++ (NSIndexPath *)indexPathWithDataSource:(ZHTableViewDataSource *)dataSource indexPath:(NSIndexPath *)indexPath {
+	ZHTableViewGroup *group = [self groupForSectionWithDataSource:dataSource section:indexPath.section];
+	ZHTableViewCell *tableViewCell = [self cellForIndexPath:dataSource indexPath:indexPath];
+	return [group indexPathWithCell:tableViewCell indexPath:indexPath];
+}
+
 - (void)registerClasss {
     for (ZHTableViewGroup *group in self.groups) {
         [group registerHeaderFooterCellWithTableView:self.tableView];
diff --git a/ZHTableViewGroup/Classes/ZHTableViewGroup.h b/ZHTableViewGroup/Classes/ZHTableViewGroup.h
@@ -6,7 +6,7 @@
 //
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 #import "ZHTableViewHeaderFooter.h"
 #import "ZHTableViewCell.h"
 
@@ -33,4 +33,5 @@ typedef void(^ZHTableViewGroupAddHeaderFooterCompletionHandle)(ZHTableViewHeader
 
 - (UITableViewHeaderFooterView *)headerFooterForStyle:(ZHTableViewHeaderFooterStyle)style tableView:(UITableView *)tableView section:(NSUInteger)section;
 
+- (NSIndexPath *)indexPathWithCell:(ZHTableViewCell *)cell indexPath:(NSIndexPath *)indexPath;
 @end
diff --git a/ZHTableViewGroup/Classes/ZHTableViewGroup.m b/ZHTableViewGroup/Classes/ZHTableViewGroup.m
@@ -66,10 +66,22 @@ - (UITableViewCell *)cellForTableViewWithTableView:(UITableView *)tableView inde
         return nil;
     }
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:tableViewCell.identifier];
-    [tableViewCell configCellWithCell:cell indexPath:indexPath];
+    [tableViewCell configCellWithCell:cell indexPath:[self indexPathWithCell:tableViewCell indexPath:indexPath]];
     return cell;
 }
 
+- (NSIndexPath *)indexPathWithCell:(ZHTableViewCell *)cell indexPath:(NSIndexPath *)indexPath {
+	__block	NSUInteger startIndex = 0;
+	[self.cells enumerateObjectsUsingBlock:^(ZHTableViewCell * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+		if (obj == cell) {
+			*stop = YES;
+			return;
+		}
+		startIndex += obj.cellNumber;
+	}];
+	return [NSIndexPath indexPathForRow:indexPath.row - startIndex inSection:indexPath.section];
+}
+
 - (ZHTableViewCell *)tableViewCellForIndexPath:(NSIndexPath *)indexPath {
     if (indexPath.row >= self.cellCount) {
         return nil;
diff --git a/ZHTableViewGroup/Classes/ZHTableViewHeaderFooter.h b/ZHTableViewGroup/Classes/ZHTableViewHeaderFooter.h
@@ -5,7 +5,7 @@
 //  Created by 张行 on 2017/3/18.
 //
 //
-#import <UIKit/UIKit.h>
+
 #import "ZHTableViewBaseModel.h"
 
 /**
diff --git a/ZHTableViewGroupObjc.podspec b/ZHTableViewGroupObjc.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ZHTableViewGroupObjc'
-  s.version          = '2.6.0'
+  s.version          = '2.7.0'
   s.summary          = 'Manger UITableView DataSource More Cell Style'
 
   s.homepage         = 'https://github.com/josercc/ZHTableViewGroup'

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ - (ZHTableViewDataSourceCustomHeightCompletionHandle)completionHandleWithTableVi`
`25`	`25`	`if (!model.customHeightCompletionHandle) {`
`26`	`26`	`return model.height;`
`27`	`27`	`}`
`28`		`- return model.customHeightCompletionHandle(tableView,indexPath,model);`
	`28`	`+ return model.customHeightCompletionHandle(tableView,[ZHTableViewDataSource indexPathWithDataSource:_dataSource indexPath:indexPath],model);`
`29`	`29`	`};`
`30`	`30`	`return completionHandle;`
`31`	`31`	`}`