@shopify/react-native-skia 1.5.10 → 1.7.0

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

@@ -3,97 +3,88 @@ package com.shopify.reactnative.skia;
 import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.util.Log;
-import android.view.TextureView;
+import android.view.Surface;
+import android.view.View;
 
 import com.facebook.react.views.view.ReactViewGroup;
 
-public abstract class SkiaBaseView extends ReactViewGroup implements TextureView.SurfaceTextureListener {
-    private TextureView mTexture;
+public abstract class SkiaBaseView extends ReactViewGroup implements SkiaViewAPI {
+    private View mView;
 
-    private String tag = "SkiaView";
-
-    private boolean isDropped = false;
+    private final boolean debug = false;
+    private final String tag = "SkiaView";
 
     public SkiaBaseView(Context context) {
         super(context);
-        mTexture = new TextureView(context);
-        mTexture.setSurfaceTextureListener(this);
-        mTexture.setOpaque(false);
-        addView(mTexture);
+        mView = new SkiaTextureView(context, this, debug);
+        addView(mView);
     }
 
-    private void createSurfaceTexture() {
-        // This API Level is >= 26, we created our own SurfaceTexture to have a faster time to first frame
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            Log.i(tag, "Create SurfaceTexture");
-            SurfaceTexture surface = new SurfaceTexture(false);
-            mTexture.setSurfaceTexture(surface);
-            this.onSurfaceTextureAvailable(surface, this.getMeasuredWidth(), this.getMeasuredHeight());
+    public void setOpaque(boolean value) {
+        if (value && mView instanceof SkiaTextureView) {
+            removeView(mView);
+            mView = new SkiaSurfaceView(getContext(), this, debug);
+            addView(mView);
+        } else if (!value && mView instanceof SkiaSurfaceView) {
+            removeView(mView);
+            mView = new SkiaTextureView(getContext(), this, debug);
+            addView(mView);
         }
     }
 
-    void dropInstance() {
-        isDropped = true;
-        unregisterView();
-    }
-
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        if (this.getMeasuredWidth() == 0) {
-            createSurfaceTexture();
+        if (getMeasuredWidth() == 0) {
+            if (mView instanceof SkiaTextureView) {
+                ((SkiaTextureView) mView).createSurfaceTexture();
+            }
+        }
+    }
+
+    void dropInstance() {
+        if (mView instanceof SkiaTextureView) {
+            ((SkiaTextureView)mView).isDropped = true;
         }
+        unregisterView();
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        Log.i(tag, "onLayout " + this.getMeasuredWidth() + "/" + this.getMeasuredHeight());
         super.onLayout(changed, left, top, right, bottom);
-        mTexture.layout(0, 0, this.getMeasuredWidth(), this.getMeasuredHeight());
+        mView.layout(0, 0, right - left, bottom - top);
     }
 
     @Override
-    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        Log.i(tag, "onSurfaceTextureAvailable " + width + "/" + height);
-        surfaceAvailable(surface, width, height);
+    public void onSurfaceCreated(Surface surface, int width, int height) {
+        surfaceAvailable(surface, width, height, true);
     }
 
     @Override
-    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-        if (isDropped) {
-            return;
-        }
+    public void onSurfaceChanged(Surface surface, int width, int height) {
         Log.i(tag, "onSurfaceTextureSizeChanged " + width + "/" + height);
-        surfaceSizeChanged(surface, width, height);
+        surfaceSizeChanged(surface, width, height, true);
     }
 
     @Override
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        Log.i(tag, "onSurfaceTextureDestroyed");
-        // https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener#onSurfaceTextureDestroyed(android.graphics.SurfaceTexture)
-        surfaceDestroyed();
-        // Because of React Native Screens (which dettach the view), we always keep the surface alive.
-        // If not, Texture view will recreate the texture surface by itself and
-        // we will lose the fast first time to frame.
-        // We only delete the surface when the view is dropped (destroySurface invoked by SkiaBaseViewManager);
-        if (!isDropped) {
-            createSurfaceTexture();
-        }
-        return false;
+    public void onSurfaceTextureCreated(SurfaceTexture surface, int width, int height) {
+        surfaceAvailable(surface, width, height, false);
     }
 
-    private long _prevTimestamp = 0;
     @Override
-    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        long timestamp = surface.getTimestamp();
-        long frameDuration = (timestamp - _prevTimestamp)/1000000;
-        Log.i(tag, "onSurfaceTextureUpdated "+frameDuration+"ms");
-        _prevTimestamp = timestamp;
+    public void onSurfaceTextureChanged(SurfaceTexture surface, int width, int height) {
+        Log.i(tag, "onSurfaceTextureSizeChanged " + width + "/" + height);
+        surfaceSizeChanged(surface, width, height, false);
+    }
+
+    @Override
+    public void onSurfaceDestroyed() {
+        surfaceDestroyed();
     }
 
-    protected abstract void surfaceAvailable(Object surface, int width, int height);
+    protected abstract void surfaceAvailable(Object surface, int width, int height, boolean opaque);
 
-    protected abstract void surfaceSizeChanged(Object surface, int width, int height);
+    protected abstract void surfaceSizeChanged(Object surface, int width, int height, boolean opaque);
 
     protected abstract void surfaceDestroyed();
 

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

@@ -26,6 +26,11 @@ public abstract class SkiaBaseViewManager<T extends SkiaBaseView> extends ReactV
         ((SkiaBaseView)view).setDebugMode(show);
     }
 
+    @ReactProp(name = "opaque")
+    public void setOpaque(T view, boolean value) {
+        ((SkiaBaseView)view).setOpaque(value);
+    }
+
     @Override
     public void onDropViewInstance(@NonNull ReactViewGroup view) {
         super.onDropViewInstance(view);

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

@@ -25,9 +25,9 @@ public class SkiaDomView extends SkiaBaseView {
 
     private native HybridData initHybrid(SkiaManager skiaManager);
 
-    protected native void surfaceAvailable(Object surface, int width, int height);
+    protected native void surfaceAvailable(Object surface, int width, int height, boolean opaque);
 
-    protected native void surfaceSizeChanged(Object surface, int width, int height);
+    protected native void surfaceSizeChanged(Object surface, int width, int height, boolean opaque);
 
     protected native void surfaceDestroyed();
 

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

@@ -24,9 +24,9 @@ public class SkiaPictureView extends SkiaBaseView {
 
     private native HybridData initHybrid(SkiaManager skiaManager);
 
-    protected native void surfaceAvailable(Object surface, int width, int height);
+    protected native void surfaceAvailable(Object surface, int width, int height, boolean opaque);
 
-    protected native void surfaceSizeChanged(Object surface, int width, int height);
+    protected native void surfaceSizeChanged(Object surface, int width, int height, boolean opaque);
 
     protected native void surfaceDestroyed();
 

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

@@ -0,0 +1,42 @@
+package com.shopify.reactnative.skia;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import androidx.annotation.NonNull;
+
+@SuppressLint("ViewConstructor")
+public class SkiaSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
+
+    SkiaViewAPI mApi;
+    boolean mDebug;
+
+    public SkiaSurfaceView(Context context, SkiaViewAPI api, boolean debug) {
+        super(context);
+        mApi = api;
+        mDebug = debug;
+        getHolder().addCallback(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mApi.onSurfaceDestroyed();
+    }
+
+    @Override
+    public void surfaceCreated(@NonNull SurfaceHolder holder) {
+        mApi.onSurfaceCreated(holder.getSurface(), getWidth(), getHeight());
+    }
+
+    @Override
+    public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width, int height) {
+        mApi.onSurfaceChanged(holder.getSurface(), getWidth(), getHeight());
+    }
+
+    @Override
+    public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
+        mApi.onSurfaceDestroyed();
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.shopify.reactnative.skia;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+import androidx.annotation.NonNull;
+
+@SuppressLint("ViewConstructor")
+public class SkiaTextureView extends TextureView implements TextureView.SurfaceTextureListener {
+
+    private String tag = "SkiaTextureView";
+
+    SkiaViewAPI mApi;
+    boolean mDebug;
+    boolean pristine = true;
+
+    public boolean isDropped = false;
+
+    public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug) {
+        super(context);
+        mApi = api;
+        mDebug = debug;
+        setOpaque(false);
+        setSurfaceTextureListener(this);
+    }
+
+    public void createSurfaceTexture() {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            Log.i(tag, "Create SurfaceTexture");
+            SurfaceTexture surfaceTexture = new SurfaceTexture(false);
+            setSurfaceTexture(surfaceTexture);
+            onSurfaceTextureAvailable(surfaceTexture, getWidth(), getHeight());
+        }
+    }
+
+    private void reCreateSurfaceTexture() {
+        boolean surfaceIsAlreadyAvailable = getSurfaceTexture() != null;
+        if (surfaceIsAlreadyAvailable) {
+            createSurfaceTexture();
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
+        Log.i(tag, "onSurfaceTextureAvailable:  " + width + "x" + height);
+        mApi.onSurfaceTextureCreated(surfaceTexture, width, height);
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
+        Log.i(tag, "onSurfaceTextureSizeChanged:  " + width + "x" + height);
+        if (isDropped) {
+            return;
+        }
+        mApi.onSurfaceTextureCreated(surfaceTexture, width, height);
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surfaceTexture) {
+        mApi.onSurfaceDestroyed();
+        // Because of React Native Screens (which dettach the view), we always keep the surface alive.
+        // If not, Texture view will recreate the texture surface by itself and
+        // we will lose the fast first time to frame.
+        // We only delete the surface when the view is dropped (destroySurface invoked by SkiaBaseViewManager);
+        if (!isDropped) {
+            reCreateSurfaceTexture();
+        }
+        return false;
+    }
+
+    private long _prevTimestamp = 0;
+    @Override
+    public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) {
+        if (!mDebug) {
+            return;
+        }
+        long timestamp = surface.getTimestamp();
+        long frameDuration = (timestamp - _prevTimestamp)/1000000;
+        Log.i("SkiaTextureView", "onSurfaceTextureUpdated "+frameDuration+"ms");
+        _prevTimestamp = timestamp;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.shopify.reactnative.skia;
+
+import android.graphics.SurfaceTexture;
+import android.view.Surface;
+
+public interface SkiaViewAPI {
+    void onSurfaceCreated(Surface surface, int width, int height);
+
+    void onSurfaceChanged(Surface surface, int width, int height);
+
+    void onSurfaceTextureCreated(SurfaceTexture surface, int width, int height);
+
+    void onSurfaceTextureChanged(SurfaceTexture surface, int width, int height);
+
+    void onSurfaceDestroyed();
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDomViewManagerDelegate.java

@@ -21,6 +21,9 @@ public class SkiaDomViewManagerDelegate<T extends View, U extends BaseViewManage
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "opaque":
+        mViewManager.setOpaque(view, value != null && (boolean) value);
+        break;
       case "debug":
         mViewManager.setDebug(view, value != null && (boolean) value);
         break;

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDomViewManagerInterface.java

@@ -14,4 +14,5 @@ import androidx.annotation.Nullable;
 
 public interface SkiaDomViewManagerInterface<T extends View> {
   void setDebug(T view, boolean value);
+  void setOpaque(T view, boolean value);
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerDelegate.java

@@ -24,8 +24,10 @@ public class SkiaPictureViewManagerDelegate<T extends View, U extends BaseViewMa
       case "mode":
         mViewManager.setMode(view, value == null ? null : (String) value);
         break;
+      case "opaque":
+        mViewManager.setOpaque(view, value != null && (boolean) value);
       case "debug":
-        mViewManager.setDebug(view, value == null ? false : (boolean) value);
+        mViewManager.setDebug(view, value != null && (boolean) value);
         break;
       default:
         super.setProperty(view, propName, value);

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerInterface.java

@@ -15,4 +15,5 @@ import androidx.annotation.Nullable;
 public interface SkiaPictureViewManagerInterface<T extends View> {
   void setMode(T view, @Nullable String value);
   void setDebug(T view, boolean value);
+  void setOpaque(T view, boolean value);
 }

package/cpp/api/JsiSkContourMeasure.h

@@ -26,11 +26,7 @@ public:
   JsiSkContourMeasure(std::shared_ptr<RNSkPlatformContext> context,
                       const sk_sp<SkContourMeasure> contourMeasure)
       : JsiSkWrappingSkPtrHostObject(std::move(context),
-                                     std::move(contourMeasure)) {
-    if (contourMeasure == nullptr) {
-      throw jsi::JSError(*context->getJsRuntime(), "Contour measure is null");
-    }
-  }
+                                     std::move(contourMeasure)) {}
 
   JSI_HOST_FUNCTION(getPosTan) {
     auto dist = arguments[0].asNumber();

package/cpp/api/JsiSkImage.h

@@ -10,6 +10,7 @@
 #include "JsiSkShader.h"
 #include "third_party/base64.h"
 
+#include "JsiTextureInfo.h"
 #include "RNSkTypedArray.h"
 
 #if defined(SK_GRAPHITE)
@@ -215,6 +216,15 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), rasterImage));
   }
 
+  JSI_HOST_FUNCTION(getNativeTextureUnstable) {
+    auto image = getObject();
+    if (!image->isTextureBacked()) {
+      return jsi::Value::null();
+    }
+    auto texInfo = getContext()->getTexture(image);
+    return JsiTextureInfo::toValue(runtime, texInfo);
+  }
+
   EXPORT_JSI_API_TYPENAME(JsiSkImage, Image)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImage, width),
@@ -226,6 +236,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkImage, encodeToBase64),
                        JSI_EXPORT_FUNC(JsiSkImage, readPixels),
                        JSI_EXPORT_FUNC(JsiSkImage, makeNonTextureImage),
+                       JSI_EXPORT_FUNC(JsiSkImage, getNativeTextureUnstable),
                        JSI_EXPORT_FUNC(JsiSkImage, dispose))
 
   JsiSkImage(std::shared_ptr<RNSkPlatformContext> context,

package/cpp/api/JsiSkImageFactory.h

@@ -78,10 +78,24 @@ public:
         });
   }
 
