@shopify/react-native-skia 0.1.158 → 0.1.160

package/android/CMakeLists.txt

@@ -1,11 +1,6 @@
 project(RNSkia)
 cmake_minimum_required(VERSION 3.4.1)
 
-if(${BUILD_TYPE} STREQUAL "debug")
-    set (CMAKE_BUILD_TYPE Debug)
-    message("-- Building with Debug Symbols")
-endif()
-
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSK_GL -DSK_BUILD_FOR_ANDROID -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID")
@@ -14,12 +9,19 @@ set (PACKAGE_NAME "reactskia")
 set (SKIA_LIB "skia")
 set (SKIA_SVG_LIB "svg")
 set (SKIA_SKSHAPER_LIB "skshaper")
+set (SKIA_SKPARAGRAPH_LIB "skparagraph")
+set (SKIA_SKUNICODE_LIB "skunicode")
 
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 file(GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
 file(GLOB libfbjni_link_DIRS "${build_DIR}/fbjni*.aar/jni/${ANDROID_ABI}")
 file(GLOB libfbjni_include_DIRS "${build_DIR}/fbjni-*-headers.jar/")
 
+message("-- ABI     : " ${ANDROID_ABI})
+message("-- PREBUILT: " ${PREBUILT_DIR})
+message("-- BUILD   : " ${build_DIR})
+message("-- LIBRN   : " ${LIBRN_DIR})
+
 link_directories(../libs/android/${ANDROID_ABI}/)
 
 if(${REACT_NATIVE_VERSION} LESS 66)
@@ -41,11 +43,15 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/SkiaOpenGLRenderer.cpp"
 
         "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiHostObject.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiValue.cpp"
 
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkManager.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkJsView.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDomView.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDispatchQueue.cpp"
 
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia/dom/base/DrawingContext.cpp"
+
         "${PROJECT_SOURCE_DIR}/cpp/api/third_party/CSSColorParser.cpp"
         
 )
