acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Clean up patch comments

Browse Source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Tomek Zawadzki
2026-07-27 12:15:44 +02:00
parent 50b3d64999
commit 2ee6fd7fff
2 changed files with 373 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/react-native@0.81.5.patch
+6 -6
View File
@@ -225,16 +225,16 @@ index 8b6571698fc5dd091a0d8980a33bb40295faf305..27c97bfeb6f13907c89f1d85f2bb8b8a
} }
} }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt
index 89b666dcf0258df0702c812600b685463128294c..54e70abca9e2f35de740cfc4fb2f83e9f5af11e1 100644 index 89b666dcf0258df0702c812600b685463128294c..2b1c3971f0c31a0d7a592b90170e4cc53a8a69dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt
@@ -431,6 +431,13 @@ public open class ReactViewGroup public constructor(context: Context?) : @@ -431,6 +431,13 @@ public open class ReactViewGroup public constructor(context: Context?) :
inSubviewClippingLoop = true inSubviewClippingLoop = true
var clippedSoFar = 0 var clippedSoFar = 0
for (i in 0..<allChildrenCount) { for (i in 0..<allChildrenCount) {
+ // Bluesky patch: reentrant child removal during this loop can compact allChildren and + // Reentrant child removal during this loop can compact allChildren and leave a null at
+ // leave a null at an index below allChildrenCount. A null entry means the view is already + // an index below allChildrenCount. A null entry means the view is already detached, so
+ // detached, so treat it as clipped instead of crashing (Sentry APP-T20Q). + // treat it as clipped instead of crashing.
+ if (childArray[i] == null) { + if (childArray[i] == null) {
+ clippedSoFar++ + clippedSoFar++
+ continue + continue
@@ -247,8 +247,8 @@ index 89b666dcf0258df0702c812600b685463128294c..54e70abca9e2f35de740cfc4fb2f83e9
assertOnUiThread() assertOnUiThread()
- val child = checkNotNull(allChildren?.get(idx)) - val child = checkNotNull(allChildren?.get(idx))
+ // Bluesky patch: allChildren can be mutated reentrantly while a clipping pass is running, + // allChildren can be mutated reentrantly while a clipping pass is running, so a stale
+ // so a stale index can point at a null slot. Skip it instead of crashing (Sentry APP-T20Q). + // index can point at a null slot. Skip it instead of crashing.
+ val child = allChildren?.get(idx) ?: return + val child = allChildren?.get(idx) ?: return
val intersects = clippingRect.intersects(child.left, child.top, child.right, child.bottom) val intersects = clippingRect.intersects(child.left, child.top, child.right, child.bottom)
var needUpdateClippingRecursive = false var needUpdateClippingRecursive = false
pnpm-lock.yaml
Generated
+367 -367
View File
File diff suppressed because it is too large Load Diff