feat(ios): textarea contentHeight fix with new return property textar…

…eaHeight in "change" event (#13416) * fix(ios): textarea contentHeight fix with new event for contentChange * fix(ios): textarea contentHeight fix * fix(ios): textarea contentHeight update for doc * Update TextArea.yml * fix(ios): textarea contentHeight fix with new return property textareaHeight in "change" event Fixes #13413 * Update TextArea.yml * Update TextArea.yml * Update TextArea.yml * Update TextArea.yml * Update TiUITextWidgetProxy.m event property changed to better "contentHeight" * Update TextArea.yml * Update TiUITextArea.m removed unused variable
tidev · Apr 22, 2022 · 94820d1 · 94820d1
1 parent 5c01a8d
commit 94820d1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/apidoc/Titanium/UI/TextArea.yml b/apidoc/Titanium/UI/TextArea.yml
@@ -518,6 +518,11 @@ events:
       - name: value
         summary: New value of this text area.
         type: String
+      - name: contentHeight
+        summary: Content height value of this text area
+        type: Number
+        platforms: [iphone, ipad, macos]
+        since: {iphone: "10.2.0", ipad: "10.2.0", macos: "10.2.0"}
 
   - name: focus
     summary: Fired when this text area gains focus.

diff --git a/iphone/Classes/TiUITextArea.m b/iphone/Classes/TiUITextArea.m
@@ -337,7 +337,9 @@ - (void)textViewDidEndEditing:(UITextView *)tv
 
 - (void)textViewDidChange:(UITextView *)tv
 {
-  [(TiUITextAreaProxy *)[self proxy] noteValueChange:[(UITextView *)textWidgetView text]];
+  NSNumber *textareaHeight = [NSNumber numberWithFloat:tv.contentSize.height];
+
+  [(TiUITextAreaProxy *)[self proxy] noteValueChange:[(UITextView *)textWidgetView text]:textareaHeight];
 }
 
 - (void)textViewDidChangeSelection:(UITextView *)tv

diff --git a/iphone/Classes/TiUITextField.m b/iphone/Classes/TiUITextField.m
@@ -553,7 +553,7 @@ - (void)textFieldDidChange:(NSNotification *)notification
   if ([ourProxy suppressFocusEvents]) {
     return;
   }
-  [ourProxy noteValueChange:[(UITextField *)textWidgetView text]];
+  [ourProxy noteValueChange:[(UITextField *)textWidgetView text]:nil];
 }
 
 - (BOOL)textFieldShouldEndEditing:(UITextField *)tf
@@ -564,7 +564,7 @@ - (BOOL)textFieldShouldEndEditing:(UITextField *)tf
 - (BOOL)textFieldShouldClear:(UITextField *)tf
 {
   // we notify proxy so he can serialize in the model
-  [(TiUITextFieldProxy *)self.proxy noteValueChange:@""];
+  [(TiUITextFieldProxy *)self.proxy noteValueChange:@"":nil];
   return YES;
 }
 

diff --git a/iphone/Classes/TiUITextWidget.m b/iphone/Classes/TiUITextWidget.m
@@ -58,7 +58,7 @@ - (void)setValue_:(id)value
     string = [string substringToIndex:maxLength];
   }
   [(id)[self textWidgetView] setText:string];
-  [(TiUITextWidgetProxy *)[self proxy] noteValueChange:string];
+  [(TiUITextWidgetProxy *)[self proxy] noteValueChange:string:nil];
 }
 
 - (void)setMaxLength_:(id)value

diff --git a/iphone/Classes/TiUITextWidgetProxy.h b/iphone/Classes/TiUITextWidgetProxy.h
@@ -26,7 +26,7 @@
 }
 
 //Internal values
-- (void)noteValueChange:(NSString *)newValue;
+- (void)noteValueChange:(NSString *)newValue:(NSNumber *)contentHeight;
 
 @property (nonatomic, readwrite, assign) BOOL suppressFocusEvents;
 // workaround bridge layer issue clashing with focused:(id)unused method

diff --git a/iphone/Classes/TiUITextWidgetProxy.m b/iphone/Classes/TiUITextWidgetProxy.m
@@ -118,13 +118,22 @@ - (BOOL)focused:(id)unused
   return result;
 }
 
-- (void)noteValueChange:(NSString *)newValue
+- (void)noteValueChange:(NSString *)newValue:(NSNumber *)contentHeight
 {
   NSString *oldValue = [TiUtils stringValue:[self valueForKey:@"value"]];
   if (![oldValue isEqual:newValue]) {
     [self replaceValue:newValue forKey:@"value" notification:NO];
+
+    NSMutableDictionary *event = [NSMutableDictionary dictionary];
+    if (contentHeight != nil) {
+      [event setValue:contentHeight forKey:@"contentHeight"];
+    }
+    [event setValue:newValue forKey:@"value"];
+    if ([self _hasListeners:@"change"]) {
+      [self fireEvent:@"change" withObject:event];
+    }
+
     [self contentsWillChange];
-    [self fireEvent:@"change" withObject:[NSDictionary dictionaryWithObject:newValue forKey:@"value"]];
     TiThreadPerformOnMainThread(
         ^{
           //Make sure the text widget is in view when editing.