You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2018/07/12 04:33:05 UTC
[2/2] incubator-weex git commit: [WEEX-500][iOS] Fix Sticky in List
will not be removed in some cases
[WEEX-500][iOS] Fix Sticky in List will not be removed in some cases
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5ca1f002
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5ca1f002
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5ca1f002
Branch: refs/heads/master
Commit: 5ca1f002a0df89f5a13b363ab28323b76f80438e
Parents: bedc6aa
Author: Xiaomin <ca...@yahoo.com>
Authored: Wed Jul 11 20:41:37 2018 +0800
Committer: Adam Feng <cx...@gmail.com>
Committed: Thu Jul 12 12:32:00 2018 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm | 4 +++-
ios/sdk/WeexSDK/Sources/Model/WXComponent.mm | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ca1f002/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm
index 9b8a1a2..056ca4e 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm
@@ -354,7 +354,9 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
{
if([self.stickyArray containsObject:sticky]) {
[self.stickyArray removeObject:sticky];
- [self adjustSticky];
+ WXPerformBlockOnMainThread(^{
+ [self adjustSticky];
+ });
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ca1f002/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
index d877868..467a6b7 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -602,6 +602,9 @@ static BOOL bNeedRemoveEvents = YES;
[self.weexInstance.componentManager removeFixedComponent:self];
self->_isNeedJoinLayoutSystem = YES;
}
+ if (_positionType == WXPositionTypeSticky) {
+ [self.ancestorScroller removeStickyComponent:self];
+ }
}
- (void)_moveToSupercomponent:(WXComponent *)newSupercomponent atIndex:(NSUInteger)index