Prevents android crash due to unsupported ellipsize mode

Fixes facebook#18474 Applies the default behavior if the ellipsize mode is set to "clip", since it's only supported by IOS
t4deu · Mar 24, 2018 · 774ba4f · 774ba4f
1 parent 1acef45
commit 774ba4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/RNTester/js/TextExample.android.js b/RNTester/js/TextExample.android.js
@@ -453,6 +453,9 @@ class TextExample extends React.Component<{}> {
           <Text ellipsizeMode="head" numberOfLines={1}>
             This very long text should be truncated with dots in the beginning.
           </Text>
+          <Text ellipsizeMode="clip" numberOfLines={1}>
+            Because clip is only supported on IOS this text should be truncated with dots in the end.
+          </Text>
         </RNTesterBlock>
         <RNTesterBlock title="Include Font Padding">
           <View style={{flexDirection: 'row', justifyContent: 'space-around', marginBottom: 10}}>

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -46,7 +46,9 @@ public void setNumberOfLines(ReactTextView view, int numberOfLines) {
 
   @ReactProp(name = ViewProps.ELLIPSIZE_MODE)
   public void setEllipsizeMode(ReactTextView view, @Nullable String ellipsizeMode) {
-    if (ellipsizeMode == null || ellipsizeMode.equals("tail")) {
+    if (ellipsizeMode == null
+      || ellipsizeMode.equals("tail")
+      || ellipsizeMode.equals("clip")) {
       view.setEllipsizeLocation(TextUtils.TruncateAt.END);
     } else if (ellipsizeMode.equals("head")) {
       view.setEllipsizeLocation(TextUtils.TruncateAt.START);