[0.78] Fix elevation with border-radius set

[polovi]

Target Branch(es)

0.78

Link to commit or PR to be picked

facebook/react-native@f7d78f8

Description

This commit (f7d78f81cc971be2dcf5476c790556df4220b2bc) landed after the 0.78 branch was cut and was not included in the stable release.
Reference: link to your original issue

[react-native-bot]

Thank you for opening a new pick-request for React Native.
Those are the criterias we follow when accepting/rejecting a pick request (source).

If your pick does not satisfy the criteria below, please close it as it will not be considered.

✅ Which pick requests we accept

1. ✅ Fixes for regressions to core APIs. Examples:
   • A core component is behaving differently between version 0.X and 0.X-1
   • The TurboModule.getEnforcing function is throwing an assertion error which is not expected.
2. ✅ Fixes to bugs in the core React Native’s experience. Examples:
   • Breakpoints in React Native DevTools not working correctly in the debugger
   • Fast Refresh not working as expected
   • Metro bundler not starting properly or ignoring the configuration file
   • Buttons that are not clickable
3. ✅ Fixes to APIs used by 3P libraries and Out-of-tree platforms. Examples:
   • An API that is used by react-native-macos is not behaving as expected or regressing
4. ✅ Bump of patch version of dependencies. Example:
   • Bump Gradle from 8.11.0 to 8.11.1
5. ✅ Fixes for Low/High Security Vulnerability. Example:
   • Bump Gradle from 8.11.0 to 8.12.0 if there is a security vulnerability in 8.11 and there is no version 8.11.x which would contain the same fix.
6. ✅ Fixes and reverts of accidental breaking changes. Example:
   • Reverting or fix-forwarding a migration to Kotlin of a file (say ReactRootView.java ) if that is causing a breaking change for the whole React Native ecosystem.
7. ✅ Performance improvements picks. Examples:
   • Fixing unnecessary rendering on FlatList.
8. ✅ Any pick if the release is still in RC0 (after RC1 the previous listed criteria applies)

❌ Which pick requests we don’t accept

9. ❌ Any pick that will introduce a breaking change after RC1. Example:
   • A bugfix that contains a refactoring, resulting in changes to the public API of a class
10. ❌ Any pick that introduces a new feature after RC1. Example:
    • A commit that introduces a new API or a specific feature for a component.
11. ❌ Bump of major/minor version of dependencies. Example:
    • Bump Gradle from 8.11.0 to 8.12.0
    • Bump Gradle from 8.11.0 to 9.0.0
12. ❌Bump of a dependency to a non stable/alpha/beta version. Example:
    • Bump Gradle from 8.11.0 to 8.11.1-beta.1
13. ❌Any pick that introduces changes to the testing infrastructure of React Native after RC1. Examples:
    • Changes to the GitHub Actions workflows to optimize it, even if they’re on main.
    • Changes to the logic used to publish packages to NPM or Maven Central
14. ❌ Pick composed by various commits that has several merge conflicts
    • If your pick is too complicated to apply on the release branch, we’re going to reject it.
15. ❌ Any other non-critical improvement that landed on main.
    • In general those will ship in the following version unless they fit in one of the criteria above
16. ❌ Any other pick which is considered “small enough” to make it into a release.
    • If your pick is a one liner but is a ‘nice to have’, we won’t be picking it, as it has the risk of destabilizing the release and further delaying the release.

ℹ️ What makes for a good pick

In order for your pick to be considered, please do the following:

• ℹ️ Have a pick that contains only one commit from main, or only one PR against the release branch.
• ℹ️ Have a clear explanation of why your pick should be considered, ideally referencing one of the criteria above.
• ℹ️ Target only one minor version of React Native (e.g. [0.76]). If you want your pick to be applied to more versions, please open different picks.

[stakez]

When do we expect 0.78.1 to be released?

[cortinico]

@react-native-bot merge f7d78f81cc971be2dcf5476c790556df4220b2bc 0.78-stable

[react-native-bot]

❌ I failed to process your request with this error:

Failed to cherry-pick f7d78f81cc971be2dcf5476c790556df4220b2bc on branch 0.78-stable with: 1 with 'Command failed: cd react-native; git cherry-pick f7d78f81cc971be2dcf5476c790556df4220b2bc'

console output:

On branch 0.78-stable
You are currently cherry-picking commit f7d78f81cc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt

no changes added to commit (use "git add" and/or "git commit -a")

[cortinico]

@polovi @stakez this can't be easily picked to do a merge conflict. Please send a pull request against the release branch and we can include it.

[polovi]

I'm not sure what the problem is, I'm not the original fixer. This fix is ​​part of the 0.77-stable branch and was also part of the last 0.78 rc version. It's just not in the 0.78 final version for some reason.

[cortinico]

I'm not sure what the problem is, I'm not the original fixer. This fix is ​​part of the 0.77-stable branch and was also part of the last 0.78 rc version. It's just not in the 0.78 final version for some reason.

Which 0.78 RC had this change?

[polovi]

My mistake, it was probably only in 0.77.1 before the release of 0.78 stable.

[stakez]

@cortinico Here is the commit/fix in 0.77.1 - facebook/react-native@55d5c44

[polovi]

@polovi @stakez this can't be easily picked to do a merge conflict. Please send a pull request against the release branch and we can include it.

So the solution for this is to create new pull request for current RN code base and reaply original changes?

[cortinico]

@polovi @stakez this can't be easily picked to do a merge conflict. Please send a pull request against the release branch and we can include it.

So the solution for this is to create new pull request for current RN code base and reaply original changes?

Correct 👍