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

iOS: fix when reuse flexnode, its childNode cannot measure properly

Browse Source
This commit is contained in:
pengfei.zhou 2021-09-16 19:02:45 +08:00 committed by osborn
parent 59bb3a049d
commit 563f1a7fe1
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doric-iOS/Pod/Classes/Shader/DoricFlexNode.m
View File

@ -31,18 +31,17 @@ - (CGSize)sizeThatFits:(CGSize)size {
[view.doricLayout measure:size]; [view.doricLayout measure:size];
[view configureLayoutWithBlock:^(YGLayout *layout) { [view configureLayoutWithBlock:^(YGLayout *layout) {
layout.isEnabled = YES; layout.isEnabled = YES;
if (view.doricLayout.undefined) {
return;
}
if (layout.width.unit == YGUnitUndefined if (layout.width.unit == YGUnitUndefined
|| layout.width.unit == YGUnitAuto) { || layout.width.unit == YGUnitAuto) {
if (!view.doricLayout.undefined) {
layout.width = YGPointValue(view.doricLayout.measuredWidth); layout.width = YGPointValue(view.doricLayout.measuredWidth);
} }
}
if (layout.height.unit == YGUnitUndefined if (layout.height.unit == YGUnitUndefined
|| layout.height.unit == YGUnitAuto) { || layout.height.unit == YGUnitAuto) {
if (!view.doricLayout.undefined) {
layout.height = YGPointValue(view.doricLayout.measuredHeight); layout.height = YGPointValue(view.doricLayout.measuredHeight);
} }
}
}]; }];
} }
if (self.yoga.isLeaf) { if (self.yoga.isLeaf) {
@ -70,11 +69,26 @@ - (void)blendView:(UIView *)view forPropName:(NSString *)name propValue:(id)prop
} }
} }
- (void)afterBlended:(NSDictionary *)props {
[super afterBlended:props];
[self.childNodes forEach:^(DoricViewNode *viewNode) {
NSString *viewId = viewNode.viewId;
NSDictionary *model = [self subModelOf:viewId];
NSDictionary *dictionary = model[@"dictionary"];
if (!dictionary[@"flexConfig"]) {
viewNode.view.yoga.width = YGValueAuto;
viewNode.view.yoga.height = YGValueAuto;
}
}];
}
- (void)blendSubNode:(DoricViewNode *)subNode flexConfig:(NSDictionary *)flexConfig { - (void)blendSubNode:(DoricViewNode *)subNode flexConfig:(NSDictionary *)flexConfig {
[subNode.view configureLayoutWithBlock:^(YGLayout *_Nonnull layout) { [subNode.view configureLayoutWithBlock:^(YGLayout *_Nonnull layout) {
layout.isEnabled = YES; layout.isEnabled = YES;
}]; }];
subNode.view.doricLayout.disabled = YES; subNode.view.doricLayout.disabled = YES;
subNode.view.yoga.width = YGValueAuto;
subNode.view.yoga.height = YGValueAuto;
[self blendYoga:subNode.view.yoga from:flexConfig]; [self blendYoga:subNode.view.yoga from:flexConfig];
} }