iOS:fix cannot change rootView's layoutconfig or size

This commit is contained in:
pengfei.zhou 2020-03-13 17:45:03 +08:00 committed by osborn
parent e13d926b6c
commit 38ea6ea7d4
3 changed files with 16 additions and 4 deletions

View File

@ -20,11 +20,19 @@
#import "DoricPanel.h"
#import "Doric.h"
@interface DoricPanel()
@property(nonatomic,assign) CGFloat renderedWidth;
@property(nonatomic,assign) CGFloat renderedHeight;
@end
@implementation DoricPanel
- (void)config:(NSString *)script alias:(NSString *)alias extra:(NSString *)extra {
self.doricContext = [[[DoricContext alloc] initWithScript:script source:alias extra:extra] also:^(DoricContext *it) {
[it.rootNode setupRootView:[[DoricStackView new] also:^(DoricStackView *it) {
it.width = self.view.width;
it.height = self.view.height;
it.clipsToBounds = YES;
[self.view addSubview:it];
}]];
}];
@ -34,10 +42,10 @@ - (void)config:(NSString *)script alias:(NSString *)alias extra:(NSString *)extr
- (void)viewWillLayoutSubviews {
[super viewWillLayoutSubviews];
[self.doricContext.rootNode.view also:^(DoricStackView *it) {
if (it.width != self.view.width || it.height != self.view.height) {
it.width = self.view.width;
it.height = self.view.height;
if (it.width != self.renderedWidth || it.height != self.renderedHeight) {
[self.doricContext initContextWithWidth:it.width height:it.height];
self.renderedWidth = it.width;
self.renderedHeight = it.height;
}
}];
}

View File

@ -125,7 +125,8 @@ - (void)doricLayoutSubviews {
if ([self.superview requestFromSubview:self]) {
[self.superview doricLayoutSubviews];
} else {
[self layoutSelf:CGSizeMake(self.width, self.height)];
CGSize size = [self measureSize:CGSizeMake(self.superview.width, self.superview.height)];
[self layoutSelf:size];
}
}

View File

@ -378,6 +378,9 @@ - (NSDictionary *)getLocationOnScreen {
}
- (void)blendLayoutConfig:(NSDictionary *)params {
if (!self.layoutConfig) {
self.view.layoutConfig = [DoricLayoutConfig new];
}
[params[@"widthSpec"] also:^(NSNumber *it) {
if (it) {
self.layoutConfig.widthSpec = (DoricLayoutSpec) [it integerValue];