Skip to content

Keep scrollAwayPaddingBottom in ScrollView state on Android #59655

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

Open
lazerg wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −2
Open

Keep scrollAwayPaddingBottom in ScrollView state on Android #59655

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
6 changes: 4 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class ScrollViewState final {
Point contentOffset;
Rect contentBoundingRect;
int scrollAwayPaddingTop{0};
int scrollAwayPaddingBottom{0};

/*
* View Culling has to be disabled when accessibility features are used.
Expand All @@ -46,12 +47,13 @@ class ScrollViewState final {
ScrollViewState(const ScrollViewState &previousState, folly::dynamic data)
: contentOffset({(Float)data["contentOffsetLeft"].getDouble(), (Float)data["contentOffsetTop"].getDouble()}),
contentBoundingRect({}),
scrollAwayPaddingTop((Float)data["scrollAwayPaddingTop"].getDouble()) {};
scrollAwayPaddingTop((Float)data["scrollAwayPaddingTop"].getDouble()),
scrollAwayPaddingBottom((Float)data["scrollAwayPaddingBottom"].getDouble()) {};

folly::dynamic getDynamic() const
{
return folly::dynamic::object("contentOffsetLeft", contentOffset.x)("contentOffsetTop", contentOffset.y)(
"scrollAwayPaddingTop", scrollAwayPaddingTop);
"scrollAwayPaddingTop", scrollAwayPaddingTop)("scrollAwayPaddingBottom", scrollAwayPaddingBottom);
};
#endif
};
Expand Down
17 changes: 17 additions & 0 deletions ...es/react-native/ReactCommon/react/renderer/components/scrollview/tests/ScrollViewTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,21 @@ TEST(ScrollViewStateTest, zeroSizeContentBoundingRect) {
EXPECT_EQ(contentSize.height, 0.0f);
}

#ifdef RN_SERIALIZABLE_STATE
TEST(ScrollViewStateTest, dynamicIncludesScrollAwayPaddingBottom) {
ScrollViewState state;

EXPECT_EQ(state.getDynamic()["scrollAwayPaddingBottom"].asInt(), 0);

folly::dynamic data =
folly::dynamic::object("contentOffsetLeft", 0.0)("contentOffsetTop", 0.0)(
"scrollAwayPaddingTop", 5.0)("scrollAwayPaddingBottom", 10.0);
ScrollViewState newState(state, data);

EXPECT_EQ(newState.scrollAwayPaddingTop, 5);
EXPECT_EQ(newState.scrollAwayPaddingBottom, 10);
EXPECT_EQ(newState.getDynamic()["scrollAwayPaddingBottom"].asInt(), 10);
}
#endif

} // namespace facebook::react
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3600,6 +3600,7 @@ class facebook::react::ScrollViewState {
public facebook::react::Rect contentBoundingRect;
public facebook::react::Size getContentSize() const;
public folly::dynamic getDynamic() const;
public int scrollAwayPaddingBottom;
public int scrollAwayPaddingTop;
}

Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5782,6 +5782,7 @@ class facebook::react::ScrollViewState {
public facebook::react::Point contentOffset;
public facebook::react::Rect contentBoundingRect;
public facebook::react::Size getContentSize() const;
public int scrollAwayPaddingBottom;
public int scrollAwayPaddingTop;
}

Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,6 +2193,7 @@ class facebook::react::ScrollViewState {
public facebook::react::Point contentOffset;
public facebook::react::Rect contentBoundingRect;
public facebook::react::Size getContentSize() const;
public int scrollAwayPaddingBottom;
public int scrollAwayPaddingTop;
}

Expand Down
Loading