react-native-vroom-chart 0.9.1 → 0.11.0

package/README.md

@@ -16,8 +16,11 @@ import { VroomChart } from 'react-native-vroom-chart';
 ## Peer dependencies
 
 - `react-native` ≥ 0.76
-- `@shopify/react-native-skia` ≥ 1.5 — provides the Skia runtime we draw into
+- `@shopify/react-native-skia` ≥ 2.11.0 — provides the Skia runtime we draw into. vroom links RN-Skia's native internals (`cpp/api`) and tracks that package closely; those headers have no semver guarantee.
+
 - `react-native-gesture-handler` ≥ 2.16 — long-press / pan / pinch recognition
+- `react-native-reanimated` ≥ 4.0 — gesture worklets
+- `react-native-worklets` ≥ 0.7.0 — required by Skia 2.11's Reanimated integration on native
 
 ## Status
 

package/android/CMakeLists.txt

@@ -4,20 +4,21 @@
 # core the iOS podspec compiles (see ../react-native-vroom-chart.podspec),
 # plus this directory's small JNI entry point (src/main/cpp/VroomChartJni.cpp).
 #
-# RN-Skia's headers (JsiSkHostObjects.h, RNSkPlatformContext.h — needed by
-# ../cpp/VroomSkiaContext.cpp) aren't consumed via CMake's prefab mechanism;
-# instead we point directly at @shopify/react-native-skia's `cpp/` sources,
-# mirroring the podspec's `require.resolve('@shopify/react-native-skia/package.json')`
-# trick (VROOM_SKIA_CPP_DIR is computed the same way in build.gradle).
+# RN-Skia's headers (JsiSkNativeObjects.h, JsiSkPicture.h, and the
+# RNSkPlatformContext.h they pull in) aren't consumed via CMake's prefab
+# mechanism; instead we point directly at @shopify/react-native-skia's `cpp/`
+# sources, mirroring the podspec's
+# `require.resolve('@shopify/react-native-skia/package.json')` trick
+# (VROOM_SKIA_CPP_DIR is computed the same way in build.gradle).
 #
-# IMPORTANT — SK_GRAPHITE ABI note: RNSkPlatformContext's vtable layout
-# differs depending on whether SK_GRAPHITE was defined when RN-Skia's own
-# Android build compiled RNSkAndroidPlatformContext (the concrete class whose
-# vtable we call into via VroomSkiaContext.cpp's `ctx->createFontMgr()`).
-# We must define SK_GRAPHITE identically to however RN-Skia's own CMakeLists
-# (android/CMakeLists.txt) decided it, or virtual calls resolve to the wrong
-# vtable slot. We replicate their libskia.a symbol probe below rather than
-# hard-coding an assumption.
+# Prebuilt libskia.a lives in the sibling npm package react-native-skia-android
+# (or react-native-skia-graphite-android). build.gradle resolves that package
+# and passes VROOM_SKIA_ANDROID_LIBS_DIR = <pkg>/libs; we append ${ANDROID_ABI}.
+#
+# SK_GRAPHITE vs SK_GL/SK_GANESH must match RN-Skia's own build so our direct
+# Skia calls see the same ABI. Graphite is detected from the
+# <skia-pkg>/libs/.graphite marker (same file RN-Skia uses) and passed in as
+# VROOM_SKIA_GRAPHITE.
 cmake_minimum_required(VERSION 3.22)
 project(vroomchart)
 
@@ -35,44 +36,30 @@ find_package(shopify_react-native-skia REQUIRED CONFIG)
 if(NOT DEFINED VROOM_SKIA_CPP_DIR)
   message(FATAL_ERROR "VROOM_SKIA_CPP_DIR not set — passed from android/build.gradle.")
 endif()
+if(NOT DEFINED VROOM_SKIA_ANDROID_LIBS_DIR)
+  message(FATAL_ERROR "VROOM_SKIA_ANDROID_LIBS_DIR not set — passed from android/build.gradle.")
+endif()
 
-# RN-Skia's own package root is one level up from its cpp/ dir; its prebuilt
-# Skia static libs live at <root>/libs/android/<abi>/libskia.a.
-get_filename_component(VROOM_SKIA_PKG_DIR "${VROOM_SKIA_CPP_DIR}" DIRECTORY)
-set(VROOM_SKIA_LIBS_DIR "${VROOM_SKIA_PKG_DIR}/libs/android/${ANDROID_ABI}")
+set(VROOM_SKIA_LIBS_DIR "${VROOM_SKIA_ANDROID_LIBS_DIR}/${ANDROID_ABI}")
 
 # Our chart core calls Skia types (SkCanvas, SkPaint, SkFont, ...) and
-# RN-Skia's own JSI plumbing (RNJsi::JsiHostObject, JsiSkPicture, ...)
+# RN-Skia's own JSI plumbing (JsiSkPicture / NativeObject, ...)
 # directly — none of that is header-only, and we need *both* libraries:
 #   - librnskia.so (RN-Skia's prefab-published `rnskia` module, consumed above
-#     via `implementation project(":shopify_react-native-skia")`) for RNJsi's
-#     own symbols (JsiHostObject, JsiSkPicture, ...), which only exist there.
-#   - libskia.a (RN-Skia's bundled prebuilt Skia static lib) for direct Skia
-#     calls (SkCanvas::drawRect, SkFont, ...): librnskia.so links libskia.a
-#     internally but doesn't re-export its symbols, so linking librnskia.so
-#     alone leaves every direct Skia call undefined.
+#     via `implementation project(":shopify_react-native-skia")`) for RN-Skia's
+#     own symbols (JsiSkPicture, NativeObject, ...), which only exist there.
+#   - libskia.a (the prebuilt Skia static lib from react-native-skia-android)
+#     for direct Skia calls (SkCanvas::drawRect, SkFont, ...): librnskia.so
+#     links libskia.a internally but doesn't re-export its symbols, so linking
+#     librnskia.so alone leaves every direct Skia call undefined.
 # Recompiling RN-Skia's cpp/jsi/*.cpp ourselves instead of linking librnskia.so
-# was considered and rejected — it would duplicate RNJsi's symbols (and their
+# was considered and rejected — it would duplicate RN-Skia's symbols (and their
 # static/global state) across two separately-loaded .so's, which is fine on
 # iOS's single static binary but not here.
 add_library(vroom_skia_prebuilt STATIC IMPORTED)
 set_property(TARGET vroom_skia_prebuilt PROPERTY
   IMPORTED_LOCATION "${VROOM_SKIA_LIBS_DIR}/libskia.a")
 
