From 5c543fa40dbb3240aa37e998962fcc3b3c22474a Mon Sep 17 00:00:00 2001 From: zshshr Date: Tue, 28 Mar 2017 19:13:42 +0800 Subject: [PATCH 1/2] * [android] recycler demo bugfix --- test/pages/components/recycler.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/test/pages/components/recycler.vue b/test/pages/components/recycler.vue index 12ca01cce1..ce4f21fbdd 100644 --- a/test/pages/components/recycler.vue +++ b/test/pages/components/recycler.vue @@ -5,13 +5,14 @@ :show-scrollbar="showScrollbar" :scrollable="scrollable" @scroll="recylerScroll" @loadmore="loadmore" loadmoreoffset=3000 > - +
- -
+
-
+
Sticky Header
@@ -79,6 +80,12 @@ width: 40; margin-right: 30; } + .absolute { + position: absolute; + top: 0px; + width: 750; + height: 377; +} .banner { height: 377; flex-direction: row; From c2f0b6552530370effb6637db955616e0aad95e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9A=90=E9=A3=8E?= Date: Wed, 29 Mar 2017 19:31:36 +0800 Subject: [PATCH 2/2] * [ios] fix issue that scrollable components can not scroll to top if frame.size < contentSize --- .../Component/Recycler/WXRecyclerComponent.m | 16 ++++++++-------- .../WeexSDK/Sources/Component/WXListComponent.m | 7 +------ .../Sources/Component/WXScrollerComponent.m | 10 ++-------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m index b5b5ac8615..842fa1f7fd 100644 --- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m @@ -45,6 +45,11 @@ - (void)layoutSubviews [self.wx_component layoutDidFinish]; } +- (void)setContentOffset:(CGPoint)contentOffset +{ + [super setContentOffset:contentOffset]; +} + @end @interface WXCollectionViewCell : UICollectionViewCell @@ -211,24 +216,19 @@ - (void)_handleFirstScreenTime - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset animated:(BOOL)animated { - if (_collectionView.contentSize.height <= _collectionView.frame.size.height) { - // can not scroll - return; - } - CGPoint contentOffset = _collectionView.contentOffset; CGFloat contentOffsetY = 0; CGRect rect; while (component) { if ([component isKindOfClass:[WXCellComponent class]]) { - NSIndexPath *toIndexPath = [self.dataController indexPathForCell:component]; + NSIndexPath *toIndexPath = [self.dataController indexPathForCell:(WXCellComponent *)component]; UICollectionViewLayoutAttributes *attributes = [_collectionView layoutAttributesForItemAtIndexPath:toIndexPath]; rect = attributes.frame; break; } if ([component isKindOfClass:[WXHeaderComponent class]]) { - NSUInteger toIndex = [self.dataController indexForHeader:component]; + NSUInteger toIndex = [self.dataController indexForHeader:(WXHeaderComponent *)component]; UICollectionViewLayoutAttributes *attributes = [_collectionView layoutAttributesForSupplementaryElementOfKind:kCollectionSupplementaryViewKindHeader atIndexPath:[NSIndexPath indexPathWithIndex:toIndex]]; rect = attributes.frame; break; @@ -240,7 +240,7 @@ - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset an contentOffsetY += rect.origin.y; contentOffsetY += offset * self.weexInstance.pixelScaleFactor; - if (contentOffsetY > _collectionView.contentSize.height - _collectionView.frame.size.height) { + if (_collectionView.contentSize.height >= _collectionView.frame.size.height && contentOffsetY > _collectionView.contentSize.height - _collectionView.frame.size.height) { contentOffset.y = _collectionView.contentSize.height - _collectionView.frame.size.height; } else { contentOffset.y = contentOffsetY; diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m index bc31995049..c598a3dc7c 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m @@ -173,11 +173,6 @@ - (void)_handleFirstScreenTime - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset animated:(BOOL)animated { - if (_tableView.contentSize.height <= _tableView.frame.size.height) { - // can not scroll - return; - } - CGPoint contentOffset = _tableView.contentOffset; CGFloat contentOffsetY = 0; @@ -201,7 +196,7 @@ - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset an contentOffsetY += cellRect.origin.y; contentOffsetY += offset * self.weexInstance.pixelScaleFactor; - if (contentOffsetY > _tableView.contentSize.height - _tableView.frame.size.height) { + if (_tableView.contentSize.height >= _tableView.frame.size.height && contentOffsetY > _tableView.contentSize.height - _tableView.frame.size.height) { contentOffset.y = _tableView.contentSize.height - _tableView.frame.size.height; } else { contentOffset.y = contentOffsetY; diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index 50dc059052..eb7c15da69 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -318,12 +318,6 @@ - (void)removeScrollToListener:(WXComponent *)target - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset animated:(BOOL)animated { UIScrollView *scrollView = (UIScrollView *)self.view; - - if ((_scrollDirection == WXScrollDirectionHorizontal && scrollView.contentSize.width <= scrollView.frame.size.width) - || (_scrollDirection == WXScrollDirectionVertical && scrollView.contentSize.height <= scrollView.frame.size.height)) { - // can not scroll - return; - } CGPoint contentOffset = scrollView.contentOffset; CGFloat scaleFactor = self.weexInstance.pixelScaleFactor; @@ -332,7 +326,7 @@ - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset an CGFloat contentOffetX = [component.supercomponent.view convertPoint:component.view.frame.origin toView:self.view].x; contentOffetX += offset * scaleFactor; - if (contentOffetX > scrollView.contentSize.width - scrollView.frame.size.width) { + if (scrollView.contentSize.width >= scrollView.frame.size.width && contentOffetX > scrollView.contentSize.width - scrollView.frame.size.width) { contentOffset.x = scrollView.contentSize.width - scrollView.frame.size.width; } else { contentOffset.x = contentOffetX; @@ -341,7 +335,7 @@ - (void)scrollToComponent:(WXComponent *)component withOffset:(CGFloat)offset an CGFloat contentOffetY = [component.supercomponent.view convertPoint:component.view.frame.origin toView:self.view].y; contentOffetY += offset * scaleFactor; - if (contentOffetY > scrollView.contentSize.height - scrollView.frame.size.height) { + if (scrollView.contentSize.height >= scrollView.frame.size.height && contentOffetY > scrollView.contentSize.height - scrollView.frame.size.height) { contentOffset.y = scrollView.contentSize.height - scrollView.frame.size.height; } else { contentOffset.y = contentOffetY;