@shopify/react-native-skia 0.1.169 → 0.1.170

package/cpp/jsi/JsiValue.h

@@ -13,15 +13,15 @@ namespace RNJsi {
 namespace jsi = facebook::jsi;
 
 enum struct PropType {
-  Undefined = 1,
-  Null = 2,
-  Bool = 4,
-  Number = 8,
-  String = 16,
-  Object = 32,
-  HostObject = 64,
-  HostFunction = 128,
-  Array = 256
+  Undefined = 0,
+  Null = 1, // Keep undefined / null constant so that we can do checks faster
+  Bool = 2,
+  Number = 3,
+  String = 4,
+  Object = 5,
+  HostObject = 6,
+  HostFunction = 7,
+  Array = 8
 };
 
 using PropId = const char *;
@@ -80,7 +80,7 @@ public:
   /**
    Returns true if the value is undefined or null.
    */
-  bool isUndefinedOrNull() const { return isUndefined() || isNull(); }
+  bool isUndefinedOrNull() const { return _type <= PropType::Null; }
 
   /**
    Returns true if the value is undefined.

package/cpp/rnskia/dom/base/JsiDomDeclarationNode.h

@@ -41,9 +41,9 @@ public:
     // Materialize children first so that any inner nodes get the opportunity
     // to calculate their state before this node continues.
     for (auto &child : getChildren()) {
-      auto decl = std::dynamic_pointer_cast<JsiBaseDomDeclarationNode>(child);
-      if (decl != nullptr) {
-        decl->decorateContext(context);
+      if (child->getNodeClass() == JsiDomNodeClass::DeclarationNode) {
+        std::static_pointer_cast<JsiBaseDomDeclarationNode>(child)
+            ->decorateContext(context);
       }
     }
 
@@ -55,6 +55,10 @@ public:
 #endif
   }
 
+  JsiDomNodeClass getNodeClass() override {
+    return JsiDomNodeClass::DeclarationNode;
+  }
+
 protected:
   /**
    Invalidates and marks then context as changed. The implementation in the

package/cpp/rnskia/dom/base/JsiDomNode.h

@@ -30,6 +30,11 @@ public:
 
 static std::atomic<size_t> NodeIdent = 1000;
 
+typedef enum {
+  RenderNode = 1,
+  DeclarationNode = 2,
+} JsiDomNodeClass;
+
 /**
  Implements an abstract base class for nodes in the Skia Reconciler. This node
  coresponds to the native implementation of the Node.ts class in Javascript.
@@ -174,6 +179,12 @@ public:
    */
   virtual void invalidateContext() = 0;
 
+  /*
+   Returns the class of node so that we can do loops faster without
+   having to check using runtime type information
+   */
+  virtual JsiDomNodeClass getNodeClass() = 0;
+
   /**
    Updates any pending property changes in all nodes and child nodes. This
    function will swap any pending property changes in this and children with any

package/cpp/rnskia/dom/base/JsiDomRenderNode.h

@@ -149,6 +149,10 @@ public:
     }
   }
 
+  JsiDomNodeClass getNodeClass() override {
+    return JsiDomNodeClass::RenderNode;
+  }
+
 protected:
   /**
    Invalidates and marks then context as changed.
@@ -211,9 +215,9 @@ private:
    */
   void materializeDeclarations() {
     for (auto &child : getChildren()) {
-      auto ptr = std::dynamic_pointer_cast<JsiBaseDomDeclarationNode>(child);
-      if (ptr != nullptr) {
-        ptr->decorateContext(_localContext.get());
+      if (child->getNodeClass() == JsiDomNodeClass::DeclarationNode) {
+        std::static_pointer_cast<JsiBaseDomDeclarationNode>(child)
+            ->decorateContext(_localContext.get());
       }
     }
   }

package/cpp/rnskia/dom/base/NodeProp.h

@@ -86,9 +86,7 @@ public:
       {
         // Swap buffers
         std::lock_guard<std::mutex> lock(_swapMutex);
-        auto tmp = _value;
-        _value = _buffer;
-        _buffer = tmp;
+        _value.swap(_buffer);
 
         // turn off pending changes flag
         _hasNewValue = false;

package/cpp/rnskia/dom/nodes/JsiGroupNode.h

@@ -15,9 +15,8 @@ public:
 
   void renderNode(DrawingContext *context) override {
     for (auto &child : getChildren()) {
-      auto renderNode = std::dynamic_pointer_cast<JsiDomRenderNode>(child);
-      if (renderNode != nullptr) {
-        renderNode->render(context);
+      if (child->getNodeClass() == JsiDomNodeClass::RenderNode) {
+        std::static_pointer_cast<JsiDomRenderNode>(child)->render(context);
       }
     }
   }

package/cpp/rnskia/dom/props/FontProp.h

@@ -15,7 +15,8 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_fontProp->value().getType() != PropType::HostObject) {
+    if (!_fontProp->isSet() ||
+        _fontProp->value().getType() != PropType::HostObject) {
       throw std::runtime_error("Expected SkFont object for the Font property.");
     }
 

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -66,6 +66,16 @@ void RNSkMetalCanvasProvider::renderToCanvas(const std::function<void(SkCanvas*)
     return;
   }
   
+  // Make sure to NOT render or try any render operations while we're in the background or inactive.
+  // This will cause an error that might clear the CAMetalLayer so that the canvas is empty when
+  // the app receives focus again.
+  // Reference: https://github.com/Shopify/react-native-skia/issues/1257
+  auto state = UIApplication.sharedApplication.applicationState;
+  if (state == UIApplicationStateBackground || state == UIApplicationStateInactive)
+  {
+    return;
+  }
+  
   // Get render context for current thread
   auto renderContext = getMetalRenderContext();
   

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.169",
+  "version": "0.1.170",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [