react-native-keyboard-controller 1.13.3 → 1.14.0

package/README.md

@@ -15,6 +15,7 @@ Keyboard manager which works in identical way on both iOS and Android.
 - interactive keyboard dismissing 👆📱
 - prebuilt components (`KeyboardStickyView`, `KeyboardAwareScrollView`, re-worked `KeyboardAvoidingView`) 📚
 - `KeyboardToolbar` with easy behavior customization of _**previous**_, _**next**_ and _**done**_ buttons in the keyboard toolbar 📐
+- show anything over the keyboard (without dismissing it) using `OverKeyboardView` 🌐
 - easy focused input information retrieval 📝 🔮
 - works with any navigation library 🧭
 - and more is coming... Stay tuned! 😊

package/android/src/fabric/java/com/reactnativekeyboardcontroller/KeyboardControllerModule.kt

@@ -3,7 +3,9 @@ package com.reactnativekeyboardcontroller
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativekeyboardcontroller.modules.KeyboardControllerModuleImpl
 
-class KeyboardControllerModule(mReactContext: ReactApplicationContext) : NativeKeyboardControllerSpec(mReactContext) {
+class KeyboardControllerModule(
+  mReactContext: ReactApplicationContext,
+) : NativeKeyboardControllerSpec(mReactContext) {
   private val module = KeyboardControllerModuleImpl(mReactContext)
 
   override fun getName(): String = KeyboardControllerModuleImpl.NAME
@@ -25,10 +27,10 @@ class KeyboardControllerModule(mReactContext: ReactApplicationContext) : NativeK
   }
 
   override fun addListener(eventName: String?) {
-    /* Required for RN built-in Event Emitter Calls. */
+    // Required for RN built-in Event Emitter Calls.
   }
 
   override fun removeListeners(count: Double) {
-    /* Required for RN built-in Event Emitter Calls. */
+    // Required for RN built-in Event Emitter Calls.
   }
 }

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

@@ -11,38 +11,37 @@ import com.facebook.react.views.view.ReactViewManager
 import com.reactnativekeyboardcontroller.managers.KeyboardControllerViewManagerImpl
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
-class KeyboardControllerViewManager(mReactContext: ReactApplicationContext) :
-  ReactViewManager(),
+class KeyboardControllerViewManager(
+  mReactContext: ReactApplicationContext,
+) : ReactViewManager(),
   KeyboardControllerViewManagerInterface<ReactViewGroup> {
   private val manager = KeyboardControllerViewManagerImpl(mReactContext)
   private val mDelegate = KeyboardControllerViewManagerDelegate(this)
 
-  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup?> {
-    return mDelegate
-  }
+  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup?> = mDelegate
 
   override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
 
-  override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
-    return manager.createViewInstance(context)
-  }
+  override fun createViewInstance(context: ThemedReactContext): ReactViewGroup = manager.createViewInstance(context)
 
   @ReactProp(name = "statusBarTranslucent")
-  override fun setStatusBarTranslucent(view: ReactViewGroup, value: Boolean) {
-    return manager.setStatusBarTranslucent(view as EdgeToEdgeReactViewGroup, value)
-  }
+  override fun setStatusBarTranslucent(
+    view: ReactViewGroup,
+    value: Boolean,
+  ) = manager.setStatusBarTranslucent(view as EdgeToEdgeReactViewGroup, value)
 
   @ReactProp(name = "navigationBarTranslucent")
-  override fun setNavigationBarTranslucent(view: ReactViewGroup, value: Boolean) {
-    return manager.setNavigationBarTranslucent(view as EdgeToEdgeReactViewGroup, value)
-  }
+  override fun setNavigationBarTranslucent(
+    view: ReactViewGroup,
+    value: Boolean,
+  ) = manager.setNavigationBarTranslucent(view as EdgeToEdgeReactViewGroup, value)
 
   @ReactProp(name = "enabled")
