@shopify/react-native-skia 1.11.1 → 1.11.2

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

@@ -1,6 +1,5 @@
 export { JsiSkImage } from "./skia/web/JsiSkImage";
 export * from "./renderer";
-export * from "./renderer/CanvasOld";
 export * from "./renderer/Canvas";
 export * from "./renderer/Offscreen";
 export * from "./views";

package/lib/typescript/lib/module/mock/index.d.ts

@@ -58,7 +58,6 @@ export function Mock(CanvasKit: any): {
     useSVG: () => null;
     useVideo: () => null;
     NodeType: {};
-    JsiSkDOM: typeof import("../dom/nodes").JsiSkDOM;
     enumKey: (k: any) => any;
     processPath: (Skia: any, rawPath: any) => any;
     isPathDef: (def: any) => boolean;

package/lib/typescript/lib/module/renderer/Canvas.d.ts

@@ -1 +1,2 @@
+export function useCanvasRef(): import("react").MutableRefObject<null>;
 export const Canvas: import("react").ForwardRefExoticComponent<import("react").RefAttributes<any>>;

package/lib/typescript/lib/module/sksg/Container.d.ts

@@ -2,6 +2,8 @@ export class Container {
     constructor(Skia: any, nativeId: any);
     Skia: any;
     nativeId: any;
+    unmount(): void;
+    unmounted: boolean | undefined;
     drawOnCanvas(canvas: any): void;
 }
 export function createContainer(Skia: any, nativeId: any): StaticContainer | ReanimatedContainer | NativeReanimatedContainer;

package/lib/typescript/lib/module/sksg/Elements.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/typescript/lib/module/sksg/Reconciler.d.ts

@@ -10,6 +10,8 @@ export class SkiaSGRoot {
         } | undefined;
         Skia: any;
         nativeId: any;
+        unmount(): void;
+        unmounted: boolean | undefined;
         drawOnCanvas(canvas: any): void;
     } | {
         redraw(): void;
@@ -20,12 +22,16 @@ export class SkiaSGRoot {
         mapperId: any;
         Skia: any;
         nativeId: any;
+        unmount(): void;
+        unmounted: boolean | undefined;
         drawOnCanvas(canvas: any): void;
     } | {
         redraw(): void;
         mapperId: any;
         Skia: any;
         nativeId: any;
+        unmount(): void;
+        unmounted: boolean | undefined;
         drawOnCanvas(canvas: any): void;
     };
     root: any;

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

@@ -1,3 +1,2 @@
 export * from "./SkiaPictureView";
-export * from "./SkiaDomView";
 export * from "./types";

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

@@ -1,3 +1,2 @@
 export * from "../types";
-export * from "./JsiSkDOM";
 export * from "./datatypes";

package/lib/typescript/src/external/reanimated/renderHelpers.d.ts

@@ -1,7 +1 @@
-import type { Container } from "../../renderer/Container";
-import type { AnimatedProps } from "../../renderer/processors";
-import type { Node } from "../../dom/types";
 export declare let HAS_REANIMATED_3: boolean;
-export declare const unbindReanimatedNode: (node: Node<unknown>) => void;
-export declare function extractReanimatedProps(props: AnimatedProps<any>): AnimatedProps<any, never>[];
-export declare function bindReanimatedProps(container: Container, node: Node<any>, reanimatedProps: AnimatedProps<any>): void;

package/lib/typescript/src/index.d.ts

@@ -1,7 +1,6 @@
 import "./skia/NativeSetup";
 export { JsiSkImage } from "./skia/web/JsiSkImage";
 export * from "./renderer";
-export * from "./renderer/CanvasOld";
 export * from "./renderer/Canvas";
 export * from "./renderer/Offscreen";
 export * from "./views";

package/lib/typescript/src/renderer/Canvas.d.ts

@@ -1,6 +1,14 @@
+import type { FC } from "react";
 import type { ViewProps } from "react-native";
 import type { SharedValue } from "react-native-reanimated";
-import type { SkSize } from "../skia/types";
+import type { SkImage, SkRect, SkSize } from "../skia/types";
+interface CanvasRef extends FC<CanvasProps> {
+    makeImageSnapshot(rect?: SkRect): SkImage;
+    makeImageSnapshotAsync(rect?: SkRect): Promise<SkImage>;
+    redraw(): void;
+    getNativeId(): number;
+}
+export declare const useCanvasRef: () => import("react").RefObject<CanvasRef>;
 export interface CanvasProps extends ViewProps {
     debug?: boolean;
     opaque?: boolean;
@@ -8,3 +16,4 @@ export interface CanvasProps extends ViewProps {
     mode?: "continuous" | "default";
 }
 export declare const Canvas: import("react").ForwardRefExoticComponent<CanvasProps & import("react").RefAttributes<unknown>>;
+export {};

package/lib/typescript/src/sksg/Container.d.ts

@@ -6,7 +6,9 @@ export declare abstract class Container {
     protected nativeId: number;
     root: Node[];
     protected recording: Recording | null;
+    protected unmounted: boolean;
     constructor(Skia: Skia, nativeId: number);
+    unmount(): void;
     drawOnCanvas(canvas: SkCanvas): void;
     abstract redraw(): void;
 }

package/lib/typescript/src/sksg/Elements.d.ts

@@ -0,0 +1,65 @@
+import type { FractalNoiseProps, CircleProps, DrawingNodeProps, ImageProps, PaintProps, PathProps, LineProps, OvalProps, DiffRectProps, PointsProps, RectProps, RoundedRectProps, TextProps, VerticesProps, BlurMaskFilterProps, BlendImageFilterProps, BlurImageFilterProps, DisplacementMapImageFilterProps, DropShadowImageFilterProps, OffsetImageFilterProps, RuntimeShaderImageFilterProps, MatrixColorFilterProps, ShaderProps, ImageShaderProps, LinearGradientProps, GroupProps, PatchProps, BlendColorFilterProps, DashPathEffectProps, DiscretePathEffectProps, CornerPathEffectProps, Line2DPathEffectProps, Path1DPathEffectProps, Path2DPathEffectProps, TextPathProps, TextBlobProps, GlyphsProps, TwoPointConicalGradientProps, TurbulenceProps, SweepGradientProps, RadialGradientProps, ColorProps, PictureProps, ImageSVGProps, LerpColorFilterProps, BoxProps, BoxShadowProps, ParagraphProps, AtlasProps, ChildrenProps, MorphologyImageFilterProps, BlendProps } from "../dom/types";
+import type { SkiaProps } from "../renderer";
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            skGroup: SkiaProps<GroupProps>;
+            skLayer: SkiaProps<ChildrenProps>;
+            skPaint: SkiaProps<PaintProps>;
+            skFill: SkiaProps<DrawingNodeProps>;
+            skImage: SkiaProps<ImageProps>;
+            skCircle: SkiaProps<CircleProps>;
+            skPath: SkiaProps<PathProps>;
+            skLine: SkiaProps<LineProps>;
+            skOval: SkiaProps<OvalProps>;
+            skPatch: SkiaProps<PatchProps>;
+            skPoints: SkiaProps<PointsProps>;
+            skRect: SkiaProps<RectProps>;
+            skRRect: SkiaProps<RoundedRectProps>;
+            skAtlas: SkiaProps<AtlasProps>;
+            skVertices: SkiaProps<VerticesProps>;
+            skText: SkiaProps<TextProps>;
+            skTextPath: SkiaProps<TextPathProps>;
+            skTextBlob: SkiaProps<TextBlobProps>;
+            skGlyphs: SkiaProps<GlyphsProps>;
+            skDiffRect: SkiaProps<DiffRectProps>;
+            skPicture: SkiaProps<PictureProps>;
+            skImageSVG: SkiaProps<ImageSVGProps>;
+            skBlurMaskFilter: SkiaProps<BlurMaskFilterProps>;
+            skBlendImageFilter: SkiaProps<BlendImageFilterProps>;
+            skBlurImageFilter: SkiaProps<BlurImageFilterProps>;
+            skOffsetImageFilter: SkiaProps<OffsetImageFilterProps>;
+            skDropShadowImageFilter: SkiaProps<DropShadowImageFilterProps>;
+            skDisplacementMapImageFilter: SkiaProps<DisplacementMapImageFilterProps>;
+            skRuntimeShaderImageFilter: SkiaProps<RuntimeShaderImageFilterProps>;
+            skMorphologyImageFilter: SkiaProps<MorphologyImageFilterProps>;
+            skMatrixColorFilter: SkiaProps<MatrixColorFilterProps>;
+            skBlendColorFilter: SkiaProps<BlendColorFilterProps>;
+            skLinearToSRGBGammaColorFilter: SkiaProps<ChildrenProps>;
+            skSRGBToLinearGammaColorFilter: SkiaProps<ChildrenProps>;
+            skLumaColorFilter: SkiaProps<ChildrenProps>;
+            skLerpColorFilter: SkiaProps<LerpColorFilterProps>;
+            skShader: SkiaProps<ShaderProps>;
+            skImageShader: SkiaProps<ImageShaderProps>;
+            skColorShader: SkiaProps<ColorProps>;
+            skTurbulence: SkiaProps<TurbulenceProps>;
+            skFractalNoise: SkiaProps<FractalNoiseProps>;
+            skLinearGradient: SkiaProps<LinearGradientProps>;
+            skRadialGradient: SkiaProps<RadialGradientProps>;
+            skSweepGradient: SkiaProps<SweepGradientProps>;
+            skTwoPointConicalGradient: SkiaProps<TwoPointConicalGradientProps>;
+            skDiscretePathEffect: SkiaProps<DiscretePathEffectProps>;
+            skDashPathEffect: SkiaProps<DashPathEffectProps>;
+            skPath1DPathEffect: SkiaProps<Path1DPathEffectProps>;
+            skPath2DPathEffect: SkiaProps<Path2DPathEffectProps>;
+            skCornerPathEffect: SkiaProps<CornerPathEffectProps>;
+            skSumPathEffect: ChildrenProps;
+            skLine2DPathEffect: SkiaProps<Line2DPathEffectProps>;
+            skBlend: SkiaProps<BlendProps>;
+            skBackdropFilter: SkiaProps<ChildrenProps>;
+            skBox: SkiaProps<BoxProps>;
+            skBoxShadow: SkiaProps<BoxShadowProps>;
+            skParagraph: SkiaProps<ParagraphProps>;
+        }
+    }
+}

