Skip to content

Simplify jsi::Function storage in UIManagerBinding::startViewTransition (#56403) #56403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javache wants to merge 1 commit into from
+26 −17
Closed

Simplify jsi::Function storage in UIManagerBinding::startViewTransition (#56403) #56403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 21 additions & 17 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,10 +1064,8 @@ jsi::Value UIManagerBinding::get(
auto promiseConstructor =
runtime.global().getPropertyAsFunction(runtime, "Promise");

auto readyResolveFunc =
std::make_shared<std::shared_ptr<jsi::Function>>();
auto finishedResolveFunc =
std::make_shared<std::shared_ptr<jsi::Function>>();
std::shared_ptr<jsi::Function> readyResolveFunc;
std::shared_ptr<jsi::Function> finishedResolveFunc;

auto mutationFunc = std::make_shared<jsi::Function>(
arguments[0].asObject(runtime).asFunction(runtime));
Expand All @@ -1078,14 +1076,13 @@ jsi::Value UIManagerBinding::get(
runtime,
jsi::PropNameID::forAscii(runtime, "readyExecutor"),
2,
[readyResolveFunc](
[&readyResolveFunc](
jsi::Runtime& runtime,
const jsi::Value& /*thisValue*/,
const jsi::Value* args,
size_t /*count*/) -> jsi::Value {
auto onReadyFunc = std::make_shared<jsi::Function>(
readyResolveFunc = std::make_shared<jsi::Function>(
args[0].asObject(runtime).asFunction(runtime));
*readyResolveFunc = onReadyFunc;
return jsi::Value::undefined();
}));

Expand All @@ -1095,19 +1092,21 @@ jsi::Value UIManagerBinding::get(
runtime,
jsi::PropNameID::forAscii(runtime, "finishedExecutor"),
2,
[finishedResolveFunc, viewTransitionDelegate](
[&finishedResolveFunc, viewTransitionDelegate](
jsi::Runtime& rt,
const jsi::Value& /*thisValue*/,
const jsi::Value* args,
size_t /*count*/) -> jsi::Value {
size_t /*count*/) mutable -> jsi::Value {
auto onCompleteFunc = std::make_shared<jsi::Function>(
args[0].asObject(rt).asFunction(rt));
*finishedResolveFunc = std::make_shared<jsi::Function>(
finishedResolveFunc = std::make_shared<jsi::Function>(
jsi::Function::createFromHostFunction(
rt,
jsi::PropNameID::forAscii(rt, "finishedResolve"),
0,
[onCompleteFunc, viewTransitionDelegate](
[onCompleteFunc = std::move(onCompleteFunc),
viewTransitionDelegate =
std::move(viewTransitionDelegate)](
jsi::Runtime& runtime,
const jsi::Value& /*thisValue*/,
const jsi::Value* /*args*/,
Expand All @@ -1125,20 +1124,25 @@ jsi::Value UIManagerBinding::get(

viewTransitionDelegate->startViewTransition(
[&runtime, mutationFunc = std::move(mutationFunc)]() {
// mutationCallback is called synchronously by the
// delegate during startViewTransition, so &runtime is
// valid (it comes from the enclosing host function).
mutationFunc->call(runtime);
},
[readyResolveFunc = std::move(readyResolveFunc), &runtime]() {
if (*readyResolveFunc) {
(*readyResolveFunc)->call(runtime);
// onReadyCallback is called synchronously on the JS
// thread by the delegate, so &runtime is valid.
if (readyResolveFunc) {
readyResolveFunc->call(runtime);
}
},
[finishedResolveFunc = std::move(finishedResolveFunc),
uiManager]() {
uiManager->runtimeExecutor_(
runtimeExecutor = uiManager->runtimeExecutor_]() {
runtimeExecutor(
[finishedResolveFunc = std::move(finishedResolveFunc)](
jsi::Runtime& rt) mutable {
if (*finishedResolveFunc) {
(*finishedResolveFunc)->call(rt);
if (finishedResolveFunc) {
finishedResolveFunc->call(rt);
}
});
});
Expand Down
5 changes: 5 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ class UIManagerViewTransitionDelegate {

virtual void restoreViewTransitionName(const ShadowNode &shadowNode) {}

/*
* Start a view transition. mutationCallback and onReadyCallback MUST be
* called from a thread with access to the jsi::Runtime.
* onCompleteCallback may be called from any thread.
*/
virtual void startViewTransition(
std::function<void()> mutationCallback,
std::function<void()> onReadyCallback,
Expand Down
Loading