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

iOS: List support fit width or height

Browse Source
This commit is contained in:
pengfei.zhou 2022-08-25 11:36:44 +08:00 committed by osborn
parent 3937a3f4d3
commit 921829ba53
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doric-iOS/Pod/Classes/Shader/DoricLayouts.m
View File

@ -1085,8 +1085,8 @@ - (void)undefinedMeasureWidth:(DoricMeasureSpec)widthMeasureSpec
+ self.paddingTop + self.paddingBottom + self.paddingTop + self.paddingBottom
spec:heightMeasureSpec spec:heightMeasureSpec
childMeasuredState:0]; childMeasuredState:0];
self.measuredWidth = widthSizeAndState.size; self.measuredWidth = MAX(widthSizeAndState.size, self.minWidth);
self.measuredHeight = heightSizeAndState.size; self.measuredHeight = MAX(heightSizeAndState.size, self.minHeight);
self.measuredState = (widthSizeAndState.state self.measuredState = (widthSizeAndState.state
<< DORIC_MEASURED_HEIGHT_STATE_SHIFT) | heightSizeAndState.state; << DORIC_MEASURED_HEIGHT_STATE_SHIFT) | heightSizeAndState.state;
} }

41
doric-iOS/Pod/Classes/Shader/DoricListNode.m
View File

@ -39,7 +39,11 @@ @interface DoricTableView : UITableView
@implementation DoricTableView @implementation DoricTableView
- (CGSize)sizeThatFits:(CGSize)size { - (CGSize)sizeThatFits:(CGSize)size {
return [super sizeThatFits:size]; CGSize result = [super sizeThatFits:size];
if(self.doricLayout.widthSpec == DoricLayoutFit && self.contentSize.width>0){
return CGSizeMake(self.contentSize.width, result.height);
}
return result;
} }
@end @end
@ -200,6 +204,13 @@ - (void)blend:(NSDictionary *)props {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
self.rowCount = self.itemCount + (self.loadMore ? 1 : 0); self.rowCount = self.itemCount + (self.loadMore ? 1 : 0);
[self.view reloadData]; [self.view reloadData];
if (self.view.height == 0 && self.view.doricLayout.heightSpec == DoricLayoutFit) {
DoricSuperNode *node = self.superNode;
while (node.superNode != nil) {
node = node.superNode;
}
[node requestLayout];
}
}); });
} }
self.needReload = false; self.needReload = false;
@ -404,12 +415,24 @@ - (void)callItem:(NSUInteger)position height:(CGFloat)height {
self.itemHeights[@(position)] = @(height); self.itemHeights[@(position)] = @(height);
if (@available(iOS 12.0, *)) { if (@available(iOS 12.0, *)) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if (self.view.doricLayout.heightSpec == DoricLayoutFit) { if (self.view.doricLayout.widthSpec == DoricLayoutFit
|| self.view.doricLayout.heightSpec == DoricLayoutFit) {
DoricSuperNode *node = self.superNode; DoricSuperNode *node = self.superNode;
while (node.superNode != nil) { while (node.superNode != nil) {
node = node.superNode; node = node.superNode;
} }
[node requestLayout]; [node requestLayout];
if (self.view.doricLayout.widthSpec == DoricLayoutFit) {
CGFloat width = 0;
for (UITableViewCell *tableViewCell in self.view.visibleCells) {
if ([tableViewCell isKindOfClass:[DoricTableViewCell class]]) {
DoricListItemNode *node = ((DoricTableViewCell *) tableViewCell)
.doricListItemNode;
width = MAX(width, node.view.width);
}
}
self.view.width = width;
}
} }
[UIView performWithoutAnimation:^{ [UIView performWithoutAnimation:^{
NSUInteger itemCount = self.rowCount; NSUInteger itemCount = self.rowCount;
@ -427,12 +450,24 @@ - (void)callItem:(NSUInteger)position height:(CGFloat)height {
}); });
} else { } else {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if (self.view.doricLayout.heightSpec == DoricLayoutFit) { if (self.view.doricLayout.widthSpec == DoricLayoutFit
|| self.view.doricLayout.heightSpec == DoricLayoutFit) {
DoricSuperNode *node = self.superNode; DoricSuperNode *node = self.superNode;
while (node.superNode != nil) { while (node.superNode != nil) {
node = node.superNode; node = node.superNode;
} }
[node requestLayout]; [node requestLayout];
if (self.view.doricLayout.widthSpec == DoricLayoutFit) {
CGFloat width = 0;
for (UITableViewCell *tableViewCell in self.view.visibleCells) {
if ([tableViewCell isKindOfClass:[DoricTableViewCell class]]) {
DoricListItemNode *node = ((DoricTableViewCell *) tableViewCell)
.doricListItemNode;
width = MAX(width, node.view.width);
}
}
self.view.width = width;
}
} }
[self.view reloadData]; [self.view reloadData];
}); });