react-native-vroom-chart 0.15.0 → 0.17.0

package/cpp/_core_src/ma_overlay.cpp

@@ -18,6 +18,8 @@
 
 #include "curve.h"
 #include "gradient.h"
+#include "line_morph.h"
+#include "tip_geometry.h"
 #include "tip_pulse.h"
 #include "viewport.h"
 
@@ -51,9 +53,82 @@ void stroke_path(SkCanvas* canvas,
 
 inline float lerp(float a, float b, float t) { return a + (b - a) * t; }
 
-// Width of the background-colored ring that separates the tip dot from the line
-// and from the pulse expanding out behind it.
-constexpr float kTipBorderPx = 2.f;
+// Slot `k` of an indicator series in screen space, blended from the outgoing
+// capture toward the new value. Slot 0 is the rightmost vertex on both sides —
+// the pairing a timeframe switch preserves, same as close_vertex below.
+//
+// The capture is in fractions of the candle area and the price band, so it
+// lands on the pixels it occupied pre-switch even though both the surface and
+// the bounds may have changed under it.
+MorphVertex series_vertex(const Layout& lay,
+                          const PriceBounds& bounds,
+                          const ::VroomCandle* visible,
+                          std::size_t n,
+                          const double* values,
+                          int64_t window_ms,
+                          int64_t visible_start_ms,
+                          int64_t candle_duration_ms,
+                          int64_t time_shift_ms,
+                          const LineMorph* from,
+                          std::size_t from_count,
+                          float morph_t,
+                          std::size_t k) {
+    MorphVertex to;
+    if (values && k < n) {
+        const std::size_t i = n - 1 - k;
+        const double v = values[i];
+        if (std::isfinite(v)) {
+            to = MorphVertex{
+                vroom::candle_center_x(lay, visible[i].time_ms + time_shift_ms,
+                                       candle_duration_ms, visible_start_ms,
+                                       window_ms),
+                vroom::price_to_y(lay, bounds, v), true};
+        }
+    }
+    MorphVertex frm;
+    if (k < from_count) {
+        const LineSnapshot& s = from->pts[k];
+        if (s.valid) {
+            frm = MorphVertex{s.x * vroom::candle_area_width(lay),
+                              vroom::y_at_fraction(lay, s.y), true};
+        }
+    }
+    return vroom::morph_vertex(to, frm, morph_t);
+}
+
+// The same series walked left to right into `out`, for the two fills — they
+// need to look ahead for crossovers and back along the opposite edge, so they
+// can't stream the way the stroke does. out[j] is slot slots-1-j.
+void resolve_series(const Layout& lay,
+                    const PriceBounds& bounds,
+                    const ::VroomCandle* visible,
+                    std::size_t n,
+                    const double* values,
+                    int64_t window_ms,
+                    int64_t visible_start_ms,
+                    int64_t candle_duration_ms,
+                    int64_t time_shift_ms,
+                    const LineMorph* from,
+                    float morph_t,
+                    std::size_t slots,
+                    std::vector<MorphVertex>& out) {
+    const std::size_t from_count = vroom::morph_line_count(from, morph_t);
+    out.clear();
+    out.reserve(slots);
+    for (std::size_t j = 0; j < slots; ++j) {
+        out.push_back(series_vertex(lay, bounds, visible, n, values, window_ms,
+                                    visible_start_ms, candle_duration_ms,
+                                    time_shift_ms, from, from_count, morph_t,
+                                    slots - 1 - j));
+    }
+}
+
+// How many vertices a morphing series spans: the new slice and the capture can
+// disagree on length, and every slot either defines has to be walked.
+inline std::size_t series_slots(std::size_t n, const LineMorph* from,
+                                float morph_t) {
+    return std::max(n, vroom::morph_line_count(from, morph_t));
+}
 
 // One vertex of the close polyline, in screen space. Slot `k` counts back from
 // the right edge (0 = the newest close), the pairing a timeframe switch
@@ -198,31 +273,43 @@ void draw(SkCanvas* canvas,
           uint32_t color,
           float width,
           const unsigned char* break_before,
-          float opacity) {
-    if (!canvas || !values_visible || n == 0 || candle_right <= 0.f ||
-        candle_area_h <= 0.f) {
-        return;
-    }
+          float opacity,
+          int64_t time_shift_ms,
+          const LineMorph* from,
+          float morph_t) {
+    if (!canvas || candle_right <= 0.f || candle_area_h <= 0.f) return;
     opacity = std::clamp(opacity, 0.f, 1.f);
     if (opacity <= 0.f) return;
+    morph_t = std::clamp(morph_t, 0.f, 1.f);
+
+    const std::size_t from_count = vroom::morph_line_count(from, morph_t);
+    const std::size_t slots = std::max(n, from_count);
+    if (slots == 0 || (!values_visible && from_count == 0)) return;
 
+    // Descending slots, which walks the line left to right. Settled (no
+    // capture) this visits exactly the source indices 0..n-1 in order, so the
+    // path is the one it has always emitted.
     // SkPathBuilder (not SkPath's edit methods, removed in newer Skia tips).
     SkPathBuilder path;
     bool pen_down = false;
-    for (std::size_t i = 0; i < n; ++i) {
-        const double v = values_visible[i];
-        if (!std::isfinite(v)) {
+    for (std::size_t j = 0; j < slots; ++j) {
+        const std::size_t k = slots - 1 - j;
+        const MorphVertex p = series_vertex(
+            lay, bounds, visible, n, values_visible, window_ms,
+            visible_start_ms, candle_duration_ms, time_shift_ms, from,
+            from_count, morph_t, k);
+        if (!p.valid) {
             pen_down = false;
             continue;
         }
-        const float x = vroom::candle_center_x(
-            lay, visible[i].time_ms, candle_duration_ms, visible_start_ms,
-            window_ms);
-        const float y = vroom::price_to_y(lay, bounds, v);
-        if (pen_down && !(break_before && break_before[i])) {
-            path.lineTo(x, y);
+        // Session breaks are a property of the incoming data, so a slot the new
+        // series doesn't reach can't carry one.
+        const bool breaks =
+            break_before && k < n && break_before[n - 1 - k] != 0;
+        if (pen_down && !breaks) {
+            path.lineTo(p.x, p.y);
         } else {
-            path.moveTo(x, y);
+            path.moveTo(p.x, p.y);
             pen_down = true;
         }
     }
@@ -329,6 +416,7 @@ void draw_close_tip(SkCanvas* canvas,
                     int64_t visible_start_ms,
                     int64_t candle_duration_ms,
                     float candle_right,
+                    float clip_right,
                     float candle_area_h,
                     uint32_t line_color,
                     uint32_t bg_color,
@@ -357,14 +445,21 @@ void draw_close_tip(SkCanvas* canvas,
     if (tip.fY < 0.f || tip.fY > candle_area_h) return;
     if (tip.fX < 0.f || tip.fX > candle_right) return;
 
-    // Scaling off the stroke keeps the marker proportionate at any line width;
-    // the floor stops a hairline chart from getting an invisible dot.
-    const float w = line_width > 0.f ? line_width : 1.5f;
-    const float dot_r = std::max(2.f, w * 1.5f);
-    const float border_r = dot_r + kTipBorderPx;
+    const auto geo = vroom::tip_geometry::of(line_width);
+    const float dot_r = geo.dot_r;
+    const float border_r = geo.border_r;
 
     canvas->save();
-    canvas->clipRect(SkRect::MakeLTRB(0.f, 0.f, candle_right, candle_area_h));
+    // Wider than the on-pane test above: the dot is anchored at the newest
+    // candle's center, which on a view pinned to the latest bar is closer to
+    // candle_right than the dot's own radius, so it has to reach into the gutter
+    // to draw in full. `clip_right` is the gutter's far side — the y-axis
+    // strip's edge — which the layout keeps wide enough for the dot (see
+    // tip_geometry::gutter_px). The pulse ring is much wider still and clips
+    // there; that is intended.
+    canvas->clipRect(
+        SkRect::MakeLTRB(0.f, 0.f, std::max(candle_right, clip_right),
+                         candle_area_h));
 
     // Ring first: the border paints over its inner edge, so it reads as
     // expanding out from underneath the dot rather than around it.
@@ -419,42 +514,51 @@ void fill_between(SkCanvas* canvas,
                   float candle_right,
                   float candle_area_h,
                   uint32_t color,
-                  float opacity) {
-    if (!canvas || !upper_visible || !lower_visible || n == 0 ||
-        candle_right <= 0.f || candle_area_h <= 0.f) {
-        return;
-    }
+                  float opacity,
+                  const LineMorph* upper_from,
+                  const LineMorph* lower_from,
+                  float morph_t) {
+    if (!canvas || candle_right <= 0.f || candle_area_h <= 0.f) return;
     opacity = std::clamp(opacity, 0.f, 1.f);
     if (opacity <= 0.f) return;
+    morph_t = std::clamp(morph_t, 0.f, 1.f);
+
+    const std::size_t slots =
+        std::max(series_slots(n, upper_from, morph_t),
+                 series_slots(n, lower_from, morph_t));
+    if (slots == 0) return;
 
-    // One closed contour per maximal run where both series are finite; a
+    // Both edges resolved left to right first: mid-morph a vertex is a blend of
+    // the captured shape and the new one, and the fill has to be stitched from
+    // the same positions the two lines are stroked at.
+    static thread_local std::vector<MorphVertex> upper;
+    static thread_local std::vector<MorphVertex> lower;
+    resolve_series(lay, bounds, visible, n, upper_visible, window_ms,
+                   visible_start_ms, candle_duration_ms, 0, upper_from, morph_t,
+                   slots, upper);
+    resolve_series(lay, bounds, visible, n, lower_visible, window_ms,
+                   visible_start_ms, candle_duration_ms, 0, lower_from, morph_t,
+                   slots, lower);
+
+    // One closed contour per maximal run where both edges are defined; a
     // single-point run has no area. Multiple runs (e.g. around a data gap)
     // become multiple contours in one path.
     SkPathBuilder path;
     std::size_t i = 0;
-    while (i < n) {
-        if (!std::isfinite(upper_visible[i]) ||
-            !std::isfinite(lower_visible[i])) {
+    while (i < slots) {
+        if (!upper[i].valid || !lower[i].valid) {
             ++i;
             continue;
         }
         std::size_t e = i;
-        while (e + 1 < n && std::isfinite(upper_visible[e + 1]) &&
-               std::isfinite(lower_visible[e + 1])) {
-            ++e;
-        }
+        while (e + 1 < slots && upper[e + 1].valid && lower[e + 1].valid) ++e;
         if (e > i) {
-            const auto x_at = [&](std::size_t k) {
-                return vroom::candle_center_x(lay, visible[k].time_ms,
-                                              candle_duration_ms,
-                                              visible_start_ms, window_ms);
-            };
-            path.moveTo(x_at(i), vroom::price_to_y(lay, bounds, upper_visible[i]));
+            path.moveTo(upper[i].x, upper[i].y);
             for (std::size_t k = i + 1; k <= e; ++k) {
-                path.lineTo(x_at(k), vroom::price_to_y(lay, bounds, upper_visible[k]));
+                path.lineTo(upper[k].x, upper[k].y);
             }
             for (std::size_t k = e + 1; k-- > i;) {
-                path.lineTo(x_at(k), vroom::price_to_y(lay, bounds, lower_visible[k]));
+                path.lineTo(lower[k].x, lower[k].y);
             }
             path.close();
         }
@@ -473,4 +577,128 @@ void fill_between(SkCanvas* canvas,
     canvas->restore();
 }
 
+void fill_cloud(SkCanvas* canvas,
+                const Layout& lay,
+                const PriceBounds& bounds,
+                const ::VroomCandle* visible,
+                std::size_t n,
+                const double* a_visible,
+                const double* b_visible,
+                int64_t window_ms,
+                int64_t visible_start_ms,
+                int64_t candle_duration_ms,
+                float candle_right,
+                float candle_area_h,
+                uint32_t above_color,
+                uint32_t below_color,
+                float opacity,
+                int64_t time_shift_ms,
+                const LineMorph* a_from,
+                const LineMorph* b_from,
+                float morph_t) {
+    if (!canvas || candle_right <= 0.f || candle_area_h <= 0.f) return;
+    opacity = std::clamp(opacity, 0.f, 1.f);
+    if (opacity <= 0.f) return;
+    morph_t = std::clamp(morph_t, 0.f, 1.f);
+
+    const std::size_t slots = std::max(series_slots(n, a_from, morph_t),
+                                       series_slots(n, b_from, morph_t));
+    if (slots == 0) return;
+
+    static thread_local std::vector<MorphVertex> edge_a;
+    static thread_local std::vector<MorphVertex> edge_b;
+    resolve_series(lay, bounds, visible, n, a_visible, window_ms,
+                   visible_start_ms, candle_duration_ms, time_shift_ms, a_from,
+                   morph_t, slots, edge_a);
+    resolve_series(lay, bounds, visible, n, b_visible, window_ms,
+                   visible_start_ms, candle_duration_ms, time_shift_ms, b_from,
+                   morph_t, slots, edge_b);
+
+    // A vertex of the cloud: one x with the two edge heights there. At a
+    // crossover the two collapse onto the same y, which is what lets the
+    // neighboring contours meet on a point instead of overlapping.
+    struct Vertex {
+        float x, ya, yb;
+    };
+
+    SkPathBuilder above_path;
+    SkPathBuilder below_path;
+    std::vector<Vertex> contour;
+
+    // Closes the accumulated vertices into the path for whichever side is on
+    // top: forward along edge a, back along edge b.
+    const auto flush = [&](int sign) {
+        if (contour.size() >= 2) {
+            SkPathBuilder& into = sign >= 0 ? above_path : below_path;
+            into.moveTo(contour[0].x, contour[0].ya);
+            for (std::size_t k = 1; k < contour.size(); ++k) {
+                into.lineTo(contour[k].x, contour[k].ya);
+            }
+            for (std::size_t k = contour.size(); k-- > 0;) {
+                into.lineTo(contour[k].x, contour[k].yb);
+            }
+            into.close();
+        }
+        contour.clear();
+    };
+
+    // Which tone a run takes, read off the drawn geometry rather than the raw
+    // values: y grows downward, so a above b means ya is the smaller. Mid-morph
+    // the values belong to two different resolutions and only the interpolated
+    // positions say where the edges actually sit.
+    const auto separation = [&](std::size_t k) {
+        return static_cast<double>(edge_b[k].y - edge_a[k].y);
+    };
+
+    std::size_t i = 0;
+    while (i < slots) {
+        if (!edge_a[i].valid || !edge_b[i].valid) {
+            ++i;
+            continue;
+        }
+        std::size_t e = i;
+        while (e + 1 < slots && edge_a[e + 1].valid && edge_b[e + 1].valid) ++e;
+
+        int sign = 0;
+        Vertex prev{};
+        for (std::size_t k = i; k <= e; ++k) {
+            const Vertex v = Vertex{edge_a[k].x, edge_a[k].y, edge_b[k].y};
+            const double d = separation(k);
+            const int s = d > 0.0 ? 1 : (d < 0.0 ? -1 : 0);
+            if (sign != 0 && s != 0 && s != sign) {
+                // The spans swapped between the previous bar and this one. Meet
+                // them at the crossing so both tones end on the same point.
+                const double d0 = separation(k - 1);
+                const float t = static_cast<float>(d0 / (d0 - d));
+                const float xc = prev.x + (v.x - prev.x) * t;
+                const float yc = prev.ya + (v.ya - prev.ya) * t;
+                contour.push_back(Vertex{xc, yc, yc});
+                flush(sign);
+                contour.push_back(Vertex{xc, yc, yc});
+                sign = s;
+            } else if (sign == 0) {
+                sign = s;
+            }
+            contour.push_back(v);
+            prev = v;
+        }
+        flush(sign);
+        i = e + 1;
+    }
+
+    SkPaint fill;
+    fill.setAntiAlias(true);
+    fill.setStyle(SkPaint::kFill_Style);
+
+    canvas->save();
+    canvas->clipRect(SkRect::MakeLTRB(0.f, 0.f, candle_right, candle_area_h));
+    fill.setColor(static_cast<SkColor>(above_color));
+    fill.setAlphaf(fill.getAlphaf() * opacity);
+    canvas->drawPath(above_path.detach(), fill);
+    fill.setColor(static_cast<SkColor>(below_color));
+    fill.setAlphaf(fill.getAlphaf() * opacity);
+    canvas->drawPath(below_path.detach(), fill);
+    canvas->restore();
+}
+
 }  // namespace vroom::ma_overlay

package/cpp/_core_src/ma_overlay.h

@@ -13,6 +13,7 @@ class SkCanvas;
 namespace vroom {
 struct CandleSnapshot;
 struct Layout;
+struct LineMorph;
 struct PriceBounds;
 }  // namespace vroom
 
@@ -25,6 +26,18 @@ namespace vroom::ma_overlay {
 // `break_before` (optional, aligned with `visible`) forces a new subpath at any
 // index where it is non-zero — used by VWAP to break the line at session
 // resets. Pass nullptr for continuous lines (SMA/EMA).
+//
+// `time_shift_ms` offsets where each value lands on the time axis, for a series
+// drawn away from the bar it was computed on (Ichimoku's leading and lagging
+// spans). The shifted time need not be a bar that exists: projection is linear,
+// so a leading span runs past the newest candle into empty time. `visible` is
+// then the *source* slice — see ichimoku::shifted_source_range.
+//
+// `from` / `morph_t` are the interval morph, the indicator counterpart of what
+// draw_close_line does for the price series: the capture holds this series'
+// outgoing shape indexed from the right (slot 0 = newest) and each vertex
+// slides from where it sat before the timeframe switch to where it sits now.
+// A null capture (the default) draws `values_visible` alone.
 void draw(SkCanvas* canvas,
           const Layout& lay,
           const PriceBounds& bounds,
@@ -39,7 +52,10 @@ void draw(SkCanvas* canvas,
           uint32_t color,
           float width,
           const unsigned char* break_before = nullptr,
-          float opacity = 1.f);
+          float opacity = 1.f,
+          int64_t time_shift_ms = 0,
+          const LineMorph* from = nullptr,
+          float morph_t = 1.f);
 
 // The close-price polyline of line-chart mode. Equivalent to draw() fed the
 // visible closes, plus the interval morph: `from` / `from_n` is the outgoing
@@ -115,6 +131,12 @@ void draw_close_gradient(SkCanvas* canvas,
 //
 // `pulse_phase` is in cycles and wraps, so the caller can hand over elapsed time
 // divided by tip_pulse::kPeriodSeconds. Ignored unless `pulse`.
+//
+// `candle_right` bounds where the marked candle may be for the marker to draw at
+// all; `clip_right` bounds the paint, and is wider — the dot overhangs the plot
+// when the newest candle is at the right edge, so it paints into the gutter the
+// layout reserves for it. Callers must therefore draw the tip *after* the axis
+// backgrounds, which mask that gutter.
 void draw_close_tip(SkCanvas* canvas,
                     const Layout& lay,
                     const PriceBounds& bounds,
@@ -124,6 +146,7 @@ void draw_close_tip(SkCanvas* canvas,
                     int64_t visible_start_ms,
                     int64_t candle_duration_ms,
                     float candle_right,
+                    float clip_right,
                     float candle_area_h,
                     uint32_t line_color,
                     uint32_t bg_color,
@@ -140,6 +163,9 @@ void draw_close_tip(SkCanvas* canvas,
 // Runs where either series is NaN are skipped, so the fill never bridges the
 // warmup gap. Plain-alpha SkPaint fill, no gradient ramp (see gradient.h).
 // Clipped to the candle area like draw().
+//
+// Takes a capture per edge so the fill is built from the same interpolated
+// vertices its two lines are, and can't detach from them mid-morph.
 void fill_between(SkCanvas* canvas,
                   const Layout& lay,
                   const PriceBounds& bounds,
@@ -153,6 +179,42 @@ void fill_between(SkCanvas* canvas,
                   float candle_right,
                   float candle_area_h,
                   uint32_t color,
-                  float opacity);
+                  float opacity,
+                  const LineMorph* upper_from = nullptr,
+                  const LineMorph* lower_from = nullptr,
+                  float morph_t = 1.f);
+
+// Ichimoku's cloud: the region between two aligned series, filled with
+// `above_color` where `a` is over `b` and `below_color` where it is under, both
+// at their alpha × `opacity`.
+//
+// Each run is split at every crossover, with the interpolated meeting point
+// added to the contour on both sides, so the two tones abut exactly instead of
+// overlapping or leaving a seam. NaN in either series breaks the run, as in
+// fill_between. `time_shift_ms` shifts the whole cloud along the time axis the
+// same way draw() does.
+//
+// Morphs per edge like fill_between. Which tone a run takes is read off the
+// interpolated vertices rather than the raw values, so a crossover that only
+// exists mid-morph still splits the cloud where the two edges actually meet.
+void fill_cloud(SkCanvas* canvas,
+                const Layout& lay,
+                const PriceBounds& bounds,
+                const ::VroomCandle* visible,
+                std::size_t n,
+                const double* a_visible,
+                const double* b_visible,
+                int64_t window_ms,
+                int64_t visible_start_ms,
+                int64_t candle_duration_ms,
+                float candle_right,
+                float candle_area_h,
+                uint32_t above_color,
+                uint32_t below_color,
+                float opacity,
+                int64_t time_shift_ms = 0,
+                const LineMorph* a_from = nullptr,
+                const LineMorph* b_from = nullptr,
+                float morph_t = 1.f);
 
 }  // namespace vroom::ma_overlay

package/cpp/_core_src/macd.cpp

@@ -1,6 +1,7 @@
 #include "macd.h"
 
-#include <cmath>  // std::nan, std::isfinite
+#include <algorithm>  // std::max
+#include <cmath>      // std::nan, std::isfinite, std::abs
 
 #include "ma.h"
 #include "series_ma.h"
@@ -36,4 +37,26 @@ void compute(const ::VroomCandle* candles, std::size_t n, int fast, int slow,
     }
 }
 
+double autoscale(const double* macd, const double* signal, const double* hist,
+                 std::size_t n) {
+    double scale = 0.0;
+    const auto track = [&](const double* s) {
+        if (!s) return;
+        for (std::size_t i = 0; i < n; ++i) {
+            if (std::isfinite(s[i])) scale = std::max(scale, std::abs(s[i]));
+        }
+    };
+    track(macd);
+    track(signal);
+    track(hist);
+    return scale;
+}
+
+double band_fraction(double v, double scale, double y_scale) {
+    // Nothing on show yet — everything collapses onto the zero line rather than
+    // dividing by zero.
+    if (!(scale > 0.0)) return 0.5;
+    return 0.5 + (v / scale) * 0.5 * kBandPadFraction * y_scale;
+}
+
 }  // namespace vroom::macd

package/cpp/_core_src/macd.h

@@ -16,6 +16,10 @@
 
 namespace vroom::macd {
 
+// How much of the pane's half-band an extreme is allowed to fill, so a peak
+// stops short of the separator instead of touching it.
+constexpr double kBandPadFraction = 0.85;
+
 // Computes MACD over [candles, candles+n). fast/slow/signal are clamped to >= 1
 // (callers pass 12/26/9 by default; slow should exceed fast). `source` selects
 // the price series (vroom::ma::Source); `ma_kind` picks the averaging for the
@@ -29,4 +33,16 @@ void compute(const ::VroomCandle* candles, std::size_t n, int fast, int slow,
              std::vector<double>& macd_out, std::vector<double>& signal_out,
              std::vector<double>& hist_out);
 
+// The amplitude the pane band is fitted to, symmetric about zero: the largest
+// finite magnitude across the series on show, or 0 when there is nothing to
+// plot. Pass nullptr for a hidden series so the rest fill the band.
+double autoscale(const double* macd, const double* signal, const double* hist,
+                 std::size_t n);
+
+// Where a value sits in the pane band, as a fraction of its height — 0 at the
+// bottom edge, 1 at the top, 0.5 on the zero line. `y_scale` is the user's
+// y-axis zoom (1 = the default fit). Split out of the renderer so the
+// interval-morph capture maps its geometry through the same math.
+double band_fraction(double v, double scale, double y_scale);
+
 }  // namespace vroom::macd