fix missed highlighted & enabled update of background

Author: Alex009

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/ButtonWithIconViewFactory.kt

@@ -20,7 +20,7 @@ import dev.icerock.moko.widgets.core.style.view.WidgetSize
 import dev.icerock.moko.widgets.core.utils.applyStateBackgroundIfNeeded
 import dev.icerock.moko.widgets.core.utils.applyTextStyleIfNeeded
 import dev.icerock.moko.widgets.core.utils.bind
-import dev.icerock.moko.widgets.core.utils.onBoundsChanged
+import dev.icerock.moko.widgets.core.utils.observeKeyChanges
 import dev.icerock.moko.widgets.core.utils.setEventHandler
 import dev.icerock.moko.widgets.core.widget.ButtonWidget
 import kotlinx.cinterop.useContents
@@ -141,7 +141,8 @@ actual class ButtonWithIconViewFactory actual constructor(
     }
 
     private fun setupLayoutUpdate(button: UIButton, viewFactory: ButtonWithIconViewFactory) {
-        button.onBoundsChanged(
+        button.observeKeyChanges(
+            keyPath = "bounds",
             context = viewFactory,
         ) { button, viewFactory ->
             val icPadding: Double = viewFactory.iconPadding?.toDouble() ?: 0.0

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemButtonViewFactory.kt

@@ -22,6 +22,7 @@ import dev.icerock.moko.widgets.core.utils.bind
 import dev.icerock.moko.widgets.core.utils.setEventHandler
 import dev.icerock.moko.widgets.core.widget.ButtonWidget
 import platform.UIKit.UIButton
+import platform.UIKit.UIButtonType
 import platform.UIKit.UIButtonTypeCustom
 import platform.UIKit.UIButtonTypeSystem
 import platform.UIKit.UIControlEventTouchUpInside
@@ -44,14 +45,13 @@ actual class SystemButtonViewFactory actual constructor(
         size: WS,
         viewFactoryContext: ViewFactoryContext
     ): ViewBundle<WS> {
-
-        val buttonType = if (widget.content is ButtonWidget.Content.Icon) {
+        val buttonType: UIButtonType = if (widget.content is ButtonWidget.Content.Icon) {
             UIButtonTypeCustom
         } else {
             UIButtonTypeSystem
         }
 
-        val button = UIButton.buttonWithType(buttonType).apply {
+        val button: UIButton = UIButton.buttonWithType(buttonType).apply {
             translatesAutoresizingMaskIntoConstraints = false
 
             applyStateBackgroundIfNeeded(background)
@@ -81,6 +81,7 @@ actual class SystemButtonViewFactory actual constructor(
                     button.setTitle(title = processedText, forState = UIControlStateNormal)
                 }
             }
+
             is ButtonWidget.Content.Icon -> {
                 content.image.bind { image ->
                     image.apply(button) {

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/BackgroundExt.kt

@@ -98,7 +98,8 @@ fun UIButton.applyStateBackgroundIfNeeded(background: PressableState<Background<
 
     stateLayers.update(this)
 
-    this.onBoundsChanged(
+    this.observeKeyChanges(
+        keyPath = "bounds",
         context = stateLayers,
     ) { button, stateLayers ->
         val (width: CGFloat, height: CGFloat) = button.layer.bounds.useContents {
@@ -112,10 +113,22 @@ fun UIButton.applyStateBackgroundIfNeeded(background: PressableState<Background<
         stateLayers.disabled.frame = CGRectMake(0.0, 0.0, width, height)
         stateLayers.pressed.frame = CGRectMake(0.0, 0.0, width, height)
 
-        stateLayers.update(button)
-
         CATransaction.commit()
     }
+
+    listOf("highlighted", "enabled").forEach { keyPath ->
+        this.observeKeyChanges(
+            keyPath = keyPath,
+            context = stateLayers,
+        ) { button, stateLayers ->
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+
+            stateLayers.update(button)
+
+            CATransaction.commit()
+        }
+    }
 }
 
 private data class StateLayers(
@@ -164,7 +177,8 @@ fun UIView.applyBackgroundIfNeeded(background: Background<out Fill>?) {
     val bgLayer: CALayer = background.caLayer()
     layer.insertSublayer(bgLayer, 0U)
 
-    this.onBoundsChanged(
+    this.observeKeyChanges(
+        keyPath = "bounds",
         context = bgLayer,
     ) { view, bgLayer ->
         val (width: CGFloat, height: CGFloat) = view.layer.bounds.useContents {

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/UIControlExt.kt

@@ -20,7 +20,7 @@ import platform.objc.OBJC_ASSOCIATION_RETAIN
 import platform.objc.objc_setAssociatedObject
 import kotlin.native.ref.WeakReference
 
-fun <V: UIControl> V.setEventHandler(controlEvent: UIControlEvents, action: (V) -> Unit) {
+fun <V : UIControl> V.setEventHandler(controlEvent: UIControlEvents, action: (V) -> Unit) {
     val weakReference: WeakReference<V> = WeakReference(this)
     val target = LambdaTarget {
         val strongRef: V = weakReference.get() ?: return@LambdaTarget
@@ -58,7 +58,8 @@ fun UIGestureRecognizer.setHandler(action: () -> Unit) {
     )
 }
 
-fun <V : UIView, CTX> V.onBoundsChanged(
+fun <V : UIView, CTX> V.observeKeyChanges(
+    keyPath: String,
     context: CTX,
     action: (V, CTX) -> Unit
 ) {
@@ -72,14 +73,14 @@ fun <V : UIView, CTX> V.onBoundsChanged(
 
     objc_setAssociatedObject(
         `object` = this,
-        key = "onBoundsChanged".cstr,
+        key = "observeKeyChanges-$keyPath".cstr,
         value = target,
         policy = OBJC_ASSOCIATION_RETAIN
     )
 
     this.addObserver(
         observer = target,
-        forKeyPath = "bounds",
+        forKeyPath = keyPath,
         options = NSKeyValueObservingOptionNew,
         context = null
     )