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

Implement alignment for nodes Text 

Summary: Alignment wasn't implemented for Text, this patch supports it.

Differential Revision: D2980358
This commit is contained in:
Ahmed El-Helw 2016-02-26 13:41:49 -08:00
parent 848bae2e95
commit df382e986c
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import com.facebook.csslayout.CSSNode;
import com.facebook.csslayout.MeasureOutput;
import com.facebook.csslayout.Spacing;
import com.facebook.fbui.widget.text.staticlayouthelper.StaticLayoutHelper;
import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ViewDefaults;
import com.facebook.react.uimanager.ViewProps;
@ -48,6 +49,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
private float mSpacingMult = 1.0f;
private float mSpacingAdd = 0.0f;
private int mNumberOfLines = Integer.MAX_VALUE;
private Layout.Alignment mAlignment = Layout.Alignment.ALIGN_NORMAL;
public RCTText() {
setMeasureFunction(this);
@ -120,7 +122,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
text.length(),
PAINT,
maximumWidth,
Layout.Alignment.ALIGN_NORMAL,
mAlignment,
mSpacingMult,
mSpacingAdd,
INCLUDE_PADDING,
@ -173,7 +175,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
mText,
PAINT,
Integer.MAX_VALUE, // fits one line so don't care about the width
Layout.Alignment.ALIGN_NORMAL,
mAlignment,
mSpacingMult,
mSpacingAdd,
mBoringLayoutMetrics,
@ -255,6 +257,24 @@ import com.facebook.react.uimanager.annotations.ReactProp;
dirty();
}
@ReactProp(name = ViewProps.TEXT_ALIGN)
public void setTextAlign(@Nullable String textAlign) {
if (textAlign == null || "auto".equals(textAlign)) {
mAlignment = Layout.Alignment.ALIGN_NORMAL;
} else if ("left".equals(textAlign)) {
// left and right may yield potentially different results (relative to non-nodes) in cases
// when supportsRTL="true" in the manifest.
mAlignment = Layout.Alignment.ALIGN_NORMAL;
} else if ("right".equals(textAlign)) {
mAlignment = Layout.Alignment.ALIGN_OPPOSITE;
} else if ("center".equals(textAlign)) {
mAlignment = Layout.Alignment.ALIGN_CENTER;
} else {
throw new JSApplicationIllegalArgumentException("Invalid textAlign: " + textAlign);
}
notifyChanged(false);
}
/**
* Returns a new CharSequence that includes all the text and styling information to create Layout.
*/