@shopify/react-native-skia 0.1.171 → 0.1.173

package/lib/module/views/api.d.ts

@@ -0,0 +1,5 @@
+import type { ISkiaViewApi } from "./types";
+declare global {
+    var SkiaViewApi: ISkiaViewApi;
+}
+export declare const SkiaViewApi: ISkiaViewApi;

package/lib/module/views/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./SkiaView";
+export * from "./SkiaPictureView";
+export * from "./SkiaDomView";
+export * from "./types";
+export * from "./useDrawCallback";
+export * from "./useTouchHandler";

package/lib/module/views/types.d.ts

@@ -0,0 +1,91 @@
+import type { ViewProps } from "react-native";
+import type { GroupProps, RenderNode } from "../dom/types";
+import type { SkCanvas, SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkiaMutableValue, SkiaValue } from "../values";
+export declare type DrawMode = "continuous" | "default";
+export declare type NativeSkiaViewProps = ViewProps & {
+    mode?: DrawMode;
+    debug?: boolean;
+};
+export declare enum TouchType {
+    Start = 0,
+    Active = 1,
+    End = 2,
+    Cancelled = 3
+}
+export interface TouchInfo {
+    x: number;
+    y: number;
+    force: number;
+    type: TouchType;
+    id: number;
+    timestamp: number;
+}
+export interface DrawingInfo {
+    width: number;
+    height: number;
+    timestamp: number;
+    touches: Array<Array<TouchInfo>>;
+}
+export declare type ExtendedTouchInfo = TouchInfo & {
+    velocityX: number;
+    velocityY: number;
+};
+export declare type TouchHandlers = {
+    onStart?: (touchInfo: TouchInfo) => void;
+    onActive?: (touchInfo: ExtendedTouchInfo) => void;
+    onEnd?: (touchInfo: ExtendedTouchInfo) => void;
+};
+export declare type TouchHandler = (touchInfo: Array<Array<TouchInfo>>) => void;
+export declare type RNSkiaDrawCallback = (canvas: SkCanvas, info: DrawingInfo) => void;
+/**
+ * Listener interface for value changes
+ */
+export interface ValueListener {
+    addListener: (callback: () => void) => number;
+    removeListener: (id: number) => void;
+}
+export interface ISkiaViewApi {
+    setJsiProperty: <T>(nativeId: number, name: string, value: T) => void;
+    callJsiMethod: <T extends Array<unknown>>(nativeId: number, name: string, ...args: T) => void;
+    registerValuesInView: (nativeId: number, values: SkiaValue<unknown>[]) => () => void;
+    requestRedraw: (nativeId: number) => void;
+    makeImageSnapshot: (nativeId: number, rect?: SkRect) => SkImage;
+}
+export interface SkiaBaseViewProps extends ViewProps {
+    /**
+     * Sets the drawing mode for the skia view. There are two drawing
+     * modes, "continuous" and "default", where the continuous mode will
+     * continuously redraw the view, and the default mode will only
+     * redraw when any of the regular react properties are changed like
+     * sizes and margins.
+     */
+    mode?: DrawMode;
+    /**
+     * When set to true the view will display information about the
+     * average time it takes to render.
+     */
+    debug?: boolean;
+    /**
+     * Pass an animated value to the onSize property to get updates when
+     * the Skia view is resized.
+     */
+    onSize?: SkiaMutableValue<SkSize>;
+}
+export interface SkiaDrawViewProps extends SkiaBaseViewProps {
+    /**
+     * Draw callback. Will be called whenever the view is invalidated and
+     * needs to redraw. This is either caused by a change in a react
+     * property, a touch event, or a call to redraw. If the view is in
+     * continuous mode the callback will be called 60 frames per second
+     * by the native view.
+     */
+    onDraw?: RNSkiaDrawCallback;
+}
+export interface SkiaPictureViewProps extends SkiaBaseViewProps {
+    picture?: SkPicture;
+}
+export interface SkiaDomViewProps extends SkiaBaseViewProps {
+    root?: RenderNode<GroupProps>;
+    onTouch?: TouchHandler;
+}

package/lib/module/views/useDrawCallback.d.ts

@@ -0,0 +1,8 @@
+import type { DependencyList } from "react";
+import type { RNSkiaDrawCallback } from "./types";
+/**
+ * Creates a memoized callback for the onDraw handler of a Skia component.
+ * @param callback The callback to memoize.
+ * @param deps Dependencies for the callback.
+ * */
+export declare const useDrawCallback: (callback: RNSkiaDrawCallback, deps?: DependencyList) => RNSkiaDrawCallback;

