Fix focusable parameter for Window and Dialog (#225)

setFocusable make the root component focusable, not the window itself. For Window we should use setFocusableWindowState
JetBrains · Aug 18, 2022 · 0f28953 · 0f28953
1 parent b2cc256
commit 0f28953
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/window/Dialog.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/window/Dialog.desktop.kt
@@ -177,7 +177,7 @@ fun Dialog(
                 set(currentTransparent, dialog::isTransparent::set)
                 set(currentResizable, dialog::setResizable)
                 set(currentEnabled, dialog::setEnabled)
-                set(currentFocusable, dialog::setFocusable)
+                set(currentFocusable, dialog::setFocusableWindowState)
             }
             if (state.size != appliedState.size) {
                 dialog.setSizeSafely(state.size)

diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/window/Window.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/window/Window.desktop.kt
@@ -199,7 +199,7 @@ fun Window(
                 set(currentTransparent, window::isTransparent::set)
                 set(currentResizable, window::setResizable)
                 set(currentEnabled, window::setEnabled)
-                set(currentFocusable, window::setFocusable)
+                set(currentFocusable, window::setFocusableWindowState)
                 set(currentAlwaysOnTop, window::setAlwaysOnTop)
             }
             if (state.size != appliedState.size) {

diff --git a/...ose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/window/window/WindowParameterTest.kt b/...ose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/window/window/WindowParameterTest.kt
@@ -170,11 +170,11 @@ class WindowParameterTest {
         }
 
         awaitIdle()
-        assertThat(window?.isFocusable).isFalse()
+        assertThat(window?.isFocusableWindow).isFalse()
 
         focusable = true
         awaitIdle()
-        assertThat(window?.isFocusable).isTrue()
+        assertThat(window?.isFocusableWindow).isTrue()
 
         window?.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
     }