Skip to content

Commit c8398fc

Browse files
kirillzyuskokirillzyusko
authored
refactor: don't inject package context (#983)
## 📜 Description Don't pass `reactContext` from `createViewManagers` to a real view managers. ## 💡 Motivation and Context This seems to be a rudiment - for some reasons I had that code in the past, but now it seems completely unused and only pollutes Android Studio warnings that variable is unused. I don't see any use cases where it would be actually used, so in this PR I'm removing that approach and now all magers are context-aware-free 🎉 ## 📢 Changelog <!-- High level overview of important changes --> <!-- For example: fixed status bar manipulation; added new types declarations; --> <!-- If your changes don't affect one of platform/language below - then remove this platform/language --> ### Android - don't pass `reactContext` from `createViewManagers` to a real view managers. ## 🤔 How Has This Been Tested? Tested via CI. ## 📸 Screenshots (if appropriate): <img width="832" alt="image" src="https://github.com/user-attachments/assets/b8aad165-d62e-4924-b2a4-38cad9a02b15" /> ## 📝 Checklist - [x] CI successfully passed - [x] I added new mocks and corresponding unit-tests if library API was changed
1 parent 9de9115 commit c8398fc

File tree

11 files changed

+24
-51
lines changed

11 files changed

+24
-51
lines changed

‎android/src/base/java/com/reactnativekeyboardcontroller/KeyboardControllerPackage.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class KeyboardControllerPackage : BaseReactPackage() {
5454

5555
override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
5656
listOf(
57-
KeyboardControllerViewManager(reactContext),
58-
KeyboardGestureAreaViewManager(reactContext),
59-
OverKeyboardViewManager(reactContext),
57+
KeyboardControllerViewManager(),
58+
KeyboardGestureAreaViewManager(),
59+
OverKeyboardViewManager(),
6060
)
6161
}

‎android/src/fabric/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.reactnativekeyboardcontroller
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.ThemedReactContext
54
import com.facebook.react.uimanager.ViewManagerDelegate
65
import com.facebook.react.uimanager.annotations.ReactProp
@@ -11,11 +10,10 @@ import com.facebook.react.views.view.ReactViewManager
1110
import com.reactnativekeyboardcontroller.managers.KeyboardControllerViewManagerImpl
1211
import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
1312

