react-native-screens 3.31.1 → 3.33.0

package/android/src/main/java/com/swmansion/rnscreens/ScreensShadowNode.kt

@@ -6,7 +6,9 @@ import com.facebook.react.uimanager.NativeViewHierarchyManager
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer
 import com.facebook.react.uimanager.UIManagerModule
 
-internal class ScreensShadowNode(private var context: ReactContext) : LayoutShadowNode() {
+internal class ScreensShadowNode(
+    private var context: ReactContext,
+) : LayoutShadowNode() {
     override fun onBeforeLayout(nativeViewHierarchyOptimizer: NativeViewHierarchyOptimizer) {
         super.onBeforeLayout(nativeViewHierarchyOptimizer)
         (context.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->

package/android/src/main/java/com/swmansion/rnscreens/SearchBarManager.kt

@@ -1,12 +1,15 @@
 package com.swmansion.rnscreens
 
+import android.util.Log
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
-import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNSSearchBarManagerDelegate
+import com.facebook.react.viewmanagers.RNSSearchBarManagerInterface
 import com.swmansion.rnscreens.events.SearchBarBlurEvent
 import com.swmansion.rnscreens.events.SearchBarChangeTextEvent
 import com.swmansion.rnscreens.events.SearchBarCloseEvent
@@ -15,120 +18,223 @@ import com.swmansion.rnscreens.events.SearchBarOpenEvent
 import com.swmansion.rnscreens.events.SearchBarSearchButtonPressEvent
 
 @ReactModule(name = SearchBarManager.REACT_CLASS)
-class SearchBarManager : ViewGroupManager<SearchBarView>() {
-    override fun getName(): String {
-        return REACT_CLASS
-    }
+class SearchBarManager :
+    ViewGroupManager<SearchBarView>(),
+    RNSSearchBarManagerInterface<SearchBarView> {
+    private val delegate: ViewManagerDelegate<SearchBarView>
 
-    override fun createViewInstance(context: ThemedReactContext): SearchBarView {
-        return SearchBarView(context)
+    init {
+        delegate = RNSSearchBarManagerDelegate<SearchBarView, SearchBarManager>(this)
     }
 
+    protected override fun getDelegate(): ViewManagerDelegate<SearchBarView> = delegate
+
+    override fun getName(): String = REACT_CLASS
+
+    override fun createViewInstance(context: ThemedReactContext): SearchBarView = SearchBarView(context)
+
     override fun onAfterUpdateTransaction(view: SearchBarView) {
         super.onAfterUpdateTransaction(view)
         view.onUpdate()
     }
 
     @ReactProp(name = "autoCapitalize")
-    fun setAutoCapitalize(view: SearchBarView, autoCapitalize: String?) {
-        view.autoCapitalize = when (autoCapitalize) {
-            null, "none" -> SearchBarView.SearchBarAutoCapitalize.NONE
-            "words" -> SearchBarView.SearchBarAutoCapitalize.WORDS
-            "sentences" -> SearchBarView.SearchBarAutoCapitalize.SENTENCES
-            "characters" -> SearchBarView.SearchBarAutoCapitalize.CHARACTERS
-            else -> throw JSApplicationIllegalArgumentException(
-                "Forbidden auto capitalize value passed"
-            )
-        }
+    override fun setAutoCapitalize(
+        view: SearchBarView,
+        autoCapitalize: String?,
+    ) {
+        view.autoCapitalize =
+            when (autoCapitalize) {
+                null, "none" -> SearchBarView.SearchBarAutoCapitalize.NONE
+                "words" -> SearchBarView.SearchBarAutoCapitalize.WORDS
+                "sentences" -> SearchBarView.SearchBarAutoCapitalize.SENTENCES
+                "characters" -> SearchBarView.SearchBarAutoCapitalize.CHARACTERS
+                else -> throw JSApplicationIllegalArgumentException(
+                    "Forbidden auto capitalize value passed",
+                )
+            }
     }
 
     @ReactProp(name = "autoFocus")
-    fun setAutoFocus(view: SearchBarView, autoFocus: Boolean?) {
+    fun setAutoFocus(
+        view: SearchBarView,
+        autoFocus: Boolean?,
+    ) {
         view.autoFocus = autoFocus ?: false
     }
 
     @ReactProp(name = "barTintColor", customType = "Color")
-    fun setTintColor(view: SearchBarView, color: Int?) {
+    override fun setBarTintColor(
+        view: SearchBarView,
+        color: Int?,
+    ) {
         view.tintColor = color
     }
 
     @ReactProp(name = "disableBackButtonOverride")
-    fun setDisableBackButtonOverride(view: SearchBarView, disableBackButtonOverride: Boolean?) {
+    override fun setDisableBackButtonOverride(
+        view: SearchBarView,
+        disableBackButtonOverride: Boolean,
+    ) {
         view.shouldOverrideBackButton = disableBackButtonOverride != true
     }
 
     @ReactProp(name = "inputType")
-    fun setInputType(view: SearchBarView, inputType: String?) {
-        view.inputType = when (inputType) {
-            null, "text" -> SearchBarView.SearchBarInputTypes.TEXT
-            "phone" -> SearchBarView.SearchBarInputTypes.PHONE
-            "number" -> SearchBarView.SearchBarInputTypes.NUMBER
-            "email" -> SearchBarView.SearchBarInputTypes.EMAIL
-            else -> throw JSApplicationIllegalArgumentException(
-                "Forbidden input type value"
-            )
-        }
+    override fun setInputType(
+        view: SearchBarView,
+        inputType: String?,
+    ) {
+        view.inputType =
+            when (inputType) {
+                null, "text" -> SearchBarView.SearchBarInputTypes.TEXT
+                "phone" -> SearchBarView.SearchBarInputTypes.PHONE
+                "number" -> SearchBarView.SearchBarInputTypes.NUMBER
+                "email" -> SearchBarView.SearchBarInputTypes.EMAIL
+                else -> throw JSApplicationIllegalArgumentException(
+                    "Forbidden input type value",
+                )
+            }
     }
 
     @ReactProp(name = "placeholder")
-    fun setPlaceholder(view: SearchBarView, placeholder: String?) {
+    override fun setPlaceholder(
+        view: SearchBarView,
+        placeholder: String?,
+    ) {
         if (placeholder != null) {
             view.placeholder = placeholder
         }
     }
 
     @ReactProp(name = "textColor", customType = "Color")
-    fun setTextColor(view: SearchBarView, color: Int?) {
+    override fun setTextColor(
+        view: SearchBarView,
+        color: Int?,
+    ) {
         view.textColor = color
     }
 
     @ReactProp(name = "headerIconColor", customType = "Color")
-    fun setHeaderIconColor(view: SearchBarView, color: Int?) {
+    override fun setHeaderIconColor(
+        view: SearchBarView,
+        color: Int?,
+    ) {
         view.headerIconColor = color
     }
 
     @ReactProp(name = "hintTextColor", customType = "Color")
-    fun setHintTextColor(view: SearchBarView, color: Int?) {
+    override fun setHintTextColor(
+        view: SearchBarView,
+        color: Int?,
+    ) {
         view.hintTextColor = color
     }
 
     @ReactProp(name = "shouldShowHintSearchIcon")
-    fun setShouldShowHintSearchIcon(view: SearchBarView, shouldShowHintSearchIcon: Boolean?) {
+    override fun setShouldShowHintSearchIcon(
+        view: SearchBarView,
+        shouldShowHintSearchIcon: Boolean,
+    ) {
         view.shouldShowHintSearchIcon = shouldShowHintSearchIcon ?: true
     }
 
-    fun setPlacement(view: SearchBarView, placeholder: String?) = Unit
-
-    override fun receiveCommand(root: SearchBarView, commandId: String?, args: ReadableArray?) {
-        when (commandId) {
-            "focus" -> root.handleFocusJsRequest()
-            "blur" -> root.handleBlurJsRequest()
-            "clearText" -> root.handleClearTextJsRequest()
-            "toggleCancelButton" -> root.handleToggleCancelButtonJsRequest(false) // just a dummy argument
-            "setText" -> root.handleSetTextJsRequest(args?.getString(0))
-            "cancelSearch" -> root.handleCancelSearchJsRequest()
-            else -> throw JSApplicationIllegalArgumentException("Unsupported native command received: $commandId")
-        }
-    }
-
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        return MapBuilder.of(
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? =
+        MapBuilder.of(
             SearchBarBlurEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onBlur"),
+            MapBuilder.of("registrationName", "onSearchBlur"),
             SearchBarChangeTextEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onChangeText"),
             SearchBarCloseEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onClose"),
             SearchBarFocusEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onFocus"),
+            MapBuilder.of("registrationName", "onSearchFocus"),
             SearchBarOpenEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onOpen"),
             SearchBarSearchButtonPressEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onSearchButtonPress"),
         )
-    }
 
     companion object {
         const val REACT_CLASS = "RNSSearchBar"
     }
+
+    private fun logNotAvailable(propName: String) {
+        Log.w("[RNScreens]", "$propName prop is not available on Android")
+    }
+
+    // NativeCommands
+
+    override fun blur(view: SearchBarView?) {
+        view?.handleBlurJsRequest()
+    }
+
+    override fun focus(view: SearchBarView?) {
+        view?.handleFocusJsRequest()
+    }
+
+    override fun clearText(view: SearchBarView?) {
+        view?.handleClearTextJsRequest()
+    }
+
+    override fun toggleCancelButton(
+        view: SearchBarView?,
+        flag: Boolean,
+    ) {
+        view?.handleToggleCancelButtonJsRequest(flag)
+    }
+
+    override fun setText(
+        view: SearchBarView?,
+        text: String?,
+    ) {
+        view?.handleSetTextJsRequest(text)
+    }
+
+    override fun cancelSearch(view: SearchBarView?) {
+        view?.handleFocusJsRequest()
+    }
+
+    // iOS only
+
+    override fun setPlacement(
+        view: SearchBarView,
+        placeholder: String?,
+    ) {
+        logNotAvailable("setPlacement")
+    }
+
+    override fun setHideWhenScrolling(
+        view: SearchBarView?,
+        value: Boolean,
+    ) {
+        logNotAvailable("hideWhenScrolling")
+    }
+
+    override fun setObscureBackground(
+        view: SearchBarView?,
+        value: Boolean,
+    ) {
+        logNotAvailable("hideNavigationBar")
+    }
+
+    override fun setHideNavigationBar(
+        view: SearchBarView?,
+        value: Boolean,
+    ) {
+        logNotAvailable("hideNavigationBar")
+    }
+
+    override fun setCancelButtonText(
+        view: SearchBarView?,
+        value: String?,
+    ) {
+        logNotAvailable("cancelButtonText")
+    }
+
+    override fun setTintColor(
+        view: SearchBarView?,
+        value: Int?,
+    ) {
+        logNotAvailable("tintColor")
+    }
 }

package/android/src/main/java/com/swmansion/rnscreens/SearchBarView.kt

@@ -16,7 +16,9 @@ import com.swmansion.rnscreens.events.SearchBarOpenEvent
 import com.swmansion.rnscreens.events.SearchBarSearchButtonPressEvent
 
 @SuppressLint("ViewConstructor")
-class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext) {
+class SearchBarView(
+    reactContext: ReactContext?,
+) : ReactViewGroup(reactContext) {
     var inputType: SearchBarInputTypes = SearchBarInputTypes.TEXT
     var autoCapitalize: SearchBarAutoCapitalize = SearchBarAutoCapitalize.NONE
     var textColor: Int? = null
@@ -71,8 +73,10 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
         super.onAttachedToWindow()
 
         screenStackFragment?.onSearchViewCreate = { newSearchView ->
-            if (searchViewFormatter == null) searchViewFormatter =
-                SearchViewFormatter(newSearchView)
+            if (searchViewFormatter == null) {
+                searchViewFormatter =
+                    SearchViewFormatter(newSearchView)
+            }
             setSearchViewProps()
             if (autoFocus) {
                 screenStackFragment?.searchView?.focus()
@@ -81,17 +85,19 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
     }
 
     private fun setSearchViewListeners(searchView: SearchView) {
-        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextChange(newText: String?): Boolean {
-                handleTextChange(newText)
-                return true
-            }
+        searchView.setOnQueryTextListener(
+            object : SearchView.OnQueryTextListener {
+                override fun onQueryTextChange(newText: String?): Boolean {
+                    handleTextChange(newText)
+                    return true
+                }
 
-            override fun onQueryTextSubmit(query: String?): Boolean {
-                handleTextSubmit(query)
-                return true
-            }
-        })
+                override fun onQueryTextSubmit(query: String?): Boolean {
+                    handleTextSubmit(query)
+                    return true
+                }
+            },
+        )
         searchView.setOnQueryTextFocusChangeListener { _, hasFocus ->
             handleFocusChange(hasFocus)
         }
@@ -157,15 +163,19 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
     private fun setToolbarElementsVisibility(visibility: Int) {
         for (i in 0..(headerConfig?.configSubviewsCount?.minus(1) ?: 0)) {
             val subview = headerConfig?.getConfigSubview(i)
-            if (subview?.type != ScreenStackHeaderSubview.Type.SEARCH_BAR)
+            if (subview?.type != ScreenStackHeaderSubview.Type.SEARCH_BAR) {
                 subview?.visibility = visibility
+            }
         }
     }
 
     private val surfaceId = UIManagerHelper.getSurfaceId(this)
 
     enum class SearchBarAutoCapitalize {
-        NONE, WORDS, SENTENCES, CHARACTERS
+        NONE,
+        WORDS,
+        SENTENCES,
+        CHARACTERS,
     }
 
     enum class SearchBarInputTypes {
@@ -179,17 +189,14 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
                 }
         },
         PHONE {
-            override fun toAndroidInputType(capitalize: SearchBarAutoCapitalize) =
-                InputType.TYPE_CLASS_PHONE
+            override fun toAndroidInputType(capitalize: SearchBarAutoCapitalize) = InputType.TYPE_CLASS_PHONE
         },
         NUMBER {
-            override fun toAndroidInputType(capitalize: SearchBarAutoCapitalize) =
-                InputType.TYPE_CLASS_NUMBER
+            override fun toAndroidInputType(capitalize: SearchBarAutoCapitalize) = InputType.TYPE_CLASS_NUMBER
         },
         EMAIL {
-            override fun toAndroidInputType(capitalize: SearchBarAutoCapitalize) =
-                InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-        };
+            override fun toAndroidInputType(capitalize: SearchBarAutoCapitalize) = InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+        }, ;
 
         abstract fun toAndroidInputType(capitalize: SearchBarAutoCapitalize): Int
     }

package/android/src/main/java/com/swmansion/rnscreens/SearchViewFormatter.kt

@@ -7,7 +7,9 @@ import android.widget.ImageView
 import androidx.appcompat.R
 import androidx.appcompat.widget.SearchView
 
-class SearchViewFormatter(var searchView: SearchView) {
+class SearchViewFormatter(
+    var searchView: SearchView,
+) {
     private var defaultTextColor: Int? = null
     private var defaultTintBackground: Drawable? = null
 
@@ -57,7 +59,10 @@ class SearchViewFormatter(var searchView: SearchView) {
         }
     }
 
-    fun setPlaceholder(placeholder: String, shouldShowHintSearchIcon: Boolean) {
+    fun setPlaceholder(
+        placeholder: String,
+        shouldShowHintSearchIcon: Boolean,
+    ) {
         if (shouldShowHintSearchIcon) {
             searchView.queryHint = placeholder
         } else {

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderAttachedEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class HeaderAttachedEvent(surfaceId: Int, viewId: Int) : Event<HeaderAttachedEvent>(surfaceId, viewId) {
+class HeaderAttachedEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<HeaderAttachedEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderBackButtonClickedEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class HeaderBackButtonClickedEvent(surfaceId: Int, viewId: Int) : Event<HeaderBackButtonClickedEvent>(surfaceId, viewId) {
+class HeaderBackButtonClickedEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<HeaderBackButtonClickedEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderDetachedEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class HeaderDetachedEvent(surfaceId: Int, viewId: Int) : Event<HeaderDetachedEvent>(surfaceId, viewId) {
+class HeaderDetachedEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<HeaderDetachedEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt

@@ -3,22 +3,21 @@ package com.swmansion.rnscreens.events
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
 class HeaderHeightChangeEvent(
     surfaceId: Int,
     viewId: Int,
-    private val headerHeight: Double
+    private val headerHeight: Double,
 ) : Event<HeaderHeightChangeEvent>(surfaceId, viewId) {
-
     override fun getEventName() = EVENT_NAME
 
     // As the same header height could appear twice, use header height as a coalescing key.
     override fun getCoalescingKey(): Short = headerHeight.toInt().toShort()
 
-    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-        putDouble("headerHeight", headerHeight)
-    }
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putDouble("headerHeight", headerHeight)
+        }
 
     companion object {
         const val EVENT_NAME = "topHeaderHeightChange"

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenAppearEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class ScreenAppearEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
+class ScreenAppearEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenDisappearEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class ScreenDisappearEvent(surfaceId: Int, viewId: Int) : Event<ScreenDisappearEvent>(surfaceId, viewId) {
+class ScreenDisappearEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<ScreenDisappearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenDismissedEvent.kt

@@ -4,15 +4,19 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class ScreenDismissedEvent(surfaceId: Int, viewId: Int) : Event<ScreenDismissedEvent>(surfaceId, viewId) {
+class ScreenDismissedEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<ScreenDismissedEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-        putInt("dismissCount", 1)
-    }
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putInt("dismissCount", 1)
+        }
 
     companion object {
         const val EVENT_NAME = "topDismissed"

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenTransitionProgressEvent.kt

@@ -10,17 +10,18 @@ class ScreenTransitionProgressEvent(
     private val progress: Float,
     private val isClosing: Boolean,
     private val isGoingForward: Boolean,
-    private val coalescingKey: Short
+    private val coalescingKey: Short,
 ) : Event<ScreenTransitionProgressEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     override fun getCoalescingKey(): Short = coalescingKey
 
-    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-        putDouble("progress", progress.toDouble())
-        putInt("closing", if (isClosing) 1 else 0)
-        putInt("goingForward", if (isGoingForward) 1 else 0)
-    }
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putDouble("progress", progress.toDouble())
+            putInt("closing", if (isClosing) 1 else 0)
+            putInt("goingForward", if (isGoingForward) 1 else 0)
+        }
 
     companion object {
         const val EVENT_NAME = "topTransitionProgress"

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenWillAppearEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class ScreenWillAppearEvent(surfaceId: Int, viewId: Int) : Event<ScreenWillAppearEvent>(surfaceId, viewId) {
+class ScreenWillAppearEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<ScreenWillAppearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenWillDisappearEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class ScreenWillDisappearEvent(surfaceId: Int, viewId: Int) : Event<ScreenWillDisappearEvent>(surfaceId, viewId) {
+class ScreenWillDisappearEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<ScreenWillDisappearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarBlurEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<SearchBarBlurEvent>(surfaceId, viewId) {
+class SearchBarBlurEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<SearchBarBlurEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.
@@ -13,6 +16,6 @@ class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<SearchBarBlurEvent
     override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
-        const val EVENT_NAME = "topBlur"
+        const val EVENT_NAME = "topSearchBlur"
     }
 }

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarChangeTextEvent.kt

@@ -14,9 +14,10 @@ class SearchBarChangeTextEvent(
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-        putString("text", text)
-    }
+    override fun getEventData(): WritableMap? =
+        Arguments.createMap().apply {
+            putString("text", text)
+        }
 
     companion object {
         const val EVENT_NAME = "topChangeText"

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarCloseEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarCloseEvent(surfaceId: Int, viewId: Int) : Event<SearchBarCloseEvent>(surfaceId, viewId) {
+class SearchBarCloseEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<SearchBarCloseEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarFocusEvent.kt

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<SearchBarFocusEvent>(surfaceId, viewId) {
+class SearchBarFocusEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<SearchBarFocusEvent>(surfaceId, viewId) {
     override fun getEventName(): String = EVENT_NAME
 
     // All events for a given view can be coalesced.
@@ -13,6 +16,6 @@ class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<SearchBarFocusEve
     override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
-        const val EVENT_NAME = "topFocus"
+        const val EVENT_NAME = "topSearchFocus"
     }
 }