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

Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m

@@ -9,89 +9,27 @@
 
 #import "RCTAnimationUtils.h"
 
-static NSRegularExpression *regex;
-
 @implementation RCTInterpolationAnimatedNode
 {
   __weak RCTValueAnimatedNode *_parentNode;
   NSArray<NSNumber *> *_inputRange;
   NSArray<NSNumber *> *_outputRange;
-  NSArray<NSArray<NSNumber *> *> *_outputs;
-  NSArray<NSString *> *_soutputRange;
   NSString *_extrapolateLeft;
   NSString *_extrapolateRight;
-  NSUInteger _numVals;
-  bool _hasStringOutput;
-  bool _shouldRound;
-  NSArray<NSTextCheckingResult*> *_matches;
 }
 
 - (instancetype)initWithTag:(NSNumber *)tag
                      config:(NSDictionary<NSString *, id> *)config
 {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    regex = [NSRegularExpression regularExpressionWithPattern:@"[0-9.-]+" options:NSRegularExpressionCaseInsensitive error:nil];
-  });
   if ((self = [super initWithTag:tag config:config])) {
     _inputRange = [config[@"inputRange"] copy];
     NSMutableArray *outputRange = [NSMutableArray array];
-    NSMutableArray *soutputRange = [NSMutableArray array];
-    NSMutableArray<NSMutableArray<NSNumber *> *> *_outputRanges = [NSMutableArray array];
-
-    _hasStringOutput = NO;
     for (id value in config[@"outputRange"]) {
       if ([value isKindOfClass:[NSNumber class]]) {
         [outputRange addObject:value];
-      } else if ([value isKindOfClass:[NSString class]]) {
-        /**
-         * 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
-         */
-        NSMutableArray *output = [NSMutableArray array];
-        [_outputRanges addObject:output];
-        [soutputRange addObject:value];
-
-        _matches = [regex matchesInString:value options:0 range:NSMakeRange(0, [value length])];
-        for (NSTextCheckingResult *match in _matches) {
-          NSString* strNumber = [value substringWithRange:match.range];
-          [output addObject:[NSNumber numberWithDouble:strNumber.doubleValue]];
-        }
-
-        _hasStringOutput = YES;
-        [outputRange addObject:[output objectAtIndex:0]];
       }
     }
-    if (_hasStringOutput) {
-      // ['rgba(0, 100, 200, 0)', 'rgba(50, 150, 250, 0.5)']
-      // ->
-      // [
-      //   [0, 50],
-      //   [100, 150],
-      //   [200, 250],
-      //   [0, 0.5],
-      // ]
-      _numVals = [_matches count];
-      NSString *value = [soutputRange objectAtIndex:0];
-      _shouldRound = [value containsString:@"rgb"];
-      _matches = [regex matchesInString:value options:0 range:NSMakeRange(0, [value length])];
-      NSMutableArray<NSMutableArray<NSNumber *> *> *outputs = [NSMutableArray arrayWithCapacity:_numVals];
-      NSUInteger size = [soutputRange count];
-      for (NSUInteger j = 0; j < _numVals; j++) {
-        NSMutableArray *output = [NSMutableArray arrayWithCapacity:size];
-        [outputs addObject:output];
-        for (int i = 0; i < size; i++) {
-          [output addObject:[[_outputRanges objectAtIndex:i] objectAtIndex:j]];
-        }
-      }
-      _outputs = [outputs copy];
-    }
     _outputRange = [outputRange copy];
-    _soutputRange = [soutputRange copy];
     _extrapolateLeft = config[@"extrapolateLeft"];
     _extrapolateRight = config[@"extrapolateRight"];
   }
@@ -123,47 +61,11 @@ static NSRegularExpression *regex;
 
   CGFloat inputValue = _parentNode.value;
 
-  CGFloat interpolated = RCTInterpolateValueInRange(inputValue,
-                                                    _inputRange,
-                                                    _outputRange,
-                                                    _extrapolateLeft,
-                                                    _extrapolateRight);
-  self.value = interpolated;
-  if (_hasStringOutput) {
-    // 'rgba(0, 100, 200, 0)'
-    // ->
-    // 'rgba(${interpolations[0](input)}, ${interpolations[1](input)}, ...'
-    if (_numVals > 1) {
-      NSString *text = _soutputRange[0];
-      NSMutableString *formattedText = [NSMutableString stringWithString:text];
-      NSUInteger i = _numVals;
-      for (NSTextCheckingResult *match in [_matches reverseObjectEnumerator]) {
-        CGFloat val = RCTInterpolateValueInRange(inputValue,
-                                                          _inputRange,
-                                                          _outputs[--i],
-                                                          _extrapolateLeft,
-                                                          _extrapolateRight);
-        NSString *str;
-        if (_shouldRound) {
-          // 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).
-          bool isAlpha = i == 3;
-          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];
-        }
-
-        [formattedText replaceCharactersInRange:[match range] withString:str];
-      }
-      self.animatedObject = formattedText;
-    } else {
-      self.animatedObject = [regex stringByReplacingMatchesInString:_soutputRange[0]
-                                                 options:0
-                                                   range:NSMakeRange(0, _soutputRange[0].length)
-                                            withTemplate:[NSString stringWithFormat:@"%1f", interpolated]];
-    }
-  }
+  self.value = RCTInterpolateValueInRange(inputValue,
+                                          _inputRange,
+                                          _outputRange,
+                                          _extrapolateLeft,
+                                          _extrapolateRight);
 }
 
 @end

Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m

@@ -110,13 +110,8 @@
 
     } else if ([parentNode isKindOfClass:[RCTValueAnimatedNode class]]) {
       NSString *property = [self propertyNameForParentTag:parentTag];
-      id animatedObject = [(RCTValueAnimatedNode *)parentNode animatedObject];
-      if (animatedObject) {
-        self->_propsDictionary[property] = animatedObject;
-      } else {
-        CGFloat value = [(RCTValueAnimatedNode *)parentNode value];
-        self->_propsDictionary[property] = @(value);
-      }
+      CGFloat value = [(RCTValueAnimatedNode *)parentNode value];
+      self->_propsDictionary[property] = @(value);
     }
   }
 

Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h

@@ -24,7 +24,6 @@
 - (void)extractOffset;
 
 @property (nonatomic, assign) CGFloat value;
-@property (nonatomic, strong) id animatedObject;
 @property (nonatomic, weak) id<RCTValueAnimatedNodeObserver> valueObserver;
 
 @end