From 8ca22fc2df500e73457bb0f5f59880b68b66ade7 Mon Sep 17 00:00:00 2001 From: Andrei Coman Date: Wed, 11 Nov 2015 13:06:05 -0800 Subject: [PATCH] Fix typeface getting applied recursively without new style Differential Revision: D2643562 fb-gh-sync-id: 0db52c223d4941c89f2253bb3f4b2a5af8341ecf --- .../java/com/facebook/react/views/text/CustomStyleSpan.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java index 07a303e22..a4a1db484 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java @@ -11,9 +11,6 @@ package com.facebook.react.views.text; import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.Map; - import android.content.res.AssetManager; import android.graphics.Paint; import android.graphics.Typeface; @@ -109,6 +106,9 @@ public class CustomStyleSpan extends MetricAffectingSpan { if (family != null) { typeface = ReactFontManager.getInstance().getTypeface(family, want, assetManager); + } else if (typeface != null) { + // TODO(t9055065): Fix custom fonts getting applied to text children with different style + typeface = Typeface.create(typeface, want); } if (typeface != null) {