iOS: fix in list when not combine view model cause UI have no update (#…

…559)
doric-pub · Dec 9, 2022 · 9be6bb2 · 9be6bb2
1 parent 44d971b
commit 9be6bb2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/doric-iOS/Pod/Classes/Shader/DoricFlowLayoutNode.m b/doric-iOS/Pod/Classes/Shader/DoricFlowLayoutNode.m
@@ -399,6 +399,11 @@ - (void)blendSubNode:(NSDictionary *)subModel {
     NSString *viewId = subModel[@"id"];
     DoricViewNode *viewNode = [self subNodeWithViewId:viewId];
     BOOL skipReload = NO;
+
+    NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
+    [self recursiveMixin:subModel to:model];
+    [self setSubModel:model in:viewId];
+
     if (viewNode) {
         CGSize originSize = viewNode.view.frame.size;
         [viewNode blend:subModel[@"props"]];
@@ -407,11 +412,8 @@ - (void)blendSubNode:(NSDictionary *)subModel {
         if (CGSizeEqualToSize(originSize, viewNode.view.frame.size)) {
             skipReload = YES;
         }
-    } else {
-        NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
-        [self recursiveMixin:subModel to:model];
-        [self setSubModel:model in:viewId];
     }
+
     if (skipReload) {
         return;
     }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricHorizontalListNode.m b/doric-iOS/Pod/Classes/Shader/DoricHorizontalListNode.m
@@ -337,6 +337,11 @@ - (void)blendSubNode:(NSDictionary *)subModel {
     NSString *viewId = subModel[@"id"];
     DoricViewNode *viewNode = [self subNodeWithViewId:viewId];
     BOOL skipReload = NO;
+
+    NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
+    [self recursiveMixin:subModel to:model];
+    [self setSubModel:model in:viewId];
+
     if (viewNode) {
         CGSize originSize = viewNode.view.frame.size;
         [viewNode blend:subModel[@"props"]];
@@ -345,11 +350,8 @@ - (void)blendSubNode:(NSDictionary *)subModel {
         if (CGSizeEqualToSize(originSize, viewNode.view.frame.size)) {
             skipReload = YES;
         }
-    } else {
-        NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
-        [self recursiveMixin:subModel to:model];
-        [self setSubModel:model in:viewId];
     }
+
     if (skipReload) {
         return;
     }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricListNode.m b/doric-iOS/Pod/Classes/Shader/DoricListNode.m
@@ -381,6 +381,11 @@ - (void)blendSubNode:(NSDictionary *)subModel {
     NSString *viewId = subModel[@"id"];
     DoricViewNode *viewNode = [self subNodeWithViewId:viewId];
     BOOL skipReload = NO;
+
+    NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
+    [self recursiveMixin:subModel to:model];
+    [self setSubModel:model in:viewId];
+
     if (viewNode) {
         CGSize originSize = viewNode.view.frame.size;
         [viewNode blend:subModel[@"props"]];
@@ -389,11 +394,8 @@ - (void)blendSubNode:(NSDictionary *)subModel {
         if (CGSizeEqualToSize(originSize, viewNode.view.frame.size)) {
             skipReload = YES;
         }
-    } else {
-        NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
-        [self recursiveMixin:subModel to:model];
-        [self setSubModel:model in:viewId];
     }
+
     if (skipReload) {
         return;
     }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricSliderNode.m b/doric-iOS/Pod/Classes/Shader/DoricSliderNode.m
@@ -253,6 +253,11 @@ - (void)blendSubNode:(NSDictionary *)subModel {
     NSString *viewId = subModel[@"id"];
     DoricViewNode *viewNode = [self subNodeWithViewId:viewId];
     BOOL skipReload = NO;
+
+    NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
+    [self recursiveMixin:subModel to:model];
+    [self setSubModel:model in:viewId];
+
     if (viewNode) {
         CGSize originSize = viewNode.view.frame.size;
         [viewNode blend:subModel[@"props"]];
@@ -261,11 +266,8 @@ - (void)blendSubNode:(NSDictionary *)subModel {
         if (CGSizeEqualToSize(originSize, viewNode.view.frame.size)) {
             skipReload = YES;
         }
-    } else {
-        NSMutableDictionary *model = [[self subModelOf:viewId] mutableCopy];
-        [self recursiveMixin:subModel to:model];
-        [self setSubModel:model in:viewId];
     }
+
     if (skipReload) {
         return;
     }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricSuperNode.m b/doric-iOS/Pod/Classes/Shader/DoricSuperNode.m
@@ -83,6 +83,8 @@ - (void)recursiveMixin:(NSDictionary *)srcModel to:(NSMutableDictionary *)target
             }];
             if (viewModel) {
                 [self recursiveMixin:subview to:viewModel];
+            } else {
+                [targetOri addObject:subview];
             }
         }
     }