Use rememberUpdatedState to prevent stale lambda capture (#30)

* Attempting to fix dragging lag on Linux #19

* Use rememberUpdatedState for lambdas that are captured to ensure it uses the latest value when calling it.

* Fix issue with resizing of color wheel

* Fix lint

Author: riggaroo

color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/ClassicColorPicker.kt

@@ -6,7 +6,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -35,14 +37,15 @@ fun ClassicColorPicker(
     Row(modifier = modifier) {
         val barThickness = 32.dp
         val paddingBetweenBars = 8.dp
+        val updatedOnColorChanged by rememberUpdatedState(onColorChanged)
         Column(modifier = Modifier.weight(0.8f)) {
             SaturationValueArea(
                 modifier = Modifier.weight(0.8f),
                 currentColor = colorPickerValueState.value,
                 onSaturationValueChanged = { saturation, value ->
                     colorPickerValueState.value =
                         colorPickerValueState.value.copy(saturation = saturation, value = value)
-                    onColorChanged(colorPickerValueState.value)
+                    updatedOnColorChanged(colorPickerValueState.value)
                 }
             )
             if (showAlphaBar) {
@@ -52,7 +55,7 @@ fun ClassicColorPicker(
                     currentColor = colorPickerValueState.value,
                     onAlphaChanged = { alpha ->
                         colorPickerValueState.value = colorPickerValueState.value.copy(alpha = alpha)
-                        onColorChanged(colorPickerValueState.value)
+                        updatedOnColorChanged(colorPickerValueState.value)
                     }
                 )
             }
@@ -63,7 +66,7 @@ fun ClassicColorPicker(
             currentColor = colorPickerValueState.value,
             onHueChanged = { newHue ->
                 colorPickerValueState.value = colorPickerValueState.value.copy(hue = newHue)
-                onColorChanged(colorPickerValueState.value)
+                updatedOnColorChanged(colorPickerValueState.value)
             }
         )
     }

color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/harmony/HarmonyColorPicker.kt

@@ -15,10 +15,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
@@ -48,6 +48,7 @@ fun HarmonyColorPicker(
                 .fillMaxWidth()
         ) {
             val hsvColor = remember { mutableStateOf(HsvColor.from(color)) }
+            val updatedOnColorChanged by rememberUpdatedState(onColorChanged)
 
             HarmonyColorPickerWithMagnifiers(
                 modifier = Modifier
@@ -56,7 +57,7 @@ fun HarmonyColorPicker(
                 hsvColor = hsvColor,
                 onColorChanged = {
                     hsvColor.value = it
-                    onColorChanged(it)
+                    updatedOnColorChanged(it)
                 },
                 harmonyMode = harmonyMode
             )
@@ -68,7 +69,7 @@ fun HarmonyColorPicker(
                     .weight(0.2f),
                 onValueChange = { value ->
                     hsvColor.value = hsvColor.value.copy(value = value)
-                    onColorChanged(hsvColor.value)
+                    updatedOnColorChanged(hsvColor.value)
                 },
                 currentColor = hsvColor.value
             )
@@ -90,14 +91,11 @@ private fun HarmonyColorPickerWithMagnifiers(
             .aspectRatio(1f, matchHeightConstraintsFirst = true)
 
     ) {
+        val updatedOnColorChanged by rememberUpdatedState(onColorChanged)
         val diameterPx = remember(constraints.maxWidth) {
             mutableStateOf(constraints.maxWidth)
         }
-        val magnifierSize = remember {
-            derivedStateOf {
-                IntSize(diameterPx.value, diameterPx.value)
-            }
-        }
+
         var animateChanges by remember {
             mutableStateOf(false)
         }
@@ -108,10 +106,10 @@ private fun HarmonyColorPickerWithMagnifiers(
         fun updateColorWheel(newPosition: Offset, animate: Boolean) {
             // Work out if the new position is inside the circle we are drawing, and has a
             // valid color associated to it. If not, keep the current position
-            val newColor = colorForPosition(newPosition, magnifierSize.value, hsvColor.value.value)
+            val newColor = colorForPosition(newPosition, IntSize(diameterPx.value, diameterPx.value), hsvColor.value.value)
             if (newColor != null) {
                 animateChanges = animate
-                onColorChanged(newColor)
+                updatedOnColorChanged(newColor)
             }
         }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Sep 25 18:37:16 BST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists