GithubStar/QMUI_Android
1
0
Fork 0
mirror of https://github.com/Tencent/QMUI_Android.git synced 2026-10-17 04:31:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: click through mask.

Browse Source
This commit is contained in:
cgspine
2022-02-24 17:01:16 +08:00
parent 1ff924d926
commit 516601fd64
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/src/main/java/com/qmuiteam/compose/modal/ModalImpl.kt
+21 -19
View File
@@ -130,20 +130,24 @@ internal class StillModalImpl(
@Composable
override fun ModalContent(visible: Boolean, dismissFinishAction: () -> Unit) {
if (visible) {
var modifier = Modifier
.fillMaxSize()
.background(mask)
if (maskCancellable) {
modifier = modifier.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null
) {
dismiss()
Box(
modifier = Modifier
.fillMaxSize()
.background(mask)
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
enabled = maskCancellable
) {
dismiss()
}
)
} else {
DisposableEffect("") {
onDispose {
dismissFinishAction()
}
}
Box(modifier = modifier)
} else {
dismissFinishAction()
}
}
}
@@ -165,18 +169,16 @@ internal class AnimateModalImpl(
enter = fadeIn(tween(durationMillis), 0f),
exit = fadeOut(tween(durationMillis), 0f)
) {
var modifier = Modifier
Box(modifier = Modifier
.fillMaxSize()
.background(mask)
if (maskCancellable) {
modifier = modifier.clickable(
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null
indication = null,
enabled = maskCancellable
) {
dismiss()
}
}
Box(modifier = modifier)
})
content(this@AnimateModalImpl)
DisposableEffect("") {
onDispose {