react-native-vroom-chart 0.9.0 → 0.10.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_include/vroom/vroom_chart.h

@@ -345,7 +345,8 @@ void vroom_chart_set_visible_range(VroomChart* chart, int64_t start_ms, int64_t
 // Target candle *body* width in px for the default/reset framing. Larger = more
 // zoomed in (fewer candles), smaller = more zoomed out. 0 restores the legacy
 // "most recent ~80 candles" default. Affects initial framing only; an explicit
-// set_visible_range still overrides it.
+// set_visible_range still overrides it. A series shorter than the implied window
+// is left-padded with empty slots so bars stay this wide instead of stretching.
 void vroom_chart_set_default_candle_width(VroomChart* chart, float px);
 
 // Chart render mode: 0 = candlesticks (default), 1 = line chart (a polyline

package/cpp/_core_src/chart_facade.cpp

@@ -50,6 +50,21 @@ int64_t max_future_gap(int64_t window_ms, int64_t cur_future) {
     return std::max<int64_t>((window_ms * 3) / 4, cur_future);
 }
 
+// Pan/translate future allowance. A window longer than the data has nowhere
+// useful to scroll, so don't grow the future gap — growing it used to combine
+// with a first-candle start pin and latch the view. Dense series keep the
+// usual 3/4-window rubber-band.
+int64_t pan_max_future(int64_t window_ms, int64_t cur_future,
+                       int64_t first_time, int64_t last_time,
+                       int64_t candle_duration_ms) {
+    const int64_t dur = candle_duration_ms > 0 ? candle_duration_ms : 0;
+    const int64_t data_extent = last_time + dur - first_time;
+    if (data_extent >= 0 && window_ms > data_extent) {
+        return std::max<int64_t>(0, cur_future);
+    }
+    return max_future_gap(window_ms, cur_future);
+}
+
 // Rubber-band a forward (into-future) pan delta: once the current future gap is
 // past the soft cap (window/2), damp the delta quadratically toward zero as it
 // nears the hard cap (3*window/4). Backward (into-past) deltas are unaffected.
@@ -109,13 +124,20 @@ void apply_default_framing(VroomChart* chart) {
         const double body = std::clamp(static_cast<double>(chart->default_candle_px),
                                        kMinCandleBodyPx, kMaxCandleBodyPx);
         if (usable > 0.0 && ratio > 0.0 && dur > 0.0 && body > 0.0) {
-            int64_t window_ms = static_cast<int64_t>((usable * dur * ratio) / body);
-            const int64_t span =
-                chart->candles.back().time_ms - chart->candles.front().time_ms;
-            window_ms = std::clamp<int64_t>(window_ms, chart->candle_duration_ms,
-                                            span > 0 ? span : window_ms);
-            frame(window_ms);
-            return;
+            int64_t window_ms = vroom::window_for_body_width(
+                lay, chart->candle_duration_ms, body);
+            // Floor at one slot so the window is valid. Do NOT clamp to the
+            // data span: a short series would then stretch each bar to fill
+            // the plot, the opposite of a target body width. Empty space on
+            // the left is intentional — same rule as timeframeWindow (width
+            // wins).
+            if (window_ms > 0) {
+                if (window_ms < chart->candle_duration_ms) {
+                    window_ms = chart->candle_duration_ms;
+                }
+                frame(window_ms);
+                return;
+            }
         }
     }
 
@@ -404,30 +426,23 @@ extern "C" void vroom_chart_pan(VroomChart* chart, float dx_px, float /*dy_px*/)
         (-dx_px / usable_px) * static_cast<float>(window_ms));
     if (delta_ms == 0) return;
 
-    // The right edge can overshoot the last candle into empty "future" space.
-    // Free scrolling up to half a window (candles fill >= 50%); from there to
-    // 3/4 of a window (candles fill >= 25%) panning forward is rubber-banded so
-    // it slows and hard-stops at the cap. The x-axis drag zoom can leave a gap
-    // larger than the cap (it zooms in until ~one candle remains), so the cap
-    // never forces it back — it just shrinks naturally as the user scrolls.
-    // Left edge still hard-clamps at the first candle.
+    // Forward pans rubber-band between half and 3/4 of a window of empty
+    // future (see damp_future_delta / max_future_gap). Past clamping lives in
+    // clamp_shifted_time_window: dense series pin start at the first candle;
+    // a window longer than the data keeps empty past instead of latching.
     const int64_t first_time = chart->candles.front().time_ms;
     const int64_t last_time = chart->candles.back().time_ms;
     const int64_t cur_future = chart->visible_end_ms - last_time;
     const int64_t eff_delta = damp_future_delta(delta_ms, cur_future, window_ms);
 