-  override fun setEnabled(view: ReactViewGroup, value: Boolean) {
-    return manager.setEnabled(view as EdgeToEdgeReactViewGroup, value)
-  }
+  override fun setEnabled(
+    view: ReactViewGroup,
+    value: Boolean,
+  ) = manager.setEnabled(view as EdgeToEdgeReactViewGroup, value)
 
-  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-    return manager.getExportedCustomDirectEventTypeConstants()
-  }
+  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+    manager.getExportedCustomDirectEventTypeConstants()
 }

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

@@ -11,39 +11,49 @@ import com.facebook.react.views.view.ReactViewManager
 import com.reactnativekeyboardcontroller.managers.KeyboardGestureAreaViewManagerImpl
 import com.reactnativekeyboardcontroller.views.KeyboardGestureAreaReactViewGroup
 
-class KeyboardGestureAreaViewManager(mReactContext: ReactApplicationContext) :
-  ReactViewManager(),
+class KeyboardGestureAreaViewManager(
+  mReactContext: ReactApplicationContext,
+) : ReactViewManager(),
   KeyboardGestureAreaManagerInterface<ReactViewGroup> {
   private val manager = KeyboardGestureAreaViewManagerImpl(mReactContext)
   private val mDelegate = KeyboardGestureAreaManagerDelegate(this)
 
-  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup?> {
-    return mDelegate
-  }
+  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup?> = mDelegate
 
   override fun getName(): String = KeyboardGestureAreaViewManagerImpl.NAME
 
-  override fun createViewInstance(context: ThemedReactContext): KeyboardGestureAreaReactViewGroup {
-    return manager.createViewInstance(context)
-  }
+  override fun createViewInstance(context: ThemedReactContext): KeyboardGestureAreaReactViewGroup =
+    manager.createViewInstance(context)
 
   @ReactProp(name = "offset")
-  override fun setOffset(view: ReactViewGroup, value: Double) {
+  override fun setOffset(
+    view: ReactViewGroup,
+    value: Double,
+  ) {
     manager.setOffset(view as KeyboardGestureAreaReactViewGroup, value)
   }
 
   @ReactProp(name = "interpolator")
-  override fun setInterpolator(view: ReactViewGroup, value: String?) {
+  override fun setInterpolator(
+    view: ReactViewGroup,
+    value: String?,
+  ) {
     manager.setInterpolator(view as KeyboardGestureAreaReactViewGroup, value ?: "linear")
   }
 
   @ReactProp(name = "showOnSwipeUp")
-  override fun setShowOnSwipeUp(view: ReactViewGroup, value: Boolean) {
+  override fun setShowOnSwipeUp(
+    view: ReactViewGroup,
+    value: Boolean,
+  ) {
     manager.setScrollKeyboardOnScreenWhenNotVisible(view as KeyboardGestureAreaReactViewGroup, value)
   }
 
   @ReactProp(name = "enableSwipeToDismiss")
-  override fun setEnableSwipeToDismiss(view: ReactViewGroup?, value: Boolean) {
+  override fun setEnableSwipeToDismiss(
+    view: ReactViewGroup?,
+    value: Boolean,
+  ) {
     manager.setScrollKeyboardOffScreenWhenVisible(view as KeyboardGestureAreaReactViewGroup, value)
   }
 }

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

@@ -0,0 +1,40 @@
+package com.reactnativekeyboardcontroller
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.LayoutShadowNode
+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.OverKeyboardViewManagerDelegate
+import com.facebook.react.viewmanagers.OverKeyboardViewManagerInterface
+import com.reactnativekeyboardcontroller.managers.OverKeyboardViewManagerImpl
+import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostShadowNode
+import com.reactnativekeyboardcontroller.views.overlay.OverKeyboardHostView
+
+class OverKeyboardViewManager(
+  mReactContext: ReactApplicationContext,
+) : ViewGroupManager<OverKeyboardHostView>(),
+  OverKeyboardViewManagerInterface<OverKeyboardHostView> {
+  private val manager = OverKeyboardViewManagerImpl(mReactContext)
+  private val mDelegate = OverKeyboardViewManagerDelegate(this)
+
+  override fun getDelegate(): ViewManagerDelegate<OverKeyboardHostView?> = mDelegate
+
+  override fun getName(): String = OverKeyboardViewManagerImpl.NAME
+
+  override fun createViewInstance(context: ThemedReactContext): OverKeyboardHostView =
+    manager.createViewInstance(context)
+
+  override fun createShadowNodeInstance(): LayoutShadowNode = OverKeyboardHostShadowNode()
+
+  override fun getShadowNodeClass(): Class<out LayoutShadowNode> = OverKeyboardHostShadowNode::class.java
+
+  @ReactProp(name = "visible")
+  override fun setVisible(
+    view: OverKeyboardHostView,
+    value: Boolean,
+  ) {
+    manager.setVisible(view, value)
+  }
+}

package/android/src/fabric/java/com/reactnativekeyboardcontroller/StatusBarManagerCompatModule.kt

@@ -3,8 +3,9 @@ package com.reactnativekeyboardcontroller
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativekeyboardcontroller.modules.StatusBarManagerCompatModuleImpl
 
-class StatusBarManagerCompatModule(mReactContext: ReactApplicationContext) :
-  NativeStatusBarManagerCompatSpec(mReactContext) {
+class StatusBarManagerCompatModule(
+  mReactContext: ReactApplicationContext,
+) : NativeStatusBarManagerCompatSpec(mReactContext) {
   private val module = StatusBarManagerCompatModuleImpl(mReactContext)
 
   override fun getName(): String = StatusBarManagerCompatModuleImpl.NAME
@@ -13,7 +14,10 @@ class StatusBarManagerCompatModule(mReactContext: ReactApplicationContext) :
     module.setHidden(hidden)
   }
 
-  override fun setColor(color: Double, animated: Boolean) {
+  override fun setColor(
+    color: Double,
+    animated: Boolean,
+  ) {
     module.setColor(color.toInt(), animated)
   }
 

package/android/src/main/java/com/reactnativekeyboardcontroller/KeyboardControllerPackage.kt

@@ -12,8 +12,11 @@ import com.reactnativekeyboardcontroller.modules.StatusBarManagerCompatModuleImp
 
 class KeyboardControllerPackage : TurboReactPackage() {
   @Nullable
-  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return when (name) {
+  override fun getModule(
+    name: String,
+    reactContext: ReactApplicationContext,
+  ): NativeModule? =
+    when (name) {
       KeyboardControllerModuleImpl.NAME -> {
         KeyboardControllerModule(reactContext)
       }
@@ -24,36 +27,39 @@ class KeyboardControllerPackage : TurboReactPackage() {
         null
       }
     }
-  }
 
-  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-    return ReactModuleInfoProvider {
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+    ReactModuleInfoProvider {
       val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
       val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
 
-      moduleInfos[KeyboardControllerModuleImpl.NAME] = ReactModuleInfo(
-        KeyboardControllerModuleImpl.NAME,
-        KeyboardControllerModuleImpl.NAME,
-        false, // canOverrideExistingModule
-        false, // needsEagerInit
-        true, // hasConstants
-        false, // isCxxModule
-        isTurboModule, // isTurboModule
-      )
-      moduleInfos[StatusBarManagerCompatModuleImpl.NAME] = ReactModuleInfo(
-        StatusBarManagerCompatModuleImpl.NAME,
-        StatusBarManagerCompatModuleImpl.NAME,
-        false, // canOverrideExistingModule
-        false, // needsEagerInit
-        true, // hasConstants
-        false, // isCxxModule
-        isTurboModule, // isTurboModule
-      )
+      moduleInfos[KeyboardControllerModuleImpl.NAME] =
+        ReactModuleInfo(
+          KeyboardControllerModuleImpl.NAME,
+          KeyboardControllerModuleImpl.NAME,
+          false, // canOverrideExistingModule
+          false, // needsEagerInit
+          true, // hasConstants
+          false, // isCxxModule
+          isTurboModule, // isTurboModule
+        )
+      moduleInfos[StatusBarManagerCompatModuleImpl.NAME] =
+        ReactModuleInfo(
+          StatusBarManagerCompatModuleImpl.NAME,
+          StatusBarManagerCompatModuleImpl.NAME,
+          false, // canOverrideExistingModule
+          false, // needsEagerInit
+          true, // hasConstants
+          false, // isCxxModule
+          isTurboModule, // isTurboModule
+        )
       moduleInfos
     }
-  }
 
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return listOf(KeyboardControllerViewManager(reactContext), KeyboardGestureAreaViewManager(reactContext))
-  }
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
+    listOf(
+      KeyboardControllerViewManager(reactContext),
+      KeyboardGestureAreaViewManager(reactContext),
+      OverKeyboardViewManager(reactContext),
+    )
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/FocusedInputLayoutChangedEvent.kt

@@ -25,19 +25,20 @@ class FocusedInputLayoutChangedEvent(
   // All events for a given view can be coalesced
   override fun getCoalescingKey(): Short = 0
 
-  override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-    putInt("target", event.target)
-    putInt("parentScrollViewTarget", event.parentScrollViewTarget)
-    putMap(
-      "layout",
-      Arguments.createMap().apply {
-        putDouble("x", event.x)
-        putDouble("y", event.y)
-        putDouble("width", event.width)
-        putDouble("height", event.height)
-        putDouble("absoluteX", event.absoluteX)
-        putDouble("absoluteY", event.absoluteY)
-      },
-    )
-  }
+  override fun getEventData(): WritableMap? =
+    Arguments.createMap().apply {
+      putInt("target", event.target)
+      putInt("parentScrollViewTarget", event.parentScrollViewTarget)
+      putMap(
+        "layout",
+        Arguments.createMap().apply {
+          putDouble("x", event.x)
+          putDouble("y", event.y)
+          putDouble("width", event.width)
+          putDouble("height", event.height)
+          putDouble("absoluteX", event.absoluteX)
+          putDouble("absoluteY", event.absoluteY)
+        },
+      )
+    }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/FocusedInputSelectionChangedEvent.kt

@@ -24,28 +24,29 @@ class FocusedInputSelectionChangedEvent(
   // All events for a given view can be coalesced
   override fun getCoalescingKey(): Short = 0
 
-  override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-    putInt("target", event.target)
-    putMap(
-      "selection",
-      Arguments.createMap().apply {
-        putMap(
-          "start",
-          Arguments.createMap().apply {
-            putDouble("x", event.startX)
-            putDouble("y", event.startY)
-            putInt("position", event.start)
-          },
-        )
-        putMap(
-          "end",
-          Arguments.createMap().apply {
-            putDouble("x", event.endX)
-            putDouble("y", event.endY)
-            putInt("position", event.end)
-          },
-        )
-      },
-    )
-  }
+  override fun getEventData(): WritableMap? =
+    Arguments.createMap().apply {
+      putInt("target", event.target)
+      putMap(
+        "selection",
+        Arguments.createMap().apply {
+          putMap(
+            "start",
+            Arguments.createMap().apply {
+              putDouble("x", event.startX)
+              putDouble("y", event.startY)
+              putInt("position", event.start)
+            },
+          )
+          putMap(
+            "end",
+            Arguments.createMap().apply {
+              putDouble("x", event.endX)
+              putDouble("y", event.endY)
+              putInt("position", event.end)
+            },
+          )
+        },
+      )
+    }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/FocusedInputTextChangedEvent.kt

@@ -14,7 +14,8 @@ class FocusedInputTextChangedEvent(
   // 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)
+    }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/KeyboardTransitionEvent.kt

@@ -19,10 +19,11 @@ class KeyboardTransitionEvent(
   // All events for a given view can be coalesced?
   override fun getCoalescingKey(): Short = 0
 
-  override fun getEventData(): WritableMap? = Arguments.createMap().apply {
-    putDouble("progress", progress)
-    putDouble("height", height)
-    putInt("duration", duration)
-    putInt("target", target)
-  }
+  override fun getEventData(): WritableMap? =
+    Arguments.createMap().apply {
+      putDouble("progress", progress)
+      putDouble("height", height)
+      putInt("duration", duration)
+      putInt("target", target)
+    }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/Context.kt

@@ -0,0 +1,38 @@
+package com.reactnativekeyboardcontroller.extensions
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Point
+import android.os.Build
+import android.view.Display
+import android.view.WindowManager
+import android.view.WindowMetrics
+
+@SuppressLint("ObsoleteSdkInt")
+@Suppress("DEPRECATION")
+fun Context.getDisplaySize(): Point {
+  val size = Point()
+
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+    // For API level 30 (Android 11) and above
+    val windowManager = getSystemService(WindowManager::class.java)
+    val windowMetrics: WindowMetrics = windowManager.currentWindowMetrics
+
+    val bounds = windowMetrics.bounds
+    size.x = bounds.width()
+    size.y = bounds.height()
+  } else {
+    val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+    val display: Display = windowManager.defaultDisplay
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+      display.getRealSize(size) // API level 17 and above
+    } else {
+      // Fallback for API level < 17
+      size.x = display.width
+      size.y = display.height
+    }
+  }
+
+  return size
+}

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/EditText.kt

@@ -3,11 +3,11 @@ package com.reactnativekeyboardcontroller.extensions
 import android.os.Build
 import android.text.Editable
 import android.text.TextWatcher
-import android.util.Log
 import android.view.View
 import android.widget.EditText
 import com.facebook.react.views.scroll.ReactScrollView
 import com.facebook.react.views.textinput.ReactEditText
+import com.reactnativekeyboardcontroller.log.Logger
 import com.reactnativekeyboardcontroller.ui.FrameScheduler
 import java.lang.reflect.Field
 import kotlin.math.max
@@ -22,22 +22,33 @@ import kotlin.math.min
 fun EditText.addOnTextChangedListener(action: (String) -> Unit): TextWatcher {
   var lastText: String? = null
 
-  val listener = object : TextWatcher {
-    @Suppress("detekt:EmptyFunctionBlock")
-    override fun afterTextChanged(s: Editable?) {}
-
-    @Suppress("detekt:EmptyFunctionBlock")
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-      val currentText = s.toString()
-
-      if (currentText != lastText) {
-        lastText = currentText
-        action(currentText)
+  val listener =
+    object : TextWatcher {
+      @Suppress("detekt:EmptyFunctionBlock")
+      override fun afterTextChanged(s: Editable?) = Unit
+
+      @Suppress("detekt:EmptyFunctionBlock")
+      override fun beforeTextChanged(
+        s: CharSequence?,
+        start: Int,
+        count: Int,
+        after: Int,
+      ) = Unit
+
+      override fun onTextChanged(
+        s: CharSequence?,
+        start: Int,
+        before: Int,
+        count: Int,
+      ) {
+        val currentText = s.toString()
+
+        if (currentText != lastText) {
+          lastText = currentText
+          action(currentText)
+        }
       }
     }
-  }
 
   // we can not simply call `addTextChangedListener(listener)`, because the issue
   // https://github.com/kirillzyusko/react-native-keyboard-controller/issues/324
@@ -57,15 +68,15 @@ fun EditText.addOnTextChangedListener(action: (String) -> Unit): TextWatcher {
 
       textWatchListeners.add(0, listener)
     } else {
-      Log.w(
+      Logger.w(
         javaClass.simpleName,
         "Can not attach listener because `fieldValue` does not belong to `ArrayList<TextWatcher>`",
       )
     }
   } catch (e: ClassCastException) {
-    Log.w(javaClass.simpleName, "Can not attach listener because casting failed: ${e.message}")
+    Logger.w(javaClass.simpleName, "Can not attach listener because casting failed: ${e.message}")
   } catch (e: NoSuchFieldException) {
-    Log.w(javaClass.simpleName, "Can not attach listener because field `mListeners` not found: ${e.message}")
+    Logger.w(javaClass.simpleName, "Can not attach listener because field `mListeners` not found: ${e.message}")
   }
 
   return listener
@@ -106,52 +117,61 @@ class KeyboardControllerSelectionWatcher(
   private var lastSelectionStart: Int = -1
   private var lastSelectionEnd: Int = -1
 
-  private val frameScheduler = FrameScheduler {
-    val start = editText.selectionStart
-    val end = editText.selectionEnd
-
-    if (lastSelectionStart != start || lastSelectionEnd != end) {
-      lastSelectionStart = start
-      lastSelectionEnd = end
-
-      val view = editText
-      val layout = view.layout
-
-      if (layout === null) {
-        return@FrameScheduler
+  private val frameScheduler =
+    FrameScheduler {
+      val start = editText.selectionStart
+      val end = editText.selectionEnd
+
+      if (lastSelectionStart != start || lastSelectionEnd != end) {
+        lastSelectionStart = start
+        lastSelectionEnd = end
+
+        val view = editText
+        val layout = view.layout
+
+        if (layout === null) {
+          return@FrameScheduler
+        }
+
+        val cursorPositionStartX: Float
+        val cursorPositionStartY: Float
+        val cursorPositionEndX: Float
+        val cursorPositionEndY: Float
+
+        val realStart = min(start, end)
+        val realEnd = max(start, end)
+
+        val lineStart = layout.getLineForOffset(realStart)
+        val baselineStart = layout.getLineBaseline(lineStart)
+        val ascentStart = layout.getLineAscent(lineStart)
+
+        cursorPositionStartX = layout.getPrimaryHorizontal(realStart)
+        cursorPositionStartY = (baselineStart + ascentStart).toFloat()
+
+        val lineEnd = layout.getLineForOffset(realEnd)
+
+        val right = layout.getPrimaryHorizontal(realEnd)
+        val bottom = layout.getLineBottom(lineEnd) + layout.getLineAscent(lineEnd)
+        val cursorWidth =
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            view.textCursorDrawable?.intrinsicWidth ?: 0
+          } else {
+            0
+          }
+
+        cursorPositionEndX = right + cursorWidth
+        cursorPositionEndY = bottom.toFloat()
+
+        action(
+          start,
+          end,
+          cursorPositionStartX.dp,
+          cursorPositionStartY.dp,
+          cursorPositionEndX.dp,
+          cursorPositionEndY.dp,
+        )
       }
-
-      val cursorPositionStartX: Float
-      val cursorPositionStartY: Float
-      val cursorPositionEndX: Float
-      val cursorPositionEndY: Float
-
-      val realStart = min(start, end)
-      val realEnd = max(start, end)
-
-      val lineStart = layout.getLineForOffset(realStart)
-      val baselineStart = layout.getLineBaseline(lineStart)
-      val ascentStart = layout.getLineAscent(lineStart)
-
-      cursorPositionStartX = layout.getPrimaryHorizontal(realStart)
-      cursorPositionStartY = (baselineStart + ascentStart).toFloat()
-
-      val lineEnd = layout.getLineForOffset(realEnd)
-
-      val right = layout.getPrimaryHorizontal(realEnd)
-      val bottom = layout.getLineBottom(lineEnd) + layout.getLineAscent(lineEnd)
-      val cursorWidth = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        view.textCursorDrawable?.intrinsicWidth ?: 0
-      } else {
-        0
-      }
-
-      cursorPositionEndX = right + cursorWidth
-      cursorPositionEndY = bottom.toFloat()
-
-      action(start, end, cursorPositionStartX.dp, cursorPositionStartY.dp, cursorPositionEndX.dp, cursorPositionEndY.dp)
     }
-  }
 
   fun setup() {
     frameScheduler.start()