Skip to content

Make setMaintainVisibleContentPosition and MaintainVisibleScrollPositionHelper internal #57077

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
cortinico wants to merge 1 commit into from
Closed

Make setMaintainVisibleContentPosition and MaintainVisibleScrollPositionHelper internal #57077

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
26 changes: 0 additions & 26 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5429,30 +5429,6 @@ public abstract interface class com/facebook/react/views/scroll/FpsListener {
public abstract fun isEnabled ()Z
}

public final class com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper : com/facebook/react/bridge/UIManagerListener {
public fun <init> (Landroid/view/ViewGroup;Z)V
public fun didDispatchMountItems (Lcom/facebook/react/bridge/UIManager;)V
public fun didMountItems (Lcom/facebook/react/bridge/UIManager;)V
public fun didScheduleMountItems (Lcom/facebook/react/bridge/UIManager;)V
public final fun getConfig ()Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;
public final fun setConfig (Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;)V
public final fun start ()V
public final fun stop ()V
public fun willDispatchViewUpdates (Lcom/facebook/react/bridge/UIManager;)V
public fun willMountItems (Lcom/facebook/react/bridge/UIManager;)V
}

public final class com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config {
public static final field Companion Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config$Companion;
public static final fun fromReadableMap (Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;
public final fun getAutoScrollToTopThreshold ()Ljava/lang/Integer;
public final fun getMinIndexForVisible ()I
}

public final class com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config$Companion {
public final fun fromReadableMap (Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;
}

public final class com/facebook/react/views/scroll/OnScrollDispatchHelper {
public fun <init> ()V
public final fun getXFlingVelocity ()F
Expand Down Expand Up @@ -5540,7 +5516,6 @@ public class com/facebook/react/views/scroll/ReactHorizontalScrollView : android
public fun setFadingEdgeLengthEnd (I)V
public fun setFadingEdgeLengthStart (I)V
public fun setLastScrollDispatchTime (J)V
public fun setMaintainVisibleContentPosition (Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;)V
public fun setOverflow (Ljava/lang/String;)V
public fun setOverflowInset (IIII)V
public fun setPagingEnabled (Z)V
Expand Down Expand Up @@ -5685,7 +5660,6 @@ public class com/facebook/react/views/scroll/ReactScrollView : android/widget/Sc
public fun setFadingEdgeLengthEnd (I)V
public fun setFadingEdgeLengthStart (I)V
public fun setLastScrollDispatchTime (J)V
public fun setMaintainVisibleContentPosition (Lcom/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper$Config;)V
public fun setOverflow (Ljava/lang/String;)V
public fun setOverflowInset (IIII)V
public fun setPagingEnabled (Z)V
Expand Down
19 changes: 8 additions & 11 deletions ...roid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import java.lang.ref.WeakReference
* This uses UIManager to listen to updates and capture position of items before and after layout.
*/
@OptIn(UnstableReactNativeAPI::class)
public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
internal class MaintainVisibleScrollPositionHelper<ScrollViewT>(
private val scrollView: ScrollViewT,
private val horizontal: Boolean,
) : UIManagerListener where ScrollViewT : HasSmoothScroll?, ScrollViewT : ViewGroup? {

public var config: Config? = null
var config: Config? = null
private var firstVisibleViewRef: WeakReference<View>? = null
private var prevFirstVisibleFrame: Rect? = null
private var isListening = false
Expand All @@ -50,14 +50,11 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
)
)

public class Config
internal constructor(
public val minIndexForVisible: Int,
public val autoScrollToTopThreshold: Int?,
) {
public companion object {
class Config
internal constructor(val minIndexForVisible: Int, val autoScrollToTopThreshold: Int?) {
companion object {
@JvmStatic
public fun fromReadableMap(value: ReadableMap): Config {
fun fromReadableMap(value: ReadableMap): Config {
val minIndexForVisible = value.getInt("minIndexForVisible")
val autoScrollToTopThreshold =
if (value.hasKey("autoscrollToTopThreshold")) value.getInt("autoscrollToTopThreshold")
Expand All @@ -68,7 +65,7 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
}

/** Start listening to view hierarchy updates. Should be called when this is created. */
public fun start() {
fun start() {
if (isListening) {
return
}
Expand All @@ -77,7 +74,7 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT>(
}

/** Stop listening to view hierarchy updates. Should be called before this is destroyed. */
public fun stop() {
fun stop() {
if (!isListening) {
return
}
Expand Down
2 changes: 1 addition & 1 deletion ...e/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
invalidate()
}

public open fun setMaintainVisibleContentPosition(
internal open fun setMaintainVisibleContentPosition(
config: MaintainVisibleScrollPositionHelper.Config?
) {
if (config != null && maintainVisibleContentPositionHelper == null) {
Expand Down
4 changes: 2 additions & 2 deletions ...ative/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<ef65f89c556fb0b391aace166349cebc>>
* @generated SignedSource<<2b0cbc5249ac34ae7f030a9c0fffd1f3>>
*/

/**
Expand Down Expand Up @@ -392,7 +392,7 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
invalidate()
}

public open fun setMaintainVisibleContentPosition(
internal open fun setMaintainVisibleContentPosition(
config: MaintainVisibleScrollPositionHelper.Config?
) {
if (config != null && maintainVisibleContentPositionHelper == null) {
Expand Down
2 changes: 1 addition & 1 deletion ...eact-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
invalidate()
}

public open fun setMaintainVisibleContentPosition(
internal open fun setMaintainVisibleContentPosition(
config: MaintainVisibleScrollPositionHelper.Config?
) {
if (config != null && maintainVisibleContentPositionHelper == null) {
Expand Down
Loading