-set(SK_GRAPHITE_AVAILABLE OFF)
-if(EXISTS "${VROOM_SKIA_LIBS_DIR}/libskia.a")
-  execute_process(
-    COMMAND nm "${VROOM_SKIA_LIBS_DIR}/libskia.a"
-    COMMAND grep "dawn::\\|wgpu\\|_ZN4dawn\\|DawnDevice\\|dawn_native"
-    OUTPUT_VARIABLE VROOM_NM_OUTPUT
-    ERROR_QUIET
-    RESULT_VARIABLE VROOM_NM_RESULT
-  )
-  if(VROOM_NM_RESULT EQUAL 0 AND NOT "${VROOM_NM_OUTPUT}" STREQUAL "")
-    set(SK_GRAPHITE_AVAILABLE ON)
-  endif()
-endif()
-
 # The chart core (shared across iOS/Android/WASM — see ../../core/CMakeLists.txt).
 set(VROOM_CORE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/_core_include")
 set(VROOM_CORE_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/_core_src")
@@ -81,7 +68,7 @@ file(GLOB VROOM_CORE_SOURCES CONFIGURE_DEPENDS "${VROOM_CORE_SRC_DIR}/*.cpp")
 add_library(vroomchart SHARED
   "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/VroomJsiInstaller.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/VroomChartHostObject.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/VroomSkiaContext.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/VroomFontMgr.cpp"
   ${VROOM_CORE_SOURCES}
   "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/VroomChartJni.cpp"
 )
@@ -101,7 +88,9 @@ target_include_directories(vroomchart PRIVATE
   "${VROOM_SKIA_CPP_DIR}/dawn/include"
   # RNSkPlatformContext.h pulls in ReactCommon/CallInvoker.h directly, which
   # isn't part of the prefab-published jsi headers — same dirs RN-Skia's own
-  # android/CMakeLists.txt adds for the same reason.
+  # android/CMakeLists.txt adds for the same reason. Still required: we include
+  # JsiSkPicture.h, which includes JsiSkNativeObjects.h, which includes
+  # RNSkPlatformContext.h.
   "${REACT_NATIVE_DIR}/ReactCommon"
   "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
   "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
@@ -114,7 +103,7 @@ target_compile_definitions(vroomchart PRIVATE
   ONANDROID
   ON_ANDROID
 )
-if(SK_GRAPHITE_AVAILABLE)
+if(VROOM_SKIA_GRAPHITE)
   target_compile_definitions(vroomchart PRIVATE SK_GRAPHITE)
 else()
   target_compile_definitions(vroomchart PRIVATE SK_GL SK_GANESH)

package/android/README.md

@@ -8,31 +8,33 @@ Android equivalent of `../ios/`: a small TurboModule
 [`../cpp/VroomJsiInstaller.cpp`](../cpp/VroomJsiInstaller.cpp) the iOS bridge
 uses.
 
-The chart core itself (`../cpp/_core_src`) and the RN-Skia font/context glue
-(`../cpp/VroomSkiaContext.*`) are unmodified and shared across iOS and
-Android — only the platform glue (this directory + `../ios/`) differs.
+The chart core (`../cpp/_core_src`) and the platform font-manager helper
+(`../cpp/VroomFontMgr.*`) are unmodified and shared across iOS and Android —
+only the platform glue (this directory + `../ios/`) differs.
 `../cpp/VroomChartHostObject.cpp` has one small `#if defined(__ANDROID__)`
 branch (see "Cross-`.so` Skia objects" below).
 
 `build.gradle` resolves `@shopify/react-native-skia`'s `cpp/` sources via
 Node module resolution (mirroring `../react-native-vroom-chart.podspec`'s
-`require.resolve` trick) so `VroomSkiaContext.cpp` can include RN-Skia's
-`JsiSkHostObjects.h` / `RNSkPlatformContext.h`. `CMakeLists.txt` also
-replicates RN-Skia's own Graphite-vs-Ganesh detection (probing its bundled
-`libskia.a`) so `SK_GRAPHITE` is defined identically to however RN-Skia's own
-Android build was compiled — `RNSkPlatformContext`'s vtable layout depends on
-that macro, and a mismatch would corrupt the virtual call in
-`VroomJsiInstaller.cpp`'s `ensureAxisTypeface`.
+`require.resolve` trick) so we can include RN-Skia's `JsiSkPicture.h` /
+`JsiSkNativeObjects.h`. Android prebuilt `libskia.a` lives in the sibling
+`react-native-skia-android` package (or `react-native-skia-graphite-android`
+when `<skia-pkg>/libs/.graphite` exists); Gradle resolves that package and
+passes its `libs/` dir to CMake. Graphite vs Ganesh is the same marker file
+RN-Skia uses, so `SK_GRAPHITE` / `SK_GL`+`SK_GANESH` match RN-Skia's own
+build — needed for vroom's direct Skia calls, not for a virtual call into
+RN-Skia (we construct the font manager ourselves).
 
 We link two RN-Skia-adjacent libraries into `libvroomchart.so`, for two
 different reasons:
   - `shopify_react-native-skia::rnskia` (RN-Skia's own prefab-published
-    shared library, `librnskia.so`) — for `RNJsi::JsiHostObject` and friends,
-    whose out-of-line methods are compiled only there.
-  - RN-Skia's bundled `libskia.a` (imported directly by path, since it isn't
-    prefab-published) — for direct Skia calls (`SkCanvas::drawRect`, `SkFont`,
-    ...), since `librnskia.so` links `libskia.a` internally but doesn't
-    re-export its symbols.
+    shared library, `librnskia.so`) — for `JsiSkPicture` / `NativeObject`
+    and friends, whose out-of-line methods are compiled only there.
+  - `libskia.a` from `react-native-skia-android` (imported directly by path,
+    since it isn't prefab-published) — for direct Skia calls
+    (`SkCanvas::drawRect`, `SkFont`, `SkFontMgr_New_Android`, ...), since
+    `librnskia.so` links `libskia.a` internally but doesn't re-export its
+    symbols.
 
 ### Cross-`.so` Skia objects
 
@@ -43,11 +45,11 @@ of the JSI bridge, but **`RNSkia::JsiSkPicture` — the object `render()` /
 `libvroomchart.so` on Android.** RN-Skia's own C++ (e.g.
 `cpp/api/recorder/Convertor.h`'s `getPropertyValue<sk_sp<SkPicture>>`, which
 runs whenever `<Picture>` reads the value) does
