mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-24 04:16:00 +08:00
Fix NativeAnimation invalidation & races on iOS
Summary: This diff attempts to fix a number of iOS native animation bugs related to improper node invalidation and a race with view creation. The major issues were presented in #9120 as problems 3 and 3b, but I'll recap here: The invalidation model we use is overly complicated and incomplete. The proper combination of `_needsUpdate` and `_hasUpdated` will result in nodes values being recomputed. However, we do not invalidate nodes in all the places we should, e.g. if we create a new view and attach it to an existing value node (see example in #9120). This diff chooses to remove the `_hasUpdated` flag, and simply relies on the `_needsUpdate` flag to mark a node as dirty. We mark nodes as dirty when they are: - created - updated - attached to new parents - detached from old parents - attached to a view Calling `updateNodeIfNecessary` will, if necessary, compute all invalidated parent values before recomputing the node value. It will then apply the update, and mark the no Closes https://github.com/facebook/react-native/pull/10663 Differential Revision: D4120301 Pulled By: mkonicek fbshipit-source-id: e247afcb5d8c15999b8328c664b9f7e764d76a75
This commit is contained in:
committed by
Facebook Github Bot
parent
bf901d926e
commit
c858420b2d
@@ -8,35 +8,17 @@
|
||||
*/
|
||||
|
||||
#import "RCTPropsAnimatedNode.h"
|
||||
|
||||
#import "RCTAnimationUtils.h"
|
||||
#import "RCTNativeAnimatedModule.h"
|
||||
#import "RCTStyleAnimatedNode.h"
|
||||
#import "RCTValueAnimatedNode.h"
|
||||
#import "RCTViewPropertyMapper.h"
|
||||
|
||||
@implementation RCTPropsAnimatedNode
|
||||
{
|
||||
RCTStyleAnimatedNode *_parentNode;
|
||||
}
|
||||
|
||||
- (void)onAttachedToNode:(RCTAnimatedNode *)parent
|
||||
- (void)connectToView:(NSNumber *)viewTag uiManager:(RCTUIManager *)uiManager
|
||||
{
|
||||
[super onAttachedToNode:parent];
|
||||
if ([parent isKindOfClass:[RCTStyleAnimatedNode class]]) {
|
||||
_parentNode = (RCTStyleAnimatedNode *)parent;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)onDetachedFromNode:(RCTAnimatedNode *)parent
|
||||
{
|
||||
[super onDetachedFromNode:parent];
|
||||
if (_parentNode == parent) {
|
||||
_parentNode = nil;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)connectToView:(NSNumber *)viewTag animatedModule:(RCTNativeAnimatedModule *)animationModule
|
||||
{
|
||||
_propertyMapper = [[RCTViewPropertyMapper alloc] initWithViewTag:viewTag animationModule:animationModule];
|
||||
_propertyMapper = [[RCTViewPropertyMapper alloc] initWithViewTag:viewTag uiManager:uiManager];
|
||||
}
|
||||
|
||||
- (void)disconnectFromView:(NSNumber *)viewTag
|
||||
@@ -50,11 +32,36 @@
|
||||
[self performViewUpdatesIfNecessary];
|
||||
}
|
||||
|
||||
- (NSString *)propertyNameForParentTag:(NSNumber *)parentTag
|
||||
{
|
||||
__block NSString *propertyName;
|
||||
[self.config[@"props"] enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull property, NSNumber * _Nonnull tag, BOOL * _Nonnull stop) {
|
||||
if ([tag isEqualToNumber:parentTag]) {
|
||||
propertyName = property;
|
||||
*stop = YES;
|
||||
}
|
||||
}];
|
||||
return propertyName;
|
||||
}
|
||||
|
||||
- (void)performViewUpdatesIfNecessary
|
||||
{
|
||||
NSDictionary *updates = [_parentNode updatedPropsDictionary];
|
||||
if (updates.count) {
|
||||
[_propertyMapper updateViewWithDictionary:updates];
|
||||
NSMutableDictionary *props = [NSMutableDictionary dictionary];
|
||||
[self.parentNodes enumerateKeysAndObjectsUsingBlock:^(NSNumber * _Nonnull parentTag, RCTAnimatedNode * _Nonnull parentNode, BOOL * _Nonnull stop) {
|
||||
|
||||
if ([parentNode isKindOfClass:[RCTStyleAnimatedNode class]]) {
|
||||
[props addEntriesFromDictionary:[(RCTStyleAnimatedNode *)parentNode propsDictionary]];
|
||||
|
||||
} else if ([parentNode isKindOfClass:[RCTValueAnimatedNode class]]) {
|
||||
NSString *property = [self propertyNameForParentTag:parentTag];
|
||||
CGFloat value = [(RCTValueAnimatedNode *)parentNode value];
|
||||
[props setObject:@(value) forKey:property];
|
||||
}
|
||||
|
||||
}];
|
||||
|
||||
if (props.count) {
|
||||
[_propertyMapper updateViewWithDictionary:props];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user