Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions Libraries/Animated/src/AnimatedImplementation.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ var NativeAnimatedAPI = NativeAnimatedHelper.API;

var warnedMissingNativeAnimated = false;

function shouldUseNativeDriver(config: AnimationConfig | EventConfig): boolean {
function shouldUseNativeDriver(config?: AnimationConfig | EventConfig | AnimatedValueConfig): boolean {
if (!config) {
return false;
}
if (config.useNativeDriver &&
!NativeAnimatedHelper.isNativeAnimatedAvailable()) {
if (!warnedMissingNativeAnimated) {
Expand All@@ -48,7 +51,6 @@ function shouldUseNativeDriver(config: AnimationConfig | EventConfig): boolean {
}
return false;
}

return config.useNativeDriver || false;
}

Expand DownExpand Up@@ -682,6 +684,10 @@ class SpringAnimation extends Animation {
}
}

type AnimatedValueConfig = {
useNativeDriver?: bool;
};

type ValueListenerCallback = (state: {value: number}) => void;

var _uniqueId = 1;
Expand All@@ -700,12 +706,15 @@ class AnimatedValue extends AnimatedWithChildren {
_listeners: {[key: string]: ValueListenerCallback};
__nativeAnimatedValueListener: ?any;

constructor(value: number) {
constructor(value: number, config?: AnimatedValueConfig) {
super();
this._value = value;
this._offset = 0;
this._animation = null;
this._listeners = {};
if (shouldUseNativeDriver(config)) {
this.__makeNative();
}
}

__detach() {
Expand DownExpand Up@@ -964,7 +973,7 @@ class AnimatedValueXY extends AnimatedWithChildren {
y: AnimatedValue;
_listeners: {[key: string]: {x: string, y: string}};

constructor(valueIn?: ?{x: number | AnimatedValue, y: number | AnimatedValue}) {
constructor(valueIn?: ?{x: number | AnimatedValue, y: number | AnimatedValue}, config?: AnimatedValueConfig) {
super();
var value: any = valueIn || {x: 0, y: 0}; // @flowfixme: shouldn't need `: any`
if (typeof value.x === 'number' && typeof value.y === 'number') {
Expand All@@ -981,6 +990,9 @@ class AnimatedValueXY extends AnimatedWithChildren {
this.y = value.y;
}
this._listeners = {};
if (shouldUseNativeDriver(config)) {
this.__makeNative();
}
}

setValue(value: {x: number, y: number}) {
Expand DownExpand Up@@ -1955,6 +1967,9 @@ var spring = function(
value: AnimatedValue | AnimatedValueXY,
config: SpringAnimationConfig,
): CompositeAnimation {
if (value.__isNative) {
config.useNativeDriver = true;
}
return maybeVectorAnim(value, config, spring) || {
start: function(callback?: ?EndCallback): void {
callback = _combineCallbacks(callback, config);
Expand DownExpand Up@@ -1984,6 +1999,9 @@ var timing = function(
value: AnimatedValue | AnimatedValueXY,
config: TimingAnimationConfig,
): CompositeAnimation {
if (value.__isNative) {
config.useNativeDriver = true;
}
return maybeVectorAnim(value, config, timing) || {
start: function(callback?: ?EndCallback): void {
callback = _combineCallbacks(callback, config);
Expand DownExpand Up@@ -2013,6 +2031,9 @@ var decay = function(
value: AnimatedValue | AnimatedValueXY,
config: DecayAnimationConfig,
): CompositeAnimation {
if (value.__isNative) {
config.useNativeDriver = true;
}
return maybeVectorAnim(value, config, decay) || {
start: function(callback?: ?EndCallback): void {
callback = _combineCallbacks(callback, config);
Expand Down