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

iOS:Fix nested use of FlexLayout

Browse Source
This commit is contained in:
pengfei.zhou 2020-04-13 11:57:31 +08:00 committed by osborn
parent d29ff4991d
commit 5a8a855f89
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,14 +28,16 @@ @interface DoricFlexView : UIView
@implementation DoricFlexView @implementation DoricFlexView
- (CGSize)sizeThatFits:(CGSize)size { - (CGSize)sizeThatFits:(CGSize)size {
for (UIView *view in self.subviews) { for (UIView *view in self.subviews) {
if (!view.doricLayout.disabled) { [view.doricLayout measure:size];
[view.doricLayout apply];
[view configureLayoutWithBlock:^(YGLayout *layout) { [view configureLayoutWithBlock:^(YGLayout *layout) {
layout.isEnabled = YES; layout.isEnabled = YES;
if (layout.width.unit == YGUnitUndefined || layout.width.unit == YGUnitAuto) {
layout.width = YGPointValue(view.doricLayout.measuredWidth); layout.width = YGPointValue(view.doricLayout.measuredWidth);
layout.height = YGPointValue(view.doricLayout.measuredHeight);
}];
} }
if (layout.height.unit == YGUnitUndefined || layout.height.unit == YGUnitAuto) {
layout.height = YGPointValue(view.doricLayout.measuredHeight);
}
}];
} }
return [self.yoga intrinsicSize]; return [self.yoga intrinsicSize];
} }
@ -205,8 +207,6 @@ - (YGValue)translateYGValueFromProperty:(id)prop {
} }
- (void)requestLayout { - (void)requestLayout {
[super requestLayout];
if (self.view.doricLayout.widthSpec != DoricLayoutFit) { if (self.view.doricLayout.widthSpec != DoricLayoutFit) {
self.view.yoga.width = YGPointValue(self.view.width); self.view.yoga.width = YGPointValue(self.view.width);
} }
@ -230,5 +230,6 @@ - (void)requestLayout {
view.doricLayout.measuredY = view.top; view.doricLayout.measuredY = view.top;
[view.doricLayout apply]; [view.doricLayout apply];
} }
[super requestLayout];
} }
@end @end

2
doric-iOS/Pod/Classes/Shader/DoricLayouts.h
View File

@ -103,6 +103,8 @@ typedef NS_ENUM(NSInteger, DoricGravity) {
- (instancetype)init; - (instancetype)init;
- (void)measure:(CGSize)targetSize;
- (void)apply; - (void)apply;
- (void)apply:(CGSize)frameSize; - (void)apply:(CGSize)frameSize;

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

@ -66,7 +66,6 @@ - (instancetype)init {
- (void)apply:(CGSize)frameSize { - (void)apply:(CGSize)frameSize {
self.resolved = NO; self.resolved = NO;
[self measure:frameSize]; [self measure:frameSize];
[self layout];
[self setFrame]; [self setFrame];
self.resolved = YES; self.resolved = YES;
} }
@ -76,6 +75,11 @@ - (void)apply {
} }
- (void)measure:(CGSize)targetSize { - (void)measure:(CGSize)targetSize {
[self measureSelf:targetSize];
[self layout];
}
- (void)measureSelf:(CGSize)targetSize {
CGFloat width; CGFloat width;
CGFloat height; CGFloat height;
if (self.widthSpec == DoricLayoutMost) { if (self.widthSpec == DoricLayoutMost) {