-    int64_t new_start = chart->visible_start_ms + eff_delta;
-    int64_t new_end = chart->visible_end_ms + eff_delta;
-
-    const int64_t max_future = max_future_gap(window_ms, cur_future);
-    if (new_end > last_time + max_future) {
-        new_end = last_time + max_future;
-        new_start = new_end - window_ms;
-    }
-    if (new_start < first_time) {
-        new_start = first_time;
-        new_end = new_start + window_ms;
-    }
+    const auto clamped = vroom::clamp_shifted_time_window(
+        chart->visible_start_ms + eff_delta,
+        chart->visible_end_ms + eff_delta,
+        first_time, last_time, chart->candle_duration_ms,
+        pan_max_future(window_ms, cur_future, first_time, last_time,
+                       chart->candle_duration_ms));
+    const int64_t new_start = clamped.start_ms;
+    const int64_t new_end = clamped.end_ms;
 
     if (new_start == chart->visible_start_ms &&
         new_end == chart->visible_end_ms) {
@@ -467,22 +482,16 @@ extern "C" void vroom_chart_translate(VroomChart* chart, float dx_px, float dy_p
                 const int64_t cur_future = chart->visible_end_ms - last_time;
                 const int64_t eff_delta =
                     damp_future_delta(delta_ms, cur_future, window_ms);
-                int64_t new_start = chart->visible_start_ms + eff_delta;
-                int64_t new_end = chart->visible_end_ms + eff_delta;
-                const int64_t max_future =
-                    max_future_gap(window_ms, cur_future);
-                if (new_end > last_time + max_future) {
-                    new_end = last_time + max_future;
-                    new_start = new_end - window_ms;
-                }
-                if (new_start < first_time) {
-                    new_start = first_time;
-                    new_end = new_start + window_ms;
-                }
-                if (new_start != chart->visible_start_ms ||
-                    new_end != chart->visible_end_ms) {
-                    chart->visible_start_ms = new_start;
-                    chart->visible_end_ms = new_end;
+                const auto clamped = vroom::clamp_shifted_time_window(
+                    chart->visible_start_ms + eff_delta,
+                    chart->visible_end_ms + eff_delta,
+                    first_time, last_time, chart->candle_duration_ms,
+                    pan_max_future(window_ms, cur_future, first_time, last_time,
+                                   chart->candle_duration_ms));
+                if (clamped.start_ms != chart->visible_start_ms ||
+                    clamped.end_ms != chart->visible_end_ms) {
+                    chart->visible_start_ms = clamped.start_ms;
+                    chart->visible_end_ms = clamped.end_ms;
                     changed = true;
                 }
             }
@@ -597,9 +606,9 @@ extern "C" void vroom_chart_scale_time_axis(VroomChart* chart, float dx_px) {
     if (new_window_ms > max_window) new_window_ms = max_window;
 
     // Pivot around the right edge — most-recent visible candle stays put.
+    // A window longer than the data may start before the first candle; that
+    // empty past is how defaultCandleWidth wins, so don't pin start to first.
     int64_t new_start = chart->visible_end_ms - new_window_ms;
-    const int64_t first_time = chart->candles.front().time_ms;
-    if (new_start < first_time) new_start = first_time;
 
     if (new_start == chart->visible_start_ms) return;
     chart->visible_start_ms = new_start;
@@ -779,17 +788,14 @@ extern "C" void vroom_chart_zoom(VroomChart* chart, float scale_x, float scale_y
                 const int64_t last_time = chart->candles.back().time_ms;
                 // Cap the future gap at 3/4 of the (new) window so >= 25% of the
                 // chart still shows candles, without snapping back an existing
-                // larger gap (e.g. from the x-axis drag zoom).
-                const int64_t max_future = max_future_gap(
-                    new_window, chart->visible_end_ms - last_time);
-                if (new_end > last_time + max_future) {
-                    new_end = last_time + max_future;
-                    new_start = new_end - new_window;
-                }
-                if (new_start < first_time) {
-                    new_start = first_time;
-                    new_end = new_start + new_window;
-                }
+                // larger gap (e.g. from the x-axis drag zoom). Past clamping
+                // matches pan: a window longer than the data keeps empty left.
+                const auto clamped = vroom::clamp_shifted_time_window(
+                    new_start, new_end, first_time, last_time,
+                    chart->candle_duration_ms,
+                    max_future_gap(new_window, chart->visible_end_ms - last_time));
+                new_start = clamped.start_ms;
+                new_end = clamped.end_ms;
                 if (new_start != chart->visible_start_ms ||
                     new_end != chart->visible_end_ms) {
                     chart->visible_start_ms = new_start;

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

@@ -21,6 +21,7 @@
 #include "chart.h"
 #include "fonts.h"
 #include "theme.h"
+#include "ticks.h"
 
 namespace vroom::crosshair {
 
@@ -146,7 +147,10 @@ void draw(SkCanvas* canvas,
     if (lay.y_axis_width_px > 0.f) {
         const double price = vroom::y_to_price(lay, bounds, cy);
         char buf[32];
-        std::snprintf(buf, sizeof(buf), "%.2f", price);
+        const int decimals = vroom::price_decimals(
+            vroom::pick_price_interval(bounds.max - bounds.min,
+                                       vroom::price_pane_bottom(lay)));
+        vroom::format_price(buf, sizeof(buf), price, decimals);
         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

@@ -153,13 +153,15 @@ 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(
+        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];
-        std::snprintf(buf, sizeof(buf), "%.2f", f.price);
+        vroom::format_price(buf, sizeof(buf), f.price, decimals);
         const size_t len = std::strlen(buf);
         const float text_w = font.measureText(
             buf, len, SkTextEncoding::kUTF8);
@@ -367,9 +369,12 @@ 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(
+        vroom::pick_price_interval(hi - lo, vroom::price_pane_bottom(lay)));
     char buf_hi[32], buf_lo[32];
-    std::snprintf(buf_hi, sizeof(buf_hi), "%.2f", hi);
-    std::snprintf(buf_lo, sizeof(buf_lo), "%.2f", lo);
+    vroom::format_price(buf_hi, sizeof(buf_hi), hi, decimals);
+    vroom::format_price(buf_lo, sizeof(buf_lo), lo, decimals);
     const float w_hi = font.measureText(
         buf_hi, std::strlen(buf_hi), SkTextEncoding::kUTF8);
     const float w_lo = font.measureText(

package/cpp/_core_src/price_indicator.cpp

@@ -19,6 +19,7 @@
 #include "chart.h"
 #include "fonts.h"
 #include "theme.h"
+#include "ticks.h"
 #include "viewport.h"
 
 namespace vroom::price_indicator {
@@ -66,7 +67,9 @@ void draw(SkCanvas* canvas,
     font.setEdging(SkFont::Edging::kSubpixelAntiAlias);
 
     char buf[32];
-    std::snprintf(buf, sizeof(buf), "%.2f", last.close);
+    const int decimals = vroom::price_decimals(
+        vroom::pick_price_interval(bounds.max - bounds.min, candle_area_h));
+    vroom::format_price(buf, sizeof(buf), last.close, decimals);
     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

@@ -23,6 +23,7 @@
 #include "fonts.h"
 #include "price_line_layout.h"
 #include "theme.h"
+#include "ticks.h"
 #include "viewport.h"
 
 namespace vroom::price_lines {
@@ -212,11 +213,12 @@ void draw_axis_badge(SkCanvas* canvas,
                      const Layout& lay,
                      double price,
                      float y,
-                     SkColor fill) {
+                     SkColor fill,
+                     int decimals) {
     if (lay.y_axis_width_px <= 0.f) return;
 
     char buf[32];
-    std::snprintf(buf, sizeof(buf), "%.2f", price);
+    vroom::format_price(buf, sizeof(buf), price, decimals);
     const size_t len = std::strlen(buf);
 
     SkRect tb;
@@ -253,6 +255,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(
+        vroom::pick_price_interval(bounds.max - bounds.min, candle_area_h));
 
     for (size_t i = 0; i < chart.price_lines.size(); ++i) {
         const VroomChart::StoredPriceLine& pl = chart.price_lines[i];
@@ -351,7 +355,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);
+                            line_color, decimals);
         }
     }
 }

package/cpp/_core_src/ticks.cpp

@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstdio>
 #include <ctime>
 
 namespace vroom {
@@ -145,4 +146,17 @@ 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,6 +6,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 
 namespace vroom {
@@ -50,4 +51,11 @@ int64_t next_tick(int64_t t, const TimeTick& tick);
 // in the same units as the data (e.g. dollars).
 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/viewport.cpp

@@ -17,6 +17,16 @@ float candle_body_width(const Layout& layout,
     return static_cast<float>(slot * layout.candle_width_ratio);
 }
 
+int64_t window_for_body_width(const Layout& layout,
+                              int64_t candle_duration_ms,
+                              double body_px) {
+    const double usable = candle_area_width(layout);
+    const double ratio = static_cast<double>(layout.candle_width_ratio);
+    const double dur = static_cast<double>(candle_duration_ms);
+    if (usable <= 0.0 || ratio <= 0.0 || dur <= 0.0 || body_px <= 0.0) return 0;
+    return static_cast<int64_t>((usable * dur * ratio) / body_px);
+}
+
 float candle_center_x(const Layout& layout,
                       int64_t time_ms,
                       int64_t candle_duration_ms,
@@ -265,4 +275,39 @@ double y_to_price(const Layout& layout,
     return bounds.min + t * range;
 }
 
+TimeWindow clamp_shifted_time_window(int64_t start_ms, int64_t end_ms,
+                                     int64_t first_time, int64_t last_time,
+                                     int64_t candle_duration_ms,
+                                     int64_t max_future) {
+    const int64_t window = end_ms - start_ms;
+    if (window <= 0) return {start_ms, end_ms};
+
+    const int64_t dur = candle_duration_ms > 0 ? candle_duration_ms : 0;
+    const int64_t last_slot_end = last_time + dur;
+    const int64_t data_extent = last_slot_end - first_time;
+
+    if (max_future >= 0 && end_ms > last_time + max_future) {
+        end_ms = last_time + max_future;
+        start_ms = end_ms - window;
+    }
+
+    // Window longer than the series: empty past is how width wins. Floor the
+    // right edge at last_time so a pan into the past is a no-op when the
+    // candles are already right-aligned. Do not pin start to first_time — that
+    // throws the extra length into the future and the two caps latch.
+    if (data_extent >= 0 && window > data_extent) {
+        if (end_ms < last_time) {
+            end_ms = last_time;
+            start_ms = end_ms - window;
+        }
+        return {start_ms, end_ms};
+    }
+
+    if (start_ms < first_time) {
+        start_ms = first_time;
+        end_ms = start_ms + window;
+    }
+    return {start_ms, end_ms};
+}
+
 }  // namespace vroom

package/cpp/_core_src/viewport.h

@@ -86,6 +86,36 @@ float candle_body_width(const Layout& layout,
                         int64_t window_ms,
                         int64_t candle_duration_ms);
 
+// Inverse of candle_body_width: the time window that makes each candle body
+// `body_px` wide. Returns 0 if any input is degenerate. Does not consult the
+// data span — a short series leaves empty space on the left (width wins).
+int64_t window_for_body_width(const Layout& layout,
+                              int64_t candle_duration_ms,
+                              double body_px);
+
+// A [start, end] time window of fixed length, used by pan/zoom clamping.
+struct TimeWindow {
+    int64_t start_ms;
+    int64_t end_ms;
+};
+
+// Clamp a same-length time window after a pan or pinch-zoom shift.
+//
+// The future cap (`max_future`, typically 3/4 of the window) is unchanged: the
+// right edge cannot run past last_time + max_future.
+//
+// The past cap depends on whether the window fits in the data:
+// - Window ≤ data extent: start cannot precede first_time (no empty past).
+// - Window > data extent: empty past is intentional (width wins). start MAY
+//   precede first_time. Instead, the last candle cannot leave the right edge
+//   (end >= last_time). Pinning start to first_time in this case would shove
+//   the extra length into the future and latch, because the future cap then
+//   fights the past cap on every subsequent pan.
+TimeWindow clamp_shifted_time_window(int64_t start_ms, int64_t end_ms,
+                                     int64_t first_time, int64_t last_time,
+                                     int64_t candle_duration_ms,
+                                     int64_t max_future);
+
 // Center-x of a candle whose period starts at time_ms and lasts
 // candle_duration_ms, given the current visible time window.
 float candle_center_x(const Layout& layout,

package/lib/index.d.mts

@@ -627,7 +627,8 @@ type VroomChartCoreProps = {
      * more zoomed in (fewer candles); smaller → more zoomed out. Only affects
      * first load / reset; an explicit `visibleRange` takes precedence. Omit for
      * the default (~80 candles). Useful to keep candles a consistent size across
-     * devices of different widths.
+     * devices of different widths. A series shorter than the window is left-padded
+     * with empty slots — bars stay this wide rather than stretching to fill.
      */
     defaultCandleWidth?: number;
     /**

package/lib/index.d.ts

@@ -627,7 +627,8 @@ type VroomChartCoreProps = {
      * more zoomed in (fewer candles); smaller → more zoomed out. Only affects
      * first load / reset; an explicit `visibleRange` takes precedence. Omit for
      * the default (~80 candles). Useful to keep candles a consistent size across
-     * devices of different widths.
+     * devices of different widths. A series shorter than the window is left-padded
+     * with empty slots — bars stay this wide rather than stretching to fill.
      */
     defaultCandleWidth?: number;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-vroom-chart",
-  "version": "0.9.0",
+  "version": "0.10.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",

package/react-native-vroom-chart.podspec

@@ -10,6 +10,11 @@ skia_pkg_json = `node --print "require.resolve('@shopify/react-native-skia/packa
 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_api_dir = File.join(skia_src_dir, "cpp", "api")
+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 +65,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