Moar native nodes

kmagiera · kmagiera · commit 1adb671e0c76 · 2018-04-09T11:10:55.000+02:00
diff --git a/Example/Reanimated/core/AnimatedBlock.js b/Example/Reanimated/core/AnimatedBlock.js
@@ -5,7 +5,7 @@ export default class AnimatedBlock extends AnimatedNode {
   _array;
 
   constructor(array) {
-    super({ type: 'block' }, array);
+    super({ type: 'block', block: array.map(n => n.__nodeID) }, array);
     this._array = array;
   }
 
diff --git a/Example/Reanimated/core/AnimatedCond.js b/Example/Reanimated/core/AnimatedCond.js
@@ -7,7 +7,15 @@ export default class AnimatedCond extends AnimatedNode {
   _elseBlock;
 
   constructor(condition, ifBlock, elseBlock) {
-    super({ type: 'cond' }, [condition, ifBlock, elseBlock]);
+    super(
+      {
+        type: 'cond',
+        cond: condition.__nodeID,
+        ifBlock: ifBlock.__nodeID,
+        elseBlock: elseBlock.__nodeID,
+      },
+      [condition, ifBlock, elseBlock]
+    );
     this._condition = condition;
     this._ifBlock = ifBlock;
     this._elseBlock = elseBlock;
diff --git a/Example/Reanimated/core/AnimatedProps.js b/Example/Reanimated/core/AnimatedProps.js
@@ -32,7 +32,7 @@ export default class AnimatedProps extends AnimatedNode {
     for (const key in this._props) {
       const value = this._props[key];
       if (value instanceof AnimatedNode) {
-        if (!value.__isNative || value instanceof AnimatedStyle) {
+        if (value instanceof AnimatedStyle) {
           // We cannot use value of natively driven nodes this way as the value we have access from
           // JS may not be up to date.
           props[key] = value.__getProps();
diff --git a/Example/Reanimated/core/AnimatedStyle.js b/Example/Reanimated/core/AnimatedStyle.js
@@ -34,11 +34,7 @@ export default class AnimatedStyle extends AnimatedNode {
     for (const key in style) {
       const value = style[key];
       if (value instanceof AnimatedNode) {
-        if (!value.__isNative) {
-          // We cannot use value of natively driven nodes this way as the value we have access from
-          // JS may not be up to date.
-          updatedStyle[key] = value.__getProps();
-        }
+        // do nothing
       } else if (value && !Array.isArray(value) && typeof value === 'object') {
         // Support animating nested values (for example: shadowOffset.height)
         updatedStyle[key] = this._walkStyleAndGetValues(value);
diff --git a/Example/ios/GestureHandler.xcodeproj/project.pbxproj b/Example/ios/GestureHandler.xcodeproj/project.pbxproj
@@ -32,6 +32,8 @@
 		447781C320763EB000B4D8C9 /* REATransformNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 447781C220763EB000B4D8C9 /* REATransformNode.m */; };
 		447781C520763FEA00B4D8C9 /* REAValueNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 447781C420763FEA00B4D8C9 /* REAValueNode.m */; };
 		447781C8207693D100B4D8C9 /* REAPropsNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 447781C7207693D100B4D8C9 /* REAPropsNode.m */; };
+		447781CB207B5C8400B4D8C9 /* REABlockNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 447781CA207B5C8400B4D8C9 /* REABlockNode.m */; };
+		447781CE207B60F300B4D8C9 /* REACondNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 447781CD207B60F300B4D8C9 /* REACondNode.m */; };
 		4486EC712076263F008A0135 /* REANodesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4486EC5F2076263F008A0135 /* REANodesManager.m */; };
 		4486EC722076263F008A0135 /* REAModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 4486EC602076263F008A0135 /* REAModule.m */; };
 		4486EC762076340F008A0135 /* REAStyleNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4486EC752076340F008A0135 /* REAStyleNode.m */; };
@@ -335,6 +337,10 @@
 		447781C420763FEA00B4D8C9 /* REAValueNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = REAValueNode.m; sourceTree = "<group>"; };
 		447781C6207693C300B4D8C9 /* REAPropsNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = REAPropsNode.h; sourceTree = "<group>"; };
 		447781C7207693D100B4D8C9 /* REAPropsNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = REAPropsNode.m; sourceTree = "<group>"; };
+		447781C9207B5C7900B4D8C9 /* REABlockNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = REABlockNode.h; sourceTree = "<group>"; };
+		447781CA207B5C8400B4D8C9 /* REABlockNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = REABlockNode.m; sourceTree = "<group>"; };
+		447781CC207B60E800B4D8C9 /* REACondNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = REACondNode.h; sourceTree = "<group>"; };
+		447781CD207B60F300B4D8C9 /* REACondNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = REACondNode.m; sourceTree = "<group>"; };
 		4486EC442076263F008A0135 /* RCTReanimatedNodesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReanimatedNodesManager.h; sourceTree = "<group>"; };
 		4486EC452076263F008A0135 /* RCTAnimationUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAnimationUtils.h; sourceTree = "<group>"; };
 		4486EC472076263F008A0135 /* REAValueNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = REAValueNode.h; sourceTree = "<group>"; };
@@ -559,6 +565,10 @@
 				447781C220763EB000B4D8C9 /* REATransformNode.m */,
 				447781C6207693C300B4D8C9 /* REAPropsNode.h */,
 				447781C7207693D100B4D8C9 /* REAPropsNode.m */,
+				447781C9207B5C7900B4D8C9 /* REABlockNode.h */,
+				447781CA207B5C8400B4D8C9 /* REABlockNode.m */,
+				447781CC207B60E800B4D8C9 /* REACondNode.h */,
+				447781CD207B60F300B4D8C9 /* REACondNode.m */,
 			);
 			path = Nodes;
 			sourceTree = "<group>";
@@ -1047,10 +1057,12 @@
 			files = (
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
+				447781CE207B60F300B4D8C9 /* REACondNode.m in Sources */,
 				4486EC712076263F008A0135 /* REANodesManager.m in Sources */,
 				447781C520763FEA00B4D8C9 /* REAValueNode.m in Sources */,
 				444DA3621F223F3F00AA9BCA /* MBFingerTipWindow.m in Sources */,
 				4486EC762076340F008A0135 /* REAStyleNode.m in Sources */,
+				447781CB207B5C8400B4D8C9 /* REABlockNode.m in Sources */,
 				4486EC722076263F008A0135 /* REAModule.m in Sources */,
 				447781C8207693D100B4D8C9 /* REAPropsNode.m in Sources */,
 				4477819B20763D8000B4D8C9 /* REANode.m in Sources */,
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REABlockNode.h b/Example/ios/GestureHandler/NativeAnimation/Nodes/REABlockNode.h
@@ -0,0 +1,6 @@
+#import "REANode.h"
+
+@interface REABlockNode : REANode
+
+@end
+
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REABlockNode.m b/Example/ios/GestureHandler/NativeAnimation/Nodes/REABlockNode.m
@@ -0,0 +1,25 @@
+#import "REABlockNode.h"
+#import "REANodesManager.h"
+
+@implementation REABlockNode {
+  NSArray<NSNumber *> *_block;
+}
+
+- (instancetype)initWithID:(REANodeID)nodeID config:(NSDictionary<NSString *,id> *)config
+{
+  if ((self = [super initWithID:nodeID config:config])) {
+    _block = config[@"block"];
+  }
+  return self;
+}
+
+- (id)evaluate
+{
+  id result;
+  for (NSNumber *inputID in _block) {
+    result = [[self.nodesManager findNodeByID:inputID] value];
+  }
+  return result;
+}
+
+@end
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REACondNode.h b/Example/ios/GestureHandler/NativeAnimation/Nodes/REACondNode.h
@@ -0,0 +1,8 @@
+#import "REANode.h"
+
+@interface REACondNode : REANode
+
+@end
+
+
+
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REACondNode.m b/Example/ios/GestureHandler/NativeAnimation/Nodes/REACondNode.m
@@ -0,0 +1,29 @@
+#import "REACondNode.h"
+#import "REANodesManager.h"
+
+@implementation REACondNode {
+  NSNumber *_condNodeID;
+  NSNumber *_ifBlockID;
+  NSNumber *_elseBlockID;
+}
+
+- (instancetype)initWithID:(REANodeID)nodeID config:(NSDictionary<NSString *,id> *)config
+{
+  if ((self = [super initWithID:nodeID config:config])) {
+    _condNodeID = config[@"cond"];
+    _ifBlockID = config[@"ifBlock"];
+    _elseBlockID = config[@"elseBlock"];
+  }
+  return self;
+}
+
+- (id)evaluate
+{
+  id cond = [[self.nodesManager findNodeByID:_condNodeID] value];
+  if ([cond floatValue]) {
+    return [[self.nodesManager findNodeByID:_ifBlockID] value];
+  }
+  return [[self.nodesManager findNodeByID:_elseBlockID] value];
+}
+
+@end
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REANode.h b/Example/ios/GestureHandler/NativeAnimation/Nodes/REANode.h
@@ -23,6 +23,7 @@ typedef NSNumber* REANodeID;
 
 - (_Nullable id)evaluate;
 - (_Nullable id)value;
+- (void)markUpdated;
 
 - (void)addChild:(REANode *)child NS_REQUIRES_SUPER;
 - (void)removeChild:(REANode *)child NS_REQUIRES_SUPER;
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REANode.m b/Example/ios/GestureHandler/NativeAnimation/Nodes/REANode.m
@@ -8,7 +8,7 @@ @interface REANode ()
 
 @property (nonatomic) NSUInteger lastLoopID;
 @property (nonatomic) id memoizedValue;
-@property (nonatomic, copy, readonly) NSMapTable<REANodeID, REANode *> *childNodes;
+@property (nonatomic, nullable) NSMutableArray<REANode *> *childNodes;
 
 @end
 
@@ -54,21 +54,18 @@ - (id)value
 - (void)addChild:(REANode *)child
 {
   if (!_childNodes) {
-    _childNodes = [NSMapTable strongToWeakObjectsMapTable];
+    _childNodes = [NSMutableArray new];
   }
   if (child) {
-    [_childNodes setObject:child forKey:child.nodeID];
-    child.lastLoopID = 0;
+    [_childNodes addObject:child];
+    [self dangerouslyRescheduleEvaluate];
   }
 }
 
 - (void)removeChild:(REANode *)child
 {
-  if (!_childNodes) {
-    return;
-  }
   if (child) {
-    [_childNodes removeObjectForKey:child.nodeID];
+    [_childNodes removeObject:child];
   }
 }
 
@@ -101,7 +98,7 @@ + (void)runPropUpdates
     if ([node respondsToSelector:@selector(update)]) {
       [(id)node update];
     } else {
-      for (REANode *child in [node childNodes]) {
+      for (REANode *child in node.childNodes) {
         weak_FindAndUpdateNodes(child);
       }
     }
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REATransformNode.m b/Example/ios/GestureHandler/NativeAnimation/Nodes/REATransformNode.m
@@ -19,7 +19,7 @@ - (id)evaluate
 {
   NSMutableArray<NSDictionary *> *transform = [NSMutableArray arrayWithCapacity:_transformConfigs.count];
   for (NSDictionary *transformConfig in _transformConfigs) {
-    NSString *type = transformConfig[@"type"];
+    NSString *property = transformConfig[@"property"];
     REANodeID nodeID = transformConfig[@"nodeID"];
     NSNumber *value;
     if (nodeID) {
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REAValueNode.h b/Example/ios/GestureHandler/NativeAnimation/Nodes/REAValueNode.h
@@ -4,19 +4,8 @@
 
 @class REAValueNode;
 
-//@protocol RCTValueAnimatedNodeObserver <NSObject>
-//
-//- (void)animatedNode:(RCTValueAnimatedNode *)node didUpdateValue:(CGFloat)value;
-//
-//@end
-
 @interface REAValueNode : REANode
 
-//- (void)setOffset:(CGFloat)offset;
-//- (void)flattenOffset;
-//- (void)extractOffset;
-
-//@property (nonatomic, assign) CGFloat value;
-//@property (nonatomic, weak) id<RCTValueAnimatedNodeObserver> valueObserver;
+@property (nonatomic, nonnull) NSNumber *value;
 
 @end
diff --git a/Example/ios/GestureHandler/NativeAnimation/Nodes/REAValueNode.m b/Example/ios/GestureHandler/NativeAnimation/Nodes/REAValueNode.m
@@ -1,48 +1,26 @@
 #import "REAValueNode.h"
 
-@interface REAValueNode ()
-
-@property (nonatomic, assign) CGFloat offset;
-
-@end
-
 @implementation REAValueNode
 
 - (instancetype)initWithID:(REANodeID)nodeID
                     config:(NSDictionary<NSString *, id> *)config
 {
     if (self = [super initWithID:nodeID config:config]) {
-        _offset = [config[@"offset"] floatValue];
-//        _value = [self.config[@"value"] floatValue];
+        _value = config[@"value"];
     }
     return self;
 }
 
-//- (void)flattenOffset
-//{
-//    _value += _offset;
-//    _offset = 0;
-//}
-//
-//- (void)extractOffset
-//{
-//    _offset += _value;
-//    _value = 0;
-//}
-//
-//- (CGFloat)value
-//{
-//    return _value + _offset;
-//}
-//
-//- (void)setValue:(CGFloat)value
-//{
-//    _value = value;
-//
-//    if (_valueObserver) {
-//        [_valueObserver animatedNode:self didUpdateValue:_value];
-//    }
-//}
+- (void)setValue:(NSNumber *)value
+{
+  _value = value;
+  [self markUpdated];
+}
+
+- (id)evaluate
+{
+  return _value;
+}
 
 @end
 
diff --git a/Example/ios/GestureHandler/NativeAnimation/REANodesManager.m b/Example/ios/GestureHandler/NativeAnimation/REANodesManager.m
@@ -7,6 +7,8 @@
 #import "Nodes/REAStyleNode.h"
 #import "Nodes/REATransformNode.h"
 #import "Nodes/REAValueNode.h"
+#import "Nodes/REABlockNode.h"
+#import "Nodes/REACondNode.h"
 //#import "REAReanimatedNode.h"
 //#import "RCTAnimationDriver.h"
 //#import "RCTDiffClampAnimatedNode.h"
@@ -38,12 +40,18 @@ - (instancetype)initWithUIManager:(nonnull RCTUIManager *)uiManager
   if ((self = [super init])) {
     _uiManager = uiManager;
     _nodes = [NSMutableDictionary new];
+    [self startAnimationLoopIfNeeded];
 //    _eventDrivers = [NSMutableDictionary new];
 //    _activeAnimations = [NSMutableSet new];
   }
   return self;
 }
 
+- (REANode *)findNodeByID:(REANodeID)nodeID
+{
+  return _nodes[nodeID];
+}
+
 #pragma mark -- Graph
 
 - (void)createNode:(REANodeID)nodeID
@@ -53,9 +61,12 @@ - (void)createNode:(REANodeID)nodeID
   static dispatch_once_t mapToken;
   dispatch_once(&mapToken, ^{
     map = @{@"props": [REAPropsNode class],
-            @"style" : [REAStyleNode class],
-            @"transform" : [REATransformNode class],
-            @"value" : [REAValueNode class]};
+            @"style": [REAStyleNode class],
+            @"transform": [REATransformNode class],
+            @"value": [REAValueNode class],
+            @"block": [REABlockNode class],
+            @"cond": [REACondNode class]
+            };
   });
 
   NSString *nodeType = [RCTConvert NSString:config[@"type"]];
@@ -384,7 +395,8 @@ - (void)stopAnimationLoop
 
 - (void)onFrame:(CADisplayLink *)displayLink
 {
-  [self stopAnimationLoopIfNeeded];
+  [REANode runPropUpdates];
+//  [self stopAnimationLoopIfNeeded];
 }
 
 //- (void)stepAnimations:(CADisplayLink *)displaylink

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export default class AnimatedBlock extends AnimatedNode {`
`5`	`5`	`_array;`
`6`	`6`
`7`	`7`	`constructor(array) {`
`8`		`- super({ type: 'block' }, array);`
	`8`	`+ super({ type: 'block', block: array.map(n => n.__nodeID) }, array);`
`9`	`9`	`this._array = array;`
`10`	`10`	`}`
`11`	`11`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +#import "REANode.h"
++
 +@interface REABlockNode : REANode
++
 +@end
++