tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

FlowLayoutItem add fullSpan attribute

Browse Source
This commit is contained in:
pengfei.zhou
2021-10-11 16:26:56 +08:00
committed by osborn
parent 9429c75834
commit 0e77c62e13
13 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doric-iOS/Pod/Classes/Shader/DoricFlowLayoutNode.m
View File

@@ -401,7 +401,8 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
DoricFlowLayoutItemNode *node = cell.viewNode;
node.viewId = model[@"id"];
[node blend:props];
BOOL fillWidth = (self.hasHeader && position == 0)
BOOL fillWidth = [props[@"fullSpan"] boolValue]
|| (self.hasHeader && position == 0)
|| (self.hasFooter
&& position == self.itemCount
+ (self.loadMore ? 1 : 0)
@@ -456,7 +457,7 @@ - (NSInteger)doricFlowLayoutColumnCount {
- (BOOL)doricFlowLayoutItemFullSpan:(NSIndexPath *)indexPath {
NSUInteger position = (NSUInteger) indexPath.row;
return (self.hasHeader && position == 0)
if ((self.hasHeader && position == 0)
|| (self.hasFooter
&& position == self.itemCount
+ (self.loadMore ? 1 : 0)
@@ -464,7 +465,12 @@ - (BOOL)doricFlowLayoutItemFullSpan:(NSIndexPath *)indexPath {
+ (self.hasFooter ? 1 : 0)
- 1)
|| (self.loadMore
&& position == self.itemCount + (self.hasHeader ? 1 : 0));
&& position == self.itemCount + (self.hasHeader ? 1 : 0))) {
return YES;
} else {
NSDictionary *model = [self itemModelAt:position];
return [model[@"props"][@"fullSpan"] boolValue];
}
}
- (void)scrollViewDidScroll:(UIScrollView *)scrollView {