react-native-vroom-chart 0.9.1 → 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_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/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/package.json

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