From 50c31c4a146fb0709bc729b1207f90e5bfa9d12e Mon Sep 17 00:00:00 2001
From: "pengfei.zhou" <pengfeizhou@foxmail.com>
Date: Sat, 7 Dec 2019 10:59:20 +0800
Subject: [PATCH] feat:fix Nested slider

---
 Pod/Classes/Shader/DoricFlowLayoutNode.m | 12 +++++++++---
 Pod/Classes/Shader/DoricScrollerNode.m   |  6 +++++-
 Pod/Classes/Shader/DoricSliderNode.m     | 12 +++++++++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Pod/Classes/Shader/DoricFlowLayoutNode.m b/Pod/Classes/Shader/DoricFlowLayoutNode.m
index 211b89e2..b3960900 100644
--- a/Pod/Classes/Shader/DoricFlowLayoutNode.m
+++ b/Pod/Classes/Shader/DoricFlowLayoutNode.m
@@ -156,6 +156,7 @@ @interface DoricFlowLayoutNode () <UICollectionViewDataSource, UICollectionViewD
 @property(nonatomic, assign) NSUInteger columnCount;
 @property(nonatomic, assign) CGFloat columnSpace;
 @property(nonatomic, assign) CGFloat rowSpace;
+@property(nonatomic, copy) NSString *renderItemFuncId;
 @end
 
 @implementation DoricFlowLayoutNode
@@ -198,9 +199,14 @@ - (void)blendView:(UICollectionView *)view forPropName:(NSString *)name propValu
         self.itemCount = [prop unsignedIntegerValue];
         [self.view reloadData];
     } else if ([@"renderItem" isEqualToString:name]) {
-        [self.itemViewIds removeAllObjects];
-        [self clearSubModel];
-        [self.view reloadData];
+        if ([self.renderItemFuncId isEqualToString:prop]) {
+        } else {
+            [self.itemViewIds removeAllObjects];
+            [self clearSubModel];
+            [self.view reloadData];
+            self.renderItemFuncId = prop;
+        }
+
     } else if ([@"batchCount" isEqualToString:name]) {
         self.batchCount = [prop unsignedIntegerValue];
     } else {
diff --git a/Pod/Classes/Shader/DoricScrollerNode.m b/Pod/Classes/Shader/DoricScrollerNode.m
index ef7d699a..733445c8 100644
--- a/Pod/Classes/Shader/DoricScrollerNode.m
+++ b/Pod/Classes/Shader/DoricScrollerNode.m
@@ -54,7 +54,11 @@ @interface DoricScrollerNode ()
 
 @implementation DoricScrollerNode
 - (DoricScrollView *)build {
-    return [DoricScrollView new];
+    return [[DoricScrollView new] also:^(DoricScrollView *it) {
+        if (@available(iOS 11, *)) {
+            it.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        }
+    }];
 }
 
 - (void)initWithSuperNode:(DoricSuperNode *)superNode {
diff --git a/Pod/Classes/Shader/DoricSliderNode.m b/Pod/Classes/Shader/DoricSliderNode.m
index c85573ad..cd25e2ff 100644
--- a/Pod/Classes/Shader/DoricSliderNode.m
+++ b/Pod/Classes/Shader/DoricSliderNode.m
@@ -37,6 +37,7 @@ @interface DoricSliderNode () <UICollectionViewDataSource, UICollectionViewDeleg
 @property(nonatomic, assign) NSUInteger batchCount;
 @property(nonatomic, copy) NSString *onPageSelectedFuncId;
 @property(nonatomic, assign) NSUInteger lastPosition;
+@property(nonatomic, copy) NSString *renderPageFuncId;
 @end
 
 @interface DoricSliderView : UICollectionView
@@ -92,9 +93,14 @@ - (void)blendView:(UICollectionView *)view forPropName:(NSString *)name propValu
         self.itemCount = [prop unsignedIntegerValue];
         [self.view reloadData];
     } else if ([@"renderPage" isEqualToString:name]) {
-        [self.itemViewIds removeAllObjects];
-        [self clearSubModel];
-        [self.view reloadData];
+        if ([self.renderPageFuncId isEqualToString:prop]) {
+
+        } else {
+            [self.itemViewIds removeAllObjects];
+            [self clearSubModel];
+            [self.view reloadData];
+            self.renderPageFuncId = prop;
+        }
     } else if ([@"batchCount" isEqualToString:name]) {
         self.batchCount = [prop unsignedIntegerValue];
     } else if ([@"onPageSlided" isEqualToString:name]) {