Skip to content

Commit fea5655

Browse files
authored
chore(android): support react-native 0.79.0 (#610)
* chore(android): support rn 0.79 * fix SafeAreaViewManager formatting * use ReactViewManager
1 parent de267ae commit fea5655

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,22 @@ import com.facebook.react.module.annotations.ReactModule
55
import com.facebook.react.uimanager.ReactStylesDiffMap
66
import com.facebook.react.uimanager.StateWrapper
77
import com.facebook.react.uimanager.ThemedReactContext
8-
import com.facebook.react.uimanager.ViewManagerDelegate
98
import com.facebook.react.uimanager.annotations.ReactProp
10-
import com.facebook.react.viewmanagers.RNCSafeAreaViewManagerInterface
119
import com.facebook.react.views.view.ReactViewGroup
1210
import com.facebook.react.views.view.ReactViewManager
1311

1412
@ReactModule(name = SafeAreaViewManager.REACT_CLASS)
15-
class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface<SafeAreaView> {
13+
class SafeAreaViewManager : ReactViewManager() {
1614
override fun getName() = REACT_CLASS
1715

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
21-
2216
override fun createViewInstance(context: ThemedReactContext) = SafeAreaView(context)
2317

2418
override fun createShadowNodeInstance() = SafeAreaViewShadowNode()
2519

2620
override fun getShadowNodeClass() = SafeAreaViewShadowNode::class.java
2721

2822
@ReactProp(name = "mode")
29-
override fun setMode(view: SafeAreaView, mode: String?) {
23+
fun setMode(view: SafeAreaView, mode: String?) {
3024
when (mode) {
3125
"padding" -> {
3226
view.setMode(SafeAreaViewMode.PADDING)
@@ -38,7 +32,7 @@ class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface<
3832
}
3933

4034
@ReactProp(name = "edges")
41-
override fun setEdges(view: SafeAreaView, propList: ReadableMap?) {
35+
fun setEdges(view: SafeAreaView, propList: ReadableMap?) {
4236
if (propList != null) {
4337
view.setEdges(
4438
SafeAreaViewEdges(

0 commit comments

Comments
 (0)