Fix the pointer icon in SelectionContainer (#1014)

JetBrains · Jan 24, 2024 · db202d9 · db202d9
1 parent ee14b93
commit db202d9
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 75 deletions.
diff --git a/...undation/src/darwinMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.darwin.kt b/...undation/src/darwinMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.darwin.kt
diff --git a/...foundation/src/jsNativeMain/kotlin/androidx/compose/foundation/text/BasicText.jsNative.kt b/...foundation/src/jsNativeMain/kotlin/androidx/compose/foundation/text/BasicText.jsNative.kt
diff --git a/...n/foundation/src/jsWasmMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.js.kt b/...n/foundation/src/jsWasmMain/kotlin/androidx/compose/foundation/text/TextPointerIcon.js.kt
diff --git a/...pose/foundation/text/BasicText.desktop.kt → ...ompose/foundation/text/BasicText.skiko.kt b/...pose/foundation/text/BasicText.desktop.kt → ...ompose/foundation/text/BasicText.skiko.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@ package androidx.compose.foundation.text
 
 import androidx.compose.foundation.text.selection.SelectionRegistrar
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.pointerHoverIcon
 
 internal actual fun Modifier.textPointerHoverIcon(
     selectionRegistrar: SelectionRegistrar?
-): Modifier = this
+): Modifier = if (selectionRegistrar == null) this else pointerHoverIcon(textPointerIcon)
diff --git a/...oundation/text/TextPointerIcon.desktop.kt → .../foundation/text/TextPointerIcon.skiko.kt b/...oundation/text/TextPointerIcon.desktop.kt → .../foundation/text/TextPointerIcon.skiko.kt
@@ -17,7 +17,5 @@
 package androidx.compose.foundation.text
 
 import androidx.compose.ui.input.pointer.PointerIcon
-import java.awt.Cursor
 
-internal actual val textPointerIcon: PointerIcon =
-    PointerIcon(Cursor(Cursor.TEXT_CURSOR))
+internal actual val textPointerIcon: PointerIcon = PointerIcon.Text
diff --git a/...ose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/pointer/PointerIcon.desktop.kt b/...ose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/pointer/PointerIcon.desktop.kt
@@ -25,13 +25,15 @@ internal class AwtCursor(val cursor: Cursor) : PointerIcon {
 
         other as AwtCursor
 
-        if (cursor != other.cursor) return false
+        // AwtCursor doesn't implement equals
+        if (cursor.type != other.cursor.type) return false
 
         return true
     }
 
     override fun hashCode(): Int {
-        return cursor.hashCode()
+        // AwtCursor doesn't implement hashCode
+        return cursor.type
     }
 
     override fun toString(): String {

diff --git a/...src/skikoTest/kotlin/androidx/compose/foundation/text/selection/SelectionContainerTest.kt b/...src/skikoTest/kotlin/androidx/compose/foundation/text/selection/SelectionContainerTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.text.selection
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.PointerIcon
+import androidx.compose.ui.input.pointer.PointerIconService
+import androidx.compose.ui.platform.LocalPointerIconService
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performMouseInput
+import androidx.compose.ui.test.runComposeUiTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+/**
+ * Tests relating to [SelectionContainer].
+ *
+ * The reason this test is in the `ui` module, even though [SelectionContainer] is in `foundation`,
+ * is that [PointerIconService] is needed for some of the tests, and it is internal in `ui`.
+ */
+@OptIn(ExperimentalTestApi::class)
+class SelectionContainerTest {
+    @Test
+    fun selectionContainerSetsTextPointerIcon() = runComposeUiTest {
+        lateinit var pointerIconService: PointerIconService
+        setContent {
+            pointerIconService = LocalPointerIconService.current!!
+            SelectionContainer {
+                Column {
+                    BasicText(
+                        text = "Text text text text",
+                        modifier = Modifier.testTag("content")
+                    )
+                }
+            }
+        }
+
+        onNodeWithTag("content").performMouseInput {
+            moveTo(Offset(1f, 1f))
+        }
+        assertEquals(PointerIcon.Text, pointerIconService.getIcon())
+    }
+}