@shopify/react-native-skia 2.11.0 → 2.11.2-next.1

package/src/renderer/components/Mask.tsx

@@ -20,17 +20,24 @@ export const Mask = ({
 }: MaskProps) => {
   return (
     <Group layer>
+      {children}
+      {/* The children composite against each other in the layer above; the
+          mask is then applied once, when its own layer is restored. A blend
+          mode attached to a <Group> without a layer would instead be applied
+          per draw call, compositing every child after the first against the
+          previous child rather than against the mask (issue #3254).
+          dstIn keeps the children where the mask is opaque and erases them
+          where it is transparent. Without clip, dstATop additionally keeps
+          the mask artwork itself wherever the children leave it uncovered. */}
       <Group
         layer={
-          <Paint blendMode="src">
+          <Paint blendMode={clip ? "dstIn" : "dstATop"}>
             {mode === "luminance" && <LumaColorFilter />}
           </Paint>
         }
       >
         {mask}
-        {clip && <Group layer={<Paint blendMode="dstIn" />}>{children}</Group>}
       </Group>
-      <Group blendMode="srcIn">{children}</Group>
     </Group>
   );
 };

package/src/skia/types/JsiInstance.ts

@@ -1,3 +1,5 @@
+/// <reference lib="esnext.disposable" preserve="true" />
+
 export interface SkJSIInstance<T extends string> extends Disposable {
   __typename__: T;
   dispose(): void;

package/src/skia/types/Matrix4.ts

@@ -190,12 +190,16 @@ export const multiply4 = (a: Matrix4, b: Matrix4): Matrix4 => {
   return result as unknown as Matrix4;
 };
 
-const skewY = (angle: number): Matrix4 => {
+// These matrices are row-major, so the shear factor of skewX - which offsets x
+// in proportion to y - belongs in row 0, column 1, and skewY's in row 1,
+// column 0. React Native's MatrixMath stores the same transforms column-major,
+// and porting its indices verbatim is what swapped the two axes here.
+const skewX = (angle: number): Matrix4 => {
   "worklet";
   return [1, Math.tan(angle), 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
 };
 
-const skewX = (angle: number): Matrix4 => {
+const skewY = (angle: number): Matrix4 => {
   "worklet";
   return [1, 0, 0, 0, Math.tan(angle), 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
 };

package/src/skia/types/Skia.ts

@@ -21,7 +21,7 @@ import type { SkVertices, VertexMode } from "./Vertices/Vertices";
 import type { DataFactory } from "./Data";
 import type { SVGFactory } from "./SVG";
 import type { TextBlobFactory } from "./TextBlob";
-import type { SkSurface, SurfaceFactory } from "./Surface";
+import type { SurfaceFactory } from "./Surface";
 import type { SkRSXform } from "./RSXform";
 import type { SkPath } from "./Path/Path";
 import type { SkContourMeasureIter } from "./ContourMeasure";
@@ -35,11 +35,6 @@ import type { NativeBufferFactory } from "./NativeBuffer";
 import type { JsiRecorder } from "./Recorder";
 import type { SkottieFactory } from "./Skottie";
 
-export interface SkiaContext {
-  getSurface(): SkSurface;
-  present(): void;
-}
-
 /**
  * Declares the interface for the native Skia API
  */
@@ -106,7 +101,6 @@ export interface Skia {
   ParagraphBuilder: ParagraphBuilderFactory;
   Skottie: SkottieFactory;
   Video: (url: string) => Promise<Video> | Video;
-  Context(surface: bigint, width: number, height: number): SkiaContext;
   NativeBuffer: NativeBufferFactory;
   Recorder(): JsiRecorder;
   /**

package/src/skia/web/JsiSkia.ts

@@ -4,7 +4,6 @@ import type {
   JsiRecorder,
   SkContourMeasureIter,
   Skia,
-  SkiaContext,
   SkPath,
   SkRect,
   SkRuntimeEffect,
@@ -137,9 +136,6 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   NativeBuffer: new JsiSkNativeBufferFactory(CanvasKit),
   Skottie: new JsiSkottieFactory(CanvasKit),
   Video: createVideo.bind(null, CanvasKit),
-  Context: (_surface: bigint, _width: number, _height: number) => {
-    return throwNotImplementedOnRNWeb<SkiaContext>();
-  },
   Recorder: () => {
     return throwNotImplementedOnRNWeb<JsiRecorder>();
   },

package/src/sksg/Recorder/DrawingContext.ts

@@ -37,7 +37,10 @@ export const createDrawingContext = (
   if (paintPool.length === 0) {
     paintPool.push(Skia.Paint());
   } else {
+    // reset() produces an anti-alias false paint, unlike the Skia.Paint()
+    // factory: restore the default so reused pools render like the first frame.
     paintPool[0].reset();
+    paintPool[0].setAntiAlias(true);
   }
   paints.push(paintPool[0]);
   opacities.push(1);
@@ -56,6 +59,17 @@ export const createDrawingContext = (
     nextPaintIndex++;
   };
 
+  // Pushes an externally owned paint (the `paint` prop) onto the stack. It
+  // pushes a frame-scoped copy, like the C++ DrawingCtx: materializePaint()
+  // mutates the top of the stack, and those mutations must not leak into the
+  // user-owned paint. It must also push an opacity alongside it: restorePaint()
+  // pops both, so pushing only the paint would underflow the opacity stack and
+  // leak the enclosing group's opacity onto everything drawn afterwards.
+  const pushPaint = (paint: SkPaint) => {
+    paints.push(track(paint.copy()));
+    opacities.push(opacities[opacities.length - 1]);
+  };
+
   const getOpacity = () => {
     return opacities[opacities.length - 1];
   };
@@ -144,6 +158,7 @@ export const createDrawingContext = (
 
     // Public methods
     savePaint,
+    pushPaint,
     saveBackdropFilter,
     get paint() {
       return paints[paints.length - 1];

package/src/sksg/Recorder/Player.ts

@@ -123,7 +123,7 @@ const play = (ctx: DrawingContext, _command: Command) => {
     ctx.canvas.saveLayer(paint);
   } else if (isDrawCommand(command, CommandType.SavePaint)) {
     if (command.props.paint) {
-      ctx.paints.push(command.props.paint);
+      ctx.pushPaint(command.props.paint);
     } else {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const { standalone } = command as any;

package/src/sksg/Recorder/Visitor.ts

@@ -104,13 +104,16 @@ const processCTM = ({
   if (layer) {
     ctm.layer = layer;
   }
+  // Only record a CTM command when saveCTM() will actually save the canvas.
+  // saveCTM() saves on transform/matrix, clip or layer; restoreCTM() always
+  // restores, so recording a CTM that saves nothing - `origin` with no
+  // transform, `clip={false}` from a conditional, a bare `invertClip` - pops
+  // an enclosing save that belongs to an ancestor.
   if (
-    clip !== undefined ||
-    invertClip !== undefined ||
-    transform !== undefined ||
-    origin !== undefined ||
-    matrix !== undefined ||
-    layer !== undefined
+    ctm.clip !== undefined ||
+    ctm.transform !== undefined ||
+    ctm.matrix !== undefined ||
+    ctm.layer !== undefined
   ) {
     return ctm;
   }

package/src/sksg/Recorder/commands/Drawing.ts

@@ -217,6 +217,16 @@ export const drawPath = (ctx: DrawingContext, props: PathProps) => {
 
   let path = processPath(ctx.Skia, pathProps.path);
 
+  // Trim runs first, so start/end address the path the caller drew. Stroking
+  // first would replace it with its outline and leave the offsets walking that
+  // outline's perimeter instead. The native recorder orders these the same way.
+  if (hasStartOffset || hasEndOffset) {
+    const trimmed = ctx.Skia.Path.Trim(path, start, end, false);
+    if (trimmed) {
+      path = trimmed;
+    }
+  }
+
   // Apply fill type using PathBuilder
   if (hasFillType) {
     const builder = ctx.Skia.PathBuilder.MakeFromPath(path);
@@ -232,14 +242,6 @@ export const drawPath = (ctx: DrawingContext, props: PathProps) => {
     }
   }
 
-  // Apply trim using static Path.Trim
-  if (hasStartOffset || hasEndOffset) {
-    const trimmed = ctx.Skia.Path.Trim(path, start, end, false);
-    if (trimmed) {
-      path = trimmed;
-    }
-  }
-
   ctx.canvas.drawPath(path, ctx.paint);
 };
 

package/src/sksg/Recorder/commands/ImageFilters.ts

@@ -31,6 +31,14 @@ export enum MorphologyOperator {
 
 const Black = Float32Array.of(0, 0, 0, 1);
 
+// Turns the source graphic into a hard silhouette: alpha is multiplied by 255
+// and clamped, so any pixel the shape covers at all becomes fully opaque, and
+// the colour channels are dropped. 255 is the saturation point of an 8-bit
+// alpha channel, so one unit of coverage is enough to reach 1.
+const AlphaSaturate = [
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0,
+];
+
 const MakeInnerShadow = (
   Skia: Skia,
   shadowOnly: boolean | undefined,
@@ -50,9 +58,20 @@ const MakeInnerShadow = (
     Skia.ColorFilter.MakeBlend(Black, BlendMode.SrcIn),
     null
   );
+  // The shadow is generated outside the shape and then clipped back into it, so
+  // "outside" has to be the complement of the shape's silhouette. Taking SrcOut
+  // against the source graphic itself makes it the complement of the source's
+  // *alpha*: inside a translucent shape 1 - alpha is non-zero, so the shadow is
+  // generated across the whole interior and tints it, no matter how small the
+  // blur and the offset are (issue #2990). Saturating alpha first keeps the
+  // shadow tied to the shape's outline instead of to its opacity.
+  const coverage = Skia.ImageFilter.MakeColorFilter(
+    Skia.ColorFilter.MakeMatrix(AlphaSaturate),
+    null
+  );
   const f1 = Skia.ImageFilter.MakeColorFilter(
     Skia.ColorFilter.MakeBlend(color, BlendMode.SrcOut),
-    null
+    coverage
   );
   const f2 = Skia.ImageFilter.MakeOffset(dx, dy, f1);
   const f3 = Skia.ImageFilter.MakeBlur(sigmaX, sigmaY, TileMode.Decal, f2);

package/src/sksg/Recorder/commands/Shaders.ts

@@ -221,7 +221,7 @@ const declareImageShader = (ctx: DrawingContext, props: ImageShaderProps) => {
     );
   } else {
     shader = ctx.track(
-      image.makeShaderCubic(
+      image.makeShaderOptions(
         TileMode[enumKey(tx)],
         TileMode[enumKey(ty)],
         sampling?.filter ?? FilterMode.Linear,

package/src/views/SkiaPictureView.web.tsx

@@ -370,22 +370,27 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
   // - The renderer is created synchronously on mount (the canvas element is
   //   guaranteed to exist in useLayoutEffect; a zero size at that point is
   //   fine, the surface is created once the canvas is measurable).
-  // - Redraw requests coalesce into a single animation frame. A picture
-  //   dispatched before the canvas has a size stays in pictureRef (drawing
-  //   while unmeasured is a no-op) and is painted by the resize path below
-  //   once the canvas becomes measurable, so it is never lost.
+  // - Redraw requests coalesce into a single microtask. A microtask (not an
+  //   animation frame) so that a picture produced inside a rAF callback (the
+  //   Reanimated mapper) is drawn before the current frame paints: deferring
+  //   to the next rAF alternates between "flush pending in this frame" and
+  //   "flush scheduled for the next frame", drawing on every other frame
+  //   only and halving the effective frame rate. A picture dispatched before
+  //   the canvas has a size stays in pictureRef (drawing while unmeasured is
+  //   a no-op) and is painted by the resize path below once the canvas
+  //   becomes measurable, so it is never lost.
   // - A ResizeObserver on the canvas itself recreates the surface and repaints
   //   synchronously (its callbacks run after layout, before paint), and is
   //   also the source of the user-facing onLayout event.
   const redrawPendingRef = useRef(false);
-  const frameRef = useRef(0);
+  const flushScheduledRef = useRef(false);
   const onLayoutRef = useRef(onLayout);
   useLayoutEffect(() => {
     onLayoutRef.current = onLayout;
   }, [onLayout]);
 
   const flushRedraw = useCallback(() => {
-    frameRef.current = 0;
+    flushScheduledRef.current = false;
     if (redrawPendingRef.current && rendererRef.current && pictureRef.current) {
       redrawPendingRef.current = false;
       rendererRef.current.draw(pictureRef.current);
@@ -396,8 +401,9 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
 
   const redraw = useCallback(() => {
     redrawPendingRef.current = true;
-    if (frameRef.current === 0) {
-      frameRef.current = requestAnimationFrame(flushRedraw);
+    if (!flushScheduledRef.current) {
+      flushScheduledRef.current = true;
+      queueMicrotask(flushRedraw);
     }
   }, [flushRedraw]);
 
@@ -568,12 +574,9 @@ export const SkiaPictureView = (props: SkiaPictureViewProps) => {
     };
   }, [isStatic]);
 
-  useEffect(() => {
-    return () => {
-      cancelAnimationFrame(frameRef.current);
-      frameRef.current = 0;
-    };
-  }, []);
+  // No flush cancellation is needed on unmount: a microtask queued before
+  // unmount runs within the same task, and flushRedraw no-ops once the
+  // layout-effect cleanup has nulled rendererRef.
 
   useImperativeHandle(
     ref,

package/cpp/api/JsiSkiaContext.h

@@ -1,94 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <numeric>
-#include <utility>
-#include <variant>
-#include <vector>
-
-#include "JsiSkConverters.h"
-#include "JsiSkNativeObjects.h"
-#include "utils/RNSkLog.h"
-#include <jsi/jsi.h>
-
-#include "JsiSkPaint.h"
-#include "JsiSkPoint.h"
-#include "JsiSkRect.h"
-#include "JsiSkSurface.h"
-#include "JsiSkTypeface.h"
-
-#include "rnskia/RNWindowContext.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkFont.h"
-#include "include/core/SkFontMetrics.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-namespace jsi = facebook::jsi;
-
-class JsiSkiaContext
-    : public JsiSkWrappingSharedPtrNativeObject<JsiSkiaContext, WindowContext> {
-public:
-  static constexpr const char *CLASS_NAME = "SkiaContext";
-
-  std::variant<std::nullptr_t, std::shared_ptr<JsiSkSurface>> getSurface() {
-    auto surface = getObject()->getSurface();
-    if (surface == nullptr) {
-      return nullptr;
-    }
-    return std::make_shared<JsiSkSurface>(getContext(), std::move(surface));
-  }
-
-  void present() { getObject()->present(); }
-
-  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
-    installCommon(runtime, prototype);
-    installMethod(runtime, prototype, "getSurface",
-                  &JsiSkiaContext::getSurface);
-    installMethod(runtime, prototype, "present", &JsiSkiaContext::present);
-  }
-
-  JsiSkiaContext(std::shared_ptr<RNSkPlatformContext> context,
-                 std::shared_ptr<WindowContext> ctx)
-      : JsiSkWrappingSharedPtrNativeObject<JsiSkiaContext, WindowContext>(
-            std::move(context), std::move(ctx)) {}
-
-  size_t getMemoryPressure() override { return 10 * 1024 * 1024; }
-
-  /**
-   * Creates the function for construction a new instance of the SkFont
-   * wrapper
-   * @param context Platform context
-   * @return A function for creating a new host object wrapper for the SkFont
-   * class
-   */
-  static const jsi::HostFunctionType
-  createCtor(std::shared_ptr<RNSkPlatformContext> context) {
-    return JSI_HOST_FUNCTION_LAMBDA {
-      jsi::BigInt pointer = arguments[0].asBigInt(runtime);
-      const uintptr_t nativeBufferPointer = pointer.asUint64(runtime);
-      void *surface = reinterpret_cast<void *>(nativeBufferPointer);
-      auto width = static_cast<int>(arguments[1].asNumber());
-      auto height = static_cast<int>(arguments[2].asNumber());
-      if (surface == nullptr) {
-        throw std::runtime_error("Surface is null");
-      }
-      auto result =
-          context->makeContextFromNativeSurface(surface, width, height);
-      if (result == nullptr) {
-        throw std::runtime_error(
-            "Couldn't create a Skia context from the native surface");
-      }
-      // Return the newly constructed object
-      return makeJsiObject(runtime, std::make_shared<JsiSkiaContext>(
-                                        context, std::move(result)));
-    };
-  }
-};
-
-} // namespace RNSkia