Fix handling of zero and one in native string interpolation

software-mansion/react-native-svg#951 (comment)
facebook · Apr 15, 2019 · 86052af · 86052af
1 parent ab49cb0
commit 86052af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
@@ -151,7 +151,8 @@ - (void)performUpdate
           CGFloat rounded = isAlpha ? round(val * 1000) / 1000 : round(val);
           str = isAlpha ? [NSString stringWithFormat:@"%1.3f", rounded] : [NSString stringWithFormat:@"%1.0f", rounded];
         } else {
-          str = [NSString stringWithFormat:@"%1f", val];
+          NSNumber *numberValue = [NSNumber numberWithDouble:val];
+          str = [numberValue stringValue];
         }
 
         [formattedText replaceCharactersInRange:[match range] withString:str];

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
@@ -221,9 +221,11 @@ public void update() {
             // round the opacity (4th column).
             boolean isAlpha = i == 4;
             int rounded = (int)Math.round(isAlpha ? val * 1000 : val);
-            mSOutputMatcher.appendReplacement(sb, isAlpha ? String.valueOf((double)rounded / 1000) : String.valueOf(rounded));
+            String num = Double.toString(isAlpha ? (double)rounded / 1000 : rounded);
+            mSOutputMatcher.appendReplacement(sb, num);
           } else {
-            mSOutputMatcher.appendReplacement(sb, String.valueOf(val));
+            String num = val == 0 ? "0" : val == 1 ? "1" : Double.toString(val);
+            mSOutputMatcher.appendReplacement(sb, num);
           }
         }
         mSOutputMatcher.appendTail(sb);