react-native-reanimated 3.19.0 → 3.19.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Common/cpp/reanimated/Fabric/PropsRegistry.cpp +13 -15
- package/Common/cpp/reanimated/Fabric/PropsRegistry.h +8 -6
- package/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp +23 -30
- package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp +15 -13
- package/android/build.gradle +3 -3
- package/android/src/main/cpp/reanimated/android/NativeProxy.cpp +14 -9
- package/android/src/main/cpp/reanimated/android/NativeProxy.h +4 -2
- package/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java +1 -2
- package/lib/module/animation/util.js +5 -3
- package/lib/module/animation/util.js.map +1 -1
- package/lib/module/component/ReducedMotionConfig.js +1 -1
- package/lib/module/layoutReanimation/web/animationParser.js.map +1 -1
- package/lib/module/layoutReanimation/web/componentUtils.js +44 -10
- package/lib/module/layoutReanimation/web/componentUtils.js.map +1 -1
- package/lib/module/layoutReanimation/web/config.js.map +1 -1
- package/lib/module/layoutReanimation/web/createAnimation.js +12 -0
- package/lib/module/layoutReanimation/web/createAnimation.js.map +1 -1
- package/lib/module/layoutReanimation/web/domUtils.js +1 -1
- package/lib/module/layoutReanimation/web/domUtils.js.map +1 -1
- package/lib/module/layoutReanimation/web/transition/Curved.web.js +1 -0
- package/lib/module/layoutReanimation/web/transition/Curved.web.js.map +1 -1
- package/lib/module/platform-specific/jsVersion.js +1 -1
- package/lib/module/runtimes.js +1 -1
- package/lib/module/threads.js +5 -5
- package/lib/typescript/animation/util.d.ts.map +1 -1
- package/lib/typescript/component/ReducedMotionConfig.d.ts +1 -1
- package/lib/typescript/layoutReanimation/web/animationParser.d.ts +3 -0
- package/lib/typescript/layoutReanimation/web/animationParser.d.ts.map +1 -1
- package/lib/typescript/layoutReanimation/web/componentUtils.d.ts.map +1 -1
- package/lib/typescript/layoutReanimation/web/config.d.ts +1 -1
- package/lib/typescript/layoutReanimation/web/config.d.ts.map +1 -1
- package/lib/typescript/layoutReanimation/web/createAnimation.d.ts.map +1 -1
- package/lib/typescript/layoutReanimation/web/transition/Curved.web.d.ts.map +1 -1
- package/lib/typescript/platform-specific/jsVersion.d.ts +1 -1
- package/lib/typescript/runtimes.d.ts +1 -1
- package/lib/typescript/threads.d.ts +5 -5
- package/package.json +1 -1
- package/scripts/reanimated_utils.rb +1 -1
- package/src/animation/util.ts +6 -4
- package/src/component/ReducedMotionConfig.tsx +1 -1
- package/src/layoutReanimation/web/animationParser.ts +3 -0
- package/src/layoutReanimation/web/componentUtils.ts +48 -11
- package/src/layoutReanimation/web/config.ts +4 -1
- package/src/layoutReanimation/web/createAnimation.ts +15 -0
- package/src/layoutReanimation/web/domUtils.ts +1 -1
- package/src/layoutReanimation/web/transition/Curved.web.ts +1 -0
- package/src/platform-specific/jsVersion.ts +1 -1
- package/src/runtimes.ts +1 -1
- package/src/threads.ts +5 -5
|
@@ -24,10 +24,9 @@ void PropsRegistry::update(
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
void PropsRegistry::for_each(
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
callback) const {
|
|
27
|
+
void PropsRegistry::for_each(std::function<void(
|
|
28
|
+
const ShadowNodeFamily &family,
|
|
29
|
+
const folly::dynamic &props)> callback) const {
|
|
31
30
|
for (const auto &[_, value] : map_) {
|
|
32
31
|
callback(value.first->getFamily(), value.second);
|
|
33
32
|
}
|
|
@@ -43,22 +42,21 @@ void PropsRegistry::unmarkNodeAsRemovable(Tag viewTag) {
|
|
|
43
42
|
}
|
|
44
43
|
|
|
45
44
|
void PropsRegistry::handleNodeRemovals(const RootShadowNode &rootShadowNode) {
|
|
46
|
-
|
|
47
|
-
it != removableShadowNodes_.end();) {
|
|
48
|
-
const auto &shadowNode = it->second;
|
|
49
|
-
const auto &family = shadowNode->getFamily();
|
|
50
|
-
const auto &ancestors = family.getAncestors(rootShadowNode);
|
|
45
|
+
RemovableShadowNodes remainingShadowNodes;
|
|
51
46
|
|
|
52
|
-
|
|
53
|
-
if (!
|
|
54
|
-
++it;
|
|
47
|
+
for (const auto &[tag, shadowNode] : removableShadowNodes_) {
|
|
48
|
+
if (!shadowNode) {
|
|
55
49
|
continue;
|
|
56
50
|
}
|
|
57
51
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
52
|
+
if (shadowNode->getFamily().getAncestors(rootShadowNode).empty()) {
|
|
53
|
+
map_.erase(tag);
|
|
54
|
+
} else {
|
|
55
|
+
remainingShadowNodes.emplace(tag, shadowNode);
|
|
56
|
+
}
|
|
61
57
|
}
|
|
58
|
+
|
|
59
|
+
removableShadowNodes_ = std::move(remainingShadowNodes);
|
|
62
60
|
}
|
|
63
61
|
|
|
64
62
|
void PropsRegistry::remove(const Tag tag) {
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
#include <react/renderer/components/root/RootShadowNode.h>
|
|
5
5
|
#include <react/renderer/core/ShadowNode.h>
|
|
6
6
|
|
|
7
|
+
#include <memory>
|
|
7
8
|
#include <unordered_map>
|
|
8
9
|
#include <utility>
|
|
9
10
|
|
|
@@ -21,10 +22,9 @@ class PropsRegistry {
|
|
|
21
22
|
const std::shared_ptr<const ShadowNode> &shadowNode,
|
|
22
23
|
folly::dynamic &&props);
|
|
23
24
|
|
|
24
|
-
void for_each(
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
callback) const;
|
|
25
|
+
void for_each(std::function<void(
|
|
26
|
+
const ShadowNodeFamily &family,
|
|
27
|
+
const folly::dynamic &props)> callback) const;
|
|
28
28
|
|
|
29
29
|
void remove(const Tag tag);
|
|
30
30
|
|
|
@@ -57,12 +57,14 @@ class PropsRegistry {
|
|
|
57
57
|
void handleNodeRemovals(const RootShadowNode &rootShadowNode);
|
|
58
58
|
|
|
59
59
|
private:
|
|
60
|
+
using RemovableShadowNodes =
|
|
61
|
+
std::unordered_map<Tag, std::shared_ptr<const ShadowNode>>;
|
|
62
|
+
|
|
60
63
|
std::unordered_map<
|
|
61
64
|
Tag,
|
|
62
65
|
std::pair<std::shared_ptr<const ShadowNode>, folly::dynamic>>
|
|
63
66
|
map_;
|
|
64
|
-
|
|
65
|
-
removableShadowNodes_;
|
|
67
|
+
RemovableShadowNodes removableShadowNodes_;
|
|
66
68
|
|
|
67
69
|
mutable std::mutex mutex_; // Protects `map_`.
|
|
68
70
|
|
|
@@ -261,9 +261,8 @@ void LayoutAnimationsProxy::handleRemovals(
|
|
|
261
261
|
node->unflattenedParent->removeChildFromUnflattenedTree(node); //???
|
|
262
262
|
if (node->state != MOVED) {
|
|
263
263
|
maybeCancelAnimation(node->tag);
|
|
264
|
-
filteredMutations.push_back(
|
|
265
|
-
|
|
266
|
-
node->mutation.oldChildShadowView));
|
|
264
|
+
filteredMutations.push_back(ShadowViewMutation::DeleteMutation(
|
|
265
|
+
node->mutation.oldChildShadowView));
|
|
267
266
|
nodeForTag_.erase(node->tag);
|
|
268
267
|
node->state = DELETED;
|
|
269
268
|
#ifdef LAYOUT_ANIMATIONS_LOGS
|
|
@@ -320,11 +319,10 @@ void LayoutAnimationsProxy::handleUpdatesAndEnterings(
|
|
|
320
319
|
auto layoutAnimationIt = layoutAnimations_.find(tag);
|
|
321
320
|
if (layoutAnimationIt == layoutAnimations_.end()) {
|
|
322
321
|
if (oldShadowViewsForReparentings.contains(tag)) {
|
|
323
|
-
filteredMutations.push_back(
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
mutation.index));
|
|
322
|
+
filteredMutations.push_back(ShadowViewMutation::InsertMutation(
|
|
323
|
+
mutationParent,
|
|
324
|
+
oldShadowViewsForReparentings[tag],
|
|
325
|
+
mutation.index));
|
|
328
326
|
} else {
|
|
329
327
|
filteredMutations.push_back(mutation);
|
|
330
328
|
}
|
|
@@ -332,9 +330,8 @@ void LayoutAnimationsProxy::handleUpdatesAndEnterings(
|
|
|
332
330
|
}
|
|
333
331
|
|
|
334
332
|
auto oldView = *layoutAnimationIt->second.currentView;
|
|
335
|
-
filteredMutations.push_back(
|
|
336
|
-
|
|
337
|
-
mutationParent, oldView, mutation.index));
|
|
333
|
+
filteredMutations.push_back(ShadowViewMutation::InsertMutation(
|
|
334
|
+
mutationParent, oldView, mutation.index));
|
|
338
335
|
if (movedViews.contains(tag)) {
|
|
339
336
|
layoutAnimationIt->second.parentTag = movedViews.at(tag);
|
|
340
337
|
}
|
|
@@ -356,9 +353,8 @@ void LayoutAnimationsProxy::handleUpdatesAndEnterings(
|
|
|
356
353
|
std::shared_ptr<ShadowView> newView =
|
|
357
354
|
cloneViewWithoutOpacity(mutation, propsParserContext);
|
|
358
355
|
|
|
359
|
-
filteredMutations.push_back(
|
|
360
|
-
|
|
361
|
-
mutation.newChildShadowView, *newView, mutationParent));
|
|
356
|
+
filteredMutations.push_back(ShadowViewMutation::UpdateMutation(
|
|
357
|
+
mutation.newChildShadowView, *newView, mutationParent));
|
|
362
358
|
break;
|
|
363
359
|
}
|
|
364
360
|
|
|
@@ -420,16 +416,15 @@ void LayoutAnimationsProxy::addOngoingAnimations(
|
|
|
420
416
|
newView->props = updateValues.newProps;
|
|
421
417
|
updateLayoutMetrics(newView->layoutMetrics, updateValues.frame);
|
|
422
418
|
|
|
423
|
-
mutations.push_back(
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
*newView,
|
|
419
|
+
mutations.push_back(ShadowViewMutation::UpdateMutation(
|
|
420
|
+
*layoutAnimation.currentView,
|
|
421
|
+
*newView,
|
|
427
422
|
#if REACT_NATIVE_MINOR_VERSION >= 78
|
|
428
|
-
|
|
423
|
+
layoutAnimation.parentTag
|
|
429
424
|
#else
|
|
430
|
-
|
|
425
|
+
*layoutAnimation.parentView
|
|
431
426
|
#endif // REACT_NATIVE_MINOR_VERSION >= 78
|
|
432
|
-
|
|
427
|
+
));
|
|
433
428
|
layoutAnimation.currentView = newView;
|
|
434
429
|
}
|
|
435
430
|
updateMap.clear();
|
|
@@ -554,9 +549,8 @@ bool LayoutAnimationsProxy::startAnimationsRecursively(
|
|
|
554
549
|
#ifdef LAYOUT_ANIMATIONS_LOGS
|
|
555
550
|
LOG(INFO) << "delete " << subNode->tag << std::endl;
|
|
556
551
|
#endif
|
|
557
|
-
mutations.push_back(
|
|
558
|
-
|
|
559
|
-
subNode->mutation.oldChildShadowView));
|
|
552
|
+
mutations.push_back(ShadowViewMutation::DeleteMutation(
|
|
553
|
+
subNode->mutation.oldChildShadowView));
|
|
560
554
|
} else {
|
|
561
555
|
subNode->state = WAITING;
|
|
562
556
|
}
|
|
@@ -697,16 +691,15 @@ void LayoutAnimationsProxy::startEnteringAnimation(
|
|
|
697
691
|
auto &mutex = strongThis->mutex;
|
|
698
692
|
auto lock = std::unique_lock<std::recursive_mutex>(mutex);
|
|
699
693
|
strongThis->layoutAnimations_.insert_or_assign(
|
|
700
|
-
tag,
|
|
701
|
-
|
|
702
|
-
finalView,
|
|
703
|
-
current,
|
|
694
|
+
tag, LayoutAnimation {
|
|
695
|
+
finalView, current,
|
|
704
696
|
#if REACT_NATIVE_MINOR_VERSION >= 78
|
|
705
|
-
|
|
697
|
+
mutation.parentTag,
|
|
706
698
|
#else
|
|
707
699
|
parent,
|
|
708
700
|
#endif // REACT_NATIVE_MINOR_VERSION >= 78
|
|
709
|
-
|
|
701
|
+
opacity
|
|
702
|
+
});
|
|
710
703
|
window = strongThis->surfaceManager.getWindow(
|
|
711
704
|
mutation.newChildShadowView.surfaceId);
|
|
712
705
|
}
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
|
|
37
37
|
namespace reanimated {
|
|
38
38
|
|
|
39
|
+
#ifdef RCT_NEW_ARCH_ENABLED
|
|
39
40
|
#if REACT_NATIVE_MINOR_VERSION >= 81
|
|
40
41
|
static inline std::shared_ptr<const ShadowNode> shadowNodeFromValue(
|
|
41
42
|
jsi::Runtime &rt,
|
|
@@ -43,7 +44,8 @@ static inline std::shared_ptr<const ShadowNode> shadowNodeFromValue(
|
|
|
43
44
|
return Bridging<std::shared_ptr<const ShadowNode>>::fromJs(
|
|
44
45
|
rt, shadowNodeWrapper);
|
|
45
46
|
}
|
|
46
|
-
#endif
|
|
47
|
+
#endif // REACT_NATIVE_MINOR_VERSION >= 81
|
|
48
|
+
#endif // RCT_NEW_ARCH_ENABLED
|
|
47
49
|
|
|
48
50
|
ReanimatedModuleProxy::ReanimatedModuleProxy(
|
|
49
51
|
const std::shared_ptr<WorkletsModuleProxy> &workletsModuleProxy,
|
|
@@ -57,14 +59,13 @@ ReanimatedModuleProxy::ReanimatedModuleProxy(
|
|
|
57
59
|
isReducedMotion_(isReducedMotion),
|
|
58
60
|
workletsModuleProxy_(workletsModuleProxy),
|
|
59
61
|
valueUnpackerCode_(workletsModuleProxy->getValueUnpackerCode()),
|
|
60
|
-
uiWorkletRuntime_(
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
valueUnpackerCode_)),
|
|
62
|
+
uiWorkletRuntime_(std::make_shared<WorkletRuntime>(
|
|
63
|
+
rnRuntime,
|
|
64
|
+
workletsModuleProxy->getJSQueue(),
|
|
65
|
+
workletsModuleProxy->getJSScheduler(),
|
|
66
|
+
"Reanimated UI runtime",
|
|
67
|
+
true /* supportsLocking */,
|
|
68
|
+
valueUnpackerCode_)),
|
|
68
69
|
eventHandlerRegistry_(std::make_unique<EventHandlerRegistry>()),
|
|
69
70
|
requestRender_(platformDepMethodsHolder.requestRender),
|
|
70
71
|
animatedSensorModule_(platformDepMethodsHolder),
|
|
@@ -410,10 +411,9 @@ std::string ReanimatedModuleProxy::obtainPropFromShadowNode(
|
|
|
410
411
|
}
|
|
411
412
|
}
|
|
412
413
|
|
|
413
|
-
throw std::runtime_error(
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
"` with function `getViewProp` is not supported"));
|
|
414
|
+
throw std::runtime_error(std::string(
|
|
415
|
+
"Getting property `" + propName +
|
|
416
|
+
"` with function `getViewProp` is not supported"));
|
|
417
417
|
}
|
|
418
418
|
|
|
419
419
|
jsi::Value ReanimatedModuleProxy::getViewProp(
|
|
@@ -621,6 +621,7 @@ void ReanimatedModuleProxy::cleanupSensors() {
|
|
|
621
621
|
void ReanimatedModuleProxy::markNodeAsRemovable(
|
|
622
622
|
jsi::Runtime &rt,
|
|
623
623
|
const jsi::Value &shadowNodeWrapper) {
|
|
624
|
+
auto lock = propsRegistry_->createLock();
|
|
624
625
|
auto shadowNode = shadowNodeFromValue(rt, shadowNodeWrapper);
|
|
625
626
|
propsRegistry_->markNodeAsRemovable(shadowNode);
|
|
626
627
|
}
|
|
@@ -628,6 +629,7 @@ void ReanimatedModuleProxy::markNodeAsRemovable(
|
|
|
628
629
|
void ReanimatedModuleProxy::unmarkNodeAsRemovable(
|
|
629
630
|
jsi::Runtime &rt,
|
|
630
631
|
const jsi::Value &viewTag) {
|
|
632
|
+
auto lock = propsRegistry_->createLock();
|
|
631
633
|
propsRegistry_->unmarkNodeAsRemovable(viewTag.asNumber());
|
|
632
634
|
}
|
|
633
635
|
|
package/android/build.gradle
CHANGED
|
@@ -332,8 +332,8 @@ android {
|
|
|
332
332
|
extractSO
|
|
333
333
|
}
|
|
334
334
|
compileOptions {
|
|
335
|
-
sourceCompatibility JavaVersion.
|
|
336
|
-
targetCompatibility JavaVersion.
|
|
335
|
+
sourceCompatibility JavaVersion.VERSION_17
|
|
336
|
+
targetCompatibility JavaVersion.VERSION_17
|
|
337
337
|
}
|
|
338
338
|
sourceSets.main {
|
|
339
339
|
java {
|
|
@@ -380,7 +380,7 @@ android {
|
|
|
380
380
|
|
|
381
381
|
def assertMinimalReactNativeVersion = task assertMinimalReactNativeVersionTask {
|
|
382
382
|
// If you change the minimal React Native version remember to update Compatibility Table in docs
|
|
383
|
-
def minimalReactNativeVersion =
|
|
383
|
+
def minimalReactNativeVersion = 78
|
|
384
384
|
onlyIf { REACT_NATIVE_MINOR_VERSION < minimalReactNativeVersion }
|
|
385
385
|
doFirst {
|
|
386
386
|
throw new GradleException("[Reanimated] Unsupported React Native version. Please use $minimalReactNativeVersion. or newer.")
|
|
@@ -41,7 +41,9 @@ NativeProxy::NativeProxy(
|
|
|
41
41
|
)
|
|
42
42
|
: javaPart_(jni::make_global(jThis)),
|
|
43
43
|
rnRuntime_(rnRuntime),
|
|
44
|
-
layoutAnimations_(
|
|
44
|
+
layoutAnimations_(
|
|
45
|
+
std::make_shared<jni::global_ref<LayoutAnimations::javaobject>>(
|
|
46
|
+
std::move(layoutAnimations))),
|
|
45
47
|
reanimatedModuleProxy_(std::make_shared<ReanimatedModuleProxy>(
|
|
46
48
|
workletsModuleProxy,
|
|
47
49
|
*rnRuntime,
|
|
@@ -407,8 +409,9 @@ void NativeProxy::progressLayoutAnimation(
|
|
|
407
409
|
const jsi::Object &newProps,
|
|
408
410
|
bool isSharedTransition) {
|
|
409
411
|
auto newPropsJNI = JNIHelper::ConvertToPropsMap(rt, newProps);
|
|
410
|
-
(*layoutAnimations_)
|
|
411
|
-
|
|
412
|
+
(*layoutAnimations_)
|
|
413
|
+
->cthis()
|
|
414
|
+
->progressLayoutAnimation(tag, newPropsJNI, isSharedTransition);
|
|
412
415
|
}
|
|
413
416
|
|
|
414
417
|
PlatformDepMethodsHolder NativeProxy::getPlatformDependentMethods() {
|
|
@@ -450,12 +453,14 @@ PlatformDepMethodsHolder NativeProxy::getPlatformDependentMethods() {
|
|
|
450
453
|
auto progressLayoutAnimation =
|
|
451
454
|
bindThis(&NativeProxy::progressLayoutAnimation);
|
|
452
455
|
|
|
453
|
-
auto endLayoutAnimation =
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
456
|
+
auto endLayoutAnimation =
|
|
457
|
+
[layoutAnimationsWeak =
|
|
458
|
+
std::weak_ptr<jni::global_ref<LayoutAnimations::javaobject>>(
|
|
459
|
+
layoutAnimations_)](int tag, bool removeView) {
|
|
460
|
+
if (auto layoutAnimations = layoutAnimationsWeak.lock()) {
|
|
461
|
+
(*layoutAnimations)->cthis()->endLayoutAnimation(tag, removeView);
|
|
462
|
+
}
|
|
463
|
+
};
|
|
459
464
|
|
|
460
465
|
auto maybeFlushUiUpdatesQueueFunction =
|
|
461
466
|
bindThis(&NativeProxy::maybeFlushUIUpdatesQueue);
|
|
@@ -168,8 +168,10 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
|
|
|
168
168
|
friend HybridBase;
|
|
169
169
|
jni::global_ref<NativeProxy::javaobject> javaPart_;
|
|
170
170
|
jsi::Runtime *rnRuntime_;
|
|
171
|
-
// We keep a shared_ptr to a jni::global_ref because you can't make weak_ptrs
|
|
172
|
-
|
|
171
|
+
// We keep a shared_ptr to a jni::global_ref because you can't make weak_ptrs
|
|
172
|
+
// from jni::global_ref.
|
|
173
|
+
std::shared_ptr<jni::global_ref<LayoutAnimations::javaobject>>
|
|
174
|
+
layoutAnimations_;
|
|
173
175
|
std::shared_ptr<ReanimatedModuleProxy> reanimatedModuleProxy_;
|
|
174
176
|
#ifndef NDEBUG
|
|
175
177
|
void checkJavaVersion(jsi::Runtime &);
|
|
@@ -9,8 +9,7 @@ import java.lang.reflect.Field;
|
|
|
9
9
|
import java.util.concurrent.Callable;
|
|
10
10
|
import java.util.concurrent.Future;
|
|
11
11
|
|
|
12
|
-
// This class is an almost exact copy of MessageQueueThreadImpl
|
|
13
|
-
// https://github.com/facebook/react-native/blob/main/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
|
|
12
|
+
// This class is an almost exact copy of MessageQueueThreadImpl from the React Native source code.
|
|
14
13
|
// The only method that has changed is `quitSynchronous()` (see comment above
|
|
15
14
|
// function implementation for details).
|
|
16
15
|
@DoNotStrip
|
|
@@ -194,17 +194,18 @@ function decorateAnimation(animation) {
|
|
|
194
194
|
animation[i].onStart(animation[i], RGBAValue[index], timestamp, previousAnimation ? previousAnimation[i] : undefined);
|
|
195
195
|
res.push(animation[i].current);
|
|
196
196
|
});
|
|
197
|
+
animation.unroundedCurrent = res;
|
|
197
198
|
|
|
198
199
|
// We need to clamp the res values to make sure they are in the correct RGBA range
|
|
199
200
|
clampRGBA(res);
|
|
200
201
|
animation.current = rgbaArrayToRGBAColor(toGammaSpace(res));
|
|
201
202
|
};
|
|
202
203
|
const colorOnFrame = (animation, timestamp) => {
|
|
203
|
-
const RGBACurrent = toLinearSpace(convertToRGBA(animation.current));
|
|
204
204
|
const res = [];
|
|
205
205
|
let finished = true;
|
|
206
|
-
|
|
207
|
-
|
|
206
|
+
// We must restore nonscale current to ever end the animation.
|
|
207
|
+
animation.current = animation.nonscaledCurrent;
|
|
208
|
+
tab.forEach(i => {
|
|
208
209
|
const result = animation[i].onFrame(animation[i], timestamp);
|
|
209
210
|
// We really need to assign this value to result, instead of passing it directly - otherwise once "finished" is false, onFrame won't be called
|
|
210
211
|
finished = finished && result;
|
|
@@ -213,6 +214,7 @@ function decorateAnimation(animation) {
|
|
|
213
214
|
|
|
214
215
|
// We need to clamp the res values to make sure they are in the correct RGBA range
|
|
215
216
|
clampRGBA(res);
|
|
217
|
+
animation.nonscaledCurrent = res;
|
|
216
218
|
animation.current = rgbaArrayToRGBAColor(toGammaSpace(res));
|
|
217
219
|
return finished;
|
|
218
220
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["clampRGBA","convertToRGBA","isColor","rgbaArrayToRGBAColor","toGammaSpace","toLinearSpace","isWorkletFunction","ReduceMotion","ReanimatedError","logger","shouldBeUseWeb","ReducedMotionManager","runOnUI","addMatrices","decomposeMatrixIntoMatricesAndAngles","flatten","getRotationMatrix","isAffineMatrixFlat","multiplyMatrices","scaleMatrix","subtractMatrices","IN_STYLE_UPDATER","SHOULD_BE_USE_WEB","LAYOUT_ANIMATION_SUPPORTED_PROPS","originX","originY","width","height","borderRadius","globalOriginX","globalOriginY","opacity","transform","backgroundColor","isValidLayoutAnimationProp","prop","__DEV__","jsValue","warn","assertEasingIsWorklet","easing","_WORKLET","factory","initialUpdaterRun","updater","result","recognizePrefixSuffix","value","match","prefix","suffix","number","strippedValue","parseFloat","isReduceMotionOnUI","uiValue","getReduceMotionFromConfig","config","System","Always","getReduceMotionForAnimation","undefined","applyProgressToMatrix","progress","a","b","applyProgressToNumber","decorateAnimation","animation","baseOnStart","onStart","baseOnFrame","onFrame","isHigherOrder","timestamp","previousAnimation","reduceMotion","animationCopy","Object","assign","callback","prefNumberSuffOnStart","__prefix","__suffix","strippedCurrent","strippedToValue","toValue","current","startValue","paPrefix","paSuffix","paStrippedValue","prefNumberSuffOnFrame","res","tab","colorOnStart","RGBAValue","RGBACurrent","RGBAToValue","forEach","i","index","push","colorOnFrame","finished","transformationMatrixOnStart","startMatrices","stopMatrices","transformationMatrixOnFrame","transforms","mappedTransforms","key","_","currentTranslation","currentScale","skewMatrix","rotations","mappedRotations","angle","rotationMatrixX","rotationMatrixY","rotationMatrixZ","rotationMatrix","updated","arrayOnStart","v","arrayOnFrame","objectOnStart","objectOnFrame","newObject","startTime","Array","isArray","defineAnimation","starting","create","__isAnimationDefinition","cancelAnimationNative","sharedValue","cancelAnimationWeb","cancelAnimation"],"sourceRoot":"../../../src","sources":["animation/util.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["clampRGBA","convertToRGBA","isColor","rgbaArrayToRGBAColor","toGammaSpace","toLinearSpace","isWorkletFunction","ReduceMotion","ReanimatedError","logger","shouldBeUseWeb","ReducedMotionManager","runOnUI","addMatrices","decomposeMatrixIntoMatricesAndAngles","flatten","getRotationMatrix","isAffineMatrixFlat","multiplyMatrices","scaleMatrix","subtractMatrices","IN_STYLE_UPDATER","SHOULD_BE_USE_WEB","LAYOUT_ANIMATION_SUPPORTED_PROPS","originX","originY","width","height","borderRadius","globalOriginX","globalOriginY","opacity","transform","backgroundColor","isValidLayoutAnimationProp","prop","__DEV__","jsValue","warn","assertEasingIsWorklet","easing","_WORKLET","factory","initialUpdaterRun","updater","result","recognizePrefixSuffix","value","match","prefix","suffix","number","strippedValue","parseFloat","isReduceMotionOnUI","uiValue","getReduceMotionFromConfig","config","System","Always","getReduceMotionForAnimation","undefined","applyProgressToMatrix","progress","a","b","applyProgressToNumber","decorateAnimation","animation","baseOnStart","onStart","baseOnFrame","onFrame","isHigherOrder","timestamp","previousAnimation","reduceMotion","animationCopy","Object","assign","callback","prefNumberSuffOnStart","__prefix","__suffix","strippedCurrent","strippedToValue","toValue","current","startValue","paPrefix","paSuffix","paStrippedValue","prefNumberSuffOnFrame","res","tab","colorOnStart","RGBAValue","RGBACurrent","RGBAToValue","forEach","i","index","push","unroundedCurrent","colorOnFrame","finished","nonscaledCurrent","transformationMatrixOnStart","startMatrices","stopMatrices","transformationMatrixOnFrame","transforms","mappedTransforms","key","_","currentTranslation","currentScale","skewMatrix","rotations","mappedRotations","angle","rotationMatrixX","rotationMatrixY","rotationMatrixZ","rotationMatrix","updated","arrayOnStart","v","arrayOnFrame","objectOnStart","objectOnFrame","newObject","startTime","Array","isArray","defineAnimation","starting","create","__isAnimationDefinition","cancelAnimationNative","sharedValue","cancelAnimationWeb","cancelAnimation"],"sourceRoot":"../../../src","sources":["animation/util.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -11,7 +11,7 @@ import { isReducedMotionEnabledInSystem, ReducedMotionManager } from "../Reduced
|
|
|
11
11
|
*
|
|
12
12
|
* @param mode - Determines default reduce motion behavior globally in your
|
|
13
13
|
* application. Configured with {@link ReduceMotion} enum.
|
|
14
|
-
* @see https://docs.swmansion.com/react-native-reanimated/docs/
|
|
14
|
+
* @see https://docs.swmansion.com/react-native-reanimated/docs/3.x/device/ReducedMotionConfig/
|
|
15
15
|
*/
|
|
16
16
|
export function ReducedMotionConfig({
|
|
17
17
|
mode
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["WebEasings","convertAnimationObjectToKeyframes","animationObject","keyframe","name","timestamp","style","Object","entries","step","property","values","easingName","toString","forEach","value","transformProperty","transformPropertyValue"],"sourceRoot":"../../../../src","sources":["layoutReanimation/web/animationParser.ts"],"mappings":"AAAA,YAAY;;
|
|
1
|
+
{"version":3,"names":["WebEasings","convertAnimationObjectToKeyframes","animationObject","keyframe","name","timestamp","style","Object","entries","step","property","values","easingName","toString","forEach","value","transformProperty","transformPropertyValue"],"sourceRoot":"../../../../src","sources":["layoutReanimation/web/animationParser.ts"],"mappings":"AAAA,YAAY;;AAKZ,SAASA,UAAU,QAAQ,iBAAc;AAwCzC,OAAO,SAASC,iCAAiCA,CAC/CC,eAA8B,EAC9B;EACA,IAAIC,QAAQ,GAAG,cAAcD,eAAe,CAACE,IAAI,KAAK;EAEtD,KAAK,MAAM,CAACC,SAAS,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACN,eAAe,CAACI,KAAK,CAAC,EAAE;IACtE,MAAMG,IAAI,GACRJ,SAAS,KAAK,MAAM,GAAG,CAAC,GAAGA,SAAS,KAAK,IAAI,GAAG,GAAG,GAAGA,SAAS;IAEjEF,QAAQ,IAAI,GAAGM,IAAI,MAAM;IAEzB,KAAK,MAAM,CAACC,QAAQ,EAAEC,MAAM,CAAC,IAAIJ,MAAM,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;MACtD,IAAII,QAAQ,KAAK,QAAQ,EAAE;QACzB,IAAIE,UAA2B,GAAG,QAAQ;QAE1C,IAAID,MAAM,IAAIX,UAAU,EAAE;UACxBY,UAAU,GAAGD,MAAM;QACrB,CAAC,MAAM,IAAIA,MAAM,CAACP,IAAI,IAAIJ,UAAU,EAAE;UACpCY,UAAU,GAAGD,MAAM,CAACP,IAAI;QAC1B;QAEAD,QAAQ,IAAI,2CAA2CH,UAAU,CAC/DY,UAAU,CACX,CAACC,QAAQ,CAAC,CAAC,IAAI;QAEhB;MACF;MAEA,IAAIH,QAAQ,KAAK,SAAS,EAAE;QAC1BP,QAAQ,IAAI,SAASQ,MAAM,MAAM;QACjC;MACF;MAEA,IAAID,QAAQ,KAAK,SAAS,EAAE;QAC1BP,QAAQ,IAAI,QAAQQ,MAAM,MAAM;QAChC;MACF;MAEA,IAAID,QAAQ,KAAK,WAAW,EAAE;QAC5BP,QAAQ,IAAI,GAAGO,QAAQ,KAAKC,MAAM,IAAI;QACtC;MACF;MAEAR,QAAQ,IAAI,YAAY;MAExBQ,MAAM,CAACG,OAAO,CAAEC,KAAuC,IAAK;QAC1D,KAAK,MAAM,CACTC,iBAAiB,EACjBC,sBAAsB,CACvB,IAAIV,MAAM,CAACC,OAAO,CAACO,KAAK,CAAC,EAAE;UAC1BZ,QAAQ,IAAI,IAAIa,iBAAiB,IAAIC,sBAAsB,GAAG;QAChE;MACF,CAAC,CAAC;MACFd,QAAQ,IAAI,IAAI,CAAC,CAAC;IACpB;IACAA,QAAQ,IAAI,IAAI,CAAC,CAAC;EACpB;EACAA,QAAQ,IAAI,IAAI,CAAC,CAAC;;EAElB,OAAOA,QAAQ;AACjB","ignoreList":[]}
|
|
@@ -117,23 +117,30 @@ export function setElementAnimation(element, animationConfig, shouldSavePosition
|
|
|
117
117
|
} else {
|
|
118
118
|
configureAnimation();
|
|
119
119
|
}
|
|
120
|
+
const maybeRemoveElement = () => {
|
|
121
|
+
if (element.reanimatedDummy && parent?.contains(element)) {
|
|
122
|
+
element.removedAfterAnimation = true;
|
|
123
|
+
parent.removeChild(element);
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
let wasCallbackCalled = false;
|
|
127
|
+
const maybeCallCallback = finished => {
|
|
128
|
+
if (!wasCallbackCalled && animationConfig.callback) {
|
|
129
|
+
animationConfig.callback(finished);
|
|
130
|
+
wasCallbackCalled = true;
|
|
131
|
+
}
|
|
132
|
+
};
|
|
120
133
|
element.onanimationend = () => {
|
|
121
134
|
if (shouldSavePosition) {
|
|
122
135
|
saveSnapshot(element);
|
|
123
136
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
parent.removeChild(element);
|
|
127
|
-
}
|
|
128
|
-
animationConfig.callback?.(true);
|
|
137
|
+
maybeRemoveElement();
|
|
138
|
+
maybeCallCallback(true);
|
|
129
139
|
element.removeEventListener('animationcancel', animationCancelHandler);
|
|
130
140
|
};
|
|
131
141
|
const animationCancelHandler = () => {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
element.removedAfterAnimation = true;
|
|
135
|
-
parent.removeChild(element);
|
|
136
|
-
}
|
|
142
|
+
maybeRemoveElement();
|
|
143
|
+
maybeCallCallback(false);
|
|
137
144
|
element.removeEventListener('animationcancel', animationCancelHandler);
|
|
138
145
|
};
|
|
139
146
|
|
|
@@ -151,6 +158,8 @@ export function setElementAnimation(element, animationConfig, shouldSavePosition
|
|
|
151
158
|
if (shouldSavePosition) {
|
|
152
159
|
setElementPosition(element, snapshots.get(element));
|
|
153
160
|
}
|
|
161
|
+
maybeRemoveElement();
|
|
162
|
+
maybeCallCallback(false);
|
|
154
163
|
});
|
|
155
164
|
}
|
|
156
165
|
}
|
|
@@ -221,6 +230,20 @@ export function handleExitingAnimation(element, animationConfig) {
|
|
|
221
230
|
element.style.animationName = '';
|
|
222
231
|
dummy.style.animationName = '';
|
|
223
232
|
|
|
233
|
+
// Moving elements in DOM resets their scroll positions
|
|
234
|
+
// so we memorize them here and restore after
|
|
235
|
+
const scrollPositions = new Map();
|
|
236
|
+
const saveScrollPosition = node => {
|
|
237
|
+
scrollPositions.set(node, {
|
|
238
|
+
top: node.scrollTop,
|
|
239
|
+
left: node.scrollLeft
|
|
240
|
+
});
|
|
241
|
+
for (const child of Array.from(node.children)) {
|
|
242
|
+
saveScrollPosition(child);
|
|
243
|
+
}
|
|
244
|
+
};
|
|
245
|
+
saveScrollPosition(element);
|
|
246
|
+
|
|
224
247
|
// After cloning the element, we want to move all children from original element to its clone. This is because original element
|
|
225
248
|
// will be unmounted, therefore when this code executes in child component, parent will be either empty or removed soon.
|
|
226
249
|
// Using element.cloneNode(true) doesn't solve the problem, because it creates copy of children and we won't be able to set their animations
|
|
@@ -230,6 +253,17 @@ export function handleExitingAnimation(element, animationConfig) {
|
|
|
230
253
|
dummy.appendChild(element.firstChild);
|
|
231
254
|
}
|
|
232
255
|
parent?.appendChild(dummy);
|
|
256
|
+
const restoreScrollPosition = node => {
|
|
257
|
+
const scrollPosition = scrollPositions.get(node === dummy ? element : node);
|
|
258
|
+
if (scrollPosition) {
|
|
259
|
+
node.scrollTop = scrollPosition.top;
|
|
260
|
+
node.scrollLeft = scrollPosition.left;
|
|
261
|
+
}
|
|
262
|
+
for (const child of Array.from(node.children)) {
|
|
263
|
+
restoreScrollPosition(child);
|
|
264
|
+
}
|
|
265
|
+
};
|
|
266
|
+
restoreScrollPosition(dummy);
|
|
233
267
|
const snapshot = snapshots.get(element);
|
|
234
268
|
const scrollOffsets = getElementScrollValue(element);
|
|
235
269
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["LayoutAnimationType","ReduceMotion","EasingNameSymbol","logger","_updatePropsJS","ReducedMotionManager","Keyframe","setElementPosition","snapshots","Animations","TransitionType","TransitionGenerator","scheduleAnimationCleanup","getEasingByName","WebEasings","prepareCurvedTransition","getEasingFromConfig","config","easingV","easingName","warn","getRandomDelay","maxDelay","Math","floor","random","getDelayFromConfig","shouldRandomizeDelay","randomizeDelay","delay","delayV","getReducedMotionFromConfig","reduceMotionV","jsValue","Never","Always","getDurationFromConfig","animationName","defaultDuration","duration","durationV","undefined","getCallbackFromConfig","callbackV","getReversedFromConfig","reversed","getProcessedConfig","animationType","easing","callback","maybeModifyStyleForKeyframe","element","style","animationFillMode","timestampRules","Object","values","definitions","position","saveSnapshot","rect","getBoundingClientRect","snapshot","top","left","width","height","scrollOffsets","getElementScrollValue","set","setElementAnimation","animationConfig","shouldSavePosition","parent","configureAnimation","animationDuration","animationDelay","animationTimingFunction","ENTERING","requestAnimationFrame","onanimationend","contains","removedAfterAnimation","removeChild","removeEventListener","animationCancelHandler","onanimationstart","visibility","addEventListener","get","handleLayoutTransition","transitionData","LINEAR","SEQUENCED","FADING","JUMPING","CURVED","ENTRY_EXIT","transitionKeyframeName","dummyTransitionKeyframeName","dummy","dummyAnimationConfig","current","scrollTopOffset","scrollLeftOffset","scrollTop","scrollLeft","parentElement","handleExitingAnimation","offsetParent","cloneNode","reanimatedDummy","firstChild","appendChild","currentScrollTopOffset","lastScrollTopOffset","currentScrollLeftOffset","lastScrollLeftOffset"],"sourceRoot":"../../../../src","sources":["layoutReanimation/web/componentUtils.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["LayoutAnimationType","ReduceMotion","EasingNameSymbol","logger","_updatePropsJS","ReducedMotionManager","Keyframe","setElementPosition","snapshots","Animations","TransitionType","TransitionGenerator","scheduleAnimationCleanup","getEasingByName","WebEasings","prepareCurvedTransition","getEasingFromConfig","config","easingV","easingName","warn","getRandomDelay","maxDelay","Math","floor","random","getDelayFromConfig","shouldRandomizeDelay","randomizeDelay","delay","delayV","getReducedMotionFromConfig","reduceMotionV","jsValue","Never","Always","getDurationFromConfig","animationName","defaultDuration","duration","durationV","undefined","getCallbackFromConfig","callbackV","getReversedFromConfig","reversed","getProcessedConfig","animationType","easing","callback","maybeModifyStyleForKeyframe","element","style","animationFillMode","timestampRules","Object","values","definitions","position","saveSnapshot","rect","getBoundingClientRect","snapshot","top","left","width","height","scrollOffsets","getElementScrollValue","set","setElementAnimation","animationConfig","shouldSavePosition","parent","configureAnimation","animationDuration","animationDelay","animationTimingFunction","ENTERING","requestAnimationFrame","maybeRemoveElement","reanimatedDummy","contains","removedAfterAnimation","removeChild","wasCallbackCalled","maybeCallCallback","finished","onanimationend","removeEventListener","animationCancelHandler","onanimationstart","visibility","addEventListener","get","handleLayoutTransition","transitionData","LINEAR","SEQUENCED","FADING","JUMPING","CURVED","ENTRY_EXIT","transitionKeyframeName","dummyTransitionKeyframeName","dummy","dummyAnimationConfig","current","scrollTopOffset","scrollLeftOffset","scrollTop","scrollLeft","parentElement","handleExitingAnimation","offsetParent","cloneNode","scrollPositions","Map","saveScrollPosition","node","child","Array","from","children","firstChild","appendChild","restoreScrollPosition","scrollPosition","currentScrollTopOffset","lastScrollTopOffset","currentScrollLeftOffset","lastScrollLeftOffset"],"sourceRoot":"../../../../src","sources":["layoutReanimation/web/componentUtils.ts"],"mappings":"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","ignoreList":[]}
|