Skip to content

Fix RefreshControl initial prop replay #57478

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
adamivancza wants to merge 1 commit into from
+75 −1
Closed

Fix RefreshControl initial prop replay #57478

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
3 changes: 2 additions & 1 deletion ...tive/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ - (void)prepareForRecycle

- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
{
const auto &oldConcreteProps = static_cast<const PullToRefreshViewProps &>(*_props);
const auto &oldConcreteProps =
static_cast<const PullToRefreshViewProps &>(*(oldProps ? oldProps : _props));
const auto &newConcreteProps = static_cast<const PullToRefreshViewProps &>(*props);

if (_recycled || newConcreteProps.tintColor != oldConcreteProps.tintColor) {
Expand Down
4 changes: 4 additions & 0 deletions packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; };
383889DA23A7398900D06C3E /* RCTConvert_UIColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */; };
3B21744731FE3D9300C10B12 /* RCTPullToRefreshViewComponentViewTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B21744631FE3D9300C10B12 /* RCTPullToRefreshViewComponentViewTests.mm */; };
3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
3F4D148C63BBF774A25488A6 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A243F0D4D5C54911E811C4 /* libPods-RNTesterIntegrationTests.a */; };
46C0FD761B0B9B1E8662B759 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B312B0EEE90BA411618B015 /* libPods-RNTesterUnitTests.a */; };
Expand Down Expand Up @@ -87,6 +88,7 @@
2B312B0EEE90BA411618B015 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNTester/Images.xcassets; sourceTree = "<group>"; };
383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIColorTests.m; sourceTree = "<group>"; };
3B21744631FE3D9300C10B12 /* RCTPullToRefreshViewComponentViewTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTPullToRefreshViewComponentViewTests.mm; sourceTree = "<group>"; };
3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = "<group>"; };
3FF60722627F93D8F62FA1E3 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = "<group>"; };
4C706D402EE4AF9BE838CBA9 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -339,6 +341,7 @@
A975CA6B2C05EADE0043F72A /* RCTNetworkTaskTests.m */,
E7DB20BE22B2BAA4005AC45F /* RCTNativeAnimatedNodesManagerTests.m */,
E7DB20AD22B2BAA3005AC45F /* RCTPerformanceLoggerTests.m */,
3B21744631FE3D9300C10B12 /* RCTPullToRefreshViewComponentViewTests.mm */,
E7DB20C122B2BAA4005AC45F /* RCTUnicodeDecodeTests.m */,
E7DB20D022B2BAA5005AC45F /* RCTURLUtilsTests.m */,
E7DB20B322B2BAA4005AC45F /* RNTesterUnitTestsBundle.js */,
Expand Down Expand Up @@ -751,6 +754,7 @@
E7DB20E822B2BAA6005AC45F /* RCTModuleMethodTests.mm in Sources */,
F1A0B1C23D4E5F6071829302 /* RCTTurboModuleArrayBufferTests.mm in Sources */,
E7DB20E222B2BAA6005AC45F /* RCTGzipTests.m in Sources */,
3B21744731FE3D9300C10B12 /* RCTPullToRefreshViewComponentViewTests.mm in Sources */,
E7DB20ED22B2BAA6005AC45F /* RCTURLUtilsTests.m in Sources */,
E7DB20D322B2BAA6005AC45F /* RCTBlobManagerTests.m in Sources */,
E7DB20E322B2BAA6005AC45F /* RCTAllocationTests.m in Sources */,
Expand Down
69 changes: 69 additions & 0 deletions packages/rn-tester/RNTesterUnitTests/RCTPullToRefreshViewComponentViewTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#import <React/RCTPullToRefreshViewComponentView.h>
#import <XCTest/XCTest.h>
#import <react/renderer/components/FBReactNativeSpec/Props.h>
#import <react/renderer/components/FBReactNativeSpec/ShadowNodes.h>
#import <react/renderer/graphics/Color.h>

using namespace facebook::react;

#if !TARGET_OS_TV

static Props::Shared makePullToRefreshViewProps()
{
auto props = std::make_shared<PullToRefreshViewProps>();
props->tintColor = colorFromRGBA(255, 255, 255, 255);
props->title = "Refreshing";
props->titleColor = colorFromRGBA(0, 255, 0, 255);
return props;
}

static void assertColorEquals(UIColor *color, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha)
{
CGFloat actualRed;
CGFloat actualGreen;
CGFloat actualBlue;
CGFloat actualAlpha;

XCTAssertTrue([color getRed:&actualRed green:&actualGreen blue:&actualBlue alpha:&actualAlpha]);
XCTAssertEqualWithAccuracy(actualRed, red, 0.001);
XCTAssertEqualWithAccuracy(actualGreen, green, 0.001);
XCTAssertEqualWithAccuracy(actualBlue, blue, 0.001);
XCTAssertEqualWithAccuracy(actualAlpha, alpha, 0.001);
}

@interface RCTPullToRefreshViewComponentViewTests : XCTestCase
@end

@implementation RCTPullToRefreshViewComponentViewTests

- (void)testUpdatePropsUsesOldPropsWhenReapplyingStoredProps
{
RCTPullToRefreshViewComponentView *view = [RCTPullToRefreshViewComponentView new];
UIRefreshControl *refreshControl = [view valueForKey:@"_refreshControl"];
auto props = makePullToRefreshViewProps();

[view updateProps:props oldProps:nullptr];

refreshControl.tintColor = nil;
refreshControl.attributedTitle = nil;

[view updateProps:props oldProps:PullToRefreshViewShadowNode::defaultSharedProps()];

assertColorEquals(refreshControl.tintColor, 1, 1, 1, 1);
XCTAssertEqualObjects(refreshControl.attributedTitle.string, @"Refreshing");
UIColor *titleColor = [refreshControl.attributedTitle attribute:NSForegroundColorAttributeName
atIndex:0
effectiveRange:nil];
assertColorEquals(titleColor, 0, 1, 0, 1);
}

@end

#endif