From ae13d4a575c630ea7f396475aee73f98df78abfe Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 17 Nov 2023 20:22:00 +0800 Subject: [PATCH] chore: global opt-in "androidx.compose.ui.ExperimentalComposeUiApi" --- flexiui-core/build.gradle.kts | 5 +++++ .../kotlin/com/highcapable/flexiui/component/DropdownMenu.kt | 2 -- .../com/highcapable/flexiui/component/DesktopContextMenu.kt | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flexiui-core/build.gradle.kts b/flexiui-core/build.gradle.kts index dabac3f..6ff88f6 100644 --- a/flexiui-core/build.gradle.kts +++ b/flexiui-core/build.gradle.kts @@ -21,6 +21,11 @@ kotlin { } jvmToolchain(17) sourceSets { + all { + languageSettings { + optIn("androidx.compose.ui.ExperimentalComposeUiApi") + } + } val commonMain by getting { dependencies { implementation(compose.runtime) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/DropdownMenu.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/DropdownMenu.kt index dccf0c8..b21f83d 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/DropdownMenu.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/DropdownMenu.kt @@ -49,7 +49,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.FocusManager @@ -258,7 +257,6 @@ private fun calculateTransformOrigin(parentBounds: IntRect, menuBounds: IntRect) return TransformOrigin(pivotX, pivotY) } -@OptIn(ExperimentalComposeUiApi::class) private fun handlePopupOnKeyEvent( keyEvent: KeyEvent, focusManager: FocusManager?, diff --git a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt index 189b97b..449e159 100644 --- a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt +++ b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt @@ -42,7 +42,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.FocusManager @@ -84,7 +83,7 @@ internal class DesktopContextMenuRepresentation( private val colors: ContextMenuColors, private val style: ContextMenuStyle ) : ContextMenuRepresentation { - @OptIn(ExperimentalComposeUiApi::class) + @Composable override fun Representation(state: ContextMenuState, items: () -> List) { val status = state.status