Skip to content

Commit 196b046

Browse files
cortinicometa-codesync[bot]
authored andcommitted
Make setMaintainVisibleContentPosition and MaintainVisibleScrollPositionHelper internal
Summary: `setMaintainVisibleContentPosition` takes a `MaintainVisibleScrollPositionHelper.Config` parameter whose constructor is `internal`, making the method uncallable by OSS consumers. This change makes both the method and the helper class `internal` to reflect that reality and reduce the public API surface. Changelog: [Internal] Differential Revision: D107530272
1 parent 5c68099 commit 196b046

5 files changed

Lines changed: 12 additions & 41 deletions

File tree

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5429,30 +5429,6 @@ public abstract interface class com/facebook/react/views/scroll/FpsListener {
54295429
public abstract fun isEnabled ()Z
54305430
}
54315431

5432-
public final class com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper : com/facebook/react/bridge/UIManagerListener {
5433-
public fun <init> (Landroid/view/ViewGroup;Z)V
5434-
public fun didDispatchMountItems (Lcom/facebook/react/bridge/UIManager;)V
5435-
public fun didMountItems (Lcom/facebook/react/bridge/UIManager;)V
5436-
public fun didScheduleMountItems (Lcom/facebook/react/bridge/UIManager;)V
5437-
public final fun getConfig ()Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;
5438-
public final fun setConfig (Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;)V
5439-
public final fun start ()V
5440-
public final fun stop ()V
5441-
public fun willDispatchViewUpdates (Lcom/facebook/react/bridge/UIManager;)V
5442-
public fun willMountItems (Lcom/facebook/react/bridge/UIManager;)V
5443-
}
5444-
5445-
public final class com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config {
5446-
public static final field Companion Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config$Companion;
5447-
public static final fun fromReadableMap (Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;
5448-
public final fun getAutoScrollToTopThreshold ()Ljava/lang/Integer;
5449-
public final fun getMinIndexForVisible ()I
5450-
}
5451-
5452-
public final class com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config$Companion {
5453-
public final fun fromReadableMap (Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;
5454-
}
5455-
54565432
public final class com/facebook/react/views/scroll/OnScrollDispatchHelper {
54575433
public fun <init> ()V
54585434
public final fun getXFlingVelocity ()F
@@ -5540,7 +5516,6 @@ public class com/facebook/react/views/scroll/ReactHorizontalScrollView : android
55405516
public fun setFadingEdgeLengthEnd (I)V
55415517
public fun setFadingEdgeLengthStart (I)V
55425518
public fun setLastScrollDispatchTime (J)V
5543-
public fun setMaintainVisibleContentPosition (Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;)V
55445519
public fun setOverflow (Ljava/lang/String;)V
55455520
public fun setOverflowInset (IIII)V
55465521
public fun setPagingEnabled (Z)V
@@ -5685,7 +5660,6 @@ public class com/facebook/react/views/scroll/ReactScrollView : android/widget/Sc
56855660
public fun setFadingEdgeLengthEnd (I)V
56865661
public fun setFadingEdgeLengthStart (I)V
56875662
public fun setLastScrollDispatchTime (J)V
5688-
public fun setMaintainVisibleContentPosition (Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;)V
56895663
public fun setOverflow (Ljava/lang/String;)V
56905664
public fun setOverflowInset (IIII)V
56915665
public fun setPagingEnabled (Z)V

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import java.lang.ref.WeakReference
2828
* This uses UIManager to listen to updates and capture position of items before and after layout.
2929
*/
3030
@OptIn(UnstableReactNativeAPI::class)
31-
public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
31+
internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
3232
private val scrollView: ScrollViewT,
3333
private val horizontal: Boolean,
3434
) : UIManagerListener where ScrollViewT : HasSmoothScroll?, ScrollViewT : ViewGroup? {
3535

36-
public var config: Config? = null
36+
var config: Config? = null
3737
private var firstVisibleViewRef: WeakReference<View>? = null
3838
private var prevFirstVisibleFrame: Rect? = null
3939
private var isListening = false
@@ -50,14 +50,11 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
5050
)
5151
)
5252

53-
public class Config
54-
internal constructor(
55-
public val minIndexForVisible: Int,
56-
public val autoScrollToTopThreshold: Int?,
57-
) {
58-
public companion object {
53+
class Config
54+
internal constructor(val minIndexForVisible: Int, val autoScrollToTopThreshold: Int?) {
55+
companion object {
5956
@JvmStatic
60-
public fun fromReadableMap(value: ReadableMap): Config {
57+
fun fromReadableMap(value: ReadableMap): Config {
6158
val minIndexForVisible = value.getInt("minIndexForVisible")
6259
val autoScrollToTopThreshold =
6360
if (value.hasKey("autoscrollToTopThreshold")) value.getInt("autoscrollToTopThreshold")
@@ -68,7 +65,7 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
6865
}
6966

7067
/** Start listening to view hierarchy updates. Should be called when this is created. */
71-
public fun start() {
68+
fun start() {
7269
if (isListening) {
7370
return
7471
}
@@ -77,7 +74,7 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
7774
}
7875

7976
/** Stop listening to view hierarchy updates. Should be called before this is destroyed. */
80-
public fun stop() {
77+
fun stop() {
8178
if (!isListening) {
8279
return
8380
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
422422
invalidate()
423423
}
424424

425-
public open fun setMaintainVisibleContentPosition(
425+
internal open fun setMaintainVisibleContentPosition(
426426
config: MaintainVisibleScrollPositionHelper.Config?
427427
) {
428428
if (config != null && maintainVisibleContentPositionHelper == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<ef65f89c556fb0b391aace166349cebc>>
7+
* @generated SignedSource<<2b0cbc5249ac34ae7f030a9c0fffd1f3>>
88
*/
99

1010
/**
@@ -392,7 +392,7 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
392392
invalidate()
393393
}
394394

395-
public open fun setMaintainVisibleContentPosition(
395+
internal open fun setMaintainVisibleContentPosition(
396396
config: MaintainVisibleScrollPositionHelper.Config?
397397
) {
398398
if (config != null && maintainVisibleContentPositionHelper == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
384384
invalidate()
385385
}
386386

387-
public open fun setMaintainVisibleContentPosition(
387+
internal open fun setMaintainVisibleContentPosition(
388388
config: MaintainVisibleScrollPositionHelper.Config?
389389
) {
390390
if (config != null && maintainVisibleContentPositionHelper == null) {

0 commit comments

Comments
 (0)