clipRect to chart area, allow min/max values to be outside of rect, adjust inset calculation to avoid crash on screen orientation change

Author: brayellison

compose-charts/src/commonMain/kotlin/ir/ehsannarmani/compose_charts/LineChart.kt

@@ -35,6 +35,7 @@ import androidx.compose.ui.graphics.PathMeasure
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.clipRect
 import androidx.compose.ui.graphics.drawscope.inset
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.takeOrElse
@@ -72,12 +73,12 @@ import ir.ehsannarmani.compose_charts.models.Line
 import ir.ehsannarmani.compose_charts.models.PopupProperties
 import ir.ehsannarmani.compose_charts.models.ZeroLineProperties
 import ir.ehsannarmani.compose_charts.utils.calculateOffset
-import ir.ehsannarmani.compose_charts.utils.rememberComputedChartMaxValue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlin.math.max
+import kotlin.math.min
 
 private data class Popup(
     val properties: PopupProperties,
@@ -116,16 +117,6 @@ fun LineChart(
         line.values.minOfOrNull { it } ?: 0.0
     } ?: 0.0 else 0.0
 ) {
-    if (data.isNotEmpty()) {
-        require(minValue <= (data.minOfOrNull { line -> line.values.minOfOrNull { it } ?: 0.0 }
-            ?: 0.0)) {
-            "Chart data must be at least $minValue (Specified Min Value)"
-        }
-        require(maxValue >= (data.maxOfOrNull { line -> line.values.maxOfOrNull { it } ?: 0.0 }
-            ?: 0.0)) {
-            "Chart data must be at most $maxValue (Specified Max Value)"
-        }
-    }
 
     val density = LocalDensity.current
     val scope = rememberCoroutineScope()
@@ -158,13 +149,20 @@ fun LineChart(
         mutableStateListOf<PathData>()
     }
 
-    val computedMaxValue =
-        rememberComputedChartMaxValue(minValue, maxValue, indicatorProperties.count)
-    val indicators = remember(indicatorProperties.indicators, minValue, maxValue) {
+    val computedMaxValue = remember(maxValue, indicatorProperties.indicators) {
+        val indicatorMax = indicatorProperties.indicators.maxOrNull() ?: return@remember maxValue
+        max(maxValue, indicatorMax)
+    }
+    val computedMinValue = remember(minValue, indicatorProperties.indicators) {
+        val indicatorMin = indicatorProperties.indicators.minOrNull() ?: return@remember minValue
+        min(minValue, indicatorMin)
+    }
+
+    val indicators = remember(indicatorProperties.indicators, computedMinValue, maxValue) {
         indicatorProperties.indicators.ifEmpty {
             split(
                 count = indicatorProperties.count,
-                minValue = minValue,
+                minValue = computedMinValue,
                 maxValue = computedMaxValue
             )
         }
@@ -228,7 +226,7 @@ fun LineChart(
         }
     }
 
-    LaunchedEffect(data, minValue, computedMaxValue) {
+    LaunchedEffect(data, computedMinValue, computedMaxValue) {
         linesPathData.clear()
     }
 
@@ -303,7 +301,7 @@ fun LineChart(
                             fraction = fraction.toDouble(),
                             rounded = line.curvedEdges ?: curvedEdges,
                             size = Size(insetPad.width(size), insetPad.height(size)),
-                            minValue = minValue,
+                            minValue = computedMinValue,
                             maxValue = computedMaxValue
                         )
                     }
@@ -359,7 +357,7 @@ fun LineChart(
                 LineChartCanvas(
                     data = data,
                     maxValue = computedMaxValue,
-                    minValue = minValue,
+                    minValue = computedMinValue,
                     indicators = indicators,
                     indicatorProperties = indicatorProperties,
                     labelProperties = labelProperties,
@@ -380,7 +378,7 @@ fun LineChart(
                 ) { xTicks, yTicks ->
                     val drawZeroLine = {
                         val zeroY = size.height - calculateOffset(
-                            minValue = minValue,
+                            minValue = computedMinValue,
                             maxValue = computedMaxValue,
                             total = size.height,
                             value = 0f
@@ -398,7 +396,7 @@ fun LineChart(
                             getLinePath(
                                 dataPoints = it.values.mapIndexed { index, v -> index.toFloat() to v.toFloat() },
                                 maxValue = computedMaxValue.toFloat(),
-                                minValue = minValue.toFloat(),
+                                minValue = computedMinValue.toFloat(),
                                 rounded = it.curvedEdges ?: curvedEdges,
                                 size = size
                             )
@@ -500,7 +498,7 @@ fun LineChart(
                                 properties = line.dotProperties ?: dotsProperties,
                                 linePath = segmentedPath,
                                 maxValue = computedMaxValue.toFloat(),
-                                minValue = minValue.toFloat(),
+                                minValue = computedMinValue.toFloat(),
                                 pathMeasure = pathMeasure,
                                 scope = scope,
                                 startIndex = pathData.startIndex,
@@ -598,18 +596,26 @@ private fun DrawScope.drawPopup(
 
     }
     if (offsetAnimator != null) {
-        val animatedOffset = if (popup.properties.mode is PopupProperties.Mode.PointMode) {
+        var animatedOffset = if (popup.properties.mode is PopupProperties.Mode.PointMode) {
             rectOffset
         } else {
             Offset(
                 x = offsetAnimator.first.value,
                 y = offsetAnimator.second.value
             )
         }
-        val rect = Rect(
+        var rect = Rect(
             offset = animatedOffset,
             size = rectSize
         )
+        if (rect.top < 0) rect = rect.copy(top = 0f, bottom = rect.height)
+        if (rect.bottom > size.height) rect =
+            rect.copy(top = size.height - rect.height, bottom = size.height)
+        if (rect.left < 0) rect = rect.copy(left = 0f, right = rect.width)
+        if (rect.right > size.width) rect =
+            rect.copy(left = size.width - rect.width, right = size.width)
+
+        animatedOffset = Offset(rect.left, rect.top)
         drawPath(
             path = Path().apply {
                 addRoundRect(
@@ -804,15 +810,18 @@ data class InsetPad(
     )
 }
 
-fun DrawScope.inset(insetPad: InsetPad, block: DrawScope.() -> Unit) =
+fun DrawScope.inset(insetPad: InsetPad, block: DrawScope.() -> Unit) {
+    val mostLeft = size.width / 2f
+    val mostTop = size.height / 2f
     inset(
-        left = insetPad.left,
-        right = insetPad.right,
-        top = insetPad.top,
-        bottom = insetPad.bottom
+        left = insetPad.left.coerceAtMost(mostLeft),
+        right = insetPad.right.coerceAtMost(size.width - mostLeft),
+        top = insetPad.top.coerceAtMost(mostTop),
+        bottom = insetPad.bottom.coerceAtMost(size.height - mostTop),
     ) {
         block()
     }
+}
 
 fun getInsetPad(
     textMeasurer: TextMeasurer,
@@ -1008,7 +1017,12 @@ private fun RowScope.LineChartCanvas(
         } else emptyList()
         val xTicks = if (labelProperties.labels.isNotEmpty() && labelProperties.enabled) {
             val measureLabel =
-                { text: String -> textMeasurer.measure(text, style = labelProperties.textStyle) }
+                { text: String ->
+                    textMeasurer.measure(
+                        text,
+                        style = labelProperties.textStyle
+                    )
+                }
             val labels = labelProperties.labels
             val maxLabelHeight = labels.maxOf {
                 measureLabel(it).size.height
@@ -1032,7 +1046,9 @@ private fun RowScope.LineChartCanvas(
             }
         } else emptyList()
         inset(insetPad) {
-            insetDrawScope(xTicks, yTicks)
+            clipRect {
+                insetDrawScope(xTicks, yTicks)
+            }
         }
     }
 }