fix(ios): allow string-based "verticalAlign" in Ti.UI.Label (#12566)

Fixes TIMOB-28391
tidev · Aug 17, 2021 · 9363c42 · 9363c42
1 parent 4d44a18
commit 9363c42
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/apidoc/Titanium/UI/Button.yml b/apidoc/Titanium/UI/Button.yml
@@ -351,7 +351,7 @@ properties:
     type: [Number,String]
     constants: Titanium.UI.TEXT_VERTICAL_ALIGNMENT_*
     default: Titanium.UI.TEXT_VERTICAL_ALIGNMENT_CENTER
-    platforms: [android]
+    platforms: [android, iphone, ipad, macos]
 
 examples:
   - title: Simple Button Example

diff --git a/apidoc/Titanium/UI/Label.yml b/apidoc/Titanium/UI/Label.yml
@@ -236,7 +236,7 @@ properties:
         behavior when the property is undefined is to center the text vertically.
     type: [Number,String]
     constants: Titanium.UI.TEXT_VERTICAL_ALIGNMENT_*
-    default: undefined on Android, iPhone and iPad.
+    default: undefined
     since: { iphone: "3.0.0", ipad: "3.0.0", android: "3.0.0" }
 
 events:

diff --git a/iphone/Classes/TiUILabel.m b/iphone/Classes/TiUILabel.m
@@ -395,7 +395,7 @@ - (BOOL)isHighlighted
 
 - (void)setVerticalAlign_:(id)value
 {
-  verticalAlign = [TiUtils intValue:value def:UIControlContentVerticalAlignmentFill];
+  verticalAlign = [self verticalAlignFromValue:value];
   if (verticalAlign < UIControlContentVerticalAlignmentCenter || verticalAlign > UIControlContentVerticalAlignmentBottom) {
     verticalAlign = UIControlContentVerticalAlignmentFill;
   }
@@ -535,6 +535,23 @@ - (void)setShadowOffset_:(id)value
   [[self label] setShadowOffset:size];
 }
 
+- (UIControlContentVerticalAlignment)verticalAlignFromValue:(id)value
+{
+  if ([value isKindOfClass:[NSNumber class]]) {
+    return [TiUtils intValue:value def:UIControlContentVerticalAlignmentFill];
+  } else if ([value isKindOfClass:[NSString class]]) {
+    if ([value isEqualToString:@"top"]) {
+      return UIControlContentVerticalAlignmentTop;
+    } else if ([value isEqualToString:@"bottom"]) {
+      return UIControlContentVerticalAlignmentBottom;
+    } else if ([value isEqualToString:@"center"]) {
+      return UIControlContentVerticalAlignmentCenter;
+    }
+  }
+
+  return UIControlContentVerticalAlignmentFill;
+}
+
 @end
 
 #endif
diff --git a/tests/Resources/ti.ui.label.test.js b/tests/Resources/ti.ui.label.test.js
@@ -163,6 +163,7 @@ describe('Titanium.UI.Label', function () {
 				text: 'this is some text',
 				verticalAlign: Ti.UI.TEXT_VERTICAL_ALIGNMENT_BOTTOM
 			});
+			// The internal structure is managed differently (string vs NSInteger enum)
 			if (utilities.isAndroid()) {
 				should(label.verticalAlign).be.a.String();
 			} else {