diff --git a/doric-iOS/Pod/Classes/Shader/DoricLayouts.m b/doric-iOS/Pod/Classes/Shader/DoricLayouts.m index bf8f3dff..a22caf96 100644 --- a/doric-iOS/Pod/Classes/Shader/DoricLayouts.m +++ b/doric-iOS/Pod/Classes/Shader/DoricLayouts.m @@ -26,7 +26,7 @@ #import @interface YGLayout () -@property (nonatomic, assign, readonly) YGNodeRef node; +@property(nonatomic, assign, readonly) YGNodeRef node; @end void DoricAddEllipticArcPath(CGMutablePathRef path, @@ -1537,9 +1537,9 @@ - (void)layoutFlex { layout.measuredX = YGNodeLayoutGetLeft(child.yoga.node); layout.measuredY = YGNodeLayoutGetTop(child.yoga.node); [layout measureWidth:DoricMeasureSpecMake(DoricMeasureExactly, - YGNodeLayoutGetWidth(child.yoga.node)) + YGNodeLayoutGetWidth(child.yoga.node)) height:DoricMeasureSpecMake(DoricMeasureExactly, - YGNodeLayoutGetHeight(child.yoga.node))]; + YGNodeLayoutGetHeight(child.yoga.node))]; [layout layout]; } } diff --git a/doric-iOS/Pod/Classes/Shader/DoricListNode.m b/doric-iOS/Pod/Classes/Shader/DoricListNode.m index a6fd328e..c54cedf5 100644 --- a/doric-iOS/Pod/Classes/Shader/DoricListNode.m +++ b/doric-iOS/Pod/Classes/Shader/DoricListNode.m @@ -231,10 +231,10 @@ - (void)blend:(NSDictionary *)props { NSIndexPath *p = [NSIndexPath indexPathForRow:l inSection:0]; [indexPaths addObject:p]; } - if (@available(iOS 11.0, *)) { - [self.view performBatchUpdates:^{ - @try { + @try { + [self.view performBatchUpdates:^{ + if (oldLoadMore != self.loadMore) { if (self.loadMore) { [self.view insertRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationNone]; @@ -246,10 +246,10 @@ - (void)blend:(NSDictionary *)props { } else { [self.view insertRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationNone]; } - } @catch (NSException *exception) { - [self.view reloadData]; - } - } completion:nil]; + } completion:nil]; + } @catch (NSException *exception) { + [self.view reloadData]; + } } else { [self.view reloadData]; }