package/lib/module/views/useTouchHandler.d.ts

@@ -0,0 +1,22 @@
+import type { DependencyList } from "react";
+import type { TouchHandlers, TouchHandler } from "./types";
+/**
+ * Provides a callback for handling touch events in the Skia View.
+ * This touch handler only handles single touches.
+ * @param handlers Callbacks for the different touch states
+ * @param deps optional Dependency array to update the handlers
+ * @returns A function that can be used from within the onDraw callback to
+ * update and handle touch events. Call it with the touches property from
+ * the info object.
+ */
+export declare const useTouchHandler: (handlers: TouchHandlers, deps?: DependencyList) => TouchHandler;
+/**
+ * Provides a callback for handling touch events in the Skia View.
+ * This touch handler handles multiple touches.
+ * @param handlers Callbacks for the different touch states
+ * @param deps optional Dependency array to update the handlers
+ * @returns A function that can be used from within the onDraw callback to
+ * update and handle touch events. Call it with the touches property from
+ * the info object.
+ */
+export declare const useMultiTouchHandler: (handlers: TouchHandlers, deps?: DependencyList) => TouchHandler;

package/lib/module/web/LoadSkiaWeb.d.ts

@@ -0,0 +1,6 @@
+import type { CanvasKit as CanvasKitType, CanvasKitInitOptions } from "canvaskit-wasm";
+declare global {
+    var CanvasKit: CanvasKitType;
+}
+export declare const LoadSkiaWeb: (opts?: CanvasKitInitOptions) => Promise<void>;
+export declare const LoadSkia: (opts?: CanvasKitInitOptions) => Promise<void>;

package/lib/module/web/WithSkiaWeb.d.ts

@@ -0,0 +1,12 @@
+import type { ComponentProps, ComponentType } from "react";
+import { Suspense } from "react";
+import { LoadSkiaWeb } from "./LoadSkiaWeb";
+interface WithSkiaProps {
+    fallback?: ComponentProps<typeof Suspense>["fallback"];
+    getComponent: () => Promise<{
+        default: ComponentType;
+    }>;
+    opts?: Parameters<typeof LoadSkiaWeb>[0];
+}
+export declare const WithSkiaWeb: ({ getComponent, fallback, opts, }: WithSkiaProps) => JSX.Element;
+export {};

package/lib/module/web/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./LoadSkiaWeb";
+export * from "./WithSkiaWeb";

package/lib/typescript/src/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/typescript/src/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/typescript/src/dom/nodes/PaintNode.d.ts

@@ -1,8 +1,8 @@
-import type { SkPaint } from "../../skia/types";
 import type { DeclarationNode, PaintProps } from "../types";
+import type { DeclarationContext } from "../types/DeclarationContext";
 import type { NodeContext } from "./Node";
 import { JsiDeclarationNode } from "./Node";
