Merge branch 'master' into TIMOB-19300

tidev · Dec 20, 2019 · ee08945 · ee08945
2 parents 2345b42 + 99d08f6
commit ee08945
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
@@ -497,7 +497,7 @@ public void focus()
 	{
 		super.focus();
 		if (tv != null && proxy != null && proxy.getProperties() != null) {
-			final boolean editable = proxy.getProperties().optBoolean(TiC.PROPERTY_EDITABLE, false);
+			final boolean editable = proxy.getProperties().optBoolean(TiC.PROPERTY_EDITABLE, true);
 			TiUIHelper.showSoftKeyboard(tv, editable);
 		}
 	}

diff --git a/apidoc/Titanium/UI/Font.yml b/apidoc/Titanium/UI/Font.yml
@@ -100,6 +100,10 @@ properties:
     description: |
         Use one of the TEXT_STYLE constants from <Titanium.UI> to set the font to a predefined system font.
         When this property is set to a valid value, all other font properties are ignored.
+
+        Notes:
+         Since SDK 9.0.0 property <Font.fontFamily> will not be ignored for iOS 11+. 
+         Custom fonts can be used with this property for dynamic font management.
     type: String
     constants: Titanium.UI.TEXT_STYLE_*
     platforms: [iphone, ipad]

diff --git a/iphone/Classes/TiUIListSectionProxy.m b/iphone/Classes/TiUIListSectionProxy.m
@@ -159,7 +159,10 @@ - (void)appendItems:(id)args
       [_items addObjectsFromArray:items];
       id<TiUIListViewDelegateView> theDelegate = [theDispatcher delegateView];
       if (theDelegate != nil) {
-        [theDelegate updateSearchResults:nil];
+        TiThreadPerformOnMainThread(^{
+          [theDelegate updateSearchResults:nil];
+        },
+            NO);
         if ([theDispatcher isKindOfClass:[TiViewProxy class]]) {
           [(TiViewProxy *)theDispatcher contentsWillChange];
         }

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/WebFont.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/WebFont.m
@@ -36,8 +36,15 @@ - (BOOL)isSizeNotSet
 
 - (UIFont *)font
 {
+  // TO DO: Refactor this function
   if (font == nil) {
-    if (textStyle != nil && [textStyle isKindOfClass:[NSString class]]) {
+    if (textStyle != nil && [textStyle isKindOfClass:[NSString class]] && family != nil && [TiUtils isIOSVersionOrGreater:@"11.0"]) {
+      UIFont *tempFont = [UIFont fontWithName:family size:self.size];
+      if (tempFont) {
+        UIFontMetrics *fontMetrics = [UIFontMetrics metricsForTextStyle:textStyle];
+        font = [[fontMetrics scaledFontForFont:tempFont] retain];
+      }
+    } else if (textStyle != nil && [textStyle isKindOfClass:[NSString class]]) {
       font = [[UIFont preferredFontForTextStyle:textStyle] retain];
     } else {
       if (family != nil) {
@@ -126,7 +133,7 @@ - (UIFont *)font
       if (font == nil) {
         //NO valid family specified. Just check for characteristics. Semi bold is ignored here.
         if (self.isBoldWeight) {
-          UIFont *theFont = ([TiUtils isIOSVersionOrGreater:@"8.2"]) ? [UIFont systemFontOfSize:self.size weight:UIFontWeightBold] : [UIFont boldSystemFontOfSize:self.size];
+          UIFont *theFont = [UIFont systemFontOfSize:self.size weight:UIFontWeightBold];
           if (self.isItalicStyle) {
             NSString *fontFamily = [theFont familyName];
             NSArray *fontNames = [UIFont fontNamesForFamilyName:fontFamily];
@@ -153,7 +160,7 @@ - (UIFont *)font
           }
         } else if (self.isItalicStyle) {
           font = [[UIFont italicSystemFontOfSize:self.size] retain];
-        } else if ([TiUtils isIOSVersionOrGreater:@"8.2"]) {
+        } else {
           if (self.isSemiboldWeight) {
             font = [[UIFont systemFontOfSize:self.size weight:UIFontWeightSemibold] retain];
           } else if (self.isThinWeight) {
@@ -165,8 +172,6 @@ - (UIFont *)font
           } else {
             font = [[UIFont systemFontOfSize:self.size] retain];
           }
-        } else {
-          font = [[UIFont systemFontOfSize:self.size] retain];
         }
       }
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -135,8 +135,8 @@
     "clang-format": "1.2.3",
     "commander": "^4.0.1",
     "commitizen": "^4.0.3",
-    "conventional-changelog-cli": "^2.0.30",
-    "core-js": "^3.4.8",
+    "conventional-changelog-cli": "^2.0.31",
+    "core-js": "^3.5.0",
     "cz-conventional-changelog": "^3.0.2",
     "danger": "^9.2.9",
     "dateformat": "^3.0.3",