Skip to content

Enable direct manipulation for c++ NativeAnimated for Android #50568

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
zeyap wants to merge 1 commit into from
Closed

Enable direct manipulation for c++ NativeAnimated for Android #50568

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
1 change: 1 addition & 0 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2378,6 +2378,7 @@ public class com/facebook/react/fabric/FabricUIManager : com/facebook/react/brid
public fun stopSurface (Lcom/facebook/react/fabric/SurfaceHandlerBinding;)V
public fun sweepActiveTouchForTag (II)V
public fun synchronouslyUpdateViewOnUIThread (ILcom/facebook/react/bridge/ReadableMap;)V
public fun synchronouslyUpdateViewOnUIThread (ILcom/facebook/react/bridge/ReadableNativeMap;)V
public fun updateRootLayoutSpecs (IIIII)V
}

Expand Down
8 changes: 8 additions & 0 deletions ...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableNativeMap;
import com.facebook.react.bridge.UIManager;
import com.facebook.react.bridge.UIManagerListener;
import com.facebook.react.bridge.UiThreadUtil;
Expand Down Expand Up @@ -621,6 +622,13 @@ public void removeUIManagerEventListener(UIManagerListener listener) {
mListeners.remove(listener);
}

@UiThread
@ThreadConfined(UI)
public void synchronouslyUpdateViewOnUIThread(
final int reactTag, @NonNull final ReadableNativeMap props) {
synchronouslyUpdateViewOnUIThread(reactTag, (ReadableMap) props);
}

@Override
@UiThread
@ThreadConfined(UI)
Expand Down
11 changes: 11 additions & 0 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,4 +1068,15 @@ void FabricMountingManager::onAllAnimationsComplete() {
allAnimationsCompleteJNI(javaUIManager_);
}

void FabricMountingManager::synchronouslyUpdateViewOnUIThread(
Tag viewTag,
const folly::dynamic& props) {
static auto synchronouslyUpdateViewOnUIThreadJNI =
JFabricUIManager::javaClassStatic()
->getMethod<void(jint, ReadableNativeMap::javaobject)>(
"synchronouslyUpdateViewOnUIThread");
auto propsMap = ReadableNativeMap::newObjectCxxArgs(props);
synchronouslyUpdateViewOnUIThreadJNI(javaUIManager_, viewTag, propsMap.get());
}

} // namespace facebook::react
4 changes: 4 additions & 0 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ class FabricMountingManager final {

void onAllAnimationsComplete();

void synchronouslyUpdateViewOnUIThread(
Tag viewTag,
const folly::dynamic& props);

private:
bool isOnMainThread();

Expand Down
6 changes: 5 additions & 1 deletion packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,11 @@ void FabricUIManagerBinding::schedulerDidSetIsJSResponder(

void FabricUIManagerBinding::schedulerShouldSynchronouslyUpdateViewOnUIThread(
Tag tag,
const folly::dynamic& props) {}
const folly::dynamic& props) {
if (ReactNativeFeatureFlags::cxxNativeAnimatedEnabled() && mountingManager_) {
mountingManager_->synchronouslyUpdateViewOnUIThread(tag, props);
}
}

void FabricUIManagerBinding::onAnimationStarted() {
auto mountingManager = getMountingManager("onAnimationStarted");
Expand Down