@@ -5,19 +5,19 @@ import com.facebook.react.module.annotations.ReactModule
55import com.facebook.react.uimanager.ReactStylesDiffMap
66import com.facebook.react.uimanager.StateWrapper
77import com.facebook.react.uimanager.ThemedReactContext
8+ import com.facebook.react.uimanager.ViewGroupManager
89import com.facebook.react.uimanager.ViewManagerDelegate
910import com.facebook.react.uimanager.annotations.ReactProp
11+ import com.facebook.react.viewmanagers.RNCSafeAreaViewManagerDelegate
1012import com.facebook.react.viewmanagers.RNCSafeAreaViewManagerInterface
11- import com.facebook.react.views.view.ReactViewGroup
12- import com.facebook.react.views.view.ReactViewManager
1313
1414@ReactModule(name = SafeAreaViewManager .REACT_CLASS )
15- class SafeAreaViewManager : ReactViewManager (), RNCSafeAreaViewManagerInterface<SafeAreaView> {
15+ class SafeAreaViewManager : ViewGroupManager < SafeAreaView > (), RNCSafeAreaViewManagerInterface<SafeAreaView> {
1616 override fun getName () = REACT_CLASS
1717
18- // Make sure we're not using delegates for now since ReactViewGroupManager doesn't use one. If it
19- // does in the future we will need a way to compose delegates together.
20- override fun getDelegate (): ViewManagerDelegate <ReactViewGroup > ? = null
18+ private val delegate : ViewManagerDelegate < SafeAreaView > = RNCSafeAreaViewManagerDelegate ( this )
19+
20+ override fun getDelegate (): ViewManagerDelegate <SafeAreaView > = delegate
2121
2222 override fun createViewInstance (context : ThemedReactContext ) = SafeAreaView (context)
2323
@@ -59,11 +59,11 @@ class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface<
5959 }
6060
6161 override fun updateState (
62- view : ReactViewGroup ,
62+ view : SafeAreaView ,
6363 props : ReactStylesDiffMap ? ,
6464 stateWrapper : StateWrapper ?
6565 ): Any? {
66- ( view as SafeAreaView ) .setStateWrapper(stateWrapper)
66+ view.setStateWrapper(stateWrapper)
6767 return null
6868 }
6969
0 commit comments