+  JSI_HOST_FUNCTION(MakeImageFromNativeTextureUnstable) {
+    auto texInfo = JsiTextureInfo::fromValue(runtime, arguments[0]);
+    auto image = getContext()->makeImageFromNativeTexture(
+        texInfo, arguments[1].asNumber(), arguments[2].asNumber(),
+        count > 3 && arguments[3].asBool());
+    if (image == nullptr) {
+      throw std::runtime_error("Failed to convert native texture to SkImage!");
+    }
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImageFromEncoded),
                        JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImageFromViewTag),
                        JSI_EXPORT_FUNC(JsiSkImageFactory,
                                        MakeImageFromNativeBuffer),
+                       JSI_EXPORT_FUNC(JsiSkImageFactory,
+                                       MakeImageFromNativeTextureUnstable),
                        JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImage))
 
   explicit JsiSkImageFactory(std::shared_ptr<RNSkPlatformContext> context)

package/cpp/api/JsiSkPicture.h

@@ -4,6 +4,8 @@
 
 #include "JsiSkData.h"
 #include "JsiSkHostObjects.h"
+#include "JsiSkMatrix.h"
+#include "JsiSkRect.h"
 #include "JsiSkShader.h"
 
 #pragma clang diagnostic push

package/cpp/api/JsiSkSurface.h

