Merge pull request #602 from kiwicom/fix-slider

hrach · web-flow · commit 41e25d20b134 · 2023-12-18T11:17:37.000+01:00
Fix Slider's track rendering after migration to M3 1.2
diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/Slider.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/Slider.kt
@@ -290,18 +290,13 @@ private fun Track(
 ) {
     Track(
         steps = sliderState.steps,
-        activeRangeStart = {
-            calcFraction(
-                sliderState.valueRange.start,
-                sliderState.valueRange.endInclusive,
-                0f,
-            )
-        },
+        activeRangeStart = { 0f },
         activeRangeEnd = {
+            val valueRange = sliderState.valueRange
             calcFraction(
-                sliderState.valueRange.start,
-                sliderState.valueRange.endInclusive,
-                0f,
+                valueRange.start,
+                valueRange.endInclusive,
+                sliderState.value.coerceIn(valueRange.start, valueRange.endInclusive),
             )
         },
         enabled = enabled,
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_slider.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_slider.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe5aecb2fea2b562c1335d24cce3f817619182579414645934f8d0ef13b51014
-size 42460
+oid sha256:2262c0f9a9e48f8e6739a374a9cd4f9eae624ac79940928b28853234135356df
+size 42052
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_slider_big.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_slider_big.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11b105731cc0231d50aa51f638e543cfdd5ef2036cf2e28d8f3d7502a6d80292
-size 49214
+oid sha256:ab42d4e8b16891323a108ef24193c9e2df332388a849a7fc0c34b58d98ab3f1d
+size 48719
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_slider_dark.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_slider_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2d2a6de2cd72c843c05e26e2337fec02687c630291fac1acb0503ce06c80f4c
-size 36160
+oid sha256:478b19c7c051773074590fc9b624ec47f363ce74e74c4480be9d55bf58af3c4f
+size 36326
