Correct color markers in tooltip, update future_changes.md

future_changes.md

@@ -13,6 +13,10 @@
  See: [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-23c/tooltips_disable_splitting.ipynb).
 
 
+- Variadic line sizes in `geom_line()` and `geom_path()` with `size` mapping. 
+See: [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-23c/aes_size_variadic_with_mapping.ipynb).
+
+
 ### Changed
 
 - [BREAKING] `geom_boxplot()` no longer support parameter `sampling`.

plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/geom/util/TargetCollectorHelper.kt

@@ -42,21 +42,25 @@ class TargetCollectorHelper(
  fun addVariadicPaths(paths: List<List<PathData>>) {
  val hintKind = VERTICAL_TOOLTIP.takeIf { ctx.flipped } ?: HORIZONTAL_TOOLTIP
 
- paths.forEach { path ->
- val flattenPath = path
- .flatMap(PathData::points)
- .let { reduce(it, 0.5) { p1, p2 -> p1.coord.subtract(p2.coord).length() } }
+ for (path in paths) {
+ val pathAesIndex = mutableMapOf<Int, DataPointAesthetics>()
+ for (subPath in path) {
+ for (p in subPath.aesthetics) {
+ // Do not use aes from p - if size and colour are mapped the colour of the tooltip marker
+ // and line colour will be different
+ pathAesIndex[p.index()] = subPath.aes
+ }
+ }
 
- val flattenPathData = PathData(flattenPath)
- val aesIndex = flattenPathData.aesthetics.associateBy(
- keySelector = DataPointAesthetics::index,
- valueTransform = { it }
- )
+ val flattenPathData = path
+ .flatMap(PathData::points) // make a single path to make tooltips in HOVER mode work correctly
+ .let { reduce(it, 0.5) { p1, p2 -> p1.coord.subtract(p2.coord).length() } }
+ .let(::PathData)
 
  targetCollector.addPath(
  flattenPathData.coordinates,
  { i -> flattenPathData.aesthetics[i].index() },
- TooltipParams(markerColorsFactory = { i: Int -> colorMarkerMapper(aesIndex[i]!!) }),
+ TooltipParams(markerColorsFactory = { i: Int -> colorMarkerMapper(pathAesIndex[i]!!) }),
  hintKind
  )
  }