@@ -66,6 +72,7 @@ target_include_directories(
         cpp/skia/include/utils/
         cpp/skia/include/pathops/
         cpp/skia/modules/
+        cpp/skia/modules/skparagraph/include/
         cpp/skia/include/
         cpp/skia
 
@@ -75,6 +82,10 @@ target_include_directories(
         cpp/rnskia-android
         cpp/rnskia
         cpp/rnskia/values
+        cpp/rnskia/dom
+        cpp/rnskia/dom/base
+        cpp/rnskia/dom/nodes
+        cpp/rnskia/dom/props
         cpp/utils  
 
         ${libfbjni_include_DIRS}
@@ -82,6 +93,7 @@ target_include_directories(
 
 # Import prebuilt SKIA libraries
 set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/android/${ANDROID_ABI}")
+
 add_library(skia STATIC IMPORTED)
 set_property(TARGET skia PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskia.a")
 
@@ -91,18 +103,20 @@ set_property(TARGET svg PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libsvg.a")
 add_library(skshaper STATIC IMPORTED)
 set_property(TARGET skshaper PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskshaper.a")
 
+add_library(skparagraph STATIC IMPORTED)
+set_property(TARGET skparagraph PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskparagraph.a")
+
+add_library(skunicode STATIC IMPORTED)
+set_property(TARGET skunicode PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode.a")
+
 
 find_library(
         LOG_LIB
         log
 )
 
-find_library(
-         JSI_LIB
-         jsi
-         PATHS ${LIBRN_DIR}
-         NO_CMAKE_FIND_ROOT_PATH
- )
+message("-- LOG     : " ${LOG_LIB})
+
  if(${REACT_NATIVE_VERSION} LESS 66)
          # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
          set (JSI_LIB "")
@@ -116,6 +130,8 @@ find_library(
          )
  endif()
 
+ message("-- JSI     : " ${JSI_LIB})
+
 find_library(
         REACT_LIB
         react_nativemodule_core
@@ -123,6 +139,8 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
+message("-- REACT   : " ${REACT_LIB})
+
 find_library(
         FBJNI_LIBRARY 
         fbjni 
@@ -130,6 +148,8 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
+message("-- FBJNI   : " ${FBJNI_LIBRARY})
+
 find_library(
         TURBOMODULES_LIB
         turbomodulejsijni
@@ -137,6 +157,8 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
+message("-- TURBO   : " ${TURBOMODULES_LIB})
+
 # Link
 target_link_libraries(
         ${PACKAGE_NAME}
@@ -147,6 +169,8 @@ target_link_libraries(
         ${TURBOMODULES_LIB}
         ${SKIA_SVG_LIB}
         ${SKIA_SKSHAPER_LIB}
+        ${SKIA_SKPARAGRAPH_LIB}
+        ${SKIA_SKUNICODE_LIB}
         ${SKIA_LIB}
         -ljnigraphics
         -lGLESv2

package/android/build.gradle

@@ -48,26 +48,14 @@ logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
 
 def sourceBuild = false
 def defaultDir = null
-def androidSourcesDir = null
-def androidSourcesName = 'React Native sources'
-
-def buildType = "debug"
-tasks.all({ task ->
-    if (task.name == "buildCMakeRelease") {
-        buildType = "release"
-    }
-})
 
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  androidSourcesDir = defaultDir.parentFile.toString()
 } else if (findProject(':ReactAndroid') != null) {
     sourceBuild = true
     defaultDir = project(':ReactAndroid').projectDir
-    androidSourcesDir = defaultDir.parentFile.toString()
 } else {
   defaultDir = file("$nodeModules/react-native/android")
-  androidSourcesDir = defaultDir.parentFile.toString()
 }
 
 if (!defaultDir.exists()) {
@@ -81,14 +69,24 @@ def prebuiltDir = sourceBuild
     : "$buildDir/react-native-0*/jni"
 
 
+def buildType = "debug"
+if (gradle.startParameter.taskRequests.args[0].toString().contains("Release")) {
+    buildType = "release"
+} else if (gradle.startParameter.taskRequests.args[0].toString().contains("Debug")) {
+    buildType = "debug"
+}
+
 def reactProperties = new Properties()
 file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
-def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME").split("\\.")[1].toInteger()
+def FULL_RN_VERSION = reactProperties.getProperty("VERSION_NAME")
+def REACT_NATIVE_VERSION = FULL_RN_VERSION.split("\\.")[1].toInteger()
 
-logger.warn("react-native-skia: React Native version: ${REACT_NATIVE_VERSION}")
-logger.warn("react-native-skia: Is Source build: ${sourceBuild}")
-logger.warn("react-native-skia: Prebuilt dir: ${prebuiltDir}")
-logger.warn("react-native-skia: Build type: ${buildType}")
+logger.warn("react-native-skia: RN Version: ${REACT_NATIVE_VERSION} / ${FULL_RN_VERSION}")
+logger.warn("react-native-skia: isSourceBuild: ${sourceBuild}")
+logger.warn("react-native-skia: PrebuiltDir: ${prebuiltDir}")
+logger.warn("react-native-skia: buildType: ${buildType}")
+logger.warn("react-native-skia: buildDir: ${buildDir}")
+logger.warn("react-native-skia: node_modules: ${nodeModules}")
 
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -123,8 +121,7 @@ android {
                 arguments '-DANDROID_STL=c++_shared',
                           "-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION}",
                           "-DNODE_MODULES_DIR=${nodeModules}",
-                          "-DPREBUILT_DIR=${prebuiltDir}",
-                          "-DBUILD_TYPE=${buildType}"
+                          "-DPREBUILT_DIR=${prebuiltDir}"
 
             }
         }
@@ -189,13 +186,12 @@ dependencies {
     //noinspection GradleDynamicVersion
     extractJNI("com.facebook.fbjni:fbjni:0.2.2")
 
-    if(REACT_NATIVE_VERSION < 69) {
-        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include "**/**/*.aar" }).singleFile
-        extractJNI(files(rnAAR))
-    } else {
-        // React Native >= 0.69
+    if (!sourceBuild) {
         def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
-        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile
+        if (REACT_NATIVE_VERSION < 69) {
+            rnAarMatcher = "**/**/*.aar"
+        }
+        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile        
         extractJNI(files(rnAAR))
     }
 }

package/android/cpp/jni/JniLoad.cpp

@@ -1,4 +1,5 @@
 #include "JniPlatformContext.h"
+#include "JniSkiaDomView.h"
 #include "JniSkiaDrawView.h"
 #include "JniSkiaManager.h"
 #include "JniSkiaPictureView.h"
@@ -10,6 +11,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     RNSkia::JniSkiaManager::registerNatives();
     RNSkia::JniSkiaDrawView::registerNatives();
     RNSkia::JniSkiaPictureView::registerNatives();
+    RNSkia::JniSkiaDomView::registerNatives();
     RNSkia::JniPlatformContext::registerNatives();
   });
 }

package/android/cpp/jni/include/JniSkiaDomView.h

@@ -0,0 +1,89 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <fbjni/fbjni.h>
+#include <jni.h>
+#include <jsi/jsi.h>
+
+#include <JniSkiaBaseView.h>
+#include <JniSkiaManager.h>
+#include <RNSkAndroidView.h>
+#include <RNSkDomView.h>
+
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+#include <fbjni/detail/Hybrid.h>
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+namespace jni = facebook::jni;
+
+class JniSkiaDomView : public jni::HybridClass<JniSkiaDomView>,
+                       public JniSkiaBaseView {
+public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/shopify/reactnative/skia/SkiaDomView;";
+
+  static jni::local_ref<jhybriddata>
+  initHybrid(jni::alias_ref<jhybridobject> jThis,
+             jni::alias_ref<JniSkiaManager::javaobject> skiaManager) {
+    return makeCxxInstance(jThis, skiaManager);
+  }
+
+  static void registerNatives() {
+    registerHybrid(
+        {makeNativeMethod("initHybrid", JniSkiaDomView::initHybrid),
+         makeNativeMethod("surfaceAvailable", JniSkiaDomView::surfaceAvailable),
+         makeNativeMethod("surfaceDestroyed", JniSkiaDomView::surfaceDestroyed),
+         makeNativeMethod("surfaceSizeChanged",
+                          JniSkiaDomView::surfaceSizeChanged),
+         makeNativeMethod("setMode", JniSkiaDomView::setMode),
+         makeNativeMethod("setDebugMode", JniSkiaDomView::setDebugMode),
+         makeNativeMethod("updateTouchPoints",
+                          JniSkiaDomView::updateTouchPoints),
+         makeNativeMethod("registerView", JniSkiaDomView::registerView),
+         makeNativeMethod("unregisterView", JniSkiaDomView::unregisterView)});
+  }
+
+protected:
+  void updateTouchPoints(jni::JArrayDouble touches) override {
+    JniSkiaBaseView::updateTouchPoints(touches);
+  }
+
+  void surfaceAvailable(jobject surface, int width, int height) override {
+    JniSkiaBaseView::surfaceAvailable(surface, width, height);
+  }
+
+  void surfaceSizeChanged(int width, int height) override {
+    JniSkiaBaseView::surfaceSizeChanged(width, height);
+  }
+
+  void surfaceDestroyed() override { JniSkiaBaseView::surfaceDestroyed(); }
+
+  void setMode(std::string mode) override { JniSkiaBaseView::setMode(mode); }
+
+  void setDebugMode(bool show) override { JniSkiaBaseView::setDebugMode(show); }
+
+  void registerView(int nativeId) override {
+    JniSkiaBaseView::registerView(nativeId);
+  }
+
+  void unregisterView() override { JniSkiaBaseView::unregisterView(); }
+
+private:
+  friend HybridBase;
+
+  explicit JniSkiaDomView(
+      jni::alias_ref<jhybridobject> jThis,
+      jni::alias_ref<JniSkiaManager::javaobject> skiaManager)
+      : JniSkiaBaseView(skiaManager,
+                        std::make_shared<RNSkAndroidView<RNSkia::RNSkDomView>>(
+                            skiaManager->cthis()->getPlatformContext())) {}
+
+  jni::global_ref<javaobject> javaPart_;
+};
+
+} // namespace RNSkia

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.cpp

@@ -6,10 +6,11 @@
 
 namespace RNSkia {
 /** Static members */
-std::shared_ptr<DrawingContext> SkiaOpenGLRenderer::getThreadDrawingContext() {
+std::shared_ptr<OpenGLDrawingContext>
+SkiaOpenGLRenderer::getThreadDrawingContext() {
   auto threadId = std::this_thread::get_id();
   if (threadContexts.count(threadId) == 0) {
-    auto drawingContext = std::make_shared<DrawingContext>();
+    auto drawingContext = std::make_shared<OpenGLDrawingContext>();
     drawingContext->glContext = EGL_NO_CONTEXT;
     drawingContext->glDisplay = EGL_NO_DISPLAY;
     drawingContext->glConfig = 0;
@@ -64,7 +65,7 @@ void SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb,
       cb(_skSurface->getCanvas());
 
       // Flush
-      _skSurface->flush();
+      _skSurface->flushAndSubmit();
 
       if (!eglSwapBuffers(getThreadDrawingContext()->glDisplay, _glSurface)) {
         RNSkLogger::logToConsole("eglSwapBuffers failed: %d\n", eglGetError());

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.h

@@ -26,14 +26,15 @@
 #pragma clang diagnostic pop
 
 namespace RNSkia {
-using DrawingContext = struct {
+using OpenGLDrawingContext = struct {
   EGLContext glContext;
   EGLDisplay glDisplay;
   EGLConfig glConfig;
   sk_sp<GrDirectContext> skContext;
 };
 
-static std::unordered_map<std::thread::id, std::shared_ptr<DrawingContext>>
+static std::unordered_map<std::thread::id,
+                          std::shared_ptr<OpenGLDrawingContext>>
     threadContexts;
 
 enum RenderState : int {
@@ -113,7 +114,7 @@ private:
    * each new view, we track the OpenGL and Skia drawing context per thread.
    * @return The drawing context for the current thread
    */
-  static std::shared_ptr<DrawingContext> getThreadDrawingContext();
+  static std::shared_ptr<OpenGLDrawingContext> getThreadDrawingContext();
 
   EGLSurface _glSurface = EGL_NO_SURFACE;
 

package/android/src/main/java/com/shopify/reactnative/skia/RNSkiaPackage.java

@@ -18,6 +18,7 @@ public class RNSkiaPackage implements ReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(new SkiaDrawViewManager(), new SkiaPictureViewManager());
+        return Arrays.<ViewManager>asList(new SkiaDrawViewManager(),
+                new SkiaPictureViewManager(), new SkiaDomViewManager());
     }
 }

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDomView.java

@@ -0,0 +1,45 @@
+package com.shopify.reactnative.skia;
+
+import android.content.Context;
+
+import com.facebook.jni.HybridData;
+import com.facebook.jni.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactContext;
+
+public class SkiaDomView extends SkiaBaseView {
+    @DoNotStrip
+    private HybridData mHybridData;
+
+    public SkiaDomView(Context context) {
+        super(context);
+        RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
+        mHybridData = initHybrid(skiaModule.getSkiaManager());
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+        mHybridData.resetNative();
+    }
+
+    private native HybridData initHybrid(SkiaManager skiaManager);
+
+    protected native void surfaceAvailable(Object surface, int width, int height);
+
+    protected native void surfaceSizeChanged(int width, int height);
+
+    protected native void surfaceDestroyed();
+
+    protected native void setBgColor(int color);
+
+    protected native void setMode(String mode);
+
+    protected native void setDebugMode(boolean show);
+
+    protected native void updateTouchPoints(double[] points);
+
+    protected native void registerView(int nativeId);
+
+    protected native void unregisterView();
+
+}

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDomViewManager.java

@@ -0,0 +1,64 @@
+package com.shopify.reactnative.skia;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.HashMap;
+
+public class SkiaDomViewManager extends BaseViewManager<SkiaDomView, LayoutShadowNode> {
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "SkiaDomView";
+    }
+
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        return new LayoutShadowNode();
+    }
+
+    @Override
+    public Class<? extends LayoutShadowNode> getShadowNodeClass() {
+        return LayoutShadowNode.class;
+    }
+
+    @Override
+    public void updateExtraData(SkiaDomView root, Object extraData) {
+    }
+
+    @Override
+    public void setNativeId(@NonNull SkiaDomView view, @Nullable String nativeId) {
+        super.setNativeId(view, nativeId);
+        int nativeIdResolved = Integer.parseInt(nativeId);
+        view.registerView(nativeIdResolved);
+    }
+
+    @ReactProp(name = "mode")
+    public void setMode(SkiaDomView view, String mode) {
+        view.setMode(mode);
+    }
+
+    @ReactProp(name = "debug")
+    public void setDebug(SkiaDomView view, boolean show) {
+        view.setDebugMode(show);
+    }
+
+    @Override
+    public void onDropViewInstance(@NonNull SkiaDomView view) {
+        super.onDropViewInstance(view);
+        view.unregisterView();
+    }
+
+    @NonNull
+    @Override
+    protected SkiaDomView createViewInstance(@NonNull ThemedReactContext reactContext) {
+        return new SkiaDomView(reactContext);
+    }
+}

package/cpp/api/JsiSkHostObjects.h

@@ -54,6 +54,12 @@ public:
   T &getObject() { return _object; }
   const T &getObject() const { return _object; }
 
+  /**
+   Updates the inner object with a new version of the object.
+   */
+  void setObject(T &object) { _object = object; }
+  void setObject(const T &object) { _object = object; }
+
 private:
   /**
    * Wrapped object

package/cpp/api/JsiSkImageFilterFactory.h

@@ -204,7 +204,7 @@ public:
   JSI_HOST_FUNCTION(MakeRuntimeShader) {
     auto rtb = JsiSkRuntimeShaderBuilder::fromValue(runtime, arguments[0]);
 
-    const char *childName = nullptr;
+    const char *childName = "";
     if (!arguments[1].isNull() && !arguments[1].isUndefined()) {
       childName = arguments[1].asString(runtime).utf8(runtime).c_str();
     }

package/cpp/api/JsiSkPaint.h

@@ -184,8 +184,15 @@ public:
             std::move(context), std::make_shared<SkPaint>(std::move(paint))) {}
 
   /**
-Returns the underlying object from a host object of this type
-*/
+   Copy from another paint
+   */
+  void fromPaint(const SkPaint &paint) {
+    setObject(std::make_shared<SkPaint>(std::move(paint)));
+  }
+
+  /**
+   Returns the underlying object from a host object of this type
+ */
   static std::shared_ptr<SkPaint> fromValue(jsi::Runtime &runtime,
                                             const jsi::Value &obj) {
     return obj.asObject(runtime).asHostObject<JsiSkPaint>(runtime)->getObject();

package/cpp/api/JsiSkPath.h

@@ -17,6 +17,7 @@
 #include <SkDashPathEffect.h>
 #include <SkParsePath.h>
 #include <SkPath.h>
+#include <SkPathEffect.h>
 #include <SkPathOps.h>
 #include <SkPathTypes.h>
 #include <SkString.h>

package/cpp/api/JsiSkRuntimeEffect.h

@@ -99,7 +99,7 @@ public:
       throw jsi::JSError(runtime, "invalid uniform index");
     }
     auto it = getObject()->uniforms().begin() + i;
-    return jsi::String::createFromAscii(runtime, it->name.c_str());
+    return jsi::String::createFromAscii(runtime, std::string(it->name));
   }
 
   JSI_HOST_FUNCTION(getUniform) {
@@ -131,41 +131,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkRuntimeEffect>(std::move(context),
                                                       std::move(rt)) {}
 
-private:
-  sk_sp<SkData> castUniforms(jsi::Runtime &runtime, const jsi::Value &value) {
-    auto jsiUniforms = value.asObject(runtime).asArray(runtime);
-    auto jsiUniformsSize = jsiUniforms.size(runtime);
-
-    // verify size of input uniforms
-    if (jsiUniformsSize * sizeof(float) != getObject()->uniformSize()) {
-      std::string msg =
-          "Uniforms size differs from effect's uniform size. Received " +
-          std::to_string(jsiUniformsSize) + " expected " +
-          std::to_string(getObject()->uniformSize() / sizeof(float));
-      throw jsi::JSError(runtime, msg.c_str());
-    }
-
-    auto uniforms = SkData::MakeUninitialized(getObject()->uniformSize());
-
-    // Convert to skia uniforms
-    const auto &u = getObject()->uniforms();
-    for (std::size_t i = 0; i < u.size(); i++) {
-      auto it = getObject()->uniforms().begin() + i;
-      RuntimeEffectUniform reu = fromUniform(*it);
-      for (std::size_t j = 0; j < reu.columns * reu.rows; ++j) {
-        const std::size_t offset = reu.slot + j;
-        float fValue = jsiUniforms.getValueAtIndex(runtime, offset).asNumber();
-        int iValue = static_cast<int>(fValue);
-        auto value = reu.isInteger ? iValue : fValue;
-        memcpy(SkTAddOffset<void>(uniforms->writable_data(),
-                                  offset * sizeof(value)),
-               &value, sizeof(value));
-      }
-    }
-    return uniforms;
-  }
-
-  RuntimeEffectUniform fromUniform(const SkRuntimeEffect::Uniform &u) {
+  static RuntimeEffectUniform fromUniform(const SkRuntimeEffect::Uniform &u) {
     RuntimeEffectUniform su;
     su.rows = u.count; // arrayLength
     su.columns = 1;
@@ -214,5 +180,39 @@ private:
     su.slot = static_cast<int>(u.offset / sizeof(float));
     return su;
   }
+
+private:
+  sk_sp<SkData> castUniforms(jsi::Runtime &runtime, const jsi::Value &value) {
+    auto jsiUniforms = value.asObject(runtime).asArray(runtime);
+    auto jsiUniformsSize = jsiUniforms.size(runtime);
+
+    // verify size of input uniforms
+    if (jsiUniformsSize * sizeof(float) != getObject()->uniformSize()) {
+      std::string msg =
+          "Uniforms size differs from effect's uniform size. Received " +
+          std::to_string(jsiUniformsSize) + " expected " +
+          std::to_string(getObject()->uniformSize() / sizeof(float));
+      throw jsi::JSError(runtime, msg.c_str());
+    }
+
+    auto uniforms = SkData::MakeUninitialized(getObject()->uniformSize());
+
+    // Convert to skia uniforms
+    const auto &u = getObject()->uniforms();
+    for (std::size_t i = 0; i < u.size(); i++) {
+      auto it = getObject()->uniforms().begin() + i;
+      RuntimeEffectUniform reu = fromUniform(*it);
+      for (std::size_t j = 0; j < reu.columns * reu.rows; ++j) {
+        const std::size_t offset = reu.slot + j;
+        float fValue = jsiUniforms.getValueAtIndex(runtime, offset).asNumber();
+        int iValue = static_cast<int>(fValue);
+        auto value = reu.isInteger ? iValue : fValue;
+        memcpy(SkTAddOffset<void>(uniforms->writable_data(),
+                                  offset * sizeof(value)),
+               &value, sizeof(value));
+      }
+    }
+    return uniforms;
+  }
 };
 } // namespace RNSkia