@shopify/react-native-skia 2.2.11 → 2.2.13

package/cpp/api/JsiVideo.h

@@ -39,8 +39,10 @@ public:
     if (!image) {
       return jsi::Value::null();
     }
-    return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
+    auto hostObjectInstance =
+        std::make_shared<JsiSkImage>(getContext(), std::move(image));
+    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
+        runtime, hostObjectInstance, getContext());
   }
 
   JSI_HOST_FUNCTION(duration) { return getObject()->duration(); }
@@ -96,6 +98,8 @@ public:
       : JsiSkWrappingSharedPtrHostObject(std::move(context), std::move(video)) {
   }
 
+  size_t getMemoryPressure() const override { return 32768; }
+
   /**
    * Creates the function for construction a new instance of the SkFont
    * wrapper
@@ -109,9 +113,10 @@ public:
       auto url = arguments[0].asString(runtime).utf8(runtime);
       auto video = context->createVideo(url);
       // Return the newly constructed object
-      return jsi::Object::createFromHostObject(
-          runtime,
-          std::make_shared<JsiVideo>(std::move(context), std::move(video)));
+      auto videoObj =
+          std::make_shared<JsiVideo>(std::move(context), std::move(video));
+      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, videoObj,
+                                                         context);
     };
   }
 };

package/cpp/api/recorder/JsiRecorder.h

@@ -58,8 +58,10 @@ public:
     DrawingCtx ctx(canvas);
     getObject()->play(&ctx);
     auto picture = pictureRecorder.finishRecordingAsPicture();
-    return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
+    auto hostObjectInstance =
+        std::make_shared<JsiSkPicture>(getContext(), std::move(picture));
+    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
+        runtime, hostObjectInstance, getContext());
   }
 
   JSI_HOST_FUNCTION(applyUpdates) {
@@ -312,12 +314,15 @@ public:
                        JSI_EXPORT_FUNC(JsiRecorder, play),
                        JSI_EXPORT_FUNC(JsiRecorder, applyUpdates))
 
+  size_t getMemoryPressure() const override { return 16384; }
+
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
       // Return the newly constructed object
-      return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiRecorder>(std::move(context)));
+      auto recorder = std::make_shared<JsiRecorder>(std::move(context));
+      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, recorder,
+                                                         context);
     };
   }
 };

package/cpp/jsi/JsiHostObject.h

@@ -47,7 +47,7 @@
  * Creates a JSI export function declaration
  */
 #define JSI_EXPORT_FUNC(CLASS, FUNCTION)                                       \
-  {#FUNCTION, (jsi::Value(JsiHostObject::*)(                                   \
+  {#FUNCTION, (jsi::Value (JsiHostObject::*)(                                  \
                   jsi::Runtime & runtime, const jsi::Value &thisValue,         \
                   const jsi::Value *arguments, size_t)) &                      \
                   CLASS::FUNCTION}
@@ -65,7 +65,7 @@
  * Creates a JSI export getter declaration
  */
 #define JSI_EXPORT_PROP_GET(CLASS, FUNCTION)                                   \
-  {#FUNCTION, (jsi::Value(JsiHostObject::*)(jsi::Runtime & runtime)) &         \
+  {#FUNCTION, (jsi::Value (JsiHostObject::*)(jsi::Runtime & runtime)) &        \
                   CLASS::STR_CAT(STR_GET, FUNCTION)}
 
 /**
@@ -83,7 +83,7 @@
  */
 #define JSI_EXPORT_PROP_SET(CLASS, FUNCTION)                                   \
   {#FUNCTION,                                                                  \
-   (void(JsiHostObject::*)(jsi::Runtime & runtime, const jsi::Value &)) &      \
+   (void (JsiHostObject::*)(jsi::Runtime & runtime, const jsi::Value &)) &     \
        CLASS::STR_CAT(STR_SET, FUNCTION)}
 
 /**

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -104,8 +104,16 @@ public:
           auto name = arguments[1].asString(runtime).utf8(runtime);
           if (name == "onSize" && isSharedValue(runtime, arguments[2])) {
             jsi::Object size(runtime);
-            size.setProperty(runtime, "width", info->view->getScaledWidth());
-            size.setProperty(runtime, "height", info->view->getScaledHeight());
+            auto pd = _platformContext->getPixelDensity();
+            auto w = info->view != nullptr
+                         ? std::max(info->view->getScaledWidth(), 0)
+                         : 0;
+            auto h = info->view != nullptr
+                         ? std::max(info->view->getScaledHeight(), 0)
+                         : 0;
+
+            size.setProperty(runtime, "width", w / pd);
+            size.setProperty(runtime, "height", h / pd);
             arguments[2].asObject(runtime).setProperty(runtime, "value", size);
           } else {
             info->props.insert_or_assign(

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",