From 46b4e776e65e88b4787079fa9491a7cc5a44e7db Mon Sep 17 00:00:00 2001 From: ruifanyuan Date: Mon, 6 Nov 2023 17:40:44 +0800 Subject: [PATCH] fix(ios): add caretColor property support --- .../component/textinput/NativeRenderTextField.m | 8 ++++++++ .../component/textinput/NativeRenderTextView.mm | 15 +++++++++++++++ .../textinput/NativeRenderTextViewManager.mm | 1 + 3 files changed, 24 insertions(+) diff --git a/renderer/native/ios/renderer/component/textinput/NativeRenderTextField.m b/renderer/native/ios/renderer/component/textinput/NativeRenderTextField.m index b25057211..8a5db6308 100644 --- a/renderer/native/ios/renderer/component/textinput/NativeRenderTextField.m +++ b/renderer/native/ios/renderer/component/textinput/NativeRenderTextField.m @@ -48,6 +48,14 @@ } } +- (UIColor*)caretColor{ + return self.tintColor; +} + +- (void)setCaretColor:(UIColor*)color{ + self.tintColor = color; +} + - (void)setReturnKeyType:(UIReturnKeyType) returnKeyType{ [super setReturnKeyType:returnKeyType]; if([self isFirstResponder]){ diff --git a/renderer/native/ios/renderer/component/textinput/NativeRenderTextView.mm b/renderer/native/ios/renderer/component/textinput/NativeRenderTextView.mm index 1d0e9a321..3df6575be 100644 --- a/renderer/native/ios/renderer/component/textinput/NativeRenderTextView.mm +++ b/renderer/native/ios/renderer/component/textinput/NativeRenderTextView.mm @@ -55,6 +55,21 @@ return [super resignFirstResponder]; } +- (void)setKeyboardType:(UIKeyboardType)keyboardType { + [super setKeyboardType:keyboardType]; + + if([self isFirstResponder]){ + [self reloadInputViews]; + } +} + +- (UIColor*)caretColor{ + return self.tintColor; +} + +- (void)setCaretColor:(UIColor*)color{ + self.tintColor = color; +} @end @interface NativeRenderTextView () diff --git a/renderer/native/ios/renderer/component/textinput/NativeRenderTextViewManager.mm b/renderer/native/ios/renderer/component/textinput/NativeRenderTextViewManager.mm index ffd9f0003..f2ffb65ec 100644 --- a/renderer/native/ios/renderer/component/textinput/NativeRenderTextViewManager.mm +++ b/renderer/native/ios/renderer/component/textinput/NativeRenderTextViewManager.mm @@ -170,6 +170,7 @@ HIPPY_REMAP_VIEW_PROPERTY(selectionColor, tintColor, UIColor) HIPPY_EXPORT_VIEW_PROPERTY(selectTextOnFocus, BOOL) HIPPY_EXPORT_VIEW_PROPERTY(selection, NativeRenderTextSelection) HIPPY_EXPORT_VIEW_PROPERTY(text, NSString) +HIPPY_REMAP_VIEW_PROPERTY(caretColor, textView.caretColor, UIColor) HIPPY_CUSTOM_SHADOW_PROPERTY(fontSize, NSNumber, NativeRenderObjectTextView) { view.font = [HippyFont updateFont:view.font withSize:json];