From 921829ba53a135252fd83384c182182f342a8994 Mon Sep 17 00:00:00 2001
From: "pengfei.zhou" <pengfeizhou@foxmail.com>
Date: Thu, 25 Aug 2022 11:36:44 +0800
Subject: [PATCH] iOS: List support fit width or height

---
 doric-iOS/Pod/Classes/Shader/DoricLayouts.m  |  4 +-
 doric-iOS/Pod/Classes/Shader/DoricListNode.m | 41 ++++++++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/doric-iOS/Pod/Classes/Shader/DoricLayouts.m b/doric-iOS/Pod/Classes/Shader/DoricLayouts.m
index 73281f78..d47cded5 100644
--- a/doric-iOS/Pod/Classes/Shader/DoricLayouts.m
+++ b/doric-iOS/Pod/Classes/Shader/DoricLayouts.m
@@ -1085,8 +1085,8 @@ - (void)undefinedMeasureWidth:(DoricMeasureSpec)widthMeasureSpec
                     + self.paddingTop + self.paddingBottom
                                                                 spec:heightMeasureSpec
                                                   childMeasuredState:0];
-    self.measuredWidth = widthSizeAndState.size;
-    self.measuredHeight = heightSizeAndState.size;
+    self.measuredWidth = MAX(widthSizeAndState.size, self.minWidth);
+    self.measuredHeight = MAX(heightSizeAndState.size, self.minHeight);
     self.measuredState = (widthSizeAndState.state
             << DORIC_MEASURED_HEIGHT_STATE_SHIFT) | heightSizeAndState.state;
 }
diff --git a/doric-iOS/Pod/Classes/Shader/DoricListNode.m b/doric-iOS/Pod/Classes/Shader/DoricListNode.m
index 41ac7c53..ffe75d72 100644
--- a/doric-iOS/Pod/Classes/Shader/DoricListNode.m
+++ b/doric-iOS/Pod/Classes/Shader/DoricListNode.m
@@ -39,7 +39,11 @@ @interface DoricTableView : UITableView
 
 @implementation DoricTableView
 - (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
 
@@ -200,6 +204,13 @@ - (void)blend:(NSDictionary *)props {
         dispatch_async(dispatch_get_main_queue(), ^{
             self.rowCount = self.itemCount + (self.loadMore ? 1 : 0);
             [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;
@@ -404,12 +415,24 @@ - (void)callItem:(NSUInteger)position height:(CGFloat)height {
     self.itemHeights[@(position)] = @(height);
     if (@available(iOS 12.0, *)) {
         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;
                 while (node.superNode != nil) {
                     node = node.superNode;
                 }
                 [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:^{
                 NSUInteger itemCount = self.rowCount;
@@ -427,12 +450,24 @@ - (void)callItem:(NSUInteger)position height:(CGFloat)height {
         });
     } else {
         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;
                 while (node.superNode != nil) {
                     node = node.superNode;
                 }
                 [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];
         });