Skip to content

Commit 4c4270d

Browse files
Nick Lefevermeta-codesync[bot]
authored andcommitted
Add endFillColor prop to scroll view (#54203)
Summary: Pull Request resolved: #54203 Adding the Android `endFillColor` property to the scroll view props, setting the default value to `TRANSPARENT`. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D85021077 fbshipit-source-id: 73eb12671035b1b2e2ca95a08b7c73b55ce2c0da
1 parent df7508d commit 4c4270d

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,16 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps(
5656
rawProps,
5757
"overScrollMode",
5858
sourceProps.overScrollMode,
59-
"auto")) {}
59+
"auto")),
60+
endFillColor(
61+
ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
62+
? sourceProps.endFillColor
63+
: convertRawProp(
64+
context,
65+
rawProps,
66+
"endFillColor",
67+
sourceProps.endFillColor,
68+
clearColor())) {}
6069

6170
void HostPlatformScrollViewProps::setProp(
6271
const PropsParserContext& context,
@@ -75,6 +84,7 @@ void HostPlatformScrollViewProps::setProp(
7584
RAW_SET_PROP_SWITCH_CASE_BASIC(nestedScrollEnabled);
7685
RAW_SET_PROP_SWITCH_CASE_BASIC(fadingEdgeLength);
7786
RAW_SET_PROP_SWITCH_CASE_BASIC(overScrollMode);
87+
RAW_SET_PROP_SWITCH_CASE_BASIC(endFillColor);
7888
}
7989
}
8090

@@ -98,7 +108,11 @@ SharedDebugStringConvertibleList HostPlatformScrollViewProps::getDebugProps()
98108
debugStringConvertibleItem(
99109
"overScrollMode",
100110
overScrollMode,
101-
defaultScrollViewProps.overScrollMode)};
111+
defaultScrollViewProps.overScrollMode),
112+
debugStringConvertibleItem(
113+
"endFillColor",
114+
endFillColor,
115+
defaultScrollViewProps.endFillColor)};
102116
}
103117
#endif
104118

@@ -378,6 +392,10 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps(
378392
result["overScrollMode"] = overScrollMode;
379393
}
380394

395+
if (endFillColor != oldProps->endFillColor) {
396+
result["endFillColor"] = *endFillColor;
397+
}
398+
381399
return result;
382400
}
383401

packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class HostPlatformScrollViewProps : public BaseScrollViewProps {
3434
bool nestedScrollEnabled{};
3535
folly::dynamic fadingEdgeLength{};
3636
std::string overScrollMode{"auto"};
37+
SharedColor endFillColor{clearColor()};
3738

3839
#pragma mark - DebugStringConvertible
3940

0 commit comments

Comments
 (0)