@@ -6,6 +6,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkHostObjects.h"
+#include "JsiTextureInfo.h"
 
 #include "JsiSkCanvas.h"
 #include "JsiSkImage.h"
@@ -78,11 +79,17 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
+  JSI_HOST_FUNCTION(getNativeTextureUnstable) {
+    auto texInfo = getContext()->getTexture(getObject());
+    return JsiTextureInfo::toValue(runtime, texInfo);
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurface, width),
                        JSI_EXPORT_FUNC(JsiSkSurface, height),
                        JSI_EXPORT_FUNC(JsiSkSurface, getCanvas),
                        JSI_EXPORT_FUNC(JsiSkSurface, makeImageSnapshot),
                        JSI_EXPORT_FUNC(JsiSkSurface, flush),
+                       JSI_EXPORT_FUNC(JsiSkSurface, getNativeTextureUnstable),
                        JSI_EXPORT_FUNC(JsiSkSurface, dispose))
 };
 

package/cpp/api/JsiTextureInfo.h

@@ -0,0 +1,53 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+#include "RNSkPlatformContext.h"
+
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
+
+namespace RNSkia {
+
+namespace JsiTextureInfo {
+
+inline jsi::Value toValue(jsi::Runtime &runtime, const TextureInfo &texInfo) {
+  jsi::Object textureInfo(runtime);
+  textureInfo.setProperty(
+      runtime, "mtlTexture",
+      jsi::BigInt::fromUint64(runtime,
+                              reinterpret_cast<uint64_t>(texInfo.mtlTexture)));
+  textureInfo.setProperty(runtime, "glTarget",
+                          static_cast<int>(texInfo.glTarget));
+  textureInfo.setProperty(runtime, "glID", static_cast<int>(texInfo.glID));
+  textureInfo.setProperty(runtime, "glFormat",
+                          static_cast<int>(texInfo.glFormat));
+  textureInfo.setProperty(runtime, "glProtected",
+                          static_cast<int>(texInfo.glProtected));
+  return textureInfo;
+}
+
+inline TextureInfo fromValue(jsi::Runtime &runtime, const jsi::Value &value) {
+  auto object = value.getObject(runtime);
+  TextureInfo texInfo;
+  if (object.hasProperty(runtime, "mtlTexture")) {
+    texInfo.mtlTexture =
+        reinterpret_cast<const void *>(object.getProperty(runtime, "mtlTexture")
+                                           .asBigInt(runtime)
+                                           .asUint64(runtime));
+  }
+  if (object.hasProperty(runtime, "glID")) {
+    texInfo.glTarget = static_cast<unsigned int>(
+        object.getProperty(runtime, "glTarget").asNumber());
+    texInfo.glID = static_cast<unsigned int>(
+        object.getProperty(runtime, "glID").asNumber());
+    texInfo.glFormat = static_cast<unsigned int>(
+        object.getProperty(runtime, "glFormat").asNumber());
+    texInfo.glProtected =
+        object.getProperty(runtime, "glProtected").asNumber() != 0;
+  }
+  return texInfo;
+}
+
+} // namespace JsiTextureInfo
+} // namespace RNSkia

