blackteachinese closed pull request #1731: [WEEX-657][iOS] Add a feature to
control the offset of list attach to…
URL: https://github.com/apache/incubator-weex/pull/1731
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index d6aca1de3f..af73a07fb9 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -1033,6 +1033,7 @@
DCF0CD9E1EAF3A6B0062CA8F /* native-bundle-main.js in Resources
*/ = {isa = PBXBuildFile; fileRef = DCF0CD9D1EAF3A6B0062CA8F /*
native-bundle-main.js */; };
DCF343671E49CAEE00A2FB34 /* WXJSExceptionInfo.h in Headers */ =
{isa = PBXBuildFile; fileRef = DCF343651E49CAEE00A2FB34 /* WXJSExceptionInfo.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
DCF343681E49CAEE00A2FB34 /* WXJSExceptionInfo.m in Sources */ =
{isa = PBXBuildFile; fileRef = DCF343661E49CAEE00A2FB34 /* WXJSExceptionInfo.m
*/; };
+ E6F9D95421A80E780082072E /* WXListComponent_internal.h in
Headers */ = {isa = PBXBuildFile; fileRef = E6F9D95321A80E780082072E /*
WXListComponent_internal.h */; };
ED053500207F4DEB007B4568 /* JSContext+Weex.h in Headers */ =
{isa = PBXBuildFile; fileRef = ED0534FE207F4DEB007B4568 /* JSContext+Weex.h */;
settings = {ATTRIBUTES = (Public, ); }; };
ED053501207F4DEB007B4568 /* JSContext+Weex.h in Headers */ =
{isa = PBXBuildFile; fileRef = ED0534FE207F4DEB007B4568 /* JSContext+Weex.h */;
settings = {ATTRIBUTES = (Public, ); }; };
ED053502207F4DEB007B4568 /* JSContext+Weex.m in Sources */ =
{isa = PBXBuildFile; fileRef = ED0534FF207F4DEB007B4568 /* JSContext+Weex.m */;
};
@@ -1602,6 +1603,7 @@
DCF0CD9D1EAF3A6B0062CA8F /* native-bundle-main.js */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.javascript; name =
"native-bundle-main.js"; path = "../../../../pre-build/native-bundle-main.js";
sourceTree = "<group>"; };
DCF343651E49CAEE00A2FB34 /* WXJSExceptionInfo.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXJSExceptionInfo.h; sourceTree = "<group>"; };
DCF343661E49CAEE00A2FB34 /* WXJSExceptionInfo.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXJSExceptionInfo.m; sourceTree = "<group>"; };
+ E6F9D95321A80E780082072E /* WXListComponent_internal.h */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
WXListComponent_internal.h; sourceTree = "<group>"; };
ED0534FE207F4DEB007B4568 /* JSContext+Weex.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
"JSContext+Weex.h"; sourceTree = "<group>"; };
ED0534FF207F4DEB007B4568 /* JSContext+Weex.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
"JSContext+Weex.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -2197,6 +2199,7 @@
37B51EE31E97804D0040A743 /*
WXCycleSliderComponent.mm */,
74CC7A1B1C2BC5F800829368 /* WXCellComponent.mm
*/,
74CC7A1E1C2BF9DC00829368 /* WXListComponent.h
*/,
+ E6F9D95321A80E780082072E /*
WXListComponent_internal.h */,
74CC7A1F1C2BF9DC00829368 /* WXListComponent.mm
*/,
2AC750221C7565690041D390 /*
WXIndicatorComponent.h */,
2AC750231C7565690041D390 /*
WXIndicatorComponent.m */,
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm
b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm
index a9f18bf1b1..b63231411a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.mm
@@ -32,6 +32,14 @@
#import "WXRefreshComponent.h"
#import "WXLoadingComponent.h"
+@interface WXListComponent () <UITableViewDataSource, UITableViewDelegate,
WXCellRenderDelegate, WXHeaderRenderDelegate>
+
+@property (nonatomic, assign) NSUInteger currentTopVisibleSection;
+// Set whether the content offset position all the way to the bottom
+@property (assign, nonatomic) BOOL contentAttachBottom;
+
+@end
+
@interface WXTableView : UITableView
@end
@@ -79,6 +87,19 @@ - (void)setContentOffset:(CGPoint)contentOffset
[super setContentOffset:contentOffset];
}
+- (void)setFrame:(CGRect)frame {
+ [super setFrame:frame];
+ if (![self.wx_component isKindOfClass:[WXListComponent class]]) return;
+ BOOL contentAttachBottom = [(WXListComponent *)self.wx_component
contentAttachBottom];
+ if (contentAttachBottom) {
+ CGFloat offsetHeight = self.contentSize.height -
CGRectGetHeight(self.bounds);
+ if (offsetHeight >= 0) {
+ [self setContentOffset:CGPointMake(0, offsetHeight) animated:NO];
+ }
+ }
+}
+
+
@end
// WXText is a non-public is not permitted
@@ -114,12 +135,6 @@ - (NSString *)description
}
@end
-@interface WXListComponent () <UITableViewDataSource, UITableViewDelegate,
WXCellRenderDelegate, WXHeaderRenderDelegate>
-
-@property (nonatomic, assign) NSUInteger currentTopVisibleSection;
-
-@end
-
@implementation WXListComponent
{
__weak UITableView * _tableView;
@@ -144,6 +159,7 @@ - (instancetype)initWithRef:(NSString *)ref type:(NSString
*)type styles:(NSDict
_completedSections = [NSMutableArray array];
_reloadInterval = attributes[@"reloadInterval"] ? [WXConvert
CGFloat:attributes[@"reloadInterval"]]/1000 : 0;
_updataType = [WXConvert
NSString:attributes[@"updataType"]]?:@"insert";
+ _contentAttachBottom = [WXConvert
BOOL:attributes[@"contentAttachBottom"]];
[self fixFlicker];
}
@@ -198,6 +214,9 @@ - (void)updateAttributes:(NSDictionary *)attributes
if (attributes[@"updataType"]) {
_updataType = [WXConvert NSString:attributes[@"updataType"]];
}
+ if (attributes[@"contentAttachBottom"]) {
+ _contentAttachBottom = [WXConvert
BOOL:attributes[@"contentAttachBottom"]];
+ }
}
- (void)setContentSize:(CGSize)contentSize
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
