diff --git a/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt b/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt index 26c24f4..d5c39a7 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/model/ui/UiTronView.kt @@ -58,7 +58,7 @@ open class BaseProperty( var animate: Animate? = null, var transformOrigin: TransFormOrigin? = null, var propertyAnimator: List? = null, - val disableClick: Boolean? = false + var disableClick: Boolean? = false ) : Parcelable { open fun copyNonNullFrom(property: BaseProperty?) { property?.width?.let { width = it } @@ -87,6 +87,7 @@ open class BaseProperty( property?.animate?.let { animate = it } property?.propertyAnimator?.let { propertyAnimator = it } property?.transformOrigin?.let { transformOrigin = it } + property?.disableClick?.let { disableClick = it } } fun getPropertyId() = layoutId + PROPERTY_SUFFIX diff --git a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt index cc56c57..dd35b37 100644 --- a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt +++ b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt @@ -326,7 +326,7 @@ fun Modifier.customClickable( actions: List? = null, property: BaseProperty? = null ): Modifier = composed { - if (!actions.isNullOrEmpty()) { + if (!actions.isNullOrEmpty() && property?.disableClick.orFalse().not()) { if (property?.debounceTime != null && property.debounceTime.orZero() > 0) { val coroutineScope = rememberCoroutineScope() val clickEvents by remember { mutableStateOf(MutableSharedFlow()) }