Back out "[react-native][PR] Support Interpolation of strings when using native driver in Animated, fix Expected node to be marked as "native", optimize AnimatedNode creation and connections"

Summary: Original commit changeset: 82a948a95419

Reviewed By: TheSavior

Differential Revision: D14631845

fbshipit-source-id: f20d8150bccf50ea85388761e2f31ca4f97ae158

ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java

@@ -9,12 +9,6 @@ package com.facebook.react.animated;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableType;
-
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import javax.annotation.Nullable;
 
 /**
@@ -27,7 +21,6 @@ import javax.annotation.Nullable;
   public static final String EXTRAPOLATE_TYPE_IDENTITY = "identity";
   public static final String EXTRAPOLATE_TYPE_CLAMP = "clamp";
   public static final String EXTRAPOLATE_TYPE_EXTEND = "extend";
-  static final Pattern regex = Pattern.compile("[0-9.-]+");
 
   private static double[] fromDoubleArray(ReadableArray ary) {
     double[] res = new double[ary.size()];
@@ -112,68 +105,13 @@ import javax.annotation.Nullable;
 
   private final double mInputRange[];
   private final double mOutputRange[];
-  private String mPattern;
-  private double mOutputs[][];
-  private final boolean mHasStringOutput;
-  private final Matcher mSOutputMatcher;
   private final String mExtrapolateLeft;
   private final String mExtrapolateRight;
   private @Nullable ValueAnimatedNode mParent;
-  private boolean mShouldRound;
-  private int mNumVals;
 
   public InterpolationAnimatedNode(ReadableMap config) {
     mInputRange = fromDoubleArray(config.getArray("inputRange"));
-    ReadableArray output = config.getArray("outputRange");
-    mHasStringOutput = output.getType(0) == ReadableType.String;
-    if (mHasStringOutput) {
-      /*
-       * Supports string shapes by extracting numbers so new values can be computed,
-       * and recombines those values into new strings of the same shape.  Supports
-       * things like:
-       *
-       *   rgba(123, 42, 99, 0.36) // colors
-       *   -45deg                  // values with units
-       */
-      int size = output.size();
-      mOutputRange = new double[size];
-      mPattern = output.getString(0);
-      mShouldRound = mPattern.startsWith("rgb");
-      mSOutputMatcher = regex.matcher(mPattern);
-      ArrayList<ArrayList<Double>> mOutputRanges = new ArrayList<>();
-      for (int i = 0; i < size; i++) {
-        String val = output.getString(i);
-        Matcher m = regex.matcher(val);
-        ArrayList<Double> outputRange = new ArrayList<>();
-        mOutputRanges.add(outputRange);
-        while (m.find()) {
-          Double parsed = Double.parseDouble(m.group());
-          outputRange.add(parsed);
-        }
-        mOutputRange[i] = outputRange.get(0);
-      }
-
-      // ['rgba(0, 100, 200, 0)', 'rgba(50, 150, 250, 0.5)']
-      // ->
-      // [
-      //   [0, 50],
-      //   [100, 150],
-      //   [200, 250],
-      //   [0, 0.5],
-      // ]
-      mNumVals = mOutputRanges.get(0).size();
-      mOutputs = new double[mNumVals][];
-      for (int j = 0; j < mNumVals; j++) {
-        double[] arr = new double[size];
-        mOutputs[j] = arr;
-        for (int i = 0; i < size; i++) {
-          arr[i] = mOutputRanges.get(i).get(j);
-        }
-      }
-    } else {
-      mOutputRange = fromDoubleArray(output);
-      mSOutputMatcher = null;
-    }
+    mOutputRange = fromDoubleArray(config.getArray("outputRange"));
     mExtrapolateLeft = config.getString("extrapolateLeft");
     mExtrapolateRight = config.getString("extrapolateRight");
   }
@@ -204,33 +142,6 @@ import javax.annotation.Nullable;
       // unattached node.
       return;
     }
-    double value = mParent.getValue();
-    mValue = interpolate(value, mInputRange, mOutputRange, mExtrapolateLeft, mExtrapolateRight);
-    if (mHasStringOutput) {
-      // 'rgba(0, 100, 200, 0)'
-      // ->
-      // 'rgba(${interpolations[0](input)}, ${interpolations[1](input)}, ...'
-      if (mNumVals > 1) {
-        StringBuffer sb = new StringBuffer(mPattern.length());
-        int i = 0;
-        mSOutputMatcher.reset();
-        while (mSOutputMatcher.find()) {
-          double val = interpolate(value, mInputRange, mOutputs[i++], mExtrapolateLeft, mExtrapolateRight);
-          if (mShouldRound) {
-            // rgba requires that the r,g,b are integers.... so we want to round them, but we *dont* want to
-            // 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));
-          } else {
-            mSOutputMatcher.appendReplacement(sb, String.valueOf(val));
-          }
-        }
-        mSOutputMatcher.appendTail(sb);
-        mAnimatedObject = sb.toString();
-      } else {
-        mAnimatedObject = mSOutputMatcher.replaceFirst(String.valueOf(mValue));
-      }
-    }
+    mValue = interpolate(mParent.getValue(), mInputRange, mOutputRange, mExtrapolateLeft, mExtrapolateRight);
   }
 }

ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java

@@ -84,12 +84,7 @@ import javax.annotation.Nullable;
       } else if (node instanceof StyleAnimatedNode) {
         ((StyleAnimatedNode) node).collectViewUpdates(mPropMap);
       } else if (node instanceof ValueAnimatedNode) {
-        Object animatedObject = ((ValueAnimatedNode) node).getAnimatedObject();
-        if (animatedObject instanceof String) {
-          mPropMap.putString(entry.getKey(), (String)animatedObject);
-        } else {
-          mPropMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());
-        }
+        mPropMap.putDouble(entry.getKey(), ((ValueAnimatedNode) node).getValue());
       } else {
         throw new IllegalArgumentException("Unsupported type of node used in property node " +
             node.getClass());

ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java

@@ -16,7 +16,6 @@ import javax.annotation.Nullable;
  * library.
  */
 /*package*/ class ValueAnimatedNode extends AnimatedNode {
-  /*package*/ Object mAnimatedObject = null;
   /*package*/ double mValue = Double.NaN;
   /*package*/ double mOffset = 0;
   private @Nullable AnimatedNodeValueListener mValueListener;
@@ -34,10 +33,6 @@ import javax.annotation.Nullable;
     return mOffset + mValue;
   }
 
-  public Object getAnimatedObject() {
-    return mAnimatedObject;
-  }
-
   public void flattenOffset() {
     mValue += mOffset;
     mOffset = 0;