Skip to content
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ internal class TrackingAnimatedNode(
if (valAnimatedNode != null) {
animationConfig.putDouble("toValue", valAnimatedNode.getValue())
} else {
animationConfig.putNull("toValue")
val drivenNode = nativeAnimatedNodesManager.getNodeById(valueNode) as? ValueAnimatedNode
if (drivenNode == null) {
return
}
animationConfig.putDouble("toValue", drivenNode.getValue())
}
nativeAnimatedNodesManager.startAnimatingNode(animationId, valueNode, animationConfig, null)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,44 @@ class NativeAnimatedNodeTraversalTest {
assertThat(previousValue).isEqualTo(1.5)
}

@Test
fun testTrackingSpringDoesNotCrashWhenToValueNodeIsDetached() {
val springConfig: JavaOnlyMap =
JavaOnlyMap.of(
"type",
"spring",
"stiffness",
230.2,
"damping",
22.0,
"mass",
1.0,
"initialVelocity",
0.0,
"restSpeedThreshold",
0.001,
"restDisplacementThreshold",
0.001,
"overshootClamping",
false,
)

createAnimatedGraphWithTrackingNode(springConfig)

nativeAnimatedNodesManager.setAnimatedNodeValue(1, 1.0)
nativeAnimatedNodesManager.runUpdates(nextFrameTime())

nativeAnimatedNodesManager.disconnectAnimatedNodes(1, 2)
nativeAnimatedNodesManager.dropAnimatedNode(1)

nativeAnimatedNodesManager.runUpdates(nextFrameTime())

val trackedNode = nativeAnimatedNodesManager.getNodeById(3) as? ValueAnimatedNode
assertThat(trackedNode).isNotNull
val trackedValue = checkNotNull(trackedNode).getValue()
assertThat(trackedValue.isNaN()).isFalse
}

companion object {
private const val FRAME_LEN_NANOS: Long = 1000000000L / 60L
private const val INITIAL_FRAME_TIME_NANOS: Long = 14599233201256L /* random */
Expand Down
Loading