status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix RCTText not always drawing in Nodes 

Summary:
In Nodes, there were certain cases where text wasn't drawn due to an
optimization that skipped measuring because the size was already known.

Reviewed By: emilsjolander

Differential Revision: D3713841
This commit is contained in:
Ahmed El-Helw 2016-08-15 14:27:40 -07:00
parent 8600723402
commit bcf2e329ed
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
View File

@ -133,10 +133,21 @@ import com.facebook.textcachewarmer.DefaultTextLayoutCacheWarmer;
clipRight, clipRight,
clipBottom); clipBottom);
if (mText == null) {
// as an optimization, LayoutEngine may not call measure in certain cases, such as when the
// dimensions are already defined. in these cases, we should still draw the text.
if (bottom - top > 0 && right - left > 0) {
CharSequence text = getText();
if (!TextUtils.isEmpty(text)) {
mText = text;
}
}
if (mText == null) { if (mText == null) {
// nothing to draw (empty text). // nothing to draw (empty text).
return; return;
} }
}
boolean updateNodeRegion = false; boolean updateNodeRegion = false;
if (mDrawCommand == null) { if (mDrawCommand == null) {