Swizzle RCTUIManager #4619
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #import <RNReanimated/REAAnimationsManager.h> | ||
|
|
||
| @interface REASwizzledUIManager : NSObject | ||
| - (instancetype)initWithUIManager:(RCTUIManager *)uiManager | ||
| withAnimatioinManager:(REAAnimationsManager *)animationsManager; | ||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| #import <Foundation/Foundation.h> | ||
| #import <RNReanimated/FeaturesConfig.h> | ||
| #import <RNReanimated/REAIOSScheduler.h> | ||
| #import <RNReanimated/REASwizzledUIManager.h> | ||
| #import <RNReanimated/REAUtils.h> | ||
| #import <RNReanimated/Scheduler.h> | ||
| #import <React/RCTComponentData.h> | ||
| #import <React/RCTLayoutAnimation.h> | ||
|
|
@@ -16,76 +17,65 @@ | |
| #endif | ||
|
|
||
| @interface RCTUIManager (REA) | ||
| - (NSArray<id<RCTComponent>> *)_childrenToRemoveFromContainer:(id<RCTComponent>)container | ||
| atIndices:(NSArray<NSNumber *> *)atIndices; | ||
| @end | ||
|
|
||
| @implementation REASwizzledUIManager { | ||
| REAAnimationsManager *_animationsManager; | ||
| RCTUIManager *_uiManager; | ||
| } | ||
|
|
||
| static REASwizzledUIManager *_reaUIManager; | ||
|
|
||
| - (instancetype)initWithUIManager:(RCTUIManager *)uiManager | ||
| withAnimatioinManager:(REAAnimationsManager *)animationsManager | ||
| { | ||
| if (self = [super init]) { | ||
| _animationsManager = animationsManager; | ||
| _uiManager = uiManager; | ||
| _reaUIManager = self; | ||
|
Member
There was a problem hiding this comment. I don't quite understand the need for this whole REASwizzledUIManager class to exists. Also, assigning singletons like that seem a bit risky. It seem to me that the reason it's been done this way was for the swizzled methods to be able to access _uiManager and _animationsManager fields. I think the former can just be replaced by As for the latter field, the best way IMO would be to use category on UIManager class that adds animationsManager property to it using associated object technique (https://nshipster.com/associated-objects/)
Member
Author
There was a problem hiding this comment.
|
||
| [self swizzleMethods]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)swizzleMethods | ||
| { | ||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
| [REAUtils swizzleMethod:@selector(uiBlockWithLayoutUpdateForRootView:) | ||
| forClass:[RCTUIManager class] | ||
| with:@selector(reanimated_uiBlockWithLayoutUpdateForRootView:) | ||
| fromClass:[self class]]; | ||
| SEL manageChildrenOriginal = @selector | ||
| (_manageChildren:moveFromIndices:moveToIndices:addChildReactTags:addAtIndices:removeAtIndices:registry:); | ||
| SEL manageChildrenReaniamted = | ||
| @selector(reanimated_manageChildren: | ||
| moveFromIndices:moveToIndices:addChildReactTags:addAtIndices:removeAtIndices:registry:); | ||
| [REAUtils swizzleMethod:manageChildrenOriginal | ||
| forClass:[RCTUIManager class] | ||
| with:manageChildrenReaniamted | ||
|
piaskowyk marked this conversation as resolved.
Outdated
|
||
| fromClass:[self class]]; | ||
| }); | ||
| } | ||
|
|
||
| - (void)reanimated_manageChildren:(NSNumber *)containerTag | ||
| moveFromIndices:(NSArray<NSNumber *> *)moveFromIndices | ||
| moveToIndices:(NSArray<NSNumber *> *)moveToIndices | ||
| addChildReactTags:(NSArray<NSNumber *> *)addChildReactTags | ||
| addAtIndices:(NSArray<NSNumber *> *)addAtIndices | ||
| removeAtIndices:(NSArray<NSNumber *> *)removeAtIndices | ||
| registry:(NSMutableDictionary<NSNumber *, id<RCTComponent>> *)registry | ||
| { | ||
| bool isLayoutAnimationEnabled = reanimated::FeaturesConfig::isLayoutAnimationEnabled(); | ||
| id<RCTComponent> container; | ||
| NSArray<id<RCTComponent>> *permanentlyRemovedChildren; | ||
| BOOL containerIsRootOfViewController = NO; | ||
| if (isLayoutAnimationEnabled) { | ||
| container = registry[containerTag]; | ||
| permanentlyRemovedChildren = [_reaUIManager->_uiManager _childrenToRemoveFromContainer:container | ||
| atIndices:removeAtIndices]; | ||
|
|
||
| if ([container isKindOfClass:[UIView class]]) { | ||
| UIViewController *controller = ((UIView *)container).reactViewController; | ||
|
|
@@ -97,22 +87,23 @@ - (void)_manageChildren:(NSNumber *)containerTag | |
| // of some view controller. In that case, we skip running exiting animations | ||
| // in its children, to prevent issues with RN Screens. | ||
| if (containerIsRootOfViewController) { | ||
| NSArray<id<RCTComponent>> *permanentlyRemovedChildren = | ||
| [_reaUIManager->_uiManager _childrenToRemoveFromContainer:container atIndices:removeAtIndices]; | ||
| for (UIView *view in permanentlyRemovedChildren) { | ||
| [_reaUIManager->_animationsManager endAnimationsRecursive:view]; | ||
| } | ||
| [_reaUIManager->_animationsManager removeAnimationsFromSubtree:(UIView *)container]; | ||
| } | ||
| } | ||
|
|
||
| // call original method | ||
| [self reanimated_manageChildren:containerTag | ||
| moveFromIndices:moveFromIndices | ||
| moveToIndices:moveToIndices | ||
| addChildReactTags:addChildReactTags | ||
| addAtIndices:addAtIndices | ||
| removeAtIndices:removeAtIndices | ||
| registry:registry]; | ||
|
|
||
| if (!isLayoutAnimationEnabled) { | ||
| return; | ||
|
|
@@ -132,25 +123,15 @@ - (void)_manageChildren:(NSNumber *)containerTag | |
| return [(NSNumber *)obj1[0] compare:(NSNumber *)obj2[0]]; | ||
| }]; | ||
|
|
||
| [_reaUIManager->_animationsManager reattachAnimatedChildren:permanentlyRemovedChildren | ||
| toContainer:container | ||
| atIndices:removeAtIndices]; | ||
| } | ||
|
|
||
| - (RCTViewManagerUIBlock)reanimated_uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *)rootShadowView | ||
| { | ||
| if (!reanimated::FeaturesConfig::isLayoutAnimationEnabled()) { | ||
| return [self reanimated_uiBlockWithLayoutUpdateForRootView:rootShadowView]; | ||
| } | ||
|
|
||
| NSHashTable<RCTShadowView *> *affectedShadowViews = [NSHashTable weakObjectsHashTable]; | ||
|
|
@@ -266,7 +247,8 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView * | |
| } | ||
|
|
||
| // Reanimated changes /start | ||
| REASnapshot *snapshotBefore = | ||
| isNew ? nil : [_reaUIManager->_animationsManager prepareSnapshotBeforeMountForView:view]; | ||
| snapshotsBefore[reactTag] = snapshotBefore; | ||
| // Reanimated changes /end | ||
|
|
||
|
|
@@ -327,7 +309,7 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView * | |
| REASnapshot *snapshotBefore = snapshotsBefore[reactTag]; | ||
|
|
||
| if (isNew || snapshotBefore != nil) { | ||
| [_reaUIManager->_animationsManager viewDidMount:view withBeforeSnapshot:snapshotBefore withNewFrame:frame]; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -336,52 +318,9 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView * | |
| // private field | ||
| [uiManager setNextLayoutAnimationGroup:nil]; | ||
|
|
||
| [_reaUIManager->_animationsManager viewsDidLayout]; | ||
| // Reanimated changes /end | ||
| }; | ||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #import <REAUtils.h> | ||
| #import <objc/runtime.h> | ||
|
|
||
| @implementation REAUtils | ||
|
|
||
| + (void)swizzleMethod:(SEL)originalSelector | ||
| forClass:(Class)originalClass | ||
| with:(SEL)newSelector | ||
| fromClass:(Class)newClass | ||
| { | ||
| Method originalMethod = class_getInstanceMethod(originalClass, originalSelector); | ||
| Method newMethod = class_getInstanceMethod(newClass, newSelector); | ||
| IMP originalImplementation = method_getImplementation(originalMethod); | ||
| IMP newImplementation = method_getImplementation(newMethod); | ||
| class_replaceMethod(originalClass, newSelector, originalImplementation, method_getTypeEncoding(originalMethod)); | ||
| class_replaceMethod(originalClass, originalSelector, newImplementation, method_getTypeEncoding(newMethod)); | ||
| } | ||
|
|
||
| @end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.