mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
215 lines
5.9 KiB
Objective-C
215 lines
5.9 KiB
Objective-C
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import <React/RCTSpringAnimation.h>
|
|
|
|
#import <UIKit/UIKit.h>
|
|
|
|
#import <React/RCTConvert.h>
|
|
#import <React/RCTDefines.h>
|
|
|
|
#import <React/RCTAnimationUtils.h>
|
|
#import <React/RCTValueAnimatedNode.h>
|
|
|
|
@interface RCTSpringAnimation ()
|
|
|
|
@property (nonatomic, strong) NSNumber *animationId;
|
|
@property (nonatomic, strong) RCTValueAnimatedNode *valueNode;
|
|
@property (nonatomic, assign) BOOL animationHasBegun;
|
|
@property (nonatomic, assign) BOOL animationHasFinished;
|
|
|
|
@end
|
|
|
|
const NSTimeInterval MAX_DELTA_TIME = 0.064;
|
|
|
|
@implementation RCTSpringAnimation
|
|
{
|
|
CGFloat _toValue;
|
|
CGFloat _fromValue;
|
|
BOOL _overshootClamping;
|
|
CGFloat _restDisplacementThreshold;
|
|
CGFloat _restSpeedThreshold;
|
|
CGFloat _stiffness;
|
|
CGFloat _damping;
|
|
CGFloat _mass;
|
|
CGFloat _initialVelocity;
|
|
NSTimeInterval _animationStartTime;
|
|
NSTimeInterval _animationCurrentTime;
|
|
RCTResponseSenderBlock _callback;
|
|
|
|
CGFloat _lastPosition;
|
|
CGFloat _lastVelocity;
|
|
|
|
NSInteger _iterations;
|
|
NSInteger _currentLoop;
|
|
|
|
NSTimeInterval _t; // Current time (startTime + dt)
|
|
}
|
|
|
|
- (instancetype)initWithId:(NSNumber *)animationId
|
|
config:(NSDictionary *)config
|
|
forNode:(RCTValueAnimatedNode *)valueNode
|
|
callBack:(nullable RCTResponseSenderBlock)callback
|
|
{
|
|
if ((self = [super init])) {
|
|
_animationId = animationId;
|
|
_lastPosition = valueNode.value;
|
|
_valueNode = valueNode;
|
|
_lastVelocity = [RCTConvert CGFloat:config[@"initialVelocity"]];
|
|
_callback = [callback copy];
|
|
[self resetAnimationConfig:config];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)resetAnimationConfig:(NSDictionary *)config
|
|
{
|
|
NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
|
|
_toValue = [RCTConvert CGFloat:config[@"toValue"]];
|
|
_overshootClamping = [RCTConvert BOOL:config[@"overshootClamping"]];
|
|
_restDisplacementThreshold = [RCTConvert CGFloat:config[@"restDisplacementThreshold"]];
|
|
_restSpeedThreshold = [RCTConvert CGFloat:config[@"restSpeedThreshold"]];
|
|
_stiffness = [RCTConvert CGFloat:config[@"stiffness"]];
|
|
_damping = [RCTConvert CGFloat:config[@"damping"]];
|
|
_mass = [RCTConvert CGFloat:config[@"mass"]];
|
|
_initialVelocity = _lastVelocity;
|
|
_fromValue = _lastPosition;
|
|
_fromValue = _lastPosition;
|
|
_lastVelocity = _initialVelocity;
|
|
_animationHasFinished = iterations.integerValue == 0;
|
|
_iterations = iterations.integerValue;
|
|
_currentLoop = 1;
|
|
_animationStartTime = _animationCurrentTime = -1;
|
|
_animationHasBegun = YES;
|
|
}
|
|
|
|
RCT_NOT_IMPLEMENTED(- (instancetype)init)
|
|
|
|
- (void)startAnimation
|
|
{
|
|
_animationStartTime = _animationCurrentTime = -1;
|
|
_animationHasBegun = YES;
|
|
}
|
|
|
|
- (void)stopAnimation
|
|
{
|
|
_valueNode = nil;
|
|
if (_callback) {
|
|
_callback(@[@{
|
|
@"finished": @(_animationHasFinished)
|
|
}]);
|
|
}
|
|
}
|
|
|
|
- (void)stepAnimationWithTime:(NSTimeInterval)currentTime
|
|
{
|
|
if (!_animationHasBegun || _animationHasFinished) {
|
|
// Animation has not begun or animation has already finished.
|
|
return;
|
|
}
|
|
|
|
// calculate delta time
|
|
if(_animationStartTime == -1) {
|
|
_t = 0.0;
|
|
_animationStartTime = currentTime;
|
|
} else {
|
|
// Handle frame drops, and only advance dt by a max of MAX_DELTA_TIME
|
|
NSTimeInterval deltaTime = MIN(MAX_DELTA_TIME, currentTime - _animationCurrentTime);
|
|
_t = _t + deltaTime / RCTAnimationDragCoefficient();
|
|
}
|
|
|
|
// store the timestamp
|
|
_animationCurrentTime = currentTime;
|
|
|
|
CGFloat c = _damping;
|
|
CGFloat m = _mass;
|
|
CGFloat k = _stiffness;
|
|
CGFloat v0 = -_initialVelocity;
|
|
|
|
CGFloat zeta = c / (2 * sqrtf(k * m));
|
|
CGFloat omega0 = sqrtf(k / m);
|
|
CGFloat omega1 = omega0 * sqrtf(1.0 - (zeta * zeta));
|
|
CGFloat x0 = _toValue - _fromValue;
|
|
|
|
CGFloat position;
|
|
CGFloat velocity;
|
|
if (zeta < 1) {
|
|
// Under damped
|
|
CGFloat envelope = expf(-zeta * omega0 * _t);
|
|
position =
|
|
_toValue -
|
|
envelope *
|
|
((v0 + zeta * omega0 * x0) / omega1 * sinf(omega1 * _t) +
|
|
x0 * cosf(omega1 * _t));
|
|
// This looks crazy -- it's actually just the derivative of the
|
|
// oscillation function
|
|
velocity =
|
|
zeta *
|
|
omega0 *
|
|
envelope *
|
|
(sinf(omega1 * _t) * (v0 + zeta * omega0 * x0) / omega1 +
|
|
x0 * cosf(omega1 * _t)) -
|
|
envelope *
|
|
(cosf(omega1 * _t) * (v0 + zeta * omega0 * x0) -
|
|
omega1 * x0 * sinf(omega1 * _t));
|
|
} else {
|
|
CGFloat envelope = expf(-omega0 * _t);
|
|
position = _toValue - envelope * (x0 + (v0 + omega0 * x0) * _t);
|
|
velocity =
|
|
envelope * (v0 * (_t * omega0 - 1) + _t * x0 * (omega0 * omega0));
|
|
}
|
|
|
|
_lastPosition = position;
|
|
_lastVelocity = velocity;
|
|
|
|
[self onUpdate:position];
|
|
|
|
// Conditions for stopping the spring animation
|
|
BOOL isOvershooting = NO;
|
|
if (_overshootClamping && _stiffness != 0) {
|
|
if (_fromValue < _toValue) {
|
|
isOvershooting = position > _toValue;
|
|
} else {
|
|
isOvershooting = position < _toValue;
|
|
}
|
|
}
|
|
BOOL isVelocity = ABS(velocity) <= _restSpeedThreshold;
|
|
BOOL isDisplacement = YES;
|
|
if (_stiffness != 0) {
|
|
isDisplacement = ABS(_toValue - position) <= _restDisplacementThreshold;
|
|
}
|
|
|
|
if (isOvershooting || (isVelocity && isDisplacement)) {
|
|
if (_stiffness != 0) {
|
|
// Ensure that we end up with a round value
|
|
if (_animationHasFinished) {
|
|
return;
|
|
}
|
|
[self onUpdate:_toValue];
|
|
}
|
|
|
|
if (_iterations == -1 || _currentLoop < _iterations) {
|
|
_lastPosition = _fromValue;
|
|
_lastVelocity = _initialVelocity;
|
|
// Set _animationStartTime to -1 to reset instance variables on the next animation step.
|
|
_animationStartTime = -1;
|
|
_currentLoop++;
|
|
[self onUpdate:_fromValue];
|
|
} else {
|
|
_animationHasFinished = YES;
|
|
}
|
|
}
|
|
}
|
|
|
|
- (void)onUpdate:(CGFloat)outputValue
|
|
{
|
|
_valueNode.value = outputValue;
|
|
[_valueNode setNeedsUpdate];
|
|
}
|
|
|
|
@end
|