-`value.asObject(rt).asHostObject<JsiSkPicture>(rt)`, a `dynamic_pointer_cast`
-under the hood. A `JsiSkPicture` we construct ourselves has a vtable/typeinfo
-compiled into *our* `.so`; that cast — running inside `librnskia.so` — sees a
-different, unmerged RTTI record for "the same" class and fails with `Object
-is not a HostObject of desired type`.
+`getJsiObject<JsiSkPicture>(rt, value)`, a `dynamic_pointer_cast` under the
+hood. A `JsiSkPicture` we construct ourselves has a vtable/typeinfo compiled
+into *our* `.so`; that cast — running inside `librnskia.so` — sees a
+different, unmerged RTTI record for "the same" class and fails with
+`Expected a Skia object of a different type`.
 
 `VroomChartHostObject.cpp`'s `wrapPicture()` works around this only on
 Android: instead of constructing `RNSkia::JsiSkPicture` directly (as iOS

package/android/build.gradle

@@ -28,7 +28,23 @@ def resolvePackageDir(packageJsonSpecifier) {
 }
 
 def reactNativeDir = resolvePackageDir("react-native/package.json")
-def skiaCppDir = new File(resolvePackageDir("@shopify/react-native-skia/package.json"), "cpp")
+def skiaPkgDir = resolvePackageDir("@shopify/react-native-skia/package.json")
+def skiaCppDir = new File(skiaPkgDir, "cpp")
+
+// Skia 2.10+ ships Android prebuilts in react-native-skia-android (Ganesh)
+// or react-native-skia-graphite-android (Graphite). Graphite is selected by
+// the same libs/.graphite marker RN-Skia uses. Resolve from the skia package
+// so pnpm's nested .pnpm layout still finds the sibling binary package.
+def useGraphite = new File(skiaPkgDir, "libs/.graphite").exists()
+def skiaAndroidPkgName = useGraphite
+    ? "react-native-skia-graphite-android"
+    : "react-native-skia-android"
+def skiaAndroidPkgJson = providers.exec {
+  workingDir(rootDir)
+  commandLine("node", "--print",
+      "require.resolve('${skiaAndroidPkgName}/package.json', { paths: ['${skiaPkgDir}'] })")
+}.standardOutput.asText.get().trim()
+def skiaAndroidLibsDir = new File(file(skiaAndroidPkgJson).parentFile, "libs")
 
 // Mirror ../cpp/_core_{src,include} from ../../core/{src,include} whenever
 // the monorepo core is present, so edits to packages/core/ propagate on the
@@ -72,7 +88,9 @@ android {
         abiFilters(*reactNativeArchitectures())
         arguments "-DANDROID_STL=c++_shared",
                   "-DREACT_NATIVE_DIR=${reactNativeDir}",
-                  "-DVROOM_SKIA_CPP_DIR=${skiaCppDir}"
+                  "-DVROOM_SKIA_CPP_DIR=${skiaCppDir}",
+                  "-DVROOM_SKIA_ANDROID_LIBS_DIR=${skiaAndroidLibsDir}",
+                  "-DVROOM_SKIA_GRAPHITE=${useGraphite ? 'ON' : 'OFF'}"
       }
     }
   }