14-
class KeyboardControllerViewManager(
15-
mReactContext: ReactApplicationContext,
16-
) : ReactViewManager(),
13+
class KeyboardControllerViewManager :
14+
ReactViewManager(),
1715
KeyboardControllerViewManagerInterface<ReactViewGroup> {
18-
private val manager = KeyboardControllerViewManagerImpl(mReactContext)
16+
private val manager = KeyboardControllerViewManagerImpl()
1917
private val mDelegate = KeyboardControllerViewManagerDelegate(this)
2018

2119
// region Lifecycle

‎android/src/fabric/java/com/reactnativekeyboardcontroller/KeyboardGestureAreaViewManager.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.reactnativekeyboardcontroller
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.ThemedReactContext
54
import com.facebook.react.uimanager.ViewManagerDelegate
65
import com.facebook.react.uimanager.annotations.ReactProp
@@ -11,11 +10,10 @@ import com.facebook.react.views.view.ReactViewManager
1110
import com.reactnativekeyboardcontroller.managers.KeyboardGestureAreaViewManagerImpl
1211
import com.reactnativekeyboardcontroller.views.KeyboardGestureAreaReactViewGroup
1312

14-
class KeyboardGestureAreaViewManager(
15-
mReactContext: ReactApplicationContext,
16-
) : ReactViewManager(),
13+
class KeyboardGestureAreaViewManager :
14+
ReactViewManager(),
1715
KeyboardGestureAreaManagerInterface<ReactViewGroup> {
18-
private val manager = KeyboardGestureAreaViewManagerImpl(mReactContext)
16+
private val manager = KeyboardGestureAreaViewManagerImpl()
1917
private val mDelegate = KeyboardGestureAreaManagerDelegate(this)
2018

2119
override fun getDelegate(): ViewManagerDelegate<ReactViewGroup> = mDelegate

‎android/src/fabric/java/com/reactnativekeyboardcontroller/OverKeyboardViewManager.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.reactnativekeyboardcontroller
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.LayoutShadowNode
54
import com.facebook.react.uimanager.ReactStylesDiffMap
65
import com.facebook.react.uimanager.StateWrapper
@@ -14,11 +13,10 @@ import com.reactnativekeyboardcontroller.managers.OverKeyboardViewManagerImpl
1413
import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostShadowNode
1514
import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostView
1615

17-
class OverKeyboardViewManager(
18-
mReactContext: ReactApplicationContext,
19-
) : ViewGroupManager<OverKeyboardHostView>(),
16+
class OverKeyboardViewManager :
17+
ViewGroupManager<OverKeyboardHostView>(),
2018
OverKeyboardViewManagerInterface<OverKeyboardHostView> {
21-
private val manager = OverKeyboardViewManagerImpl(mReactContext)
19+
private val manager = OverKeyboardViewManagerImpl()
2220
private val mDelegate = OverKeyboardViewManagerDelegate(this)
2321

2422
override fun getDelegate(): ViewManagerDelegate<OverKeyboardHostView> = mDelegate

‎android/src/main/java/com/reactnativekeyboardcontroller/managers/KeyboardControllerViewManagerImpl.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.reactnativekeyboardcontroller.managers
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.common.MapBuilder
54
import com.facebook.react.uimanager.ThemedReactContext
65
import com.reactnativekeyboardcontroller.events.FocusedInputLayoutChangedEvent
@@ -10,10 +9,7 @@ import com.reactnativekeyboardcontroller.events.KeyboardTransitionEvent
109
import com.reactnativekeyboardcontroller.listeners.WindowDimensionListener
1110
import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
1211

13-
@Suppress("detekt:UnusedPrivateProperty")
14-
class KeyboardControllerViewManagerImpl(
15-
mReactContext: ReactApplicationContext,
16-
) {
12+
class KeyboardControllerViewManagerImpl {
1713
private var listener: WindowDimensionListener? = null
1814

1915
fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup {

‎android/src/main/java/com/reactnativekeyboardcontroller/managers/KeyboardGestureAreaViewManagerImpl.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package com.reactnativekeyboardcontroller.managers
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.ThemedReactContext
54
import com.reactnativekeyboardcontroller.views.KeyboardGestureAreaReactViewGroup
65

7-
@Suppress("detekt:UnusedPrivateProperty")
8-
class KeyboardGestureAreaViewManagerImpl(
9-
mReactContext: ReactApplicationContext,
10-
) {
6+
class KeyboardGestureAreaViewManagerImpl {
117
fun createViewInstance(reactContext: ThemedReactContext): KeyboardGestureAreaReactViewGroup =
128
KeyboardGestureAreaReactViewGroup(reactContext)
139

‎android/src/main/java/com/reactnativekeyboardcontroller/managers/OverKeyboardViewManagerImpl.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package com.reactnativekeyboardcontroller.managers
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.ThemedReactContext
54
import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostView
65

7-
@Suppress("detekt:UnusedPrivateProperty")
8-
class OverKeyboardViewManagerImpl(
9-
mReactContext: ReactApplicationContext,
10-
) {
6+
class OverKeyboardViewManagerImpl {
117
fun createViewInstance(reactContext: ThemedReactContext): OverKeyboardHostView = OverKeyboardHostView(reactContext)
128

139
fun setVisible(

‎android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package com.reactnativekeyboardcontroller
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.ThemedReactContext
54
import com.facebook.react.uimanager.annotations.ReactProp
65
import com.facebook.react.views.view.ReactViewGroup
76
import com.facebook.react.views.view.ReactViewManager
87
import com.reactnativekeyboardcontroller.managers.KeyboardControllerViewManagerImpl
98
import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
109

11-
class KeyboardControllerViewManager(
12-
mReactContext: ReactApplicationContext,
13-
) : ReactViewManager() {
14-
private val manager = KeyboardControllerViewManagerImpl(mReactContext)
10+
class KeyboardControllerViewManager : ReactViewManager() {
11+
private val manager = KeyboardControllerViewManagerImpl()
1512

1613
// region Lifecycle
1714
override fun createViewInstance(context: ThemedReactContext): ReactViewGroup = manager.createViewInstance(context)

‎android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardGestureAreaViewManager.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.reactnativekeyboardcontroller
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.ThemedReactContext
54
import com.facebook.react.uimanager.annotations.ReactProp
65
import com.facebook.react.views.view.ReactViewManager
76
import com.reactnativekeyboardcontroller.managers.KeyboardGestureAreaViewManagerImpl
87
import com.reactnativekeyboardcontroller.views.KeyboardGestureAreaReactViewGroup
98

10-
class KeyboardGestureAreaViewManager(
11-
mReactContext: ReactApplicationContext,
12-
) : ReactViewManager() {
13-
private val manager = KeyboardGestureAreaViewManagerImpl(mReactContext)
9+
class KeyboardGestureAreaViewManager : ReactViewManager() {
10+
private val manager = KeyboardGestureAreaViewManagerImpl()
1411

1512
override fun getName(): String = KeyboardGestureAreaViewManagerImpl.NAME
1613

‎android/src/paper/java/com/reactnativekeyboardcontroller/OverKeyboardViewManager.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.reactnativekeyboardcontroller
22

3-
import com.facebook.react.bridge.ReactApplicationContext
43
import com.facebook.react.uimanager.LayoutShadowNode
54
import com.facebook.react.uimanager.ThemedReactContext
65
import com.facebook.react.uimanager.ViewGroupManager
@@ -9,10 +8,8 @@ import com.reactnativekeyboardcontroller.managers.OverKeyboardViewManagerImpl
98
import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostShadowNode
109
import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostView
1110

12-
class OverKeyboardViewManager(
13-
mReactContext: ReactApplicationContext,
14-
) : ViewGroupManager<OverKeyboardHostView>() {
15-
private val manager = OverKeyboardViewManagerImpl(mReactContext)
11+
class OverKeyboardViewManager : ViewGroupManager<OverKeyboardHostView>() {
12+
private val manager = OverKeyboardViewManagerImpl()
1613

1714
override fun getName(): String = OverKeyboardViewManagerImpl.NAME
1815

‎android/src/turbo/java/com/reactnativekeyboardcontroller/KeyboardControllerPackage.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class KeyboardControllerPackage : TurboReactPackage() {
5656

5757
override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
5858
listOf(
59-
KeyboardControllerViewManager(reactContext),
60-
KeyboardGestureAreaViewManager(reactContext),
61-
OverKeyboardViewManager(reactContext),
59+
KeyboardControllerViewManager(),
60+
KeyboardGestureAreaViewManager(),
61+
OverKeyboardViewManager(),
6262
)
6363
}

0 commit comments

Comments
 (0)