-export declare class PaintNode extends JsiDeclarationNode<PaintProps, SkPaint> implements DeclarationNode<PaintProps, SkPaint> {
+export declare class PaintNode extends JsiDeclarationNode<PaintProps> implements DeclarationNode<PaintProps> {
     constructor(ctx: NodeContext, props?: PaintProps);
-    materialize(): SkPaint;
+    decorate(ctx: DeclarationContext): void;
 }

package/lib/typescript/src/dom/nodes/RenderNode.d.ts

@@ -1,5 +1,5 @@
 import type { SkMatrix, SkRect, SkRRect, SkPath, SkPaint } from "../../skia/types";
-import type { RenderNode, GroupProps, DrawingContext, NodeType, Node } from "../types";
+import type { RenderNode, GroupProps, NodeType, Node, DrawingContext } from "../types";
 import type { NodeContext } from "./Node";
 import { JsiNode } from "./Node";
 interface PaintCache {
@@ -20,8 +20,7 @@ export declare abstract class JsiRenderNode<P extends GroupProps> extends JsiNod
     insertChildBefore(child: Node<unknown>, before: Node<unknown>): void;
     private computeClip;
     private computeMatrix;
-    private getPaintCtx;
-    render(parentCtx: DrawingContext): void;
+    render(ctx: DrawingContext): void;
     abstract renderNode(ctx: DrawingContext): void;
 }
 export {};

package/lib/typescript/src/dom/nodes/drawings/BackdropFilterNode.d.ts

@@ -4,5 +4,5 @@ import type { NodeContext } from "../Node";
 export declare class BackdropFilterNode extends JsiDrawingNode<ChildrenProps, null> {
     constructor(ctx: NodeContext, props: ChildrenProps);
     protected deriveProps(): null;
-    draw({ canvas }: DrawingContext): void;
+    draw({ canvas, declarationCtx }: DrawingContext): void;
 }

package/lib/typescript/src/dom/nodes/drawings/Box.d.ts

@@ -3,8 +3,10 @@ import type { BoxShadowProps, BoxProps } from "../../types/Drawings";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
 import { JsiRenderNode } from "../RenderNode";
-export declare class BoxShadowNode extends JsiDeclarationNode<BoxShadowProps, BoxShadowProps> {
+import type { DeclarationContext } from "../../types/DeclarationContext";
+export declare class BoxShadowNode extends JsiDeclarationNode<BoxShadowProps> {
     constructor(ctx: NodeContext, props: BoxShadowProps);
+    decorate(_ctx: DeclarationContext): void;
     materialize(): BoxShadowProps;
 }
 export declare class BoxNode extends JsiRenderNode<BoxProps> {

package/lib/typescript/src/dom/nodes/paint/BlendNode.d.ts

@@ -1,12 +1,8 @@
 import type { BlendProps } from "../../types/ImageFilters";
-import type { SkShader, SkImageFilter } from "../../../skia/types";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
-import type { Node } from "../../types";
-export declare class BlendNode extends JsiDeclarationNode<BlendProps, SkShader | SkImageFilter> {
+import type { DeclarationContext } from "../../types/DeclarationContext";
+export declare class BlendNode extends JsiDeclarationNode<BlendProps> {
     constructor(ctx: NodeContext, props: BlendProps);
-    private checkChild;
-    addChild(child: Node<unknown>): void;
-    insertChildBefore(child: Node<unknown>, before: Node<unknown>): void;
-    materialize(): SkImageFilter | SkShader;
+    decorate(ctx: DeclarationContext): void;
 }

package/lib/typescript/src/dom/nodes/paint/ColorFilters.d.ts

@@ -1,36 +1,35 @@
 import type { SkColorFilter } from "../../../skia/types";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
-import type { BlendColorFilterProps, MatrixColorFilterProps, Node } from "../../types";
+import type { BlendColorFilterProps, MatrixColorFilterProps } from "../../types";
 import { NodeType } from "../../types";
 import type { LerpColorFilterProps } from "../../types/ColorFilters";
-export declare abstract class ColorFilterDeclaration<P, Nullable extends null | never = never> extends JsiDeclarationNode<P, SkColorFilter, Nullable> {
+import type { DeclarationContext } from "../../types/DeclarationContext";
+export declare abstract class ColorFilterDeclaration<P> extends JsiDeclarationNode<P> {
     constructor(ctx: NodeContext, type: NodeType, props: P);
-    addChild(child: Node<unknown>): void;
-    insertChildBefore(child: Node<unknown>, before: Node<unknown>): void;
-    compose(filter: SkColorFilter): SkColorFilter;
+    protected composeAndPush(ctx: DeclarationContext, cf1: SkColorFilter): void;
 }
 export declare class MatrixColorFilterNode extends ColorFilterDeclaration<MatrixColorFilterProps> {
     constructor(ctx: NodeContext, props: MatrixColorFilterProps);
-    materialize(): SkColorFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class BlendColorFilterNode extends ColorFilterDeclaration<BlendColorFilterProps> {
     constructor(ctx: NodeContext, props: BlendColorFilterProps);
-    materialize(): SkColorFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class LinearToSRGBGammaColorFilterNode extends ColorFilterDeclaration<null> {
     constructor(ctx: NodeContext);
-    materialize(): SkColorFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class SRGBToLinearGammaColorFilterNode extends ColorFilterDeclaration<null> {
     constructor(ctx: NodeContext);
-    materialize(): SkColorFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class LumaColorFilterNode extends ColorFilterDeclaration<null> {
     constructor(ctx: NodeContext);
-    materialize(): SkColorFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class LerpColorFilterNode extends ColorFilterDeclaration<LerpColorFilterProps> {
     constructor(ctx: NodeContext, props: LerpColorFilterProps);
-    materialize(): SkColorFilter;
+    decorate(ctx: DeclarationContext): void;
 }

package/lib/typescript/src/dom/nodes/paint/ImageFilters.d.ts

@@ -1,28 +1,28 @@
 import type { SkImageFilter } from "../../../skia/types";
-import type { BlendImageFilterProps, BlurImageFilterProps, DisplacementMapImageFilterProps, DropShadowImageFilterProps, MorphologyImageFilterProps, OffsetImageFilterProps, RuntimeShaderImageFilterProps } from "../../types";
+import type { BlendImageFilterProps, BlurImageFilterProps, DeclarationContext, DisplacementMapImageFilterProps, DropShadowImageFilterProps, MorphologyImageFilterProps, OffsetImageFilterProps, RuntimeShaderImageFilterProps } from "../../types";
 import { NodeType } from "../../types";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
-export declare abstract class ImageFilterDeclaration<P, Nullable extends null | never = never> extends JsiDeclarationNode<P, SkImageFilter, Nullable> {
+export declare abstract class ImageFilterDeclaration<P> extends JsiDeclarationNode<P> {
     constructor(ctx: NodeContext, type: NodeType, props: P);
-    getOptionalChildInstance(index: number): any;
-    getMandatoryChildInstance(index: number): any;
+    protected input(ctx: DeclarationContext): SkImageFilter | null;
+    protected composeAndPush(ctx: DeclarationContext, imgf1: SkImageFilter): void;
 }
 export declare class OffsetImageFilterNode extends ImageFilterDeclaration<OffsetImageFilterProps> {
     constructor(ctx: NodeContext, props: OffsetImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class DisplacementMapImageFilterNode extends ImageFilterDeclaration<DisplacementMapImageFilterProps> {
     constructor(ctx: NodeContext, props: DisplacementMapImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class BlurImageFilterNode extends ImageFilterDeclaration<BlurImageFilterProps> {
     constructor(ctx: NodeContext, props: BlurImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class DropShadowImageFilterNode extends ImageFilterDeclaration<DropShadowImageFilterProps> {
     constructor(ctx: NodeContext, props: DropShadowImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare enum MorphologyOperator {
     Erode = 0,
@@ -30,13 +30,13 @@ export declare enum MorphologyOperator {
 }
 export declare class MorphologyImageFilterNode extends ImageFilterDeclaration<MorphologyImageFilterProps> {
     constructor(ctx: NodeContext, props: MorphologyImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class BlendImageFilterNode extends ImageFilterDeclaration<BlendImageFilterProps> {
     constructor(ctx: NodeContext, props: BlendImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class RuntimeShaderImageFilterNode extends ImageFilterDeclaration<RuntimeShaderImageFilterProps> {
     constructor(ctx: NodeContext, props: RuntimeShaderImageFilterProps);
-    materialize(): SkImageFilter;
+    decorate(ctx: DeclarationContext): void;
 }

package/lib/typescript/src/dom/nodes/paint/MaskFilters.d.ts

@@ -1,8 +1,8 @@
-import type { SkMaskFilter } from "../../../skia/types";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
 import type { BlurMaskFilterProps } from "../../types";
-export declare class BlurMaskFilterNode extends JsiDeclarationNode<BlurMaskFilterProps, SkMaskFilter> {
+import type { DeclarationContext } from "../../types/DeclarationContext";
+export declare class BlurMaskFilterNode extends JsiDeclarationNode<BlurMaskFilterProps> {
     constructor(ctx: NodeContext, props: BlurMaskFilterProps);
-    materialize(): SkMaskFilter;
+    decorate(ctx: DeclarationContext): void;
 }

package/lib/typescript/src/dom/nodes/paint/PathEffects.d.ts

@@ -1,42 +1,39 @@
 import type { SkPathEffect } from "../../../skia/types";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
-import type { CornerPathEffectProps, DashPathEffectProps, DiscretePathEffectProps, Line2DPathEffectProps, Node, Path1DPathEffectProps, Path2DPathEffectProps } from "../../types";
+import type { CornerPathEffectProps, DashPathEffectProps, DiscretePathEffectProps, Line2DPathEffectProps, Path1DPathEffectProps, Path2DPathEffectProps } from "../../types";
 import { NodeType } from "../../types";
-declare abstract class PathEffectDeclaration<P, Nullable extends null | never = never> extends JsiDeclarationNode<P, SkPathEffect, Nullable> {
+import type { DeclarationContext } from "../../types/DeclarationContext";
+declare abstract class PathEffectDeclaration<P> extends JsiDeclarationNode<P> {
     constructor(ctx: NodeContext, type: NodeType, props: P);
-    addChild(child: Node<unknown>): void;
-    insertChildBefore(child: Node<unknown>, before: Node<unknown>): void;
-    compose(pe: SkPathEffect): SkPathEffect;
-    getOptionalChildInstance(index: number): any;
-    getMandatoryChildInstance(index: number): any;
+    protected composeAndPush(ctx: DeclarationContext, pe1: SkPathEffect): void;
 }
 export declare class DiscretePathEffectNode extends PathEffectDeclaration<DiscretePathEffectProps> {
     constructor(ctx: NodeContext, props: DiscretePathEffectProps);
-    materialize(): SkPathEffect;
+    decorate(ctx: DeclarationContext): void;
 }
-export declare class Path2DPathEffectNode extends PathEffectDeclaration<Path2DPathEffectProps, null> {
+export declare class Path2DPathEffectNode extends PathEffectDeclaration<Path2DPathEffectProps> {
     constructor(ctx: NodeContext, props: Path2DPathEffectProps);
-    materialize(): SkPathEffect | null;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class DashPathEffectNode extends PathEffectDeclaration<DashPathEffectProps> {
     constructor(ctx: NodeContext, props: DashPathEffectProps);
-    materialize(): SkPathEffect;
+    decorate(ctx: DeclarationContext): void;
 }
-export declare class CornerPathEffectNode extends PathEffectDeclaration<CornerPathEffectProps, null> {
+export declare class CornerPathEffectNode extends PathEffectDeclaration<CornerPathEffectProps> {
     constructor(ctx: NodeContext, props: CornerPathEffectProps);
-    materialize(): SkPathEffect | null;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class SumPathEffectNode extends PathEffectDeclaration<null> {
     constructor(ctx: NodeContext);
-    materialize(): SkPathEffect;
+    decorate(ctx: DeclarationContext): void;
 }
-export declare class Line2DPathEffectNode extends PathEffectDeclaration<Line2DPathEffectProps, null> {
+export declare class Line2DPathEffectNode extends PathEffectDeclaration<Line2DPathEffectProps> {
     constructor(ctx: NodeContext, props: Line2DPathEffectProps);
-    materialize(): SkPathEffect | null;
+    decorate(ctx: DeclarationContext): void;
 }
-export declare class Path1DPathEffectNode extends PathEffectDeclaration<Path1DPathEffectProps, null> {
+export declare class Path1DPathEffectNode extends PathEffectDeclaration<Path1DPathEffectProps> {
     constructor(ctx: NodeContext, props: Path1DPathEffectProps);
-    materialize(): SkPathEffect | null;
+    decorate(ctx: DeclarationContext): void;
 }
 export {};

package/lib/typescript/src/dom/nodes/paint/Shaders.d.ts

@@ -1,44 +1,43 @@
-import type { SkShader } from "../../../skia/types";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
-import type { ColorProps, FractalNoiseProps, ImageShaderProps, LinearGradientProps, RadialGradientProps, ShaderProps, SweepGradientProps, TurbulenceProps, TwoPointConicalGradientProps } from "../../types";
+import type { ColorProps, DeclarationContext, FractalNoiseProps, ImageShaderProps, LinearGradientProps, RadialGradientProps, ShaderProps, SweepGradientProps, TurbulenceProps, TwoPointConicalGradientProps } from "../../types";
 import { NodeType } from "../../types";
-export declare abstract class ShaderDeclaration<P> extends JsiDeclarationNode<P, SkShader> {
+export declare abstract class ShaderDeclaration<P> extends JsiDeclarationNode<P> {
     constructor(ctx: NodeContext, type: NodeType, props: P);
 }
 export declare class ShaderNode extends ShaderDeclaration<ShaderProps> {
     constructor(ctx: NodeContext, props: ShaderProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class ImageShaderNode extends ShaderDeclaration<ImageShaderProps> {
     constructor(ctx: NodeContext, props: ImageShaderProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class ColorNode extends ShaderDeclaration<ColorProps> {
     constructor(ctx: NodeContext, props: ColorProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class TurbulenceNode extends ShaderDeclaration<TurbulenceProps> {
     constructor(ctx: NodeContext, props: TurbulenceProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class FractalNoiseNode extends ShaderDeclaration<FractalNoiseProps> {
     constructor(ctx: NodeContext, props: FractalNoiseProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class LinearGradientNode extends ShaderDeclaration<LinearGradientProps> {
     constructor(ctx: NodeContext, props: LinearGradientProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class RadialGradientNode extends ShaderDeclaration<RadialGradientProps> {
     constructor(ctx: NodeContext, props: RadialGradientProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class SweepGradientNode extends ShaderDeclaration<SweepGradientProps> {
     constructor(ctx: NodeContext, props: SweepGradientProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }
 export declare class TwoPointConicalGradientNode extends ShaderDeclaration<TwoPointConicalGradientProps> {
     constructor(ctx: NodeContext, props: TwoPointConicalGradientProps);
-    materialize(): SkShader;
+    decorate(ctx: DeclarationContext): void;
 }