@@ -105,11 +123,11 @@ repositories {
 
 dependencies {
   implementation "com.facebook.react:react-android"
-  // ../cpp/VroomChartHostObject.cpp constructs RN-Skia JSI host objects
-  // (JsiSkPicture, etc.) whose base class (RNJsi::JsiHostObject) has
-  // out-of-line methods compiled into RN-Skia's own native library — we link
-  // against its prefab-published `rnskia` package (below, in CMakeLists.txt)
-  // rather than recompiling those .cpp files ourselves, to avoid duplicate
-  // definitions of RNSkia's internals across two separately-loaded .so's.
+  // ../cpp/VroomChartHostObject.cpp constructs RN-Skia JSI objects
+  // (JsiSkPicture, etc.) whose NativeObject base has out-of-line methods
+  // compiled into RN-Skia's own native library — we link against its
+  // prefab-published `rnskia` package (below, in CMakeLists.txt) rather than
+  // recompiling those .cpp files ourselves, to avoid duplicate definitions of
+  // RN-Skia's internals across two separately-loaded .so's.
   implementation project(":shopify_react-native-skia")
 }

package/cpp/VroomChartHostObject.cpp

@@ -8,7 +8,7 @@
 #include "vroom/vroom_chart.h"
 
 // RN-Skia headers.
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkPicture.h"
 
 namespace vroom {
@@ -78,9 +78,9 @@ std::vector<jsi::PropNameID> ChartHostObject::getPropertyNames(
 // does, below) gives it a vtable/typeinfo from *our* .so; when RN-Skia's own
 // compiled code later consumes it (e.g. Convertor.h's
 // `getPropertyValue<sk_sp<SkPicture>>`, which does
-// `value.asObject(rt).asHostObject<JsiSkPicture>(rt)` — a dynamic_pointer_cast
-// under the hood), the cast fails cross-.so with "Object is not a HostObject
-// of desired type", because the object's *runtime* type was never actually
+// `getJsiObject<JsiSkPicture>(rt, value)` — a dynamic_pointer_cast
+// under the hood), the cast fails cross-.so with "Expected a Skia object of
+// a different type", because the object's *runtime* type was never actually
 // compiled inside librnskia.so. iOS statically links everything into one
 // binary, so no such mismatch exists there.
 //
@@ -122,26 +122,30 @@ static facebook::jsi::Value wrapPicture(facebook::jsi::Runtime& rt,
   if (!skiaApi.isObject()) return facebook::jsi::Value::null();
   auto pictureFactory = skiaApi.asObject(rt).getProperty(rt, "Picture");
   if (!pictureFactory.isObject()) return facebook::jsi::Value::null();
+  auto pictureFactoryObj = pictureFactory.asObject(rt);
   auto makePicture =
-      pictureFactory.asObject(rt).getPropertyAsFunction(rt, "MakePicture");
+      pictureFactoryObj.getPropertyAsFunction(rt, "MakePicture");
 
   // Mirrors JsiSkPictureFactory::MakePicture's expected argument shape: an
   // object with a `.buffer` property holding the ArrayBuffer (matching a
   // Uint8Array-like value; the factory ignores everything else about it).
+  //
+  // Skia 2.11's NativeState host methods recover the factory via `this`
+  // (`fromThis` → "Expected PictureFactory but got non-object" if unbound).
   jsi::Object arg(rt);
   arg.setProperty(rt, "buffer", arrayBuffer);
-  return makePicture.call(rt, arg);
+  return makePicture.callWithThis(rt, pictureFactoryObj, arg);
 }
 #else
-// Shared helper: wraps a fresh picture for return to JS, with memory pressure
-// reported to Hermes so GC keeps up under gesture-rate churn.
+// Shared helper: wraps a fresh picture for return to JS. Memory pressure is
+// applied inside JsiSkPicture::create (NativeObject::create reads
+// getMemoryPressure() → picture->approximateBytesUsed()).
 static facebook::jsi::Value wrapPicture(facebook::jsi::Runtime& rt,
                                        const sk_sp<SkPicture>& pic) {
   if (!pic) return facebook::jsi::Value::null();
   auto host =
       std::make_shared<RNSkia::JsiSkPicture>(/*context=*/nullptr, pic);
-  return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(rt, host,
-                                                     /*context=*/nullptr);
+  return RNSkia::makeJsiObject(rt, host);
 }
 #endif
 

package/cpp/VroomFontMgr.cpp

@@ -0,0 +1,25 @@
+#include "VroomFontMgr.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#if defined(__APPLE__)
+#include "include/ports/SkFontMgr_mac_ct.h"
+#elif defined(__ANDROID__)
+#include "include/ports/SkFontMgr_android.h"
+#include "include/ports/SkFontScanner_FreeType.h"
+#endif
+#pragma clang diagnostic pop
+
+namespace vroom {
+
+sk_sp<SkFontMgr> makePlatformFontMgr() {
+#if defined(__APPLE__)
+  return SkFontMgr_New_CoreText(nullptr);
+#elif defined(__ANDROID__)
+  return SkFontMgr_New_Android(nullptr, SkFontScanner_Make_FreeType());
+#else
+  return nullptr;
+#endif
+}
+
+}  // namespace vroom

package/cpp/VroomFontMgr.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkRefCnt.h"
+#pragma clang diagnostic pop
+
+namespace vroom {
+
+// Returns the platform system font manager, or nullptr if unavailable.
+sk_sp<SkFontMgr> makePlatformFontMgr();
+
+}  // namespace vroom

package/cpp/VroomJsiInstaller.cpp

@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "VroomChartHostObject.h"
-#include "VroomSkiaContext.h"
+#include "VroomFontMgr.h"
 
 #include "chart_internal.h"
 
@@ -26,20 +26,36 @@
 #include "include/core/SkTypeface.h"
 #pragma clang diagnostic pop
 
+#if defined(__ANDROID__)
+#include <android/log.h>
+#define VROOM_WARN(...) \
+  __android_log_print(ANDROID_LOG_WARN, "VroomChart", __VA_ARGS__)
+#elif defined(__APPLE__)
+#include <os/log.h>
+#define VROOM_WARN(fmt, ...) \
+  os_log_error(OS_LOG_DEFAULT, "VroomChart: " fmt, ##__VA_ARGS__)
+#else
+#define VROOM_WARN(...)
+#endif
+
 namespace vroom {
 
 namespace jsi = facebook::jsi;
 
-// Loads the system typeface once via RN-Skia's platform context and hands
-// it to the chart core. Retries on each create() until it succeeds (in case
-// SkiaApi isn't installed yet when our first chart instance is created).
-static void ensureAxisTypeface(jsi::Runtime& runtime) {
+// Loads the system typeface once via the platform SkFontMgr and hands it to
+// the chart core. Built only once — constructing a font manager enumerates
+// the system font set and is not cheap. Failure is logged once; we do not
+// retry, because this no longer depends on RN-Skia's JSI bindings appearing.
+static void ensureAxisTypeface() {
   static bool done = false;
   if (done) return;
-  auto ctx = vroom::getRNSkContext(runtime);
-  if (!ctx) return;
-  auto mgr = ctx->createFontMgr();
-  if (!mgr) return;
+  done = true;
+
+  auto mgr = vroom::makePlatformFontMgr();
+  if (!mgr) {
+    VROOM_WARN("axis typeface: platform font manager unavailable");
+    return;
+  }
 
   // A null family name is meant to request "the platform default" — CoreText
   // (iOS) honors that, but Android's SkFontMgr_New_Android does not: it
@@ -51,12 +67,16 @@ static void ensureAxisTypeface(jsi::Runtime& runtime) {
   if (!tf) {
     tf = mgr->matchFamilyStyle("sans-serif", SkFontStyle());
   }
-  if (!tf) return;
+  if (!tf) {
+    VROOM_WARN("axis typeface: no default or sans-serif typeface");
+    return;
+  }
   vroom::set_axis_typeface(tf);
-  done = true;
 }
 
 void installJsi(jsi::Runtime& runtime) {
+  ensureAxisTypeface();
+
   auto create = jsi::Function::createFromHostFunction(
       runtime,
       jsi::PropNameID::forAscii(runtime, "create"),
@@ -65,7 +85,6 @@ void installJsi(jsi::Runtime& runtime) {
          const jsi::Value& /*thisVal*/,
          const jsi::Value* /*args*/,
          size_t /*count*/) -> jsi::Value {
-        ensureAxisTypeface(rt);
         auto host = std::make_shared<ChartHostObject>();
         return jsi::Object::createFromHostObject(rt, host);
       });

package/cpp/_core_src/chart.cpp

@@ -36,6 +36,7 @@
 #include "rsi.h"
 #include "rsi_pane.h"
 #include "style_inherit.h"
+#include "tip_anchor.h"
 #include "tip_pulse.h"
 #include "volume.h"
 #include "vwap.h"
@@ -311,16 +312,23 @@ void VroomChart::draw_chart(SkCanvas* canvas) {
     // 5.8. Line-mode tip marker — the dot (and optional pulse) at the newest
     //      close. Above the overlays so it stays the eye's anchor, but before the
     //      axis masks, which trim the ring at the price scale.
+    //
+    //      Unlike every layer above, this one anchors to the newest candle in
+    //      the series rather than the newest on screen, so panning into history
+    //      carries the dot off the right edge with its candle (tip_anchor.h).
     if (fade > 0.f && theme.floats[VROOM_FLOAT_LINE_TIP_DOT] > 0.5f) {
+        const auto anchor = vroom::tip_anchor::at(range.start, range.end,
+                                                  candles.size(), morphing);
         vroom::ma_overlay::draw_close_tip(
-            canvas, lay, bounds, visible, n, window_ms, visible_start_ms,
-            candle_duration_ms, candle_right, candle_area_h,
+            canvas, lay, bounds, visible, anchor.slot_count, window_ms,
+            visible_start_ms, candle_duration_ms, candle_right, candle_area_h,
             theme.colors[VROOM_COLOR_LINE],
             theme.colors[VROOM_COLOR_BACKGROUND],
             theme.floats[VROOM_FLOAT_LINE_WIDTH_PX], fade,
             theme.floats[VROOM_FLOAT_LINE_TIP_PULSE] > 0.5f,
             tip_pulse_elapsed_s / vroom::tip_pulse::kPeriodSeconds,
-            morph_src, morph_n, morph_t);
+            anchor.use_morph ? morph_src : nullptr,
+            anchor.use_morph ? morph_n : 0, morph_t);
     }
 
     // 6. Axis backgrounds (mask any candle overflow). The x-axis separator

package/cpp/_core_src/chart.h

@@ -23,6 +23,7 @@
 #pragma clang diagnostic pop
 
 #include "labels.h"
+#include "price_format.h"
 #include "theme.h"
 #include "viewport.h"
 
@@ -89,6 +90,12 @@ struct VroomChart {
     // label. 0 = uncomputed; layout() falls back to a width ratio.
     float axis_width_px = 0.f;
 
+    // How prices render, derived from the asset's own scale. Cached beside the
+    // width because the two are measured together — every label site reads this
+    // so none of them can disagree with the strip they're drawn in. Both are
+    // refreshed by labels::recompute_axis_width.
+    vroom::PriceFormat price_fmt{};
+
     // --- price bounds (y-axis state) ---------------------------------------
     // Two modes. Auto (price_bounds_manual == false, the default): the y-range
     // continuously follows the visible candles each frame and `price_bounds`

package/cpp/_core_src/chart_internal.h

@@ -23,8 +23,8 @@ sk_sp<SkPicture> render_chart_picture(VroomChart* chart);
 bool is_animating(VroomChart* chart);
 
 // Sets the typeface used for axis labels. Bridge layer calls this once at
-// startup with a system typeface loaded via RN-Skia's font manager. Labels
-// are skipped if no typeface is set.
+// startup with a system typeface from the platform SkFontMgr. Labels are
+// skipped if no typeface is set.
 void set_axis_typeface(sk_sp<SkTypeface> typeface);
 
 }  // namespace vroom

package/cpp/_core_src/crosshair.cpp

@@ -20,6 +20,7 @@
 
 #include "chart.h"
 #include "fonts.h"
+#include "price_format.h"
 #include "theme.h"
 #include "ticks.h"
 
@@ -146,11 +147,12 @@ void draw(SkCanvas* canvas,
     // sharing the y-axis labels' column.
     if (lay.y_axis_width_px > 0.f) {
         const double price = vroom::y_to_price(lay, bounds, cy);
-        char buf[32];
-        const int decimals = vroom::price_decimals(
+        char buf[48];
+        const vroom::PriceFormat fmt = vroom::with_tick_guard(
+            chart.price_fmt,
             vroom::pick_price_interval(bounds.max - bounds.min,
                                        vroom::price_pane_bottom(lay)));
-        vroom::format_price(buf, sizeof(buf), price, decimals);
+        vroom::format_price(buf, sizeof(buf), price, fmt);
         const float axis_center_x = lay.width_px - lay.y_axis_width_px * 0.5f;
         draw_badge(canvas, font, buf, axis_center_x, cy, badge_fill,
                    SK_ColorWHITE);

package/cpp/_core_src/fonts.h

@@ -1,8 +1,8 @@
 // Global typeface for axis/label text rendering.
 //
-// Loaded once at startup by the bridge layer (which uses RN-Skia's platform-
-// context font manager to grab the system default). Held as a process-global
-// so all charts share it; per-chart font configuration is not modeled yet.
+// Loaded once at startup by the bridge layer (which constructs a platform
+// SkFontMgr and grabs the system default). Held as a process-global so all
+// charts share it; per-chart font configuration is not modeled yet.
 
 #pragma once
 

package/cpp/_core_src/labels.cpp

@@ -19,6 +19,7 @@
 
 #include "chart.h"
 #include "fonts.h"
+#include "price_format.h"
 #include "ticks.h"
 #include "viewport.h"
 
@@ -47,6 +48,19 @@ void advance(Fade& f, float step, float dt) {
     }
 }
 
+// What the asset is worth, which is what its price precision keys off. The
+// newest close rather than the visible range, so panning and zooming don't
+// shift the decimals around under the user.
+//
+// An asset that has crossed orders of magnitude within one series (a token at
+// 0.00001 that later trades at 100) reads its recent scale here, so deep
+// history would round flat — the tick guard at each label site is what rescues
+// it, since the bounds down there are tiny enough to demand more decimals.
+double reference_price(const VroomChart& chart) {
+    if (!chart.candles.empty()) return chart.candles.back().close;
+    return (chart.price_bounds.max + chart.price_bounds.min) * 0.5;
+}
+
 // Drives a whole axis off the morph envelope instead of the per-label fades:
 // everything in the phase's tick set shares one opacity, and anything outside it
 // is dropped outright. At the midpoint the axis is transparent, so swapping the
@@ -153,15 +167,16 @@ void draw_y_labels(SkCanvas* canvas,
     // Horizontal center of the y-axis container ([width - y_axis_width, width]).
     // Labels (and the price box) center on this so their text shares a column.
     const float axis_center_x = lay.width_px - lay.y_axis_width_px * 0.5f;
-    const int decimals = vroom::price_decimals(
+    const vroom::PriceFormat fmt = vroom::with_tick_guard(
+        chart.price_fmt,
         vroom::pick_price_interval(bounds.max - bounds.min, candle_area_h));
 
     for (const auto& f : chart.y_fades) {
         if (f.opacity <= 1e-3f) continue;
         const float y = vroom::price_to_y(lay, bounds, f.price);
 
-        char buf[32];
-        vroom::format_price(buf, sizeof(buf), f.price, decimals);
+        char buf[48];
+        vroom::format_price(buf, sizeof(buf), f.price, fmt);
         const size_t len = std::strlen(buf);
         const float text_w = font.measureText(
             buf, len, SkTextEncoding::kUTF8);
@@ -347,6 +362,10 @@ void gc_x_fades(VroomChart& chart) {
 // ----- Axis-width sizing ----------------------------------------------------
 
 void recompute_axis_width(VroomChart& chart) {
+    // Precision first, and unconditionally: the label sites read it whether or
+    // not a typeface has loaded, and it's what the measurement below sizes for.
+    chart.price_fmt = vroom::price_format_for(reference_price(chart));
+
     auto tf = vroom::axis_typeface();
     if (!tf) {
         chart.axis_width_px = 0.f;
@@ -370,11 +389,16 @@ void recompute_axis_width(VroomChart& chart) {
 
     SkFont font(tf, chart.theme.floats[VROOM_FLOAT_AXIS_FONT_SIZE_PX]);
     const auto lay = chart.layout();
-    const int decimals = vroom::price_decimals(
+    // Same guard the label sites apply, against the bounds this is sizing for,
+    // so a zoom deep enough to add decimals widens the strip to hold them.
+    const vroom::PriceFormat fmt = vroom::with_tick_guard(
+        chart.price_fmt,
         vroom::pick_price_interval(hi - lo, vroom::price_pane_bottom(lay)));
-    char buf_hi[32], buf_lo[32];
-    vroom::format_price(buf_hi, sizeof(buf_hi), hi, decimals);
-    vroom::format_price(buf_lo, sizeof(buf_lo), lo, decimals);
+    // At the same decimals the longest label is whichever bound has the most
+    // integer digits, separators included.
+    char buf_hi[48], buf_lo[48];
+    vroom::format_price(buf_hi, sizeof(buf_hi), hi, fmt);
+    vroom::format_price(buf_lo, sizeof(buf_lo), lo, fmt);
     const float w_hi = font.measureText(
         buf_hi, std::strlen(buf_hi), SkTextEncoding::kUTF8);
     const float w_lo = font.measureText(

package/cpp/_core_src/ma_overlay.h

@@ -108,6 +108,11 @@ void draw_close_gradient(SkCanvas* canvas,
 // switch. `opacity` scales everything, fading the marker in with the line during
 // the candle→line morph.
 //
+// `n` counts the slots to the candle being marked, which is the series' newest
+// rather than the visible slice's — see tip_anchor.h, which derives it. That
+// candle can sit off the pane when panned into history, and the marker then
+// draws nothing.
+//
 // `pulse_phase` is in cycles and wraps, so the caller can hand over elapsed time
 // divided by tip_pulse::kPeriodSeconds. Ignored unless `pulse`.
 void draw_close_tip(SkCanvas* canvas,

package/cpp/_core_src/price_format.cpp

@@ -0,0 +1,87 @@
+#include "price_format.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+
+namespace vroom {
+
+namespace {
+
+// Room for %.*f of any finite double at kPriceMaxDecimals: sign, the 309
+// integer digits DBL_MAX can reach, the point, and the decimals.
+constexpr size_t kPlainCap = 340;
+
+constexpr char kGroupSeparator = ',';
+constexpr int kGroupSize = 3;
+
+}  // namespace
+
+int significant_decimals(double reference) {
+    const double r = std::fabs(reference);
+    if (!(r > 0.0) || !std::isfinite(r)) return kPriceMinDecimals;
+    // floor(log10) is the exponent of the leading digit, so subtracting it from
+    // the digit budget lands the last significant digit on the final decimal.
+    const int exponent = static_cast<int>(std::floor(std::log10(r)));
+    return std::clamp(kPriceSigDigits - 1 - exponent, kPriceMinDecimals,
+                      kPriceMaxDecimals);
+}
+
+PriceFormat price_format_for(double reference) {
+    return PriceFormat{significant_decimals(reference), true};
+}
+
+int price_decimals(double interval) {
+    if (!(interval > 0.0) || !std::isfinite(interval)) return kPriceMinDecimals;
+    const double d = std::ceil(-std::log10(interval) - 1e-12);
+    if (d < 0.0) return 0;
+    if (d > static_cast<double>(kPriceMaxDecimals)) return kPriceMaxDecimals;
+    return static_cast<int>(d);
+}
+
+PriceFormat with_tick_guard(const PriceFormat& fmt, double interval) {
+    return PriceFormat{std::max(fmt.decimals, price_decimals(interval)),
+                       fmt.group};
+}
+
+void format_price(char* buf, size_t buf_size, double price,
+                  const PriceFormat& fmt) {
+    if (!buf || buf_size == 0) return;
+    const int decimals = std::clamp(fmt.decimals, 0, kPriceMaxDecimals);
+
+    char plain[kPlainCap];
+    if (std::snprintf(plain, sizeof(plain), "%.*f", decimals, price) < 0) {
+        buf[0] = '\0';
+        return;
+    }
+    if (!fmt.group) {
+        std::snprintf(buf, buf_size, "%s", plain);
+        return;
+    }
+
+    const char* src = plain;
+    size_t out = 0;
+    // Leaves room for the terminator on every write, so the result truncates
+    // the way snprintf would rather than running off the end.
+    const auto put = [&](char c) {
+        if (out + 1 < buf_size) buf[out++] = c;
+    };
+
+    if (*src == '-' || *src == '+') put(*src++);
+
+    // Digits up to the point, or the whole run when decimals == 0. A non-finite
+    // price has none, and falls through to the tail copy as "inf" / "nan".
+    const char* int_end = src;
+    while (*int_end >= '0' && *int_end <= '9') ++int_end;
+
+    const ptrdiff_t digits = int_end - src;
+    for (ptrdiff_t i = 0; i < digits; ++i) {
+        if (i > 0 && (digits - i) % kGroupSize == 0) put(kGroupSeparator);
+        put(src[i]);
+    }
+    for (const char* p = int_end; *p != '\0'; ++p) put(*p);
+
+    buf[out] = '\0';
+}
+
+}  // namespace vroom

package/cpp/_core_src/price_format.h

@@ -0,0 +1,69 @@
+// How a price is turned into the string on the y-axis.
+//
+// Precision follows the asset's own scale rather than the tick interval: a
+// sub-cent token needs nine decimals to say anything at all, while a
+// five-figure one is unreadable past two. Deriving it from the interval — as
+// the axis used to — gets both wrong, printing "84000" for the one and
+// "0.000060" for the other.
+//
+// The rule is a fixed count of significant digits with a floor, which is what
+// reproduces a conventional price scale across the whole range:
+//
+//   4.4094e-5 -> 9 decimals   0.000044094
+//   0.023397  -> 6 decimals   0.023397
+//   80285.20  -> 2 decimals   80,285.20   (floor)
+//   2513.92   -> 2 decimals   2,513.92    (floor)
+//
+// The reference is the asset's own price, not the visible range, so the
+// precision holds steady while the user pans and zooms. A range-derived count
+// would change under the user's finger and drag the axis width along with it.
+//
+// Skia-free and separately compiled so the unit tests can cover it; see
+// tests/test_price_format.cpp.
+
+#pragma once
+
+#include <cstddef>
+
+namespace vroom {
+
+// Significant digits a price is quoted to. Five is what conventional price
+// scales show: it keeps 0.023397 intact and still fits 0.000044094.
+inline constexpr int kPriceSigDigits = 5;
+
+// Prices at or above ~1 unit read as currency, where fewer than two decimals
+// looks broken (a "$84,000" axis next to a "$80,285.20" last price).
+inline constexpr int kPriceMinDecimals = 2;
+
+// Past this the digits are noise, and %.*f starts printing the binary
+// representation's tail rather than anything the feed meant.
+inline constexpr int kPriceMaxDecimals = 12;
+
+// How to render a price. `group` inserts thousands separators, which only ever
+// affects the integer part.
+struct PriceFormat {
+    int  decimals = kPriceMinDecimals;
+    bool group = true;
+};
+
+// Decimals giving kPriceSigDigits significant digits for an asset priced around
+// |reference|, clamped to [kPriceMinDecimals, kPriceMaxDecimals]. A zero or
+// non-finite reference falls back to the floor.
+int significant_decimals(double reference);
+
+// The format for an asset priced around `reference`.
+PriceFormat price_format_for(double reference);
+
+// Decimal places needed so adjacent ticks `interval` apart don't collapse to
+// the same string. 0.01 → 2, 0.005 → 3, 1e-8 → 8. Clamped to [0, 12].
+int price_decimals(double interval);
+
+// `fmt` raised, if need be, so ticks `interval` apart stay distinct. The asset's
+// precision is the floor; only a zoom deeper than that precision adds to it.
+PriceFormat with_tick_guard(const PriceFormat& fmt, double interval);
+
+// Writes `price` into `buf` per `fmt`, truncating rather than overrunning.
+void format_price(char* buf, size_t buf_size, double price,
+                  const PriceFormat& fmt);
+
+}  // namespace vroom

package/cpp/_core_src/price_indicator.cpp

@@ -18,6 +18,7 @@
 
 #include "chart.h"
 #include "fonts.h"
+#include "price_format.h"
 #include "theme.h"
 #include "ticks.h"
 #include "viewport.h"
@@ -66,10 +67,11 @@ void draw(SkCanvas* canvas,
     font.setSubpixel(true);
     font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
 
-    char buf[32];
-    const int decimals = vroom::price_decimals(
+    char buf[48];
+    const vroom::PriceFormat fmt = vroom::with_tick_guard(
+        chart.price_fmt,
         vroom::pick_price_interval(bounds.max - bounds.min, candle_area_h));
-    vroom::format_price(buf, sizeof(buf), last.close, decimals);
+    vroom::format_price(buf, sizeof(buf), last.close, fmt);
     const size_t len = std::strlen(buf);
 
     // Measure the tight glyph bounds (origin at the baseline) so we can center

package/cpp/_core_src/price_lines.cpp

@@ -21,6 +21,7 @@
 
 #include "chart.h"
 #include "fonts.h"
+#include "price_format.h"
 #include "price_line_layout.h"
 #include "theme.h"
 #include "ticks.h"
@@ -214,11 +215,11 @@ void draw_axis_badge(SkCanvas* canvas,
                      double price,
                      float y,
                      SkColor fill,
-                     int decimals) {
+                     const PriceFormat& fmt) {
     if (lay.y_axis_width_px <= 0.f) return;
 
-    char buf[32];
-    vroom::format_price(buf, sizeof(buf), price, decimals);
+    char buf[48];
+    vroom::format_price(buf, sizeof(buf), price, fmt);
     const size_t len = std::strlen(buf);
 
     SkRect tb;
@@ -255,7 +256,8 @@ void draw(SkCanvas* canvas,
     const VroomPriceLineStyle& style = chart.price_line_style;
     SkFont font;
     const bool has_font = label_font(chart, &font);
-    const int decimals = vroom::price_decimals(
+    const vroom::PriceFormat fmt = vroom::with_tick_guard(
+        chart.price_fmt,
         vroom::pick_price_interval(bounds.max - bounds.min, candle_area_h));
 
     for (size_t i = 0; i < chart.price_lines.size(); ++i) {
@@ -355,7 +357,7 @@ void draw(SkCanvas* canvas,
 
         if (has_font && (pl.flags & VROOM_PRICE_LINE_AXIS_LABEL) != 0) {
             draw_axis_badge(canvas, font, lay, render_price(chart, i), y,
-                            line_color, decimals);
+                            line_color, fmt);
         }
     }
 }

package/cpp/_core_src/ticks.cpp

@@ -2,7 +2,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <cstdio>
 #include <ctime>
 
 namespace vroom {
@@ -146,17 +145,4 @@ double pick_price_interval(double range, float candle_area_h) {
     return nice * magnitude;
 }
 
-int price_decimals(double interval) {
-    if (!(interval > 0.0) || !std::isfinite(interval)) return 2;
-    const double d = std::ceil(-std::log10(interval) - 1e-12);
-    if (d < 0.0) return 0;
-    if (d > 12.0) return 12;
-    return static_cast<int>(d);
-}
-
-void format_price(char* buf, size_t buf_size, double price, int decimals) {
-    if (!buf || buf_size == 0) return;
-    std::snprintf(buf, buf_size, "%.*f", decimals, price);
-}
-
 }  // namespace vroom

package/cpp/_core_src/ticks.h

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <cstddef>
 #include <cstdint>
 
 namespace vroom {
@@ -49,13 +48,8 @@ int64_t next_tick(int64_t t, const TimeTick& tick);
 // "Nice number" tick selection for the y-axis: snaps to 1, 2, or 5 × 10ⁿ
 // based on the price range and target spacing. Returns the price interval
 // in the same units as the data (e.g. dollars).
+//
+// Turning that interval into a label string is price_format.h's job.
 double pick_price_interval(double range, float candle_area_h);
 
-// Decimal places needed so adjacent ticks `interval` apart don't collapse to
-// the same string. 0.01 → 2, 0.005 → 3, 1e-8 → 8. Clamped to [0, 12].
-int price_decimals(double interval);
-
-// Writes `price` into `buf` using `decimals` (from price_decimals).
-void format_price(char* buf, size_t buf_size, double price, int decimals);
-
 }  // namespace vroom

package/cpp/_core_src/tip_anchor.h

@@ -0,0 +1,49 @@
+// Which slot the line chart's tip marker anchors to (see draw_close_tip in
+// ma_overlay.cpp).
+//
+// The tip marks the newest close in the *series*, not the newest close on
+// screen — the same rule the price indicator follows (price_indicator.cpp).
+// Panning into history therefore carries the dot off the right edge with the
+// candle it belongs to, where draw_close_tip's on-pane guard drops it.
+//
+// Every other line-chart layer draws the visible slice, so the tip is the one
+// caller that has to reach past range.end. The slice is a view into the same
+// contiguous candle buffer, so widening the slot count is enough to reach the
+// newest candle — no second pointer.
+//
+// Skia-free and header-only so the unit tests can cover it; see
+// tests/test_tip_anchor.cpp.
+
+#pragma once
+
+#include <cstddef>
+
+namespace vroom::tip_anchor {
+
+// How draw_close_tip should be called for one frame.
+struct Anchor {
+    // Slot count to pass in place of the visible count, so slot 0 resolves to
+    // the newest candle in the series. Never 0 for a non-empty visible slice.
+    std::size_t slot_count;
+    // Whether the interval-morph capture still lines up with slot 0.
+    bool use_morph;
+};
+
+// `range_start`/`range_end` are the visible slice's half-open bounds into a
+// series of `total` candles; `morphing` is whether an interval morph is running.
+//
+// The capture taken at a timeframe switch is indexed from the newest *visible*
+// candle, so it only pairs with slot 0 while the newest candle is the one at the
+// right edge. Scrolled back, pairing them would interpolate the tip between two
+// unrelated candles and strand the dot mid-pane for the length of the switch.
+inline Anchor at(std::size_t range_start,
+                 std::size_t range_end,
+                 std::size_t total,
+                 bool morphing) {
+    // A caller with an empty or out-of-bounds slice has nothing to anchor to;
+    // reporting 0 slots lets draw_close_tip take its existing early-out.
+    if (range_start >= total) return Anchor{0, false};
+    return Anchor{total - range_start, morphing && range_end >= total};
+}
+
+}  // namespace vroom::tip_anchor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-vroom-chart",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "description": "Mobile-first Skia candlestick chart for React Native",
   "license": "MIT",
   "author": "Darion Welch",
@@ -59,20 +59,21 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@shopify/react-native-skia": ">=2.0.0",
+    "@shopify/react-native-skia": ">=2.11.0",
     "react": "*",
     "react-native": "*",
     "react-native-gesture-handler": ">=2.16.0",
-    "react-native-reanimated": ">=4.0.0"
+    "react-native-reanimated": ">=4.0.0",
+    "react-native-worklets": ">=0.7.0"
   },
   "devDependencies": {
-    "@shopify/react-native-skia": "2.2.12",
+    "@shopify/react-native-skia": "2.11.0",
     "@types/react": "~19.1.0",
     "react": "19.1.0",
     "react-native": "0.81.5",
     "react-native-gesture-handler": "~2.28.0",
     "react-native-reanimated": "~4.1.7",
-    "react-native-worklets": "0.5.1",
+    "react-native-worklets": "0.7.4",
     "tsup": "^8.5.1",
     "typescript": "~5.9.2",
     "vitest": "^3.2.6",
@@ -82,6 +83,7 @@
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "build": "tsup",
+    "check:podspec": "ruby scripts/check-podspec-portable.rb",
     "vendor:core": "node scripts/vendor-core.mjs"
   }
 }

package/react-native-vroom-chart.podspec

@@ -1,15 +1,34 @@
 require "json"
+require "pathname"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-# Resolve the absolute path to the @shopify/react-native-skia source.
-# We need it because RN-Skia ships its Skia headers via `#include "include/core/SkPicture.h"`,
-# which only resolves when the include path points at the source `cpp/` and `cpp/skia/`
-# directories — CocoaPods' flat Headers/Public/ layout loses the `include/...` prefix.
+# Locate the @shopify/react-native-skia source. We need it because RN-Skia ships
+# its Skia headers via `#include "include/core/SkPicture.h"`, which only resolves
+# when the include path points at the source `cpp/` and `cpp/skia/` directories —
+# CocoaPods' flat Headers/Public/ layout loses the `include/...` prefix.
+#
+# The paths must be emitted relative to $(PODS_TARGET_SRCROOT), never absolute.
+# CocoaPods serializes this spec to `Pods/Local Podspecs/*.podspec.json` and hashes
+# that file into Podfile.lock's SPEC CHECKSUMS, so an absolute path bakes the
+# checkout root of whoever ran `pod install` into the lockfile and every other
+# machine fails `pod install --deployment`. Resolving at spec-eval time (rather
+# than hardcoding `../@shopify/react-native-skia`) keeps this correct under
+# non-hoisted layouts such as pnpm's.
 skia_pkg_json = `node --print "require.resolve('@shopify/react-native-skia/package.json')"`.strip
+raise "react-native-vroom-chart: could not resolve @shopify/react-native-skia" if skia_pkg_json.empty?
 skia_src_dir = File.dirname(skia_pkg_json)
-skia_cpp_dir = File.join(skia_src_dir, "cpp")
-skia_skia_dir = File.join(skia_src_dir, "cpp", "skia")
+skia_rel_dir = File.join("$(PODS_TARGET_SRCROOT)",
+  Pathname.new(skia_src_dir).relative_path_from(Pathname.new(__dir__)).to_s)
+skia_cpp_dir = File.join(skia_rel_dir, "cpp")
+skia_skia_dir = File.join(skia_rel_dir, "cpp", "skia")
+skia_api_dir = File.join(skia_rel_dir, "cpp", "api")
+# Absolute is fine here: the result only selects a preprocessor-define string,
+# so it never reaches the emitted spec.
+use_graphite = File.exist?(File.join(skia_src_dir, "libs", ".graphite"))
+skia_preprocessor_defs = use_graphite ?
+  "$(inherited) SK_GRAPHITE=1 SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API=1 SK_DISABLE_LEGACY_SHAPER_FACTORY=1" :
+  "$(inherited) SK_METAL=1 SK_GANESH=1 SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API=1 SK_DISABLE_LEGACY_SHAPER_FACTORY=1"
 
 Pod::Spec.new do |s|
   s.name         = "react-native-vroom-chart"
@@ -60,12 +79,13 @@ Pod::Spec.new do |s|
       '"$(PODS_TARGET_SRCROOT)/cpp"',
       "\"#{skia_cpp_dir}\"",
       "\"#{skia_skia_dir}\"",
+      "\"#{skia_api_dir}\"",
     ].join(" "),
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-    # Match RN-Skia's Skia build flags so our SkCanvas/SkPicture code sees the
-    # same SK_METAL / SK_GANESH defines and doesn't mis-link.
-    "GCC_PREPROCESSOR_DEFINITIONS" =>
-      "$(inherited) SK_METAL=1 SK_GANESH=1 SK_DISABLE_LEGACY_SHAPER_FACTORY=1",
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    # Match RN-Skia's Skia build flags (Ganesh vs Graphite, plus the
+    # SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API define both branches set) so our
+    # SkCanvas/SkPicture code sees the same ABI and doesn't mis-link.
+    "GCC_PREPROCESSOR_DEFINITIONS" => skia_preprocessor_defs,
   }
 
   s.dependency "React-Core"

package/cpp/VroomSkiaContext.cpp

@@ -1,33 +0,0 @@
-#include "VroomSkiaContext.h"
-
-namespace vroom {
-
-namespace jsi = facebook::jsi;
-
-std::shared_ptr<RNSkia::RNSkPlatformContext> getRNSkContext(
-    jsi::Runtime& runtime) {
-  auto val = runtime.global().getProperty(runtime, "SkiaApi");
-  if (!val.isObject()) return nullptr;
-  auto obj = val.asObject(runtime);
-  if (!obj.isHostObject(runtime)) return nullptr;
-  auto host = obj.asHostObject(runtime);
-
-  // `global.SkiaApi` is always installed by RN-Skia's own
-  // RNSkManager::installBindings() as exactly a `JsiSkApi` host object — never
-  // any other JsiSkHostObject subclass — so this cast is safe as a plain
-  // static_cast, without any RTTI check. We deliberately avoid
-  // dynamic_pointer_cast here: on Android, RN-Skia is compiled into its own
-  // librnskia.so, separate from libvroomchart.so, so a `JsiSkApi` constructed
-  // by librnskia.so's code carries typeinfo from that .so; a dynamic_cast
-  // performed here (in libvroomchart.so) sees an unmerged RTTI record for
-  // "the same" class and always fails, even though the object is perfectly
-  // valid to use. (Same underlying issue as the JsiSkPicture cross-.so cast
-  // documented in VroomChartHostObject.cpp — but there RN-Skia's own compiled
-  // code does the cast on an object *we* construct, so we can't avoid it;
-  // here *we* do the cast on an object *they* construct, so we can just skip
-  // the runtime check we don't need.)
-  auto* accessor = static_cast<HostObjectAccessor*>(host.get());
-  return accessor->getContext();
-}
-
-}  // namespace vroom

package/cpp/VroomSkiaContext.h

@@ -1,30 +0,0 @@
-// Helpers for reaching into RN-Skia's installed JSI bindings to grab its
-// RNSkPlatformContext — which we need so we can use JsiSkFontMgrFactory to
-// get the system font manager cross-platform.
-//
-// JsiSkHostObject::getContext() is protected, so we use a "friend helper"
-// subclass that exposes it via `using`. We never construct an instance —
-// we just static_cast existing host objects to the accessor type.
-
-#pragma once
-
-#include <memory>
-
-#include <jsi/jsi.h>
-
-#include "JsiSkHostObjects.h"      // RNSkia::JsiSkHostObject
-#include "RNSkPlatformContext.h"   // RNSkia::RNSkPlatformContext
-
-namespace vroom {
-
-class HostObjectAccessor : public RNSkia::JsiSkHostObject {
- public:
-  using RNSkia::JsiSkHostObject::getContext;
-};
-
-// Returns the RN-Skia platform context by reading global.SkiaApi.
-// Returns nullptr if SkiaApi isn't on the global yet (RN-Skia not installed).
-std::shared_ptr<RNSkia::RNSkPlatformContext> getRNSkContext(
-    facebook::jsi::Runtime& runtime);
-
-}  // namespace vroom