Repository: incubator-weex Updated Branches: refs/heads/master a8de4388f -> 755d49acf
* [iOS] bugfix that waterfall component cannot scroll Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/755d49ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/755d49ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/755d49ac Branch: refs/heads/master Commit: 755d49acfb3e6c1b7ce3708e528d7cb62571b76d Parents: a8de438 Author: acton393 <zhangxing610...@gmail.com> Authored: Wed Apr 18 22:40:48 2018 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Wed Apr 18 22:40:48 2018 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/755d49ac/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index f105444..5f197d1 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -196,7 +196,11 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) scrollView.showsHorizontalScrollIndicator = _showScrollBar; scrollView.scrollEnabled = _scrollable; scrollView.pagingEnabled = _pagingEnabled; - scrollView.bounces = _bounces; + + if (scrollView.bounces != _bounces) { + scrollView.bounces = _bounces; + } + if (_alwaysScrollableHorizontal) { scrollView.alwaysBounceHorizontal = [WXConvert BOOL:_alwaysScrollableHorizontal]; }