Implement review comments

Author: wcandillon

example/src/Examples/Performance/PerformanceRects.tsx

@@ -4,6 +4,7 @@ import {
   Rect,
   Skia,
   SkiaView,
+  usePaint,
   PaintStyle,
   usePaintRef,
 } from "@shopify/react-native-skia";
@@ -20,22 +21,22 @@ import {
 
 // Load font
 const Size = 15;
-const paint1 = Skia.Paint();
-paint1.setAntiAlias(true);
-paint1.setColor(Skia.Color("#A2AE6A"));
-
-const paint2 = Skia.Paint();
-paint2.setAntiAlias(true);
-paint2.setColor(Skia.Color("#4060A3"));
-paint2.setStyle(PaintStyle.Stroke);
-paint2.setStrokeWidth(2);
 
 export const PerformanceDrawingTest: React.FC = () => {
   const [isDeclarative, setIsDeclarative] = useState(false);
   const [numberOfBoxes, setNumberOfBoxes] = useState(300);
 
   const { width } = useWindowDimensions();
-
+  const paint1 = usePaint((p) => {
+    p.setAntiAlias(true);
+    p.setColor(Skia.Color("#A2AE6A"));
+  });
+  const paint2 = usePaint((p) => {
+    p.setAntiAlias(true);
+    p.setColor(Skia.Color("#4060A3"));
+    p.setStyle(PaintStyle.Stroke);
+    p.setStrokeWidth(2);
+  });
   const rects = useMemo(
     () =>
       new Array(numberOfBoxes)
@@ -58,7 +59,7 @@ export const PerformanceDrawingTest: React.FC = () => {
         canvas.drawRect(rects[i], paint2);
       }
     },
-    [rects]
+    [paint1, paint2, rects]
   );
   const paint1Ref = usePaintRef();
   const paint2Ref = usePaintRef();

package/cpp/api/JsiSkPaint.h

@@ -215,9 +215,11 @@ Returns the underlying object from a host object of this type
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
+      auto paint = SkPaint();
+      paint.setAntiAlias(true);
       // Return the newly constructed object
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkPaint>(std::move(context), SkPaint()));
+          runtime, std::make_shared<JsiSkPaint>(std::move(context), paint));
     };
   }
 };

package/src/__tests__/snapshots/transform/rectangles.png

@@ -18,7 +18,6 @@ import ReactReconciler from "react-reconciler";
 
 import { SkiaView, useDrawCallback } from "../views";
 import type { TouchHandler } from "../views";
-import { defaultSkiaPaint } from "../skia/types";
 import type { FontMgr } from "../skia/types";
 import { useValue } from "../values/hooks/useValue";
 import { Skia } from "../skia/Skia";
@@ -97,7 +96,7 @@ export const Canvas = forwardRef<SkiaView, CanvasProps>(
         ) {
           canvasCtx.size.current = { width, height };
         }
-        const paint = defaultSkiaPaint(Skia.Paint());
+        const paint = Skia.Paint();
         const ctx = {
           width,
           height,

package/src/__tests__/snapshots/transform/rotate.png

@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
 import React, { useMemo } from "react";
 
-import { BlendMode, defaultSkiaPaint } from "../../skia/types";
+import { BlendMode } from "../../skia/types";
 import { useCanvas } from "../useCanvas";
 
 import { Group } from "./Group";
@@ -16,15 +16,15 @@ interface MaskProps {
 export const Mask = ({ children, mask, mode, clip }: MaskProps) => {
   const { Skia } = useCanvas();
   const maskPaint = useMemo(() => {
-    const paint = defaultSkiaPaint(Skia.Paint());
+    const paint = Skia.Paint();
     paint.setBlendMode(BlendMode.Src);
     if (mode === "luminance") {
       paint.setColorFilter(Skia.ColorFilter.MakeLumaColorFilter());
     }
     return paint;
   }, [Skia, mode]);
   const clippingPaint = useMemo(() => {
-    const paint = defaultSkiaPaint(Skia.Paint());
+    const paint = Skia.Paint();
     paint.setBlendMode(BlendMode.DstIn);
     return paint;
   }, [Skia]);

package/src/__tests__/snapshots/transform/scale.png

@@ -6,7 +6,6 @@ import type { CustomPaintProps, AnimatedProps } from "../processors";
 import { processPaint } from "../processors";
 import { createDeclaration } from "../nodes";
 import { useCanvas } from "../useCanvas";
-import { defaultSkiaPaint } from "../../skia/types";
 
 export const usePaintRef = () => useRef<SkPaint>(null);
 
@@ -17,7 +16,7 @@ export interface PaintProps extends Omit<CustomPaintProps, "paint"> {
 export const Paint = forwardRef<SkPaint, AnimatedProps<PaintProps>>(
   (props, ref) => {
     const { Skia } = useCanvas();
-    const paint = useMemo(() => defaultSkiaPaint(Skia.Paint()), [Skia]);
+    const paint = useMemo(() => Skia.Paint(), [Skia]);
     useImperativeHandle(ref, () => paint, [paint]);
     const onDeclare = useMemo(
       () =>

package/src/__tests__/snapshots/transform/skew.png

@@ -3,9 +3,6 @@ import { useMemo } from "react";
 
 import { Skia } from "../Skia";
 import type { SkPaint } from "../types";
-import { defaultSkiaPaint } from "../types/Paint/Paint";
-
-export const SkiaPaint = () => defaultSkiaPaint(Skia.Paint());
 
 /**
  * Returns a Skia Paint object
@@ -15,7 +12,7 @@ export const usePaint = (
   deps?: DependencyList
 ) =>
   useMemo(() => {
-    const p = SkiaPaint();
+    const p = Skia.Paint();
     if (initializer) {
       initializer(p);
     }