diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.mm index d93b19c75b..696b212066 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.mm +++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.mm @@ -43,6 +43,7 @@ @interface WXEditComponent() @property (nonatomic, copy) NSString *inputType; @property (nonatomic) NSUInteger rows; @property (nonatomic) BOOL hideDoneButton; +@property (nonatomic) UITextAutocapitalizationType autocapitalizationType; //style @property (nonatomic) WXPixelType fontSize; @@ -154,6 +155,10 @@ - (instancetype)initWithRef:(NSString *)ref type:(NSString *)type styles:(NSDict }else { _placeholderColor = [UIColor colorWithRed:0x99/255.0 green:0x99/255.0 blue:0x99/255.0 alpha:1.0]; } + + if (attributes[@"autoCapitalizationType"]) { + _autocapitalizationType = [WXConvert UITextAutocapitalizationType:attributes[@"autoCapitalizationType"]]; + } } return self; @@ -182,6 +187,7 @@ - (void)viewDidLoad [self setEnabled:!_disabled]; [self setRows:_rows]; [self setReturnKeyType:_returnKeyType]; + [self setAutocapitalizationType:_autocapitalizationType]; [self updatePattern]; if (!self.hideDoneButton) { @@ -305,6 +311,10 @@ -(void)setReturnKeyType:(UIReturnKeyType)returnKeyType { } +- (void)setAutocapitalizationType:(UITextAutocapitalizationType)autocapitalizationType { + +} + -(void)setInputAccessoryView:(UIView *)inputAccessoryView { } @@ -447,6 +457,11 @@ - (void)updateAttributes:(NSDictionary *)attributes _rows = 2; [self setRows:_rows]; } + + if (attributes[@"autoCapitalizationType"]) { + _autocapitalizationType = [WXConvert UITextAutocapitalizationType:attributes[@"autoCapitalizationType"]]; + [self setAutocapitalizationType:_autocapitalizationType]; + } } #pragma mark - upate styles diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.mm index f64df8af38..2b6d2fb3ae 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.mm +++ b/ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.mm @@ -221,6 +221,10 @@ -(void)setRows:(NSUInteger)rows [self setNeedsLayout]; } +- (void)setAutocapitalizationType:(UITextAutocapitalizationType)type { + _textView.autocapitalizationType = type; +} + #pragma mark -Private Method - (void)_updateTextContentInset { diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.m index 02d8f52f26..a94c72a2ce 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.m @@ -134,6 +134,11 @@ -(void)setReturnKeyType:(UIReturnKeyType)returnKeyType { _inputView.returnKeyType = returnKeyType; } + +- (void)setAutocapitalizationType:(UITextAutocapitalizationType)type { + _inputView.autocapitalizationType = type; +} + -(void)setInputAccessoryView:(UIView *)inputAccessoryView { _inputView.inputAccessoryView = inputAccessoryView; diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h index 3b83f5c169..62598f6aa4 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h +++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.h @@ -82,6 +82,7 @@ typedef BOOL WXClipType; + (WXTextDecoration)WXTextDecoration:(id)value; + (NSTextAlignment)NSTextAlignment:(id)value; + (UIReturnKeyType)UIReturnKeyType:(id)value; ++ (UITextAutocapitalizationType)UITextAutocapitalizationType:(id)value; + (WXScrollDirection)WXScrollDirection:(id)value; + (UITableViewRowAnimation)UITableViewRowAnimation:(id)value; diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m index bdfb127528..be706fd700 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m +++ b/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m @@ -536,6 +536,22 @@ + (UIReturnKeyType)UIReturnKeyType:(id)value return UIReturnKeyDefault; } ++ (UITextAutocapitalizationType)UITextAutocapitalizationType:(id)value +{ + if([value isKindOfClass:[NSString class]]){ + NSString *string = (NSString *)value; + if ([string isEqualToString:@"none"]) + return UITextAutocapitalizationTypeNone; + else if ([string isEqualToString:@"words"]) + return UITextAutocapitalizationTypeWords; + else if ([string isEqualToString:@"sentences"]) + return UITextAutocapitalizationTypeSentences; + else if ([string isEqualToString:@"allcharacters"]) + return UITextAutocapitalizationTypeAllCharacters; + } + return UITextAutocapitalizationTypeSentences; +} + + (WXTextStyle)WXTextStyle:(id)value { if([value isKindOfClass:[NSString class]]){ diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m index aef6efc273..8745d3812d 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m +++ b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m @@ -20,8 +20,8 @@ #import "WXVersion.h" #import "WXDefine.h" -static const char* WeexSDKBuildTime = "2018-09-20 09:52:40 UTC"; -static const unsigned long WeexSDKBuildTimestamp = 1537437160; +static const char* WeexSDKBuildTime = "2018-09-30 09:57:57 UTC"; +static const unsigned long WeexSDKBuildTimestamp = 1538301477; NSString* GetWeexSDKVersion(void) {