@shopify/react-native-skia 0.1.172 → 0.1.173

package/ios/RNSkia-iOS/SkiaPictureViewManager.mm

@@ -2,50 +2,50 @@
 #include "SkiaPictureViewManager.h"
 #include <React/RCTBridge+Private.h>
 
-#include <RNSkPlatformContext.h>
-#include <RNSkPictureView.h>
 #include <RNSkIOSView.h>
+#include <RNSkPictureView.h>
+#include <RNSkPlatformContext.h>
 
 #include "SkiaManager.h"
-#include <RNSkiaModule.h>
 #include "SkiaUIView.h"
-
-
+#include <RNSkiaModule.h>
 
 @implementation SkiaPictureViewManager
 
 RCT_EXPORT_MODULE(SkiaPictureView)
 
-- (SkiaManager*) skiaManager {
+- (SkiaManager *)skiaManager {
   auto bridge = [RCTBridge currentBridge];
-  auto skiaModule = (RNSkiaModule*)[bridge moduleForName:@"RNSkia"];
+  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkia"];
   return [skiaModule manager];
 }
 
 RCT_CUSTOM_VIEW_PROPERTY(nativeID, NSNumber, SkiaUIView) {
   // Get parameter
   int nativeId = [[RCTConvert NSString:json] intValue];
-  [(SkiaUIView*)view setNativeId:nativeId];
+  [(SkiaUIView *)view setNativeId:nativeId];
 }
 
 RCT_CUSTOM_VIEW_PROPERTY(mode, NSString, SkiaUIView) {
-  std::string mode = json != NULL ? [[RCTConvert NSString:json] UTF8String] : "default";
-  [(SkiaUIView*)view setDrawingMode: mode];
+  std::string mode =
+      json != NULL ? [[RCTConvert NSString:json] UTF8String] : "default";
+  [(SkiaUIView *)view setDrawingMode:mode];
 }
 
 RCT_CUSTOM_VIEW_PROPERTY(debug, BOOL, SkiaUIView) {
   bool debug = json != NULL ? [RCTConvert BOOL:json] : false;
-  [(SkiaUIView*)view setDebugMode: debug];
+  [(SkiaUIView *)view setDebugMode:debug];
 }
 
-- (UIView *)view
-{
+- (UIView *)view {
   auto skManager = [[self skiaManager] skManager];
   // Pass SkManager as a raw pointer to avoid circular dependenciesr
-  return [[SkiaUIView alloc] initWithManager: skManager.get()
-                                     factory: [](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
-    return std::make_shared<RNSkiOSView<RNSkia::RNSkPictureView>>(context);
-  }];
+  return [[SkiaUIView alloc]
+      initWithManager:skManager.get()
+              factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
+                return std::make_shared<RNSkiOSView<RNSkia::RNSkPictureView>>(
+                    context);
+              }];
 }
 
 @end

package/ios/RNSkia-iOS/SkiaUIView.mm

@@ -9,19 +9,22 @@
 
 @implementation SkiaUIView {
   std::shared_ptr<RNSkBaseiOSView> _impl;
-  RNSkia::RNSkManager* _manager;
+  RNSkia::RNSkManager *_manager;
   RNSkia::RNSkDrawingMode _drawingMode;
-  std::function<std::shared_ptr<RNSkBaseiOSView>(std::shared_ptr<RNSkia::RNSkPlatformContext>)> _factory;
+  std::function<std::shared_ptr<RNSkBaseiOSView>(
+      std::shared_ptr<RNSkia::RNSkPlatformContext>)>
+      _factory;
   bool _debugMode;
   size_t _nativeId;
 }
 
 #pragma mark Initialization and destruction
 
-- (instancetype) initWithManager: (RNSkia::RNSkManager*)manager
-                         factory: (std::function<std::shared_ptr<RNSkBaseiOSView>(
-                                     std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory
-{
+- (instancetype)initWithManager:(RNSkia::RNSkManager *)manager
+                        factory:
+                            (std::function<std::shared_ptr<RNSkBaseiOSView>(
+                                 std::shared_ptr<RNSkia::RNSkPlatformContext>)>)
+                                factory {
   self = [super init];
   if (self) {
     _manager = manager;
@@ -31,28 +34,29 @@
     _factory = factory;
 
     // Listen to notifications about module invalidation
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(willInvalidateModules)
-                                                 name:RCTBridgeWillInvalidateModulesNotification
-                                               object:nil];
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(willInvalidateModules)
+               name:RCTBridgeWillInvalidateModulesNotification
+             object:nil];
   }
   return self;
 }
 
-- (void) willInvalidateModules {
+- (void)willInvalidateModules {
   _impl = nullptr;
   _manager = nullptr;
 }
 
 #pragma mark Lifecycle
 
-- (void) willMoveToSuperview:(UIView *)newWindow {
+- (void)willMoveToSuperview:(UIView *)newWindow {
   if (newWindow == NULL) {
     // Remove implementation view when the parent view is not set
-    if(_impl != nullptr) {
+    if (_impl != nullptr) {
       [_impl->getLayer() removeFromSuperlayer];
 
-      if(_nativeId != 0 && _manager != nullptr) {
+      if (_nativeId != 0 && _manager != nullptr) {
         _manager->setSkiaView(_nativeId, nullptr);
       }
 
@@ -60,13 +64,14 @@
     }
   } else {
     // Create implementation view when the parent view is set
-    if(_impl == nullptr && _manager != nullptr) {
+    if (_impl == nullptr && _manager != nullptr) {
       _impl = _factory(_manager->getPlatformContext());
-      if(_impl == nullptr) {
-        throw std::runtime_error("Expected Skia view implementation, got nullptr.");
+      if (_impl == nullptr) {
+        throw std::runtime_error(
+            "Expected Skia view implementation, got nullptr.");
       }
-      [self.layer addSublayer: _impl->getLayer()];
-      if(_nativeId != 0) {
+      [self.layer addSublayer:_impl->getLayer()];
+      if (_nativeId != 0) {
         _manager->setSkiaView(_nativeId, _impl->getDrawView());
       }
       _impl->getDrawView()->setDrawingMode(_drawingMode);
@@ -75,71 +80,76 @@
   }
 }
 
-- (void) dealloc {
-  if(_manager != nullptr && _nativeId != 0) {
+- (void)dealloc {
+  if (_manager != nullptr && _nativeId != 0) {
     _manager->unregisterSkiaView(_nativeId);
   }
 
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
+  [[NSNotificationCenter defaultCenter]
+      removeObserver:self
+                name:RCTBridgeWillInvalidateModulesNotification
+              object:nil];
 
   assert(_impl == nullptr);
 }
 
 #pragma mark Layout
 
-- (void) layoutSubviews {
+- (void)layoutSubviews {
   [super layoutSubviews];
-  if(_impl != nullptr) {
+  if (_impl != nullptr) {
     _impl->setSize(self.bounds.size.width, self.bounds.size.height);
   }
 }
 
 #pragma mark Properties
 
--(void) setDrawingMode:(std::string) mode {
-  _drawingMode = mode.compare("continuous") == 0 ? RNSkia::RNSkDrawingMode::Continuous : RNSkia::RNSkDrawingMode::Default;
+- (void)setDrawingMode:(std::string)mode {
+  _drawingMode = mode.compare("continuous") == 0
+                     ? RNSkia::RNSkDrawingMode::Continuous
+                     : RNSkia::RNSkDrawingMode::Default;
 
-  if(_impl != nullptr) {
+  if (_impl != nullptr) {
     _impl->getDrawView()->setDrawingMode(_drawingMode);
   }
 }
 
--(void) setDebugMode:(bool) debugMode {
+- (void)setDebugMode:(bool)debugMode {
   _debugMode = debugMode;
-  if(_impl != nullptr) {
+  if (_impl != nullptr) {
     _impl->getDrawView()->setShowDebugOverlays(debugMode);
   }
 }
 
-- (void) setNativeId:(size_t) nativeId {
+- (void)setNativeId:(size_t)nativeId {
   _nativeId = nativeId;
 
-  if(_impl != nullptr) {
+  if (_impl != nullptr) {
     _manager->registerSkiaView(nativeId, _impl->getDrawView());
   }
 }
 
 #pragma mark External API
 
-- (std::shared_ptr<RNSkBaseiOSView>) impl {
+- (std::shared_ptr<RNSkBaseiOSView>)impl {
   return _impl;
 }
 
 #pragma mark Touch handling
 
-- (void) touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   [self handleTouches:touches withEvent:event];
 }
 
--(void) touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   [self handleTouches:touches withEvent:event];
 }
 
--(void) touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   [self handleTouches:touches withEvent:event];
 }
 
-- (void) handleTouches:(NSSet<UITouch*>*) touches withEvent:(UIEvent*) event {
+- (void)handleTouches:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   if (event.type == UIEventTypeTouches) {
     std::vector<RNSkia::RNSkTouchInfo> nextTouches;
     for (UITouch *touch in touches) {
@@ -150,27 +160,27 @@
       nextTouch.force = [touch force];
       nextTouch.id = [touch hash];
       auto phase = [touch phase];
-      switch(phase) {
-        case UITouchPhaseBegan:
-          nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Start;
-          break;
-        case UITouchPhaseMoved:
-          nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Active;
-          break;
-        case UITouchPhaseEnded:
-          nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::End;
-          break;
-        case UITouchPhaseCancelled:
-          nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Cancelled;
-          break;
-        default:
-          nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Active;
-          break;
+      switch (phase) {
+      case UITouchPhaseBegan:
+        nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Start;
+        break;
+      case UITouchPhaseMoved:
+        nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Active;
+        break;
+      case UITouchPhaseEnded:
+        nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::End;
+        break;
+      case UITouchPhaseCancelled:
+        nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Cancelled;
+        break;
+      default:
+        nextTouch.type = RNSkia::RNSkTouchInfo::TouchType::Active;
+        break;
       }
 
       nextTouches.push_back(nextTouch);
     }
-    if(_impl != nullptr) {
+    if (_impl != nullptr) {
       _impl->getDrawView()->updateTouchState(nextTouches);
     }
   }

package/ios/RNSkiaModule.mm

@@ -3,14 +3,14 @@
 #import <React/RCTBridge+Private.h>
 
 @implementation RNSkiaModule {
-  SkiaManager* skiaManager;
+  SkiaManager *skiaManager;
 }
 
 RCT_EXPORT_MODULE(RNSkia)
 
 #pragma Accessors
 
--(SkiaManager*) manager {
+- (SkiaManager *)manager {
   return skiaManager;
 }
 
@@ -20,21 +20,19 @@ RCT_EXPORT_MODULE(RNSkia)
   return YES;
 }
 
-- (void)invalidate
-{
+- (void)invalidate {
   if (skiaManager != nil) {
     [skiaManager invalidate];
   }
   skiaManager = nil;
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
-{
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   if (skiaManager != nil) {
     // Already initialized, ignore call.
     return @true;
   }
-  RCTBridge* bridge = [RCTBridge currentBridge];
+  RCTBridge *bridge = [RCTBridge currentBridge];
   skiaManager = [[SkiaManager alloc] initWithBridge:bridge];
   return @true;
 }

package/lib/commonjs/dom/nodes/DrawingNode.js

@@ -66,7 +66,11 @@ class JsiDrawingNode extends _RenderNode.JsiRenderNode {
 
     this.children().map(child => {
       if (child instanceof _PaintNode.PaintNode) {
-        const paint = child.materialize();
+        const declCtx = ctx.declarationCtx;
+        declCtx.save();
+        child.decorate(declCtx);
+        const paint = declCtx.paints.pop();
+        declCtx.restore();
         this.draw({ ...ctx,
           paint
         });

package/lib/commonjs/dom/nodes/DrawingNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["JsiDrawingNode","JsiRenderNode","constructor","ctx","type","props","derived","deriveProps","setProps","setProp","name","value","hasChanged","addChild","child","JsiDeclarationNode","Error","insertChildBefore","before","renderNode","paint","draw","children","map","PaintNode","materialize"],"sources":["DrawingNode.ts"],"sourcesContent":["import type {\n  DrawingContext,\n  DrawingNodeProps,\n  Node,\n  NodeType,\n  RenderNode,\n} from \"../types\";\n\nimport type { NodeContext } from \"./Node\";\nimport { JsiDeclarationNode } from \"./Node\";\nimport { PaintNode } from \"./PaintNode\";\nimport { JsiRenderNode } from \"./RenderNode\";\n\nexport abstract class JsiDrawingNode<P extends DrawingNodeProps, C>\n  extends JsiRenderNode<P>\n  implements RenderNode<P>\n{\n  protected derived?: C;\n\n  constructor(ctx: NodeContext, type: NodeType, props: P) {\n    super(ctx, type, props);\n    this.derived = this.deriveProps();\n  }\n\n  setProps(props: P) {\n    super.setProps(props);\n    this.derived = this.deriveProps();\n  }\n\n  setProp<K extends keyof P>(name: K, value: P[K]) {\n    const hasChanged = super.setProp(name, value);\n    if (hasChanged) {\n      this.derived = this.deriveProps();\n    }\n    return hasChanged;\n  }\n\n  addChild(child: Node<unknown>): void {\n    if (!(child instanceof JsiDeclarationNode)) {\n      throw new Error(`Cannot add ${child.type} to ${this.type}`);\n    }\n    super.addChild(child);\n    this.derived = this.deriveProps();\n  }\n\n  insertChildBefore(child: Node<unknown>, before: Node<unknown>): void {\n    if (!(child instanceof JsiDeclarationNode)) {\n      throw new Error(`Cannot add ${child.type} to ${this.type}`);\n    }\n    super.insertChildBefore(child, before);\n    this.derived = this.deriveProps();\n  }\n\n  renderNode(ctx: DrawingContext): void {\n    if (this.props.paint) {\n      this.draw({ ...ctx, paint: this.props.paint });\n    } else {\n      this.draw(ctx);\n    }\n    this.children().map((child) => {\n      if (child instanceof PaintNode) {\n        const paint = child.materialize();\n        this.draw({ ...ctx, paint });\n      }\n    });\n  }\n\n  protected abstract draw(ctx: DrawingContext): void;\n  protected abstract deriveProps(): C;\n}\n"],"mappings":";;;;;;;AASA;;AACA;;AACA;;;;AAEO,MAAeA,cAAf,SACGC,yBADH,CAGP;EAGEC,WAAW,CAACC,GAAD,EAAmBC,IAAnB,EAAmCC,KAAnC,EAA6C;IACtD,MAAMF,GAAN,EAAWC,IAAX,EAAiBC,KAAjB;;IADsD;;IAEtD,KAAKC,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDC,QAAQ,CAACH,KAAD,EAAW;IACjB,MAAMG,QAAN,CAAeH,KAAf;IACA,KAAKC,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDE,OAAO,CAAoBC,IAApB,EAA6BC,KAA7B,EAA0C;IAC/C,MAAMC,UAAU,GAAG,MAAMH,OAAN,CAAcC,IAAd,EAAoBC,KAApB,CAAnB;;IACA,IAAIC,UAAJ,EAAgB;MACd,KAAKN,OAAL,GAAe,KAAKC,WAAL,EAAf;IACD;;IACD,OAAOK,UAAP;EACD;;EAEDC,QAAQ,CAACC,KAAD,EAA6B;IACnC,IAAI,EAAEA,KAAK,YAAYC,wBAAnB,CAAJ,EAA4C;MAC1C,MAAM,IAAIC,KAAJ,CAAW,cAAaF,KAAK,CAACV,IAAK,OAAM,KAAKA,IAAK,EAAnD,CAAN;IACD;;IACD,MAAMS,QAAN,CAAeC,KAAf;IACA,KAAKR,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDU,iBAAiB,CAACH,KAAD,EAAuBI,MAAvB,EAAoD;IACnE,IAAI,EAAEJ,KAAK,YAAYC,wBAAnB,CAAJ,EAA4C;MAC1C,MAAM,IAAIC,KAAJ,CAAW,cAAaF,KAAK,CAACV,IAAK,OAAM,KAAKA,IAAK,EAAnD,CAAN;IACD;;IACD,MAAMa,iBAAN,CAAwBH,KAAxB,EAA+BI,MAA/B;IACA,KAAKZ,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDY,UAAU,CAAChB,GAAD,EAA4B;IACpC,IAAI,KAAKE,KAAL,CAAWe,KAAf,EAAsB;MACpB,KAAKC,IAAL,CAAU,EAAE,GAAGlB,GAAL;QAAUiB,KAAK,EAAE,KAAKf,KAAL,CAAWe;MAA5B,CAAV;IACD,CAFD,MAEO;MACL,KAAKC,IAAL,CAAUlB,GAAV;IACD;;IACD,KAAKmB,QAAL,GAAgBC,GAAhB,CAAqBT,KAAD,IAAW;MAC7B,IAAIA,KAAK,YAAYU,oBAArB,EAAgC;QAC9B,MAAMJ,KAAK,GAAGN,KAAK,CAACW,WAAN,EAAd;QACA,KAAKJ,IAAL,CAAU,EAAE,GAAGlB,GAAL;UAAUiB;QAAV,CAAV;MACD;IACF,CALD;EAMD;;AAjDH"}
+{"version":3,"names":["JsiDrawingNode","JsiRenderNode","constructor","ctx","type","props","derived","deriveProps","setProps","setProp","name","value","hasChanged","addChild","child","JsiDeclarationNode","Error","insertChildBefore","before","renderNode","paint","draw","children","map","PaintNode","declCtx","declarationCtx","save","decorate","paints","pop","restore"],"sources":["DrawingNode.ts"],"sourcesContent":["import type {\n  DrawingContext,\n  DrawingNodeProps,\n  Node,\n  NodeType,\n  RenderNode,\n} from \"../types\";\n\nimport type { NodeContext } from \"./Node\";\nimport { JsiDeclarationNode } from \"./Node\";\nimport { PaintNode } from \"./PaintNode\";\nimport { JsiRenderNode } from \"./RenderNode\";\n\nexport abstract class JsiDrawingNode<P extends DrawingNodeProps, C>\n  extends JsiRenderNode<P>\n  implements RenderNode<P>\n{\n  protected derived?: C;\n\n  constructor(ctx: NodeContext, type: NodeType, props: P) {\n    super(ctx, type, props);\n    this.derived = this.deriveProps();\n  }\n\n  setProps(props: P) {\n    super.setProps(props);\n    this.derived = this.deriveProps();\n  }\n\n  setProp<K extends keyof P>(name: K, value: P[K]) {\n    const hasChanged = super.setProp(name, value);\n    if (hasChanged) {\n      this.derived = this.deriveProps();\n    }\n    return hasChanged;\n  }\n\n  addChild(child: Node<unknown>): void {\n    if (!(child instanceof JsiDeclarationNode)) {\n      throw new Error(`Cannot add ${child.type} to ${this.type}`);\n    }\n    super.addChild(child);\n    this.derived = this.deriveProps();\n  }\n\n  insertChildBefore(child: Node<unknown>, before: Node<unknown>): void {\n    if (!(child instanceof JsiDeclarationNode)) {\n      throw new Error(`Cannot add ${child.type} to ${this.type}`);\n    }\n    super.insertChildBefore(child, before);\n    this.derived = this.deriveProps();\n  }\n\n  renderNode(ctx: DrawingContext): void {\n    if (this.props.paint) {\n      this.draw({ ...ctx, paint: this.props.paint });\n    } else {\n      this.draw(ctx);\n    }\n    this.children().map((child) => {\n      if (child instanceof PaintNode) {\n        const declCtx = ctx.declarationCtx;\n        declCtx.save();\n        child.decorate(declCtx);\n        const paint = declCtx.paints.pop()!;\n        declCtx.restore();\n        this.draw({ ...ctx, paint });\n      }\n    });\n  }\n\n  protected abstract draw(ctx: DrawingContext): void;\n  protected abstract deriveProps(): C;\n}\n"],"mappings":";;;;;;;AASA;;AACA;;AACA;;;;AAEO,MAAeA,cAAf,SACGC,yBADH,CAGP;EAGEC,WAAW,CAACC,GAAD,EAAmBC,IAAnB,EAAmCC,KAAnC,EAA6C;IACtD,MAAMF,GAAN,EAAWC,IAAX,EAAiBC,KAAjB;;IADsD;;IAEtD,KAAKC,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDC,QAAQ,CAACH,KAAD,EAAW;IACjB,MAAMG,QAAN,CAAeH,KAAf;IACA,KAAKC,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDE,OAAO,CAAoBC,IAApB,EAA6BC,KAA7B,EAA0C;IAC/C,MAAMC,UAAU,GAAG,MAAMH,OAAN,CAAcC,IAAd,EAAoBC,KAApB,CAAnB;;IACA,IAAIC,UAAJ,EAAgB;MACd,KAAKN,OAAL,GAAe,KAAKC,WAAL,EAAf;IACD;;IACD,OAAOK,UAAP;EACD;;EAEDC,QAAQ,CAACC,KAAD,EAA6B;IACnC,IAAI,EAAEA,KAAK,YAAYC,wBAAnB,CAAJ,EAA4C;MAC1C,MAAM,IAAIC,KAAJ,CAAW,cAAaF,KAAK,CAACV,IAAK,OAAM,KAAKA,IAAK,EAAnD,CAAN;IACD;;IACD,MAAMS,QAAN,CAAeC,KAAf;IACA,KAAKR,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDU,iBAAiB,CAACH,KAAD,EAAuBI,MAAvB,EAAoD;IACnE,IAAI,EAAEJ,KAAK,YAAYC,wBAAnB,CAAJ,EAA4C;MAC1C,MAAM,IAAIC,KAAJ,CAAW,cAAaF,KAAK,CAACV,IAAK,OAAM,KAAKA,IAAK,EAAnD,CAAN;IACD;;IACD,MAAMa,iBAAN,CAAwBH,KAAxB,EAA+BI,MAA/B;IACA,KAAKZ,OAAL,GAAe,KAAKC,WAAL,EAAf;EACD;;EAEDY,UAAU,CAAChB,GAAD,EAA4B;IACpC,IAAI,KAAKE,KAAL,CAAWe,KAAf,EAAsB;MACpB,KAAKC,IAAL,CAAU,EAAE,GAAGlB,GAAL;QAAUiB,KAAK,EAAE,KAAKf,KAAL,CAAWe;MAA5B,CAAV;IACD,CAFD,MAEO;MACL,KAAKC,IAAL,CAAUlB,GAAV;IACD;;IACD,KAAKmB,QAAL,GAAgBC,GAAhB,CAAqBT,KAAD,IAAW;MAC7B,IAAIA,KAAK,YAAYU,oBAArB,EAAgC;QAC9B,MAAMC,OAAO,GAAGtB,GAAG,CAACuB,cAApB;QACAD,OAAO,CAACE,IAAR;QACAb,KAAK,CAACc,QAAN,CAAeH,OAAf;QACA,MAAML,KAAK,GAAGK,OAAO,CAACI,MAAR,CAAeC,GAAf,EAAd;QACAL,OAAO,CAACM,OAAR;QACA,KAAKV,IAAL,CAAU,EAAE,GAAGlB,GAAL;UAAUiB;QAAV,CAAV;MACD;IACF,CATD;EAUD;;AArDH"}

package/lib/commonjs/dom/nodes/JsiSkDOM.d.ts

@@ -1,14 +1,13 @@
 import type { PathProps, SkDOM, GroupProps, ImageProps, BlurImageFilterProps, MatrixColorFilterProps, CircleProps, BlurMaskFilterProps, LinearGradientProps, PaintProps, ShaderProps, ImageShaderProps, CustomDrawingNodeProps, LineProps, OvalProps, PatchProps, PointsProps, RectProps, RoundedRectProps, VerticesProps, TextProps, DiffRectProps, OffsetImageFilterProps, BlendColorFilterProps, TextPathProps, TextBlobProps, GlyphsProps, TwoPointConicalGradientProps, TurbulenceProps, SweepGradientProps, RadialGradientProps, FractalNoiseProps, ColorProps, PictureProps, ImageSVGProps, LerpColorFilterProps, DrawingNodeProps, BoxProps, BoxShadowProps, ChildrenProps } from "../types";
 import type { BlendImageFilterProps, BlendProps, DisplacementMapImageFilterProps, DropShadowImageFilterProps, MorphologyImageFilterProps, RuntimeShaderImageFilterProps } from "../types/ImageFilters";
 import type { CornerPathEffectProps, DashPathEffectProps, DiscretePathEffectProps, Line2DPathEffectProps, Path1DPathEffectProps, Path2DPathEffectProps } from "../types/PathEffects";
-import { CornerPathEffectNode, Path1DPathEffectNode, Path2DPathEffectNode, Line2DPathEffectNode, BlendNode } from "./paint";
 import type { NodeContext } from "./Node";
 export declare class JsiSkDOM implements SkDOM {
     private ctx;
     constructor(ctx: NodeContext);
     Layer(props?: ChildrenProps): import("../types").RenderNode<ChildrenProps>;
     Group(props?: GroupProps): import("../types").RenderNode<GroupProps>;
-    Paint(props: PaintProps): import("../types").DeclarationNode<PaintProps, import("../..").SkPaint, never>;
+    Paint(props: PaintProps): import("../types").DeclarationNode<PaintProps>;
     Fill(props?: DrawingNodeProps): import("../types").RenderNode<PaintProps>;
     Image(props: ImageProps): import("../types").RenderNode<ImageProps>;
     Circle(props: CircleProps): import("../types").RenderNode<CircleProps>;
@@ -28,38 +27,38 @@ export declare class JsiSkDOM implements SkDOM {
     DiffRect(props: DiffRectProps): import("../types").RenderNode<DiffRectProps>;
     Picture(props: PictureProps): import("../types").RenderNode<PictureProps>;
     ImageSVG(props: ImageSVGProps): import("../types").RenderNode<ImageSVGProps>;
-    BlurMaskFilter(props: BlurMaskFilterProps): import("../types").DeclarationNode<BlurMaskFilterProps, import("../..").SkMaskFilter, never>;
-    BlendImageFilter(props: BlendImageFilterProps): import("../types").DeclarationNode<BlendImageFilterProps, import("../..").SkImageFilter, never>;
-    DropShadowImageFilter(props: DropShadowImageFilterProps): import("../types").DeclarationNode<DropShadowImageFilterProps, import("../..").SkImageFilter, never>;
-    DisplacementMapImageFilter(props: DisplacementMapImageFilterProps): import("../types").DeclarationNode<DisplacementMapImageFilterProps, import("../..").SkImageFilter, never>;
-    BlurImageFilter(props: BlurImageFilterProps): import("../types").DeclarationNode<BlurImageFilterProps, import("../..").SkImageFilter, never>;
-    OffsetImageFilter(props: OffsetImageFilterProps): import("../types").DeclarationNode<OffsetImageFilterProps, import("../..").SkImageFilter, never>;
-    MorphologyImageFilter(props: MorphologyImageFilterProps): import("../types").DeclarationNode<MorphologyImageFilterProps, import("../..").SkImageFilter, never>;
-    RuntimeShaderImageFilter(props: RuntimeShaderImageFilterProps): import("../types").DeclarationNode<RuntimeShaderImageFilterProps, import("../..").SkImageFilter, never>;
-    MatrixColorFilter(props: MatrixColorFilterProps): import("../types").DeclarationNode<MatrixColorFilterProps, import("../..").SkColorFilter, never>;
-    BlendColorFilter(props: BlendColorFilterProps): import("../types").DeclarationNode<BlendColorFilterProps, import("../..").SkColorFilter, never>;
-    LumaColorFilter(): import("../types").DeclarationNode<null, import("../..").SkColorFilter, never>;
-    LinearToSRGBGammaColorFilter(): import("../types").DeclarationNode<null, import("../..").SkColorFilter, never>;
-    SRGBToLinearGammaColorFilter(): import("../types").DeclarationNode<null, import("../..").SkColorFilter, never>;
-    LerpColorFilter(props: LerpColorFilterProps): import("../types").DeclarationNode<LerpColorFilterProps, import("../..").SkColorFilter, never>;
-    Shader(props: ShaderProps): import("../types").DeclarationNode<ShaderProps, import("../..").SkShader, never>;
-    ImageShader(props: ImageShaderProps): import("../types").DeclarationNode<ImageShaderProps, import("../..").SkShader, never>;
-    ColorShader(props: ColorProps): import("../types").DeclarationNode<ColorProps, import("../..").SkShader, never>;
-    SweepGradient(props: SweepGradientProps): import("../types").DeclarationNode<SweepGradientProps, import("../..").SkShader, never>;
-    Turbulence(props: TurbulenceProps): import("../types").DeclarationNode<TurbulenceProps, import("../..").SkShader, never>;
-    FractalNoise(props: FractalNoiseProps): import("../types").DeclarationNode<FractalNoiseProps, import("../..").SkShader, never>;
-    LinearGradient(props: LinearGradientProps): import("../types").DeclarationNode<LinearGradientProps, import("../..").SkShader, never>;
-    RadialGradient(props: RadialGradientProps): import("../types").DeclarationNode<RadialGradientProps, import("../..").SkShader, never>;
-    TwoPointConicalGradient(props: TwoPointConicalGradientProps): import("../types").DeclarationNode<TwoPointConicalGradientProps, import("../..").SkShader, never>;
-    CornerPathEffect(props: CornerPathEffectProps): CornerPathEffectNode | import("../types").DeclarationNode<CornerPathEffectProps, import("../..").SkPathEffect, never>;
-    DiscretePathEffect(props: DiscretePathEffectProps): import("../types").DeclarationNode<DiscretePathEffectProps, import("../..").SkPathEffect, never>;
-    DashPathEffect(props: DashPathEffectProps): import("../types").DeclarationNode<DashPathEffectProps, import("../..").SkPathEffect, never>;
-    Path1DPathEffect(props: Path1DPathEffectProps): Path1DPathEffectNode | import("../types").DeclarationNode<Path1DPathEffectProps, import("../..").SkPathEffect, never>;
-    Path2DPathEffect(props: Path2DPathEffectProps): Path2DPathEffectNode | import("../types").DeclarationNode<Path2DPathEffectProps, import("../..").SkPathEffect, never>;
-    SumPathEffect(): import("../types").DeclarationNode<null, import("../..").SkPathEffect, never>;
-    Line2DPathEffect(props: Line2DPathEffectProps): Line2DPathEffectNode | import("../types").DeclarationNode<Line2DPathEffectProps, import("../..").SkPathEffect, never>;
-    Blend(props: BlendProps): BlendNode | import("../types").DeclarationNode<BlendProps, import("../..").SkImageFilter, never>;
+    BlurMaskFilter(props: BlurMaskFilterProps): import("../types").DeclarationNode<BlurMaskFilterProps>;
+    BlendImageFilter(props: BlendImageFilterProps): import("../types").DeclarationNode<BlendImageFilterProps>;
+    DropShadowImageFilter(props: DropShadowImageFilterProps): import("../types").DeclarationNode<DropShadowImageFilterProps>;
+    DisplacementMapImageFilter(props: DisplacementMapImageFilterProps): import("../types").DeclarationNode<DisplacementMapImageFilterProps>;
+    BlurImageFilter(props: BlurImageFilterProps): import("../types").DeclarationNode<BlurImageFilterProps>;
+    OffsetImageFilter(props: OffsetImageFilterProps): import("../types").DeclarationNode<OffsetImageFilterProps>;
+    MorphologyImageFilter(props: MorphologyImageFilterProps): import("../types").DeclarationNode<MorphologyImageFilterProps>;
+    RuntimeShaderImageFilter(props: RuntimeShaderImageFilterProps): import("../types").DeclarationNode<RuntimeShaderImageFilterProps>;
+    MatrixColorFilter(props: MatrixColorFilterProps): import("../types").DeclarationNode<MatrixColorFilterProps>;
+    BlendColorFilter(props: BlendColorFilterProps): import("../types").DeclarationNode<BlendColorFilterProps>;
+    LumaColorFilter(): import("../types").DeclarationNode<null>;
+    LinearToSRGBGammaColorFilter(): import("../types").DeclarationNode<null>;
+    SRGBToLinearGammaColorFilter(): import("../types").DeclarationNode<null>;
+    LerpColorFilter(props: LerpColorFilterProps): import("../types").DeclarationNode<LerpColorFilterProps>;
+    Shader(props: ShaderProps): import("../types").DeclarationNode<ShaderProps>;
+    ImageShader(props: ImageShaderProps): import("../types").DeclarationNode<ImageShaderProps>;
+    ColorShader(props: ColorProps): import("../types").DeclarationNode<ColorProps>;
+    SweepGradient(props: SweepGradientProps): import("../types").DeclarationNode<SweepGradientProps>;
+    Turbulence(props: TurbulenceProps): import("../types").DeclarationNode<TurbulenceProps>;
+    FractalNoise(props: FractalNoiseProps): import("../types").DeclarationNode<FractalNoiseProps>;
+    LinearGradient(props: LinearGradientProps): import("../types").DeclarationNode<LinearGradientProps>;
+    RadialGradient(props: RadialGradientProps): import("../types").DeclarationNode<RadialGradientProps>;
+    TwoPointConicalGradient(props: TwoPointConicalGradientProps): import("../types").DeclarationNode<TwoPointConicalGradientProps>;
+    CornerPathEffect(props: CornerPathEffectProps): import("../types").DeclarationNode<CornerPathEffectProps>;
+    DiscretePathEffect(props: DiscretePathEffectProps): import("../types").DeclarationNode<DiscretePathEffectProps>;
+    DashPathEffect(props: DashPathEffectProps): import("../types").DeclarationNode<DashPathEffectProps>;
+    Path1DPathEffect(props: Path1DPathEffectProps): import("../types").DeclarationNode<Path1DPathEffectProps>;
+    Path2DPathEffect(props: Path2DPathEffectProps): import("../types").DeclarationNode<Path2DPathEffectProps>;
+    SumPathEffect(): import("../types").DeclarationNode<null>;
+    Line2DPathEffect(props: Line2DPathEffectProps): import("../types").DeclarationNode<Line2DPathEffectProps>;
+    Blend(props: BlendProps): import("../types").DeclarationNode<BlendProps>;
     BackdropFilter(props: ChildrenProps): import("../types").RenderNode<ChildrenProps>;
     Box(props: BoxProps): import("../types").RenderNode<BoxProps>;
-    BoxShadow(props: BoxShadowProps): import("../types").DeclarationNode<BoxShadowProps, BoxShadowProps, never>;
+    BoxShadow(props: BoxShadowProps): import("../types").DeclarationNode<BoxShadowProps>;
 }

package/lib/commonjs/dom/nodes/LayerNode.js

@@ -11,19 +11,26 @@ var _RenderNode = require("./RenderNode");
 
 var _Node = require("./Node");
 
-const isLayer = node => node instanceof _Node.JsiDeclarationNode && node.isPaint();
-
 class LayerNode extends _RenderNode.JsiRenderNode {
   constructor(ctx, props) {
     super(ctx, _types.NodeType.Layer, props);
   }
 
   renderNode(ctx) {
+    let hasLayer = false;
     const [layer, ...children] = this.children();
 
-    if (isLayer(layer)) {
-      const paint = layer.materialize();
-      ctx.canvas.saveLayer(paint);
+    if (layer instanceof _Node.JsiDeclarationNode) {
+      const declCtx = ctx.declarationCtx;
+      declCtx.save();
+      layer.decorate(declCtx);
+      const paint = declCtx.paints.pop();
+      declCtx.restore();
+
+      if (paint) {
+        hasLayer = true;
+        ctx.canvas.saveLayer(paint);
+      }
     }
 
     children.map(child => {
@@ -32,7 +39,7 @@ class LayerNode extends _RenderNode.JsiRenderNode {
       }
     });
 
-    if (isLayer(layer)) {
+    if (hasLayer) {
       ctx.canvas.restore();
     }
   }

package/lib/commonjs/dom/nodes/LayerNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["isLayer","node","JsiDeclarationNode","isPaint","LayerNode","JsiRenderNode","constructor","ctx","props","NodeType","Layer","renderNode","layer","children","paint","materialize","canvas","saveLayer","map","child","render","restore"],"sources":["LayerNode.ts"],"sourcesContent":["import type { DeclarationNode, DrawingContext, Node } from \"../types\";\nimport { NodeType } from \"../types\";\nimport type { ChildrenProps } from \"../types/Common\";\nimport type { SkPaint } from \"../../skia\";\n\nimport { JsiRenderNode } from \"./RenderNode\";\nimport type { NodeContext } from \"./Node\";\nimport { JsiDeclarationNode } from \"./Node\";\n\nconst isLayer = (\n  node: Node<unknown>\n): node is DeclarationNode<unknown, SkPaint> =>\n  node instanceof JsiDeclarationNode && node.isPaint();\n\nexport class LayerNode extends JsiRenderNode<ChildrenProps> {\n  constructor(ctx: NodeContext, props: ChildrenProps) {\n    super(ctx, NodeType.Layer, props);\n  }\n\n  renderNode(ctx: DrawingContext): void {\n    const [layer, ...children] = this.children();\n    if (isLayer(layer)) {\n      const paint = layer.materialize() as SkPaint;\n      ctx.canvas.saveLayer(paint);\n    }\n    children.map((child) => {\n      if (child instanceof JsiRenderNode) {\n        child.render(ctx);\n      }\n    });\n    if (isLayer(layer)) {\n      ctx.canvas.restore();\n    }\n  }\n}\n"],"mappings":";;;;;;;AACA;;AAIA;;AAEA;;AAEA,MAAMA,OAAO,GACXC,IADc,IAGdA,IAAI,YAAYC,wBAAhB,IAAsCD,IAAI,CAACE,OAAL,EAHxC;;AAKO,MAAMC,SAAN,SAAwBC,yBAAxB,CAAqD;EAC1DC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAyC;IAClD,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;EACD;;EAEDG,UAAU,CAACJ,GAAD,EAA4B;IACpC,MAAM,CAACK,KAAD,EAAQ,GAAGC,QAAX,IAAuB,KAAKA,QAAL,EAA7B;;IACA,IAAIb,OAAO,CAACY,KAAD,CAAX,EAAoB;MAClB,MAAME,KAAK,GAAGF,KAAK,CAACG,WAAN,EAAd;MACAR,GAAG,CAACS,MAAJ,CAAWC,SAAX,CAAqBH,KAArB;IACD;;IACDD,QAAQ,CAACK,GAAT,CAAcC,KAAD,IAAW;MACtB,IAAIA,KAAK,YAAYd,yBAArB,EAAoC;QAClCc,KAAK,CAACC,MAAN,CAAab,GAAb;MACD;IACF,CAJD;;IAKA,IAAIP,OAAO,CAACY,KAAD,CAAX,EAAoB;MAClBL,GAAG,CAACS,MAAJ,CAAWK,OAAX;IACD;EACF;;AAnByD"}
+{"version":3,"names":["LayerNode","JsiRenderNode","constructor","ctx","props","NodeType","Layer","renderNode","hasLayer","layer","children","JsiDeclarationNode","declCtx","declarationCtx","save","decorate","paint","paints","pop","restore","canvas","saveLayer","map","child","render"],"sources":["LayerNode.ts"],"sourcesContent":["import type { DrawingContext } from \"../types\";\nimport { NodeType } from \"../types\";\nimport type { ChildrenProps } from \"../types/Common\";\n\nimport { JsiRenderNode } from \"./RenderNode\";\nimport type { NodeContext } from \"./Node\";\nimport { JsiDeclarationNode } from \"./Node\";\n\nexport class LayerNode extends JsiRenderNode<ChildrenProps> {\n  constructor(ctx: NodeContext, props: ChildrenProps) {\n    super(ctx, NodeType.Layer, props);\n  }\n\n  renderNode(ctx: DrawingContext): void {\n    let hasLayer = false;\n    const [layer, ...children] = this.children();\n    if (layer instanceof JsiDeclarationNode) {\n      const declCtx = ctx.declarationCtx;\n      declCtx.save();\n      layer.decorate(declCtx);\n      const paint = declCtx.paints.pop();\n      declCtx.restore();\n      if (paint) {\n        hasLayer = true;\n        ctx.canvas.saveLayer(paint);\n      }\n    }\n    children.map((child) => {\n      if (child instanceof JsiRenderNode) {\n        child.render(ctx);\n      }\n    });\n    if (hasLayer) {\n      ctx.canvas.restore();\n    }\n  }\n}\n"],"mappings":";;;;;;;AACA;;AAGA;;AAEA;;AAEO,MAAMA,SAAN,SAAwBC,yBAAxB,CAAqD;EAC1DC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAyC;IAClD,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;EACD;;EAEDG,UAAU,CAACJ,GAAD,EAA4B;IACpC,IAAIK,QAAQ,GAAG,KAAf;IACA,MAAM,CAACC,KAAD,EAAQ,GAAGC,QAAX,IAAuB,KAAKA,QAAL,EAA7B;;IACA,IAAID,KAAK,YAAYE,wBAArB,EAAyC;MACvC,MAAMC,OAAO,GAAGT,GAAG,CAACU,cAApB;MACAD,OAAO,CAACE,IAAR;MACAL,KAAK,CAACM,QAAN,CAAeH,OAAf;MACA,MAAMI,KAAK,GAAGJ,OAAO,CAACK,MAAR,CAAeC,GAAf,EAAd;MACAN,OAAO,CAACO,OAAR;;MACA,IAAIH,KAAJ,EAAW;QACTR,QAAQ,GAAG,IAAX;QACAL,GAAG,CAACiB,MAAJ,CAAWC,SAAX,CAAqBL,KAArB;MACD;IACF;;IACDN,QAAQ,CAACY,GAAT,CAAcC,KAAD,IAAW;MACtB,IAAIA,KAAK,YAAYtB,yBAArB,EAAoC;QAClCsB,KAAK,CAACC,MAAN,CAAarB,GAAb;MACD;IACF,CAJD;;IAKA,IAAIK,QAAJ,EAAc;MACZL,GAAG,CAACiB,MAAJ,CAAWD,OAAX;IACD;EACF;;AA3ByD"}

package/lib/commonjs/dom/nodes/Node.d.ts

@@ -1,7 +1,7 @@
-import type { SkColorFilter, Skia, SkImageFilter, SkMaskFilter, SkShader, SkPathEffect, SkPaint } from "../../skia/types";
-import type { Node, DeclarationNode, NodeType } from "../types";
-import { DeclarationType } from "../types";
+import type { Skia } from "../../skia/types";
+import type { Node, DeclarationNode, NodeType, DeclarationType } from "../types";
 import type { DependencyManager } from "../../renderer/DependencyManager";
+import type { DeclarationContext } from "../types/DeclarationContext";
 export interface NodeContext {
     Skia: Skia;
     depMgr: DependencyManager;
@@ -23,21 +23,16 @@ export declare abstract class JsiNode<P> implements Node<P> {
     insertChildBefore(child: Node<unknown>, before: Node<unknown>): void;
 }
 export declare type Invalidate = () => void;
-export declare abstract class JsiDeclarationNode<P, T, Nullable extends null | never = never> extends JsiNode<P> implements DeclarationNode<P, T, Nullable> {
+export declare abstract class JsiDeclarationNode<P> extends JsiNode<P> implements DeclarationNode<P> {
     declarationType: DeclarationType;
     private invalidate;
     constructor(ctx: NodeContext, declarationType: DeclarationType, type: NodeType, props: P);
-    abstract materialize(): T | Nullable;
+    abstract decorate(ctx: DeclarationContext): void;
+    protected decorateChildren(ctx: DeclarationContext): void;
     addChild(child: Node<unknown>): void;
     insertChildBefore(child: Node<unknown>, before: Node<unknown>): void;
     dispose(): void;
     setInvalidate(invalidate: Invalidate): void;
     setProps(props: P): void;
     setProp<K extends keyof P>(name: K, v: P[K]): boolean;
-    isPaint(): this is DeclarationNode<unknown, SkPaint>;
-    isImageFilter(): this is DeclarationNode<unknown, SkImageFilter>;
-    isColorFilter(): this is DeclarationNode<unknown, SkColorFilter>;
-    isShader(): this is DeclarationNode<unknown, SkShader>;
-    isMaskFilter(): this is DeclarationNode<unknown, SkMaskFilter>;
-    isPathEffect(): this is DeclarationNode<unknown, SkPathEffect>;
 }

package/lib/commonjs/dom/nodes/Node.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JsiNode = exports.JsiDeclarationNode = void 0;
 
-var _types = require("../types");
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class JsiNode {
@@ -86,6 +84,14 @@ class JsiDeclarationNode extends JsiNode {
     _defineProperty(this, "invalidate", () => {});
   }
 
+  decorateChildren(ctx) {
+    this.children().forEach(child => {
+      if (child instanceof JsiDeclarationNode) {
+        child.decorate(ctx);
+      }
+    });
+  }
+
   addChild(child) {
     if (!(child instanceof JsiDeclarationNode)) {
       throw new Error(`Cannot add child of type ${child.type} to ${this.type}`);
@@ -128,30 +134,6 @@ class JsiDeclarationNode extends JsiNode {
     return hasChanged;
   }
 
-  isPaint() {
-    return this.declarationType === _types.DeclarationType.Paint;
-  }
-
-  isImageFilter() {
-    return this.declarationType === _types.DeclarationType.ImageFilter;
-  }
-
-  isColorFilter() {
-    return this.declarationType === _types.DeclarationType.ColorFilter;
-  }
-
-  isShader() {
-    return this.declarationType === _types.DeclarationType.Shader;
-  }
-
-  isMaskFilter() {
-    return this.declarationType === _types.DeclarationType.MaskFilter;
-  }
-
-  isPathEffect() {
-    return this.declarationType === _types.DeclarationType.PathEffect;
-  }
-
 }
 
 exports.JsiDeclarationNode = JsiDeclarationNode;