Skip to content
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

Jump to bottom

chore: cherry picks for 0.71.15 #41993

Merged
merged 5 commits into from Jan 3, 2024
Merged

chore: cherry picks for 0.71.15 #41993

merged 5 commits into from Jan 3, 2024

Commits on Dec 19, 2023

  1. Fix android platform border color (facebook#39893) 

    Summary:
If you try to apply PlatformColor to borders on Android app will crash with the next error:

"Error while updating property 'borderColor' of a view managed by: RCTView"

## Changelog:

[ANDROID] [FIXED] - Fix android crash when apply PlatformColor to borders

Pull Request resolved: facebook#39893

Test Plan:
In RNTester example, go to APIs -> PlatformColor
|    Before  | After |
| ----------- | ----------- |
|  <img src="https://github.com/facebook/react-native/assets/70860930/66ac2880-53da-4438-bd9a-332f8ea40645" alt="drawing" width="200"/>    | <img src="https://github.com/facebook/react-native/assets/70860930/151f58a1-d857-4b3d-9ec6-de74eb065127" alt="drawing" width="200"/>      |

Reviewed By: NickGerleman

Differential Revision: D50011758

Pulled By: javache

fbshipit-source-id: ea06c18c6aef4b6731e9b9b87422a1e0d13de208
    @axinvd @hurali97
    axinvd authored and hurali97 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    39d8caf View commit details
    Browse the repository at this point in the history

  2. Android: fix ClassCastException in ReactRootView.java when software k… 

    …eyboard is shown (facebook#40755)

Summary:
Fixes facebook#40754

Hi all!
We noticed that our app started to crash after bumping to RN v0.71.13, anyways after a deeper investigation we also found that the crash occurs in the latest version as well.

Crash log:
```
E  FATAL EXCEPTION: main
Process: com.nfl.fantasy.core.android.debug, PID: 6034
java.lang.ClassCastException: android.app.ContextImpl cannot be cast to android.app.Activity
at com.facebook.react.ReactRootView$CustomGlobalLayoutListener.getActivity(ReactRootView.java:926)
at com.facebook.react.ReactRootView$CustomGlobalLayoutListener.checkForKeyboardEvents(ReactRootView.java:946)
at com.facebook.react.ReactRootView$CustomGlobalLayoutListener.onGlobalLayout(ReactRootView.java:912)
at android.view.ViewTreeObserver.dispatchOnGlobalLayout(ViewTreeObserver.java:1061)
```
The code which causes ClassCastException is following [here](https://github.com/facebook/react-native/blob/ea88fbe229e1d276753ee8e118184274fc872138/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java#L864).
In this code explicit type conversion to Activity is not safe because it's not guaranteed by the compiler that context will be compatible with Activity type.
The appropriate issue [has been filed](facebook#40754).

<!-- Help reviewers and the release process by writing your own changelog entry.

Pick one each for the category and type tags:

[ANDROID|GENERAL|IOS|INTERNAL] [BREAKING|ADDED|CHANGED|DEPRECATED|REMOVED|FIXED|SECURITY] - Message

For more details, see:
https://reactnative.dev/contributing/changelogs-in-pull-requests
-->

[ANDROID] [FIXED] - Fixed crash occurring in certain native views when keyboard events are fired.

Pull Request resolved: facebook#40755

Test Plan:
Tested it manually with the [reference application](https://github.com/kot331107/rnCrashReproducer).  Repro steps are as follows:

- Build and run the app on Android
- Tap the button "Open Modal"
- You should see the red popup fragment to the bottom of the screen
- Tap on the text input to open software keyboard
- Expected: it should show the keyboard and no crash happens.

Reviewed By: arushikesarwani94

Differential Revision: D50198424

Pulled By: NickGerleman

fbshipit-source-id: a5a6d86334856f4ffbe818150da5793380da4702
    @kot331107 @hurali97
    kot331107 authored and hurali97 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    8a99845 View commit details
    Browse the repository at this point in the history

  3. Merge branch '0.71-stable' of https://github.com/facebook/react-native … 

    …into hur/cherry-picks-for-0.71.15
    @hurali97
    hurali97 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    a36011b View commit details
    Browse the repository at this point in the history

  4. chore: bump podfile.lock

    @hurali97
    hurali97 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    4e04ff1 View commit details
    Browse the repository at this point in the history

  5. Merge branch '0.71-stable' of https://github.com/facebook/react-native … 

    …into hur/cherry-picks-for-0.71.15
    @hurali97
    hurali97 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    4bd918d View commit details
    Browse the repository at this point in the history