Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deterministic onLayout event ordering for iOS Paper (#40748)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/40748

The ordering of `onLayout` events is non-deterministic on iOS Paper, due to nodes being added to an `NSHashTable` before iteration, instead of an ordered collection.

We don't do any lookups on the collection, so I think this was chosen over `NSMutableArray` for the sake of `[NSHashTable weakObjectsHashTable]`, to avoid retain/release. Using a collection which does retain/release seems to cause a crash due to double release or similar, so those semantics seem intentional (though I'm not super familiar with the model here).

We can replicate the memory semantics with ordering by using `NSPointerArray` (which is unfortunately not parameterized). This change does that, so we get consistently top-down layout events (matching Fabric, and Android Paper as of D49627996). This lets us use multiple layout events to calculate right/bottom edge insets deterministically.

Changelog:
[iOS][Changed] -  Deterministic onLayout event ordering for iOS Paper

Reviewed By: luluwu2032

Differential Revision: D50093411

fbshipit-source-id: f6a9d5c973b97aede879baa8b952cc1be2447f28
This commit is contained in:
Nick Gerleman
2023-10-10 11:43:14 -07:00
committed by Facebook GitHub Bot
parent 5c2ec558c1
commit 56ddace9c8
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/React/Base/Surface/RCTSurfaceRootShadowView.h
+1 -1
View File
@@ -27,6 +27,6 @@
*/
@property (nonatomic, assign) YGDirection baseDirection;
- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews;
- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews;
@end
packages/react-native/React/Base/Surface/RCTSurfaceRootShadowView.m
+1 -1
View File
@@ -41,7 +41,7 @@
}
}
- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews
- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews
{
NSHashTable<NSString *> *other = [NSHashTable new];
packages/react-native/React/Modules/RCTUIManager.m
+1 -1
View File
@@ -534,7 +534,7 @@ static NSDictionary *deviceOrientationEventBody(UIDeviceOrientation orientation)
{
RCTAssertUIManagerQueue();
NSHashTable<RCTShadowView *> *affectedShadowViews = [NSHashTable weakObjectsHashTable];
NSPointerArray *affectedShadowViews = [NSPointerArray weakObjectsPointerArray];
[rootShadowView layoutWithAffectedShadowViews:affectedShadowViews];
if (!affectedShadowViews.count) {
packages/react-native/React/Views/RCTLayout.h
+1 -1
View File
@@ -31,7 +31,7 @@ typedef struct CG_BOXABLE RCTLayoutMetrics RCTLayoutMetrics;
struct RCTLayoutContext {
CGPoint absolutePosition;
__unsafe_unretained NSHashTable<RCTShadowView *> *_Nonnull affectedShadowViews;
__unsafe_unretained NSPointerArray *_Nonnull affectedShadowViews;
__unsafe_unretained NSHashTable<NSString *> *_Nonnull other;
};
typedef struct CG_BOXABLE RCTLayoutContext RCTLayoutContext;
packages/react-native/React/Views/RCTRootShadowView.h
+1 -1
View File
@@ -29,6 +29,6 @@
*/
@property (nonatomic, assign) YGDirection baseDirection;
- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews;
- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews;
@end
packages/react-native/React/Views/RCTRootShadowView.m
+1 -1
View File
@@ -23,7 +23,7 @@
return self;
}
- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews
- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews
{
NSHashTable<NSString *> *other = [NSHashTable new];
packages/react-native/React/Views/RCTShadowView.m
+1 -1
View File
@@ -304,7 +304,7 @@ static void RCTProcessMetaPropsBorder(const YGValue metaProps[META_PROP_COUNT],
{
if (!RCTLayoutMetricsEqualToLayoutMetrics(self.layoutMetrics, layoutMetrics)) {
self.layoutMetrics = layoutMetrics;
[layoutContext.affectedShadowViews addObject:self];
[layoutContext.affectedShadowViews addPointer:((__bridge void *)self)];
}
}
packages/rn-tester/RNTesterUnitTests/RCTShadowViewTests.m
+2 -2
View File
@@ -84,7 +84,7 @@
[self.parentView insertReactSubview:mainView atIndex:1];
[self.parentView insertReactSubview:footerView atIndex:2];
[self.parentView layoutWithAffectedShadowViews:[NSHashTable weakObjectsHashTable]];
[self.parentView layoutWithAffectedShadowViews:[NSPointerArray weakObjectsPointerArray]];
XCTAssertTrue(
CGRectEqualToRect([self.parentView measureLayoutRelativeToAncestor:self.parentView], CGRectMake(0, 0, 440, 440)));
@@ -187,7 +187,7 @@
RCTShadowView *view = [self _shadowViewWithConfig:configBlock];
[self.parentView insertReactSubview:view atIndex:0];
view.intrinsicContentSize = contentSize;
[self.parentView layoutWithAffectedShadowViews:[NSHashTable weakObjectsHashTable]];
[self.parentView layoutWithAffectedShadowViews:[NSPointerArray weakObjectsPointerArray]];
CGRect actualRect = [view measureLayoutRelativeToAncestor:self.parentView];
XCTAssertTrue(
CGRectEqualToRect(expectedRect, actualRect),