package/lib/typescript/src/sksg/Reconciler.d.ts

@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import type { SkCanvas, Skia } from "../skia/types";
 import { NodeType } from "../dom/types";
+import "./Elements";
 export declare class SkiaSGRoot {
     Skia: Skia;
     private root;

package/lib/typescript/src/views/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./SkiaPictureView";
-export * from "./SkiaDomView";
 export * from "./types";

package/package.json

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

package/src/dom/nodes/index.ts

@@ -1,3 +1,2 @@
 export * from "../types";
-export * from "./JsiSkDOM";
 export * from "./datatypes";

package/src/external/reanimated/renderHelpers.ts

@@ -1,12 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-import type { Container } from "../../renderer/Container";
-import type { AnimatedProps } from "../../renderer/processors";
-import type { Node } from "../../dom/types";
-
-import Rea from "./ReanimatedProxy";
-
 export let HAS_REANIMATED_3 = false;
+
 try {
   // This logic is convoluted but necessary
   // In most systems, `require("react-native-reanimated")` throws an error, all is well.
@@ -24,73 +17,3 @@ try {
 } catch (e) {
   // do nothing
 }
-
-const _bindings = new WeakMap<Node<unknown>, unknown>();
-
-export const unbindReanimatedNode = (node: Node<unknown>) => {
-  if (!HAS_REANIMATED_3) {
-    return;
-  }
-  const previousMapperId = _bindings.get(node);
-  if (previousMapperId !== undefined) {
-    Rea.stopMapper(previousMapperId as number);
-  }
-};
-
-export function extractReanimatedProps(props: AnimatedProps<any>) {
-  if (!HAS_REANIMATED_3) {
-    return [props, {}];
-  }
-  const reanimatedProps = {} as AnimatedProps<any>;
-  const otherProps = {} as AnimatedProps<any>;
-  for (const propName in props) {
-    if (propName === "children") {
-      continue;
-    }
-    const propValue = props[propName];
-    if (Rea.isSharedValue(propValue)) {
-      reanimatedProps[propName] = propValue;
-      otherProps[propName] = propValue.value;
-    } else {
-      otherProps[propName] = propValue;
-    }
-  }
-  return [otherProps, reanimatedProps];
-}
-
-export function bindReanimatedProps(
-  container: Container,
-  node: Node<any>,
-  reanimatedProps: AnimatedProps<any>
-) {
-  if (!HAS_REANIMATED_3) {
-    return;
-  }
-  const sharedValues = Object.values(reanimatedProps);
-  const previousMapperId = _bindings.get(node);
-  if (previousMapperId !== undefined) {
-    Rea.stopMapper(previousMapperId as number);
-  }
-  if (sharedValues.length > 0) {
-    const viewId = container.getNativeId();
-    const { SkiaViewApi } = global;
-    const mapperId = Rea.startMapper(() => {
-      "worklet";
-      if (node) {
-        for (const propName in reanimatedProps) {
-          node.setProp(propName, reanimatedProps[propName].value);
-        }
-      }
-      // On React Native we use the SkiaViewApi to redraw because it can
-      // run on the worklet thread (container.redraw can't)
-      // if SkiaViewApi is undefined, we are on web and container.redraw()
-      // can safely be invoked
-      if (SkiaViewApi) {
-        SkiaViewApi.requestRedraw(viewId);
-      } else {
-        container.redraw();
-      }
-    }, sharedValues);
-    _bindings.set(node, mapperId);
-  }
-}

package/src/index.ts

@@ -1,7 +1,6 @@
 import "./skia/NativeSetup";
 export { JsiSkImage } from "./skia/web/JsiSkImage";
 export * from "./renderer";
-export * from "./renderer/CanvasOld";
 export * from "./renderer/Canvas";
 export * from "./renderer/Offscreen";
 export * from "./views";

package/src/renderer/Canvas.tsx

@@ -1,3 +1,4 @@
+import type { FC } from "react";
 import {
   forwardRef,
   useCallback,
@@ -11,11 +12,20 @@ import type { SharedValue } from "react-native-reanimated";
 
 import { SkiaViewNativeId } from "../views/SkiaViewNativeId";
 import SkiaPictureViewNativeComponent from "../specs/SkiaPictureViewNativeComponent";
-import type { SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkRect, SkSize } from "../skia/types";
 import { SkiaSGRoot } from "../sksg/Reconciler";
 import { Skia } from "../skia";
 import type { SkiaBaseViewProps } from "../views";
 
+interface CanvasRef extends FC<CanvasProps> {
+  makeImageSnapshot(rect?: SkRect): SkImage;
+  makeImageSnapshotAsync(rect?: SkRect): Promise<SkImage>;
+  redraw(): void;
+  getNativeId(): number;
+}
+
+export const useCanvasRef = () => useRef<CanvasRef>(null);
+
 const NativeSkiaPictureView = SkiaPictureViewNativeComponent;
 
 // TODO: no need to go through the JS thread for this

package/src/sksg/Container.ts

@@ -52,9 +52,14 @@ const nativeDrawOnscreen = (
 export abstract class Container {
   public root: Node[] = [];
   protected recording: Recording | null = null;
+  protected unmounted = false;
 
   constructor(protected Skia: Skia, protected nativeId: number) {}
 
+  unmount() {
+    this.unmounted = true;
+  }
+
   drawOnCanvas(canvas: SkCanvas) {
     if (!this.recording) {
       throw new Error("No recording to draw");
@@ -101,6 +106,9 @@ class ReanimatedContainer extends Container {
     if (this.mapperId !== null) {
       Rea.stopMapper(this.mapperId);
     }
+    if (this.unmounted) {
+      return;
+    }
     const recorder = new Recorder();
     visit(recorder, this.root);
     const record = recorder.getRecording();
@@ -134,6 +142,9 @@ class NativeReanimatedContainer extends Container {
     if (this.mapperId !== null) {
       Rea.stopMapper(this.mapperId);
     }
+    if (this.unmounted) {
+      return;
+    }
     const { nativeId, Skia } = this;
     const recorder = new ReanimatedRecorder(Skia);
     visit(recorder, this.root);

package/src/sksg/Elements.tsx

@@ -0,0 +1,136 @@
+import type {
+  FractalNoiseProps,
+  CircleProps,
+  DrawingNodeProps,
+  ImageProps,
+  PaintProps,
+  PathProps,
+  LineProps,
+  OvalProps,
+  DiffRectProps,
+  PointsProps,
+  RectProps,
+  RoundedRectProps,
+  TextProps,
+  VerticesProps,
+  BlurMaskFilterProps,
+  BlendImageFilterProps,
+  BlurImageFilterProps,
+  DisplacementMapImageFilterProps,
+  DropShadowImageFilterProps,
+  OffsetImageFilterProps,
+  RuntimeShaderImageFilterProps,
+  MatrixColorFilterProps,
+  ShaderProps,
+  ImageShaderProps,
+  LinearGradientProps,
+  GroupProps,
+  PatchProps,
+  BlendColorFilterProps,
+  DashPathEffectProps,
+  DiscretePathEffectProps,
+  CornerPathEffectProps,
+  Line2DPathEffectProps,
+  Path1DPathEffectProps,
+  Path2DPathEffectProps,
+  TextPathProps,
+  TextBlobProps,
+  GlyphsProps,
+  TwoPointConicalGradientProps,
+  TurbulenceProps,
+  SweepGradientProps,
+  RadialGradientProps,
+  ColorProps,
+  PictureProps,
+  ImageSVGProps,
+  LerpColorFilterProps,
+  BoxProps,
+  BoxShadowProps,
+  ParagraphProps,
+  AtlasProps,
+  ChildrenProps,
+  MorphologyImageFilterProps,
+  BlendProps,
+} from "../dom/types";
+import type { SkiaProps } from "../renderer";
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace JSX {
+    interface IntrinsicElements {
+      skGroup: SkiaProps<GroupProps>;
+      skLayer: SkiaProps<ChildrenProps>;
+      skPaint: SkiaProps<PaintProps>;
+
+      // Drawings
+      skFill: SkiaProps<DrawingNodeProps>;
+      skImage: SkiaProps<ImageProps>;
+      skCircle: SkiaProps<CircleProps>;
+      skPath: SkiaProps<PathProps>;
+      skLine: SkiaProps<LineProps>;
+      skOval: SkiaProps<OvalProps>;
+      skPatch: SkiaProps<PatchProps>;
+      skPoints: SkiaProps<PointsProps>;
+      skRect: SkiaProps<RectProps>;
+      skRRect: SkiaProps<RoundedRectProps>;
+      skAtlas: SkiaProps<AtlasProps>;
+      skVertices: SkiaProps<VerticesProps>;
+      skText: SkiaProps<TextProps>;
+      skTextPath: SkiaProps<TextPathProps>;
+      skTextBlob: SkiaProps<TextBlobProps>;
+      skGlyphs: SkiaProps<GlyphsProps>;
+      skDiffRect: SkiaProps<DiffRectProps>;
+      skPicture: SkiaProps<PictureProps>;
+      skImageSVG: SkiaProps<ImageSVGProps>;
+
+      // BlurMaskFilters
+      skBlurMaskFilter: SkiaProps<BlurMaskFilterProps>;
+
+      // ImageFilters
+      skBlendImageFilter: SkiaProps<BlendImageFilterProps>;
+      skBlurImageFilter: SkiaProps<BlurImageFilterProps>;
+      skOffsetImageFilter: SkiaProps<OffsetImageFilterProps>;
+      skDropShadowImageFilter: SkiaProps<DropShadowImageFilterProps>;
+      skDisplacementMapImageFilter: SkiaProps<DisplacementMapImageFilterProps>;
+      skRuntimeShaderImageFilter: SkiaProps<RuntimeShaderImageFilterProps>;
+      skMorphologyImageFilter: SkiaProps<MorphologyImageFilterProps>;
+
+      // ColorFilters
+      skMatrixColorFilter: SkiaProps<MatrixColorFilterProps>;
+      skBlendColorFilter: SkiaProps<BlendColorFilterProps>;
+      skLinearToSRGBGammaColorFilter: SkiaProps<ChildrenProps>;
+      skSRGBToLinearGammaColorFilter: SkiaProps<ChildrenProps>;
+      skLumaColorFilter: SkiaProps<ChildrenProps>;
+      skLerpColorFilter: SkiaProps<LerpColorFilterProps>;
+
+      // Shaders
+      skShader: SkiaProps<ShaderProps>;
+      skImageShader: SkiaProps<ImageShaderProps>;
+      skColorShader: SkiaProps<ColorProps>;
+      skTurbulence: SkiaProps<TurbulenceProps>;
+      skFractalNoise: SkiaProps<FractalNoiseProps>;
+      skLinearGradient: SkiaProps<LinearGradientProps>;
+      skRadialGradient: SkiaProps<RadialGradientProps>;
+      skSweepGradient: SkiaProps<SweepGradientProps>;
+      skTwoPointConicalGradient: SkiaProps<TwoPointConicalGradientProps>;
+
+      // Path Effects
+      skDiscretePathEffect: SkiaProps<DiscretePathEffectProps>;
+      skDashPathEffect: SkiaProps<DashPathEffectProps>;
+      skPath1DPathEffect: SkiaProps<Path1DPathEffectProps>;
+      skPath2DPathEffect: SkiaProps<Path2DPathEffectProps>;
+      skCornerPathEffect: SkiaProps<CornerPathEffectProps>;
+      skSumPathEffect: ChildrenProps;
+      skLine2DPathEffect: SkiaProps<Line2DPathEffectProps>;
+
+      // Mixed declarations/drawings
+      skBlend: SkiaProps<BlendProps>;
+      skBackdropFilter: SkiaProps<ChildrenProps>;
+      skBox: SkiaProps<BoxProps>;
+      skBoxShadow: SkiaProps<BoxShadowProps>;
+
+      // Paragraph
+      skParagraph: SkiaProps<ParagraphProps>;
+    }
+  }
+}

package/src/sksg/Reconciler.ts

@@ -8,6 +8,7 @@ import { NodeType } from "../dom/types";
 import { debug, sksgHostConfig } from "./HostConfig";
 import type { Container } from "./Container";
 import { createContainer } from "./Container";
+import "./Elements";
 
 const skiaReconciler = ReactReconciler(sksgHostConfig);
 
@@ -59,6 +60,7 @@ export class SkiaSGRoot {
   }
 
   unmount() {
+    this.container.unmount();
     skiaReconciler.updateContainer(null, this.root, null, () => {
       debug("unmountContainer");
     });

package/src/views/index.ts

@@ -1,3 +1,2 @@
 export * from "./SkiaPictureView";
-export * from "./SkiaDomView";
 export * from "./types";

package/android/cpp/jni/include/JniSkiaDomView.h

@@ -1,82 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include <fbjni/fbjni.h>
-#include <jni.h>
-#include <jsi/jsi.h>
-
-#include "JniSkiaBaseView.h"
-#include "JniSkiaManager.h"
-#include "RNSkAndroidView.h"
-#include "RNSkDomView.h"
-
-#include <android/native_window.h>
-#include <android/native_window_jni.h>
-#include <fbjni/detail/Hybrid.h>
-
-namespace RNSkia {
-
-namespace jsi = facebook::jsi;
-namespace jni = facebook::jni;
-
-class JniSkiaDomView : public jni::HybridClass<JniSkiaDomView>,
-                       public JniSkiaBaseView {
-public:
-  static auto constexpr kJavaDescriptor =
-      "Lcom/shopify/reactnative/skia/SkiaDomView;";
-
-  static jni::local_ref<jhybriddata>
-  initHybrid(jni::alias_ref<jhybridobject> jThis,
-             jni::alias_ref<JniSkiaManager::javaobject> skiaManager) {
-    return makeCxxInstance(jThis, skiaManager);
-  }
-
-  static void registerNatives() {
-    registerHybrid(
-        {makeNativeMethod("initHybrid", JniSkiaDomView::initHybrid),
-         makeNativeMethod("surfaceAvailable", JniSkiaDomView::surfaceAvailable),
-         makeNativeMethod("surfaceDestroyed", JniSkiaDomView::surfaceDestroyed),
-         makeNativeMethod("surfaceSizeChanged",
-                          JniSkiaDomView::surfaceSizeChanged),
-         makeNativeMethod("setDebugMode", JniSkiaDomView::setDebugMode),
-         makeNativeMethod("registerView", JniSkiaDomView::registerView),
-         makeNativeMethod("unregisterView", JniSkiaDomView::unregisterView)});
-  }
-
-protected:
-  void surfaceAvailable(jobject surface, int width, int height,
-                        bool opaque) override {
-    JniSkiaBaseView::surfaceAvailable(surface, width, height, opaque);
-  }
-
-  void surfaceSizeChanged(jobject surface, int width, int height,
-                          bool opaque) override {
-    JniSkiaBaseView::surfaceSizeChanged(surface, width, height, opaque);
-  }
-
-  void surfaceDestroyed() override { JniSkiaBaseView::surfaceDestroyed(); }
-
-  void setDebugMode(bool show) override { JniSkiaBaseView::setDebugMode(show); }
-
-  void registerView(int nativeId) override {
-    JniSkiaBaseView::registerView(nativeId);
-  }
-
-  void unregisterView() override { JniSkiaBaseView::unregisterView(); }
-
-private:
-  friend HybridBase;
-
-  explicit JniSkiaDomView(
-      jni::alias_ref<jhybridobject> jThis,
-      jni::alias_ref<JniSkiaManager::javaobject> skiaManager)
-      : JniSkiaBaseView(skiaManager,
-                        std::make_shared<RNSkAndroidView<RNSkia::RNSkDomView>>(
-                            skiaManager->cthis()->getPlatformContext())) {}
-
-  jni::global_ref<javaobject> javaPart_;
-};
-
-} // namespace RNSkia

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

@@ -1,41 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import android.content.Context;
-
-import com.facebook.jni.HybridData;
-import com.facebook.jni.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.ThemedReactContext;
-
-public class SkiaDomView extends SkiaBaseView {
-    @DoNotStrip
-    private HybridData mHybridData;
-
-    public SkiaDomView(ThemedReactContext context) {
-        super(context);
-        RNSkiaModule skiaModule = context.getReactApplicationContext().getNativeModule(RNSkiaModule.class);
-        mHybridData = initHybrid(skiaModule.getSkiaManager());
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        mHybridData.resetNative();
-    }
-
-    private native HybridData initHybrid(SkiaManager skiaManager);
-
-    protected native void surfaceAvailable(Object surface, int width, int height, boolean opaque);
-
-    protected native void surfaceSizeChanged(Object surface, int width, int height, boolean opaque);
-
-    protected native void surfaceDestroyed();
-
-    protected native void setBgColor(int color);
-
-    protected native void setDebugMode(boolean show);
-
-    protected native void registerView(int nativeId);
-
-    protected native void unregisterView();
-}