package/cpp/jsi/ViewProperty.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <memory>
+#include <string>
+
+#include "JsiDomRenderNode.h"
+#include "JsiSkPicture.h"
+
+namespace RNJsi {
+namespace jsi = facebook::jsi;
+
+class ViewProperty {
+public:
+  ViewProperty(jsi::Runtime &runtime, const jsi::Value &value) {
+    if (value.isObject()) {
+      auto object = value.asObject(runtime);
+      if (object.isHostObject(runtime)) {
+        auto hostObject = object.asHostObject(runtime);
+        auto dom =
+            std::dynamic_pointer_cast<RNSkia::JsiDomRenderNode>(hostObject);
+        if (dom) {
+          _value = dom;
+        } else {
+          auto jsiPicture =
+              std::dynamic_pointer_cast<RNSkia::JsiSkPicture>(hostObject);
+          if (jsiPicture) {
+            _value = jsiPicture->getObject();
+          }
+        }
+      }
+    }
+  }
+
+  bool isNull() { return std::holds_alternative<nullptr_t>(_value); }
+
+  std::shared_ptr<RNSkia::JsiDomRenderNode> getDomRenderNode() {
+    return std::get<std::shared_ptr<RNSkia::JsiDomRenderNode>>(_value);
+  }
+
+  sk_sp<SkPicture> getPicture() { return std::get<sk_sp<SkPicture>>(_value); }
+
+private:
+  std::variant<nullptr_t, sk_sp<SkPicture>,
+               std::shared_ptr<RNSkia::JsiDomRenderNode>>
+      _value = nullptr;
+};
+} // namespace RNJsi

package/cpp/rnskia/RNSkDomView.cpp

@@ -26,26 +26,6 @@ RNSkDomRenderer::~RNSkDomRenderer() {
   }
 }
 
-bool RNSkDomRenderer::tryRender(
-    std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-
-  // We render on the main thread
-  if (_renderLock->try_lock()) {
-    bool result = false;
-    // If we have a Dom Node we can render directly on the main thread
-    if (_root != nullptr) {
-      result = canvasProvider->renderToCanvas(std::bind(
-          &RNSkDomRenderer::renderCanvas, this, std::placeholders::_1,
-          canvasProvider->getScaledWidth(), canvasProvider->getScaledHeight()));
-    }
-
-    _renderLock->unlock();
-    return result;
-  } else {
-    return false;
-  }
-}
-
 void RNSkDomRenderer::renderImmediate(
     std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
   auto prevDebugOverlay = getShowDebugOverlays();

package/cpp/rnskia/RNSkDomView.h

@@ -9,8 +9,8 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiValueWrapper.h"
 #include "RNSkView.h"
+#include "ViewProperty.h"
 
 #include "JsiDomRenderNode.h"
 #include "RNSkLog.h"
@@ -42,8 +42,6 @@ public:
 
   ~RNSkDomRenderer();
 
-  bool tryRender(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override;
-
   void
   renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override;
 
@@ -77,20 +75,17 @@ public:
                      std::bind(&RNSkView::requestRedraw, this), context)) {}
 
   void setJsiProperties(
-      std::unordered_map<std::string, JsiValueWrapper> &props) override {
-
-    RNSkView::setJsiProperties(props);
+      std::unordered_map<std::string, ViewProperty> &props) override {
 
     for (auto &prop : props) {
       if (prop.first == "root") {
         // Save root
-        if (prop.second.isUndefined() || prop.second.isNull()) {
+        if (prop.second.isNull()) {
           std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
               ->setRoot(nullptr);
         } else {
           std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-              ->setRoot(std::dynamic_pointer_cast<JsiDomRenderNode>(
-                  prop.second.getAsHostObject()));
+              ->setRoot(prop.second.getDomRenderNode());
         }
 
         // Request redraw