1515package com.scrollviewenhancer
1616
1717import android.graphics.Rect
18- import android.util.Log
1918import android.view.View
2019import com.facebook.infer.annotation.Assertions
2120import com.facebook.react.bridge.*
2221import com.facebook.react.uimanager.ReactShadowNode
2322import com.facebook.react.uimanager.UIImplementation.LayoutUpdateListener
2423import com.facebook.react.uimanager.UIManagerHelper
2524import com.facebook.react.uimanager.UIManagerModule
25+ import com.facebook.react.uimanager.UIManagerModuleListener
2626import com.facebook.react.views.scroll.ReactScrollView
2727import com.facebook.react.views.view.ReactViewGroup
2828import java.lang.ref.WeakReference
@@ -61,7 +61,7 @@ abstract class MVCPHelper {
6161class MaintainVisibleScrollPositionHelper (
6262 private val mScrollView : ReactScrollView ,
6363 private val mHorizontal : Boolean = false
64- ): MVCPHelper(), UIManagerListener , LayoutUpdateListener {
64+ ): MVCPHelper(), UIManagerModuleListener , LayoutUpdateListener {
6565 private var mFirstVisibleView: WeakReference <View >? = null
6666 private var mPrevFirstVisibleFrame: Rect ? = null
6767 private var mListening: Boolean = false
@@ -83,7 +83,7 @@ class MaintainVisibleScrollPositionHelper(
8383 if (mListening) return
8484
8585 mListening = true
86- uiManager.addUIManagerEventListener (this )
86+ uiManagerModule?.addUIManagerListener (this )
8787 uiManagerModule?.uiImplementation?.setLayoutUpdateListener(this )
8888 }
8989
@@ -94,7 +94,7 @@ class MaintainVisibleScrollPositionHelper(
9494 if (! mListening) return
9595
9696 mListening = false
97- uiManager.removeUIManagerEventListener (this )
97+ uiManagerModule?.removeUIManagerListener (this )
9898 }
9999
100100 /* *
@@ -151,18 +151,11 @@ class MaintainVisibleScrollPositionHelper(
151151 }
152152 }
153153
154- // UIManagerListener
155- override fun willDispatchViewUpdates (uiManager : UIManager ) {
154+ // UIManagerModuleListener
155+ override fun willDispatchViewUpdates (p0 : UIManagerModule ? ) {
156156 computeTargetView()
157157 }
158158
159- override fun didDispatchMountItems (uiManager : UIManager ) {
160- // noop
161- }
162-
163- override fun didScheduleMountItems (uiManager : UIManager ) {
164- // noop
165- }
166159
167160 // LayoutUpdateListener
168161 override fun onLayoutUpdated (p0 : ReactShadowNode <out ReactShadowNode <* >>? ) {
0 commit comments