@shopify/react-native-skia 2.6.8 → 2.7.0

package/lib/commonjs/mock/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_web","require","_JsiSkImage","Noop","undefined","NoopValue","current","NoopSharedValue","value","Mock","CanvasKit","global","SkiaApi","JsiSkApi","Skia","Canvas","View","WebGPUCanvas","SkiaPictureView","JsiSkImage","drawAsPicture","drawAsImage","drawAsImageFromPicture","useCanvasRef","useCanvasSize","ref","size","width","height","useValue","useComputedValue","useTiming","useLoop","useSpring","useClockValue","useValueEffect","isOnMainThread","isFabric","useClock","usePathInterpolation","useImageAsTexture","useTextureValue","useTextureValueFromPicture","useRSXformBuffer","usePointBuffer","useColorBuffer","useRectBuffer","useBuffer","useRawData","useData","useFont","Font","useFonts","useTypeface","useImage","useSVG","useVideo","exports"],"sources":["index.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport { JsiSkApi } from \"../skia/web\";\nimport { JsiSkImage } from \"../skia/web/JsiSkImage\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst Noop: () => any = () => undefined;\nconst NoopValue = () => ({ current: 0 });\nconst NoopSharedValue = () => ({ value: 0 });\n\nexport const Mock = (CanvasKit: CanvasKit) => {\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  global.SkiaApi = JsiSkApi(CanvasKit);\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  const Skia = global.SkiaApi;\n  return {\n    Skia,\n    ...require(\"../renderer/components\"),\n    ...require(\"../skia\"),\n    ...require(\"../animation\"),\n    ...require(\"../dom/types\"),\n    ...require(\"../dom/nodes\"),\n    Canvas: require(\"react-native\").View,\n    WebGPUCanvas: require(\"react-native\").View,\n    SkiaPictureView: require(\"react-native\").View,\n    JsiSkImage: JsiSkImage,\n    drawAsPicture: Noop,\n    drawAsImage: Noop,\n    drawAsImageFromPicture: Noop,\n    useCanvasRef: NoopValue,\n    useCanvasSize: () => ({\n      ref: {\n        current: 0,\n      },\n      size: {\n        width: 0,\n        height: 0,\n      },\n    }),\n    // Skia Animations\n    useValue: NoopValue,\n    useComputedValue: NoopValue,\n    useTiming: NoopValue,\n    useLoop: NoopValue,\n    useSpring: NoopValue,\n    useClockValue: NoopValue,\n    useValueEffect: Noop,\n    // Reanimated hooks\n    isOnMainThread: () => true,\n    isFabric: true,\n    useClock: NoopSharedValue,\n    usePathInterpolation: NoopSharedValue,\n    useImageAsTexture: NoopSharedValue,\n    useTextureValue: NoopSharedValue,\n    useTextureValueFromPicture: NoopSharedValue,\n    useRSXformBuffer: NoopSharedValue,\n    usePointBuffer: NoopSharedValue,\n    useColorBuffer: NoopSharedValue,\n    useRectBuffer: NoopSharedValue,\n    useBuffer: NoopSharedValue,\n    useRawData: Noop,\n    useData: Noop,\n    useFont: () => Skia.Font(undefined, 0),\n    useFonts: Noop,\n    useTypeface: () => null,\n    useImage: () => null,\n    useSVG: () => null,\n    useVideo: () => null,\n  };\n};\n"],"mappings":";;;;;;AAEA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA;AACA,MAAME,IAAe,GAAGA,CAAA,KAAMC,SAAS;AACvC,MAAMC,SAAS,GAAGA,CAAA,MAAO;EAAEC,OAAO,EAAE;AAAE,CAAC,CAAC;AACxC,MAAMC,eAAe,GAAGA,CAAA,MAAO;EAAEC,KAAK,EAAE;AAAE,CAAC,CAAC;AAErC,MAAMC,IAAI,GAAIC,SAAoB,IAAK;EAC5C;EACA;EACAC,MAAM,CAACC,OAAO,GAAG,IAAAC,aAAQ,EAACH,SAAS,CAAC;EACpC;EACA;EACA,MAAMI,IAAI,GAAGH,MAAM,CAACC,OAAO;EAC3B,OAAO;IACLE,IAAI;IACJ,GAAGb,OAAO,CAAC,wBAAwB,CAAC;IACpC,GAAGA,OAAO,CAAC,SAAS,CAAC;IACrB,GAAGA,OAAO,CAAC,cAAc,CAAC;IAC1B,GAAGA,OAAO,CAAC,cAAc,CAAC;IAC1B,GAAGA,OAAO,CAAC,cAAc,CAAC;IAC1Bc,MAAM,EAAEd,OAAO,CAAC,cAAc,CAAC,CAACe,IAAI;IACpCC,YAAY,EAAEhB,OAAO,CAAC,cAAc,CAAC,CAACe,IAAI;IAC1CE,eAAe,EAAEjB,OAAO,CAAC,cAAc,CAAC,CAACe,IAAI;IAC7CG,UAAU,EAAEA,sBAAU;IACtBC,aAAa,EAAEjB,IAAI;IACnBkB,WAAW,EAAElB,IAAI;IACjBmB,sBAAsB,EAAEnB,IAAI;IAC5BoB,YAAY,EAAElB,SAAS;IACvBmB,aAAa,EAAEA,CAAA,MAAO;MACpBC,GAAG,EAAE;QACHnB,OAAO,EAAE;MACX,CAAC;MACDoB,IAAI,EAAE;QACJC,KAAK,EAAE,CAAC;QACRC,MAAM,EAAE;MACV;IACF,CAAC,CAAC;IACF;IACAC,QAAQ,EAAExB,SAAS;IACnByB,gBAAgB,EAAEzB,SAAS;IAC3B0B,SAAS,EAAE1B,SAAS;IACpB2B,OAAO,EAAE3B,SAAS;IAClB4B,SAAS,EAAE5B,SAAS;IACpB6B,aAAa,EAAE7B,SAAS;IACxB8B,cAAc,EAAEhC,IAAI;IACpB;IACAiC,cAAc,EAAEA,CAAA,KAAM,IAAI;IAC1BC,QAAQ,EAAE,IAAI;IACdC,QAAQ,EAAE/B,eAAe;IACzBgC,oBAAoB,EAAEhC,eAAe;IACrCiC,iBAAiB,EAAEjC,eAAe;IAClCkC,eAAe,EAAElC,eAAe;IAChCmC,0BAA0B,EAAEnC,eAAe;IAC3CoC,gBAAgB,EAAEpC,eAAe;IACjCqC,cAAc,EAAErC,eAAe;IAC/BsC,cAAc,EAAEtC,eAAe;IAC/BuC,aAAa,EAAEvC,eAAe;IAC9BwC,SAAS,EAAExC,eAAe;IAC1ByC,UAAU,EAAE7C,IAAI;IAChB8C,OAAO,EAAE9C,IAAI;IACb+C,OAAO,EAAEA,CAAA,KAAMpC,IAAI,CAACqC,IAAI,CAAC/C,SAAS,EAAE,CAAC,CAAC;IACtCgD,QAAQ,EAAEjD,IAAI;IACdkD,WAAW,EAAEA,CAAA,KAAM,IAAI;IACvBC,QAAQ,EAAEA,CAAA,KAAM,IAAI;IACpBC,MAAM,EAAEA,CAAA,KAAM,IAAI;IAClBC,QAAQ,EAAEA,CAAA,KAAM;EAClB,CAAC;AACH,CAAC;AAACC,OAAA,CAAAhD,IAAA,GAAAA,IAAA","ignoreList":[]}
+{"version":3,"names":["_web","require","_JsiSkImage","Noop","undefined","NoopValue","current","NoopSharedValue","value","Mock","CanvasKit","global","SkiaApi","JsiSkApi","Skia","Canvas","View","WebGPUCanvas","getPreferredHighBitDepthCanvasFormat","SkiaPictureView","JsiSkImage","drawAsPicture","drawAsImage","drawAsImageFromPicture","useCanvasRef","useCanvasSize","ref","size","width","height","useValue","useComputedValue","useTiming","useLoop","useSpring","useClockValue","useValueEffect","isOnMainThread","isFabric","useClock","usePathInterpolation","useImageAsTexture","useTextureValue","useTextureValueFromPicture","useRSXformBuffer","usePointBuffer","useColorBuffer","useRectBuffer","useBuffer","useRawData","useData","useFont","Font","useFonts","useTypeface","useImage","useSVG","useVideo","exports"],"sources":["index.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport { JsiSkApi } from \"../skia/web\";\nimport { JsiSkImage } from \"../skia/web/JsiSkImage\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst Noop: () => any = () => undefined;\nconst NoopValue = () => ({ current: 0 });\nconst NoopSharedValue = () => ({ value: 0 });\n\nexport const Mock = (CanvasKit: CanvasKit) => {\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  global.SkiaApi = JsiSkApi(CanvasKit);\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  const Skia = global.SkiaApi;\n  return {\n    Skia,\n    ...require(\"../renderer/components\"),\n    ...require(\"../skia\"),\n    ...require(\"../animation\"),\n    ...require(\"../dom/types\"),\n    ...require(\"../dom/nodes\"),\n    Canvas: require(\"react-native\").View,\n    WebGPUCanvas: require(\"react-native\").View,\n    getPreferredHighBitDepthCanvasFormat: () => \"rgba16float\",\n    SkiaPictureView: require(\"react-native\").View,\n    JsiSkImage: JsiSkImage,\n    drawAsPicture: Noop,\n    drawAsImage: Noop,\n    drawAsImageFromPicture: Noop,\n    useCanvasRef: NoopValue,\n    useCanvasSize: () => ({\n      ref: {\n        current: 0,\n      },\n      size: {\n        width: 0,\n        height: 0,\n      },\n    }),\n    // Skia Animations\n    useValue: NoopValue,\n    useComputedValue: NoopValue,\n    useTiming: NoopValue,\n    useLoop: NoopValue,\n    useSpring: NoopValue,\n    useClockValue: NoopValue,\n    useValueEffect: Noop,\n    // Reanimated hooks\n    isOnMainThread: () => true,\n    isFabric: true,\n    useClock: NoopSharedValue,\n    usePathInterpolation: NoopSharedValue,\n    useImageAsTexture: NoopSharedValue,\n    useTextureValue: NoopSharedValue,\n    useTextureValueFromPicture: NoopSharedValue,\n    useRSXformBuffer: NoopSharedValue,\n    usePointBuffer: NoopSharedValue,\n    useColorBuffer: NoopSharedValue,\n    useRectBuffer: NoopSharedValue,\n    useBuffer: NoopSharedValue,\n    useRawData: Noop,\n    useData: Noop,\n    useFont: () => Skia.Font(undefined, 0),\n    useFonts: Noop,\n    useTypeface: () => null,\n    useImage: () => null,\n    useSVG: () => null,\n    useVideo: () => null,\n  };\n};\n"],"mappings":";;;;;;AAEA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA;AACA,MAAME,IAAe,GAAGA,CAAA,KAAMC,SAAS;AACvC,MAAMC,SAAS,GAAGA,CAAA,MAAO;EAAEC,OAAO,EAAE;AAAE,CAAC,CAAC;AACxC,MAAMC,eAAe,GAAGA,CAAA,MAAO;EAAEC,KAAK,EAAE;AAAE,CAAC,CAAC;AAErC,MAAMC,IAAI,GAAIC,SAAoB,IAAK;EAC5C;EACA;EACAC,MAAM,CAACC,OAAO,GAAG,IAAAC,aAAQ,EAACH,SAAS,CAAC;EACpC;EACA;EACA,MAAMI,IAAI,GAAGH,MAAM,CAACC,OAAO;EAC3B,OAAO;IACLE,IAAI;IACJ,GAAGb,OAAO,CAAC,wBAAwB,CAAC;IACpC,GAAGA,OAAO,CAAC,SAAS,CAAC;IACrB,GAAGA,OAAO,CAAC,cAAc,CAAC;IAC1B,GAAGA,OAAO,CAAC,cAAc,CAAC;IAC1B,GAAGA,OAAO,CAAC,cAAc,CAAC;IAC1Bc,MAAM,EAAEd,OAAO,CAAC,cAAc,CAAC,CAACe,IAAI;IACpCC,YAAY,EAAEhB,OAAO,CAAC,cAAc,CAAC,CAACe,IAAI;IAC1CE,oCAAoC,EAAEA,CAAA,KAAM,aAAa;IACzDC,eAAe,EAAElB,OAAO,CAAC,cAAc,CAAC,CAACe,IAAI;IAC7CI,UAAU,EAAEA,sBAAU;IACtBC,aAAa,EAAElB,IAAI;IACnBmB,WAAW,EAAEnB,IAAI;IACjBoB,sBAAsB,EAAEpB,IAAI;IAC5BqB,YAAY,EAAEnB,SAAS;IACvBoB,aAAa,EAAEA,CAAA,MAAO;MACpBC,GAAG,EAAE;QACHpB,OAAO,EAAE;MACX,CAAC;MACDqB,IAAI,EAAE;QACJC,KAAK,EAAE,CAAC;QACRC,MAAM,EAAE;MACV;IACF,CAAC,CAAC;IACF;IACAC,QAAQ,EAAEzB,SAAS;IACnB0B,gBAAgB,EAAE1B,SAAS;IAC3B2B,SAAS,EAAE3B,SAAS;IACpB4B,OAAO,EAAE5B,SAAS;IAClB6B,SAAS,EAAE7B,SAAS;IACpB8B,aAAa,EAAE9B,SAAS;IACxB+B,cAAc,EAAEjC,IAAI;IACpB;IACAkC,cAAc,EAAEA,CAAA,KAAM,IAAI;IAC1BC,QAAQ,EAAE,IAAI;IACdC,QAAQ,EAAEhC,eAAe;IACzBiC,oBAAoB,EAAEjC,eAAe;IACrCkC,iBAAiB,EAAElC,eAAe;IAClCmC,eAAe,EAAEnC,eAAe;IAChCoC,0BAA0B,EAAEpC,eAAe;IAC3CqC,gBAAgB,EAAErC,eAAe;IACjCsC,cAAc,EAAEtC,eAAe;IAC/BuC,cAAc,EAAEvC,eAAe;IAC/BwC,aAAa,EAAExC,eAAe;IAC9ByC,SAAS,EAAEzC,eAAe;IAC1B0C,UAAU,EAAE9C,IAAI;IAChB+C,OAAO,EAAE/C,IAAI;IACbgD,OAAO,EAAEA,CAAA,KAAMrC,IAAI,CAACsC,IAAI,CAAChD,SAAS,EAAE,CAAC,CAAC;IACtCiD,QAAQ,EAAElD,IAAI;IACdmD,WAAW,EAAEA,CAAA,KAAM,IAAI;IACvBC,QAAQ,EAAEA,CAAA,KAAM,IAAI;IACpBC,MAAM,EAAEA,CAAA,KAAM,IAAI;IAClBC,QAAQ,EAAEA,CAAA,KAAM;EAClB,CAAC;AACH,CAAC;AAACC,OAAA,CAAAjD,IAAA,GAAAA,IAAA","ignoreList":[]}

package/lib/commonjs/renderer/Canvas.d.ts

@@ -24,8 +24,17 @@ export interface CanvasProps extends Omit<ViewProps, "onLayout"> {
     opaque?: boolean;
     onSize?: SharedValue<SkSize>;
     colorSpace?: "p3" | "srgb";
+    /**
+     * Renders into a surface with more than 8 bits per channel (16-bit float on
+     * iOS, 10-bit on Android) to avoid banding in subtle gradients. Colors are
+     * identical to the default 8-bit surface, only with more precision (this is
+     * about bit depth, not HDR). On Android the extra precision survives
+     * composition only when combined with `opaque`, and the prop must be set
+     * before the canvas is mounted.
+     */
+    highBitDepth?: boolean;
     ref?: React.Ref<CanvasRef>;
     androidWarmup?: boolean;
     __destroyWebGLContextAfterRender?: boolean;
 }
-export declare const Canvas: ({ debug, opaque, children, onSize, colorSpace, androidWarmup, ref, onLayout, ...viewProps }: CanvasProps) => React.JSX.Element;
+export declare const Canvas: ({ debug, opaque, children, onSize, colorSpace, highBitDepth, androidWarmup, ref, onLayout, ...viewProps }: CanvasProps) => React.JSX.Element;

package/lib/commonjs/renderer/Canvas.js

@@ -54,6 +54,7 @@ const Canvas = ({
   children,
   onSize,
   colorSpace = "p3",
+  highBitDepth = false,
   androidWarmup = false,
   ref,
   onLayout,
@@ -159,6 +160,7 @@ const Canvas = ({
     debug: debug,
     opaque: opaque,
     colorSpace: colorSpace,
+    highBitDepth: highBitDepth,
     androidWarmup: androidWarmup,
     onLayout: _Platform.Platform.OS === "web" && (onSize || onLayout) ? onLayoutWeb : onLayout
   }, viewProps));

package/lib/commonjs/renderer/Canvas.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_ReanimatedProxy","_interopRequireDefault","_SkiaViewNativeId","_SkiaPictureViewNativeComponent","_Reconciler","_skia","_Platform","_external","_global","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","_extends","assign","bind","arguments","length","apply","useCanvasRef","useRef","exports","useReanimatedFrame","HAS_REANIMATED_3","Rea","useFrameCallback","measure","useCanvasRefPriv","useAnimatedRef","useCanvasSize","userRef","ourRef","ref","size","setSize","useState","width","height","useLayoutEffect","current","_x","_y","isFabric","Boolean","global","nativeFabricUIManager","Canvas","debug","opaque","children","onSize","colorSpace","androidWarmup","onLayout","viewProps","console","error","viewRef","nativeId","useMemo","SkiaViewNativeId","root","SkiaSGRoot","Skia","_viewRef$current","result","Platform","OS","canvasRef","value","render","useEffect","unmount","useImperativeHandle","makeImageSnapshot","rect","SkiaViewApi","makeImageSnapshotAsync","redraw","requestRedraw","getNativeId","callback","_viewRef$current2","measureInWindow","_viewRef$current3","onLayoutWeb","useCallback","nativeEvent","layout","createElement","collapsable","nativeID"],"sources":["Canvas.tsx"],"sourcesContent":["import type { FC, RefObject } from \"react\";\nimport React, {\n  useCallback,\n  useEffect,\n  useImperativeHandle,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport type {\n  LayoutChangeEvent,\n  MeasureInWindowOnSuccessCallback,\n  MeasureOnSuccessCallback,\n  View,\n  ViewProps,\n} from \"react-native\";\nimport type { SharedValue } from \"react-native-reanimated\";\n\nimport Rea from \"../external/reanimated/ReanimatedProxy\";\nimport { SkiaViewNativeId } from \"../views/SkiaViewNativeId\";\nimport SkiaPictureViewNativeComponent from \"../specs/SkiaPictureViewNativeComponent\";\nimport type { SkImage, SkRect, SkSize } from \"../skia/types\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { HAS_REANIMATED_3 } from \"../external\";\n\nexport interface CanvasRef extends FC<CanvasProps> {\n  makeImageSnapshot(rect?: SkRect): SkImage;\n  makeImageSnapshotAsync(rect?: SkRect): Promise<SkImage>;\n  redraw(): void;\n  getNativeId(): number;\n  measure(callback: MeasureOnSuccessCallback): void;\n  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;\n}\n\nexport const useCanvasRef = () => useRef<CanvasRef>(null);\n\nconst useReanimatedFrame = !HAS_REANIMATED_3 ? () => {} : Rea.useFrameCallback;\nconst measure = !HAS_REANIMATED_3 ? null : Rea.measure;\n\nconst useCanvasRefPriv: typeof useRef<View> = !HAS_REANIMATED_3\n  ? useRef\n  : Rea.useAnimatedRef;\n\nexport const useCanvasSize = (userRef?: RefObject<CanvasRef | null>) => {\n  const ourRef = useCanvasRef();\n  const ref = userRef ?? ourRef;\n  const [size, setSize] = useState<SkSize>({ width: 0, height: 0 });\n  useLayoutEffect(() => {\n    if (ref.current) {\n      ref.current.measure((_x, _y, width, height) => {\n        setSize({ width, height });\n      });\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n  return { ref, size };\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport const isFabric = Boolean((global as any)?.nativeFabricUIManager);\n\nexport interface CanvasProps extends Omit<ViewProps, \"onLayout\"> {\n  debug?: boolean;\n  /** @deprecated Not supported on Fabric. Use `onSize` or `useCanvasSize()` instead. */\n  onLayout?: ViewProps[\"onLayout\"];\n  opaque?: boolean;\n  onSize?: SharedValue<SkSize>;\n  colorSpace?: \"p3\" | \"srgb\";\n  ref?: React.Ref<CanvasRef>;\n  androidWarmup?: boolean;\n  __destroyWebGLContextAfterRender?: boolean;\n}\n\nexport const Canvas = ({\n  debug,\n  opaque,\n  children,\n  onSize,\n  colorSpace = \"p3\",\n  androidWarmup = false,\n  ref,\n  onLayout,\n  ...viewProps\n}: CanvasProps) => {\n  if (onLayout && isFabric) {\n    console.error(\n      \"<Canvas onLayout={onLayout} /> is not supported on the new architecture, to fix the issue, see: https://shopify.github.io/react-native-skia/docs/canvas/overview/#getting-the-canvas-size\"\n    );\n  }\n  const viewRef = useCanvasRefPriv(null);\n  // Native ID\n  const nativeId = useMemo(() => {\n    return SkiaViewNativeId.current++;\n  }, []);\n\n  // Root\n  const root = useMemo(() => new SkiaSGRoot(Skia, nativeId), [nativeId]);\n\n  useReanimatedFrame(() => {\n    \"worklet\";\n    if (onSize && measure) {\n      const result =\n        // eslint-disable-next-line no-nested-ternary\n        Platform.OS === \"web\"\n          ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-expect-error\n            viewRef.current?.canvasRef\n            ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n              // @ts-expect-error\n              measure(viewRef.current.canvasRef)\n            : { width: 0, height: 0 }\n          : // eslint-disable-next-line @typescript-eslint/no-explicit-any\n            measure(viewRef as any);\n      if (result) {\n        const { width, height } = result;\n        if (onSize.value.width !== width || onSize.value.height !== height) {\n          onSize.value = { width, height };\n        }\n      }\n    }\n  }, !!onSize);\n\n  // Render effects\n  useLayoutEffect(() => {\n    root.render(children);\n  }, [children, root, nativeId]);\n\n  useEffect(() => {\n    return () => {\n      root.unmount();\n    };\n  }, [root]);\n\n  // Component methods\n  useImperativeHandle(\n    ref,\n    () =>\n      ({\n        makeImageSnapshot: (rect?: SkRect) => {\n          return SkiaViewApi.makeImageSnapshot(nativeId, rect);\n        },\n        makeImageSnapshotAsync: (rect?: SkRect) => {\n          return SkiaViewApi.makeImageSnapshotAsync(nativeId, rect);\n        },\n        redraw: () => {\n          SkiaViewApi.requestRedraw(nativeId);\n        },\n        getNativeId: () => {\n          return nativeId;\n        },\n        measure: (callback) => {\n          viewRef.current?.measure(callback);\n        },\n        measureInWindow: (callback) => {\n          viewRef.current?.measureInWindow(callback);\n        },\n      }) as CanvasRef\n  );\n\n  const onLayoutWeb = useCallback(\n    (e: LayoutChangeEvent) => {\n      if (onLayout) {\n        onLayout(e);\n      }\n      if (Platform.OS === \"web\" && onSize) {\n        const { width, height } = e.nativeEvent.layout;\n        onSize.value = { width, height };\n      }\n    },\n    [onLayout, onSize]\n  );\n  return (\n    <SkiaPictureViewNativeComponent\n      ref={viewRef}\n      collapsable={false}\n      nativeID={`${nativeId}`}\n      debug={debug}\n      opaque={opaque}\n      colorSpace={colorSpace}\n      androidWarmup={androidWarmup}\n      onLayout={\n        Platform.OS === \"web\" && (onSize || onLayout) ? onLayoutWeb : onLayout\n      }\n      {...viewProps}\n    />\n  );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_ReanimatedProxy","_interopRequireDefault","_SkiaViewNativeId","_SkiaPictureViewNativeComponent","_Reconciler","_skia","_Platform","_external","_global","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","_extends","assign","bind","arguments","length","apply","useCanvasRef","useRef","exports","useReanimatedFrame","HAS_REANIMATED_3","Rea","useFrameCallback","measure","useCanvasRefPriv","useAnimatedRef","useCanvasSize","userRef","ourRef","ref","size","setSize","useState","width","height","useLayoutEffect","current","_x","_y","isFabric","Boolean","global","nativeFabricUIManager","Canvas","debug","opaque","children","onSize","colorSpace","highBitDepth","androidWarmup","onLayout","viewProps","console","error","viewRef","nativeId","useMemo","SkiaViewNativeId","root","SkiaSGRoot","Skia","_viewRef$current","result","Platform","OS","canvasRef","value","render","useEffect","unmount","useImperativeHandle","makeImageSnapshot","rect","SkiaViewApi","makeImageSnapshotAsync","redraw","requestRedraw","getNativeId","callback","_viewRef$current2","measureInWindow","_viewRef$current3","onLayoutWeb","useCallback","nativeEvent","layout","createElement","collapsable","nativeID"],"sources":["Canvas.tsx"],"sourcesContent":["import type { FC, RefObject } from \"react\";\nimport React, {\n  useCallback,\n  useEffect,\n  useImperativeHandle,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useState,\n} from \"react\";\nimport type {\n  LayoutChangeEvent,\n  MeasureInWindowOnSuccessCallback,\n  MeasureOnSuccessCallback,\n  View,\n  ViewProps,\n} from \"react-native\";\nimport type { SharedValue } from \"react-native-reanimated\";\n\nimport Rea from \"../external/reanimated/ReanimatedProxy\";\nimport { SkiaViewNativeId } from \"../views/SkiaViewNativeId\";\nimport SkiaPictureViewNativeComponent from \"../specs/SkiaPictureViewNativeComponent\";\nimport type { SkImage, SkRect, SkSize } from \"../skia/types\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { HAS_REANIMATED_3 } from \"../external\";\n\nexport interface CanvasRef extends FC<CanvasProps> {\n  makeImageSnapshot(rect?: SkRect): SkImage;\n  makeImageSnapshotAsync(rect?: SkRect): Promise<SkImage>;\n  redraw(): void;\n  getNativeId(): number;\n  measure(callback: MeasureOnSuccessCallback): void;\n  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;\n}\n\nexport const useCanvasRef = () => useRef<CanvasRef>(null);\n\nconst useReanimatedFrame = !HAS_REANIMATED_3 ? () => {} : Rea.useFrameCallback;\nconst measure = !HAS_REANIMATED_3 ? null : Rea.measure;\n\nconst useCanvasRefPriv: typeof useRef<View> = !HAS_REANIMATED_3\n  ? useRef\n  : Rea.useAnimatedRef;\n\nexport const useCanvasSize = (userRef?: RefObject<CanvasRef | null>) => {\n  const ourRef = useCanvasRef();\n  const ref = userRef ?? ourRef;\n  const [size, setSize] = useState<SkSize>({ width: 0, height: 0 });\n  useLayoutEffect(() => {\n    if (ref.current) {\n      ref.current.measure((_x, _y, width, height) => {\n        setSize({ width, height });\n      });\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n  return { ref, size };\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport const isFabric = Boolean((global as any)?.nativeFabricUIManager);\n\nexport interface CanvasProps extends Omit<ViewProps, \"onLayout\"> {\n  debug?: boolean;\n  /** @deprecated Not supported on Fabric. Use `onSize` or `useCanvasSize()` instead. */\n  onLayout?: ViewProps[\"onLayout\"];\n  opaque?: boolean;\n  onSize?: SharedValue<SkSize>;\n  colorSpace?: \"p3\" | \"srgb\";\n  /**\n   * Renders into a surface with more than 8 bits per channel (16-bit float on\n   * iOS, 10-bit on Android) to avoid banding in subtle gradients. Colors are\n   * identical to the default 8-bit surface, only with more precision (this is\n   * about bit depth, not HDR). On Android the extra precision survives\n   * composition only when combined with `opaque`, and the prop must be set\n   * before the canvas is mounted.\n   */\n  highBitDepth?: boolean;\n  ref?: React.Ref<CanvasRef>;\n  androidWarmup?: boolean;\n  __destroyWebGLContextAfterRender?: boolean;\n}\n\nexport const Canvas = ({\n  debug,\n  opaque,\n  children,\n  onSize,\n  colorSpace = \"p3\",\n  highBitDepth = false,\n  androidWarmup = false,\n  ref,\n  onLayout,\n  ...viewProps\n}: CanvasProps) => {\n  if (onLayout && isFabric) {\n    console.error(\n      \"<Canvas onLayout={onLayout} /> is not supported on the new architecture, to fix the issue, see: https://shopify.github.io/react-native-skia/docs/canvas/overview/#getting-the-canvas-size\"\n    );\n  }\n  const viewRef = useCanvasRefPriv(null);\n  // Native ID\n  const nativeId = useMemo(() => {\n    return SkiaViewNativeId.current++;\n  }, []);\n\n  // Root\n  const root = useMemo(() => new SkiaSGRoot(Skia, nativeId), [nativeId]);\n\n  useReanimatedFrame(() => {\n    \"worklet\";\n    if (onSize && measure) {\n      const result =\n        // eslint-disable-next-line no-nested-ternary\n        Platform.OS === \"web\"\n          ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-expect-error\n            viewRef.current?.canvasRef\n            ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n              // @ts-expect-error\n              measure(viewRef.current.canvasRef)\n            : { width: 0, height: 0 }\n          : // eslint-disable-next-line @typescript-eslint/no-explicit-any\n            measure(viewRef as any);\n      if (result) {\n        const { width, height } = result;\n        if (onSize.value.width !== width || onSize.value.height !== height) {\n          onSize.value = { width, height };\n        }\n      }\n    }\n  }, !!onSize);\n\n  // Render effects\n  useLayoutEffect(() => {\n    root.render(children);\n  }, [children, root, nativeId]);\n\n  useEffect(() => {\n    return () => {\n      root.unmount();\n    };\n  }, [root]);\n\n  // Component methods\n  useImperativeHandle(\n    ref,\n    () =>\n      ({\n        makeImageSnapshot: (rect?: SkRect) => {\n          return SkiaViewApi.makeImageSnapshot(nativeId, rect);\n        },\n        makeImageSnapshotAsync: (rect?: SkRect) => {\n          return SkiaViewApi.makeImageSnapshotAsync(nativeId, rect);\n        },\n        redraw: () => {\n          SkiaViewApi.requestRedraw(nativeId);\n        },\n        getNativeId: () => {\n          return nativeId;\n        },\n        measure: (callback) => {\n          viewRef.current?.measure(callback);\n        },\n        measureInWindow: (callback) => {\n          viewRef.current?.measureInWindow(callback);\n        },\n      }) as CanvasRef\n  );\n\n  const onLayoutWeb = useCallback(\n    (e: LayoutChangeEvent) => {\n      if (onLayout) {\n        onLayout(e);\n      }\n      if (Platform.OS === \"web\" && onSize) {\n        const { width, height } = e.nativeEvent.layout;\n        onSize.value = { width, height };\n      }\n    },\n    [onLayout, onSize]\n  );\n  return (\n    <SkiaPictureViewNativeComponent\n      ref={viewRef}\n      collapsable={false}\n      nativeID={`${nativeId}`}\n      debug={debug}\n      opaque={opaque}\n      colorSpace={colorSpace}\n      highBitDepth={highBitDepth}\n      androidWarmup={androidWarmup}\n      onLayout={\n        Platform.OS === \"web\" && (onSize || onLayout) ? onLayoutWeb : onLayout\n      }\n      {...viewProps}\n    />\n  );\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/skia/types/Surface/Surface.d.ts

@@ -35,8 +35,12 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
     makeImageSnapshot(bounds?: SkRect, outputImage?: SkImage): SkImage;
     /**
      * Make sure any queued draws are sent to the screen or the GPU.
+     * @param sync - When true, block until the GPU has finished executing the
+     * submitted work. Use this before reading the surface's texture from a native
+     * consumer on a different command queue (see {@link getNativeTextureUnstable}).
+     * Defaults to false.
      */
-    flush(): void;
+    flush(sync?: boolean): void;
     /**
      * Returns the possibly scaled width of the surface.
      */

package/lib/commonjs/skia/types/Surface/Surface.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Surface.ts"],"sourcesContent":["import type { SkImage } from \"../Image\";\nimport type { SkCanvas } from \"../Canvas\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkRect } from \"../Rect\";\n\nexport interface SkSurface extends SkJSIInstance<\"Surface\"> {\n  /** Returns Canvas that draws into the surface. Subsequent calls return the\n     same Canvas. Canvas returned is managed and owned by Surface, and is\n     deleted when Surface is deleted.\n\n      @return  drawing Canvas for Surface\n\n      example: https://fiddle.skia.org/c/@Surface_getCanvas\n  */\n  getCanvas(): SkCanvas;\n\n  /**\n   * Returns the backend texture of the surface.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the surface is deleted\n   * or draw operations are performed on the surface.\n   * The returned object may be null if the surface does not have a backend texture.\n   *\n   * @return backend texture of the surface or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /** Returns Image capturing Surface contents. Subsequent drawing to\n     Surface contents are not captured.\n\n      @param bounds A rectangle specifying the subset of the surface that\n   is of interest.\n      @return  Image initialized with Surface contents\n\n      example: https://fiddle.skia.org/c/@Surface_makeImageSnapshot\n  */\n  makeImageSnapshot(bounds?: SkRect, outputImage?: SkImage): SkImage;\n\n  /**\n   * Make sure any queued draws are sent to the screen or the GPU.\n   */\n  flush(): void;\n\n  /**\n   * Returns the possibly scaled width of the surface.\n   */\n  width(): number;\n\n  /**\n   * Returns the possibly scaled height of the surface.\n   */\n  height(): number;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["Surface.ts"],"sourcesContent":["import type { SkImage } from \"../Image\";\nimport type { SkCanvas } from \"../Canvas\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkRect } from \"../Rect\";\n\nexport interface SkSurface extends SkJSIInstance<\"Surface\"> {\n  /** Returns Canvas that draws into the surface. Subsequent calls return the\n     same Canvas. Canvas returned is managed and owned by Surface, and is\n     deleted when Surface is deleted.\n\n      @return  drawing Canvas for Surface\n\n      example: https://fiddle.skia.org/c/@Surface_getCanvas\n  */\n  getCanvas(): SkCanvas;\n\n  /**\n   * Returns the backend texture of the surface.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the surface is deleted\n   * or draw operations are performed on the surface.\n   * The returned object may be null if the surface does not have a backend texture.\n   *\n   * @return backend texture of the surface or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /** Returns Image capturing Surface contents. Subsequent drawing to\n     Surface contents are not captured.\n\n      @param bounds A rectangle specifying the subset of the surface that\n   is of interest.\n      @return  Image initialized with Surface contents\n\n      example: https://fiddle.skia.org/c/@Surface_makeImageSnapshot\n  */\n  makeImageSnapshot(bounds?: SkRect, outputImage?: SkImage): SkImage;\n\n  /**\n   * Make sure any queued draws are sent to the screen or the GPU.\n   * @param sync - When true, block until the GPU has finished executing the\n   * submitted work. Use this before reading the surface's texture from a native\n   * consumer on a different command queue (see {@link getNativeTextureUnstable}).\n   * Defaults to false.\n   */\n  flush(sync?: boolean): void;\n\n  /**\n   * Returns the possibly scaled width of the surface.\n   */\n  width(): number;\n\n  /**\n   * Returns the possibly scaled height of the surface.\n   */\n  height(): number;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/commonjs/skia/web/JsiSkParagraphStyle.js

@@ -5,15 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JsiSkParagraphStyle = void 0;
 var _types = require("../types");
+var _JsiSkTextStyle = require("./JsiSkTextStyle");
 class JsiSkParagraphStyle {
   static toParagraphStyle(ck, value) {
     var _value$disableHinting, _value$ellipsis, _value$heightMultipli, _value$maxLines, _value$replaceTabChar, _ps$strutStyle, _value$strutStyle$fon, _value$strutStyle, _value$strutStyle$fon2, _value$strutStyle2, _value$strutStyle$hei, _value$strutStyle3, _value$strutStyle$lea, _value$strutStyle4, _value$strutStyle$for, _value$strutStyle5, _ps$strutStyle$fontSt, _value$strutStyle6, _value$strutStyle7, _value$strutStyle8, _value$strutStyle$hal, _value$strutStyle9, _value$strutStyle$str, _value$strutStyle0;
     // Seems like we need to provide the textStyle.color value, otherwise
     // the constructor crashes.
+    const textStyle = {
+      color: ck.BLACK
+    };
+    if (value.textStyle) {
+      // Only merge the properties that are set; toTextStyle() emits undefined
+      // for the others and the ParagraphStyle constructor requires a color.
+      Object.entries(_JsiSkTextStyle.JsiSkTextStyle.toTextStyle(value.textStyle)).forEach(([key, v]) => {
+        if (v !== undefined) {
+          textStyle[key] = v;
+        }
+      });
+    }
     const ps = new ck.ParagraphStyle({
-      textStyle: {
-        color: ck.BLACK
-      }
+      textStyle
     });
     ps.disableHinting = (_value$disableHinting = value.disableHinting) !== null && _value$disableHinting !== void 0 ? _value$disableHinting : ps.disableHinting;
     ps.ellipsis = (_value$ellipsis = value.ellipsis) !== null && _value$ellipsis !== void 0 ? _value$ellipsis : ps.ellipsis;

package/lib/commonjs/skia/web/JsiSkParagraphStyle.js.map

@@ -1 +1 @@
-{"version":3,"names":["_types","require","JsiSkParagraphStyle","toParagraphStyle","ck","value","_value$disableHinting","_value$ellipsis","_value$heightMultipli","_value$maxLines","_value$replaceTabChar","_ps$strutStyle","_value$strutStyle$fon","_value$strutStyle","_value$strutStyle$fon2","_value$strutStyle2","_value$strutStyle$hei","_value$strutStyle3","_value$strutStyle$lea","_value$strutStyle4","_value$strutStyle$for","_value$strutStyle5","_ps$strutStyle$fontSt","_value$strutStyle6","_value$strutStyle7","_value$strutStyle8","_value$strutStyle$hal","_value$strutStyle9","_value$strutStyle$str","_value$strutStyle0","ps","ParagraphStyle","textStyle","color","BLACK","disableHinting","ellipsis","heightMultiplier","maxLines","replaceTabCharacters","textAlign","undefined","textDirection","TextDirection","LTR","textHeightBehavior","strutStyle","fontFamilies","fontSize","leading","forceStrutHeight","fontStyle","slant","width","weight","halfLeading","strutEnabled","exports"],"sources":["JsiSkParagraphStyle.ts"],"sourcesContent":["import type { CanvasKit, ParagraphStyle } from \"canvaskit-wasm\";\n\nimport { TextDirection } from \"../types\";\nimport type { SkParagraphStyle } from \"../types\";\n\nexport class JsiSkParagraphStyle {\n  static toParagraphStyle(\n    ck: CanvasKit,\n    value: SkParagraphStyle\n  ): ParagraphStyle {\n    // Seems like we need to provide the textStyle.color value, otherwise\n    // the constructor crashes.\n    const ps = new ck.ParagraphStyle({ textStyle: { color: ck.BLACK } });\n\n    ps.disableHinting = value.disableHinting ?? ps.disableHinting;\n    ps.ellipsis = value.ellipsis ?? ps.ellipsis;\n    ps.heightMultiplier = value.heightMultiplier ?? ps.heightMultiplier;\n    ps.maxLines = value.maxLines ?? ps.maxLines;\n    ps.replaceTabCharacters =\n      value.replaceTabCharacters ?? ps.replaceTabCharacters;\n    ps.textAlign =\n      value.textAlign !== undefined ? { value: value.textAlign } : ps.textAlign;\n    ps.textDirection =\n      value.textDirection !== undefined\n        ? { value: value.textDirection === TextDirection.LTR ? 1 : 0 }\n        : ps.textDirection;\n    ps.textHeightBehavior =\n      value.textHeightBehavior !== undefined\n        ? { value: value.textHeightBehavior }\n        : ps.textHeightBehavior;\n\n    ps.strutStyle = ps.strutStyle ?? {};\n    ps.strutStyle.fontFamilies =\n      value.strutStyle?.fontFamilies ?? ps.strutStyle.fontFamilies;\n    ps.strutStyle.fontSize =\n      value.strutStyle?.fontSize ?? ps.strutStyle.fontSize;\n    ps.strutStyle.heightMultiplier =\n      value.strutStyle?.heightMultiplier ?? ps.strutStyle.heightMultiplier;\n    ps.strutStyle.leading = value.strutStyle?.leading ?? ps.strutStyle.leading;\n    ps.strutStyle.forceStrutHeight =\n      value.strutStyle?.forceStrutHeight ?? ps.strutStyle.forceStrutHeight;\n\n    ps.strutStyle.fontStyle = ps.strutStyle.fontStyle ?? {};\n\n    ps.strutStyle.fontStyle.slant =\n      value.strutStyle?.fontStyle?.slant !== undefined\n        ? { value: value.strutStyle.fontStyle.slant }\n        : ps.strutStyle.fontStyle.slant;\n    ps.strutStyle.fontStyle.width =\n      value.strutStyle?.fontStyle?.width !== undefined\n        ? { value: value.strutStyle.fontStyle.width }\n        : ps.strutStyle.fontStyle.width;\n    ps.strutStyle.fontStyle.weight =\n      value.strutStyle?.fontStyle?.weight !== undefined\n        ? { value: value.strutStyle.fontStyle.weight }\n        : ps.strutStyle.fontStyle.weight;\n    ps.strutStyle.halfLeading =\n      value.strutStyle?.halfLeading ?? ps.strutStyle.halfLeading;\n    ps.strutStyle.strutEnabled =\n      value.strutStyle?.strutEnabled ?? ps.strutStyle.strutEnabled;\n\n    return ps;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_types","require","_JsiSkTextStyle","JsiSkParagraphStyle","toParagraphStyle","ck","value","_value$disableHinting","_value$ellipsis","_value$heightMultipli","_value$maxLines","_value$replaceTabChar","_ps$strutStyle","_value$strutStyle$fon","_value$strutStyle","_value$strutStyle$fon2","_value$strutStyle2","_value$strutStyle$hei","_value$strutStyle3","_value$strutStyle$lea","_value$strutStyle4","_value$strutStyle$for","_value$strutStyle5","_ps$strutStyle$fontSt","_value$strutStyle6","_value$strutStyle7","_value$strutStyle8","_value$strutStyle$hal","_value$strutStyle9","_value$strutStyle$str","_value$strutStyle0","textStyle","color","BLACK","Object","entries","JsiSkTextStyle","toTextStyle","forEach","key","v","undefined","ps","ParagraphStyle","disableHinting","ellipsis","heightMultiplier","maxLines","replaceTabCharacters","textAlign","textDirection","TextDirection","LTR","textHeightBehavior","strutStyle","fontFamilies","fontSize","leading","forceStrutHeight","fontStyle","slant","width","weight","halfLeading","strutEnabled","exports"],"sources":["JsiSkParagraphStyle.ts"],"sourcesContent":["import type { CanvasKit, ParagraphStyle, TextStyle } from \"canvaskit-wasm\";\n\nimport { TextDirection } from \"../types\";\nimport type { SkParagraphStyle } from \"../types\";\n\nimport { JsiSkTextStyle } from \"./JsiSkTextStyle\";\n\nexport class JsiSkParagraphStyle {\n  static toParagraphStyle(\n    ck: CanvasKit,\n    value: SkParagraphStyle\n  ): ParagraphStyle {\n    // Seems like we need to provide the textStyle.color value, otherwise\n    // the constructor crashes.\n    const textStyle: TextStyle = { color: ck.BLACK };\n    if (value.textStyle) {\n      // Only merge the properties that are set; toTextStyle() emits undefined\n      // for the others and the ParagraphStyle constructor requires a color.\n      Object.entries(JsiSkTextStyle.toTextStyle(value.textStyle)).forEach(\n        ([key, v]) => {\n          if (v !== undefined) {\n            (textStyle as Record<string, unknown>)[key] = v;\n          }\n        }\n      );\n    }\n    const ps = new ck.ParagraphStyle({ textStyle });\n\n    ps.disableHinting = value.disableHinting ?? ps.disableHinting;\n    ps.ellipsis = value.ellipsis ?? ps.ellipsis;\n    ps.heightMultiplier = value.heightMultiplier ?? ps.heightMultiplier;\n    ps.maxLines = value.maxLines ?? ps.maxLines;\n    ps.replaceTabCharacters =\n      value.replaceTabCharacters ?? ps.replaceTabCharacters;\n    ps.textAlign =\n      value.textAlign !== undefined ? { value: value.textAlign } : ps.textAlign;\n    ps.textDirection =\n      value.textDirection !== undefined\n        ? { value: value.textDirection === TextDirection.LTR ? 1 : 0 }\n        : ps.textDirection;\n    ps.textHeightBehavior =\n      value.textHeightBehavior !== undefined\n        ? { value: value.textHeightBehavior }\n        : ps.textHeightBehavior;\n\n    ps.strutStyle = ps.strutStyle ?? {};\n    ps.strutStyle.fontFamilies =\n      value.strutStyle?.fontFamilies ?? ps.strutStyle.fontFamilies;\n    ps.strutStyle.fontSize =\n      value.strutStyle?.fontSize ?? ps.strutStyle.fontSize;\n    ps.strutStyle.heightMultiplier =\n      value.strutStyle?.heightMultiplier ?? ps.strutStyle.heightMultiplier;\n    ps.strutStyle.leading = value.strutStyle?.leading ?? ps.strutStyle.leading;\n    ps.strutStyle.forceStrutHeight =\n      value.strutStyle?.forceStrutHeight ?? ps.strutStyle.forceStrutHeight;\n\n    ps.strutStyle.fontStyle = ps.strutStyle.fontStyle ?? {};\n\n    ps.strutStyle.fontStyle.slant =\n      value.strutStyle?.fontStyle?.slant !== undefined\n        ? { value: value.strutStyle.fontStyle.slant }\n        : ps.strutStyle.fontStyle.slant;\n    ps.strutStyle.fontStyle.width =\n      value.strutStyle?.fontStyle?.width !== undefined\n        ? { value: value.strutStyle.fontStyle.width }\n        : ps.strutStyle.fontStyle.width;\n    ps.strutStyle.fontStyle.weight =\n      value.strutStyle?.fontStyle?.weight !== undefined\n        ? { value: value.strutStyle.fontStyle.weight }\n        : ps.strutStyle.fontStyle.weight;\n    ps.strutStyle.halfLeading =\n      value.strutStyle?.halfLeading ?? ps.strutStyle.halfLeading;\n    ps.strutStyle.strutEnabled =\n      value.strutStyle?.strutEnabled ?? ps.strutStyle.strutEnabled;\n\n    return ps;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/skia/web/JsiSkSurface.d.ts

@@ -5,7 +5,7 @@ import { JsiSkImage } from "./JsiSkImage";
 export declare class JsiSkSurface extends HostObject<Surface, "Surface"> implements SkSurface {
     constructor(CanvasKit: CanvasKit, ref: Surface);
     [Symbol.dispose](): void;
-    flush(): void;
+    flush(_sync?: boolean): void;
     width(): number;
     height(): number;
     getCanvas(): SkCanvas;

package/lib/commonjs/skia/web/JsiSkSurface.js

@@ -15,7 +15,8 @@ class JsiSkSurface extends _Host.HostObject {
   [Symbol.dispose]() {
     this.ref.dispose();
   }
-  flush() {
+  flush(_sync) {
+    // CanvasKit has no separate CPU sync; flush() is sufficient on the web backend.
     this.ref.flush();
   }
   width() {

package/lib/commonjs/skia/web/JsiSkSurface.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Host","require","_JsiSkCanvas","_JsiSkImage","_JsiSkRect","JsiSkSurface","HostObject","constructor","CanvasKit","ref","Symbol","dispose","flush","width","height","getCanvas","JsiSkCanvas","makeImageSnapshot","bounds","outputImage","image","Array","from","JsiSkRect","fromValue","undefined","JsiSkImage","getNativeTextureUnstable","console","warn","exports"],"sources":["JsiSkSurface.ts"],"sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  [Symbol.dispose]() {\n    this.ref.dispose();\n  }\n\n  flush() {\n    this.ref.flush();\n  }\n\n  width() {\n    return this.ref.width();\n  }\n\n  height() {\n    return this.ref.height();\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    if (outputImage) {\n      outputImage.ref = image;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  getNativeTextureUnstable(): unknown {\n    console.warn(\"getBackendTexture is not implemented on Web\");\n    return null;\n  }\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEO,MAAMI,YAAY,SACfC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAY,EAAE;IAC9C,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,SAAS,CAAC;EAClC;EAEA,CAACC,MAAM,CAACC,OAAO,IAAI;IACjB,IAAI,CAACF,GAAG,CAACE,OAAO,CAAC,CAAC;EACpB;EAEAC,KAAKA,CAAA,EAAG;IACN,IAAI,CAACH,GAAG,CAACG,KAAK,CAAC,CAAC;EAClB;EAEAC,KAAKA,CAAA,EAAG;IACN,OAAO,IAAI,CAACJ,GAAG,CAACI,KAAK,CAAC,CAAC;EACzB;EAEAC,MAAMA,CAAA,EAAG;IACP,OAAO,IAAI,CAACL,GAAG,CAACK,MAAM,CAAC,CAAC;EAC1B;EAEAC,SAASA,CAAA,EAAa;IACpB,OAAO,IAAIC,wBAAW,CAAC,IAAI,CAACR,SAAS,EAAE,IAAI,CAACC,GAAG,CAACM,SAAS,CAAC,CAAC,CAAC;EAC9D;EAEAE,iBAAiBA,CAACC,MAAe,EAAEC,WAAwB,EAAW;IACpE,MAAMC,KAAK,GAAG,IAAI,CAACX,GAAG,CAACQ,iBAAiB,CACtCC,MAAM,GACFG,KAAK,CAACC,IAAI,CAACC,oBAAS,CAACC,SAAS,CAAC,IAAI,CAAChB,SAAS,EAAEU,MAAM,CAAC,CAAC,GACvDO,SACN,CAAC;IACD,IAAIN,WAAW,EAAE;MACfA,WAAW,CAACV,GAAG,GAAGW,KAAK;IACzB;IACA,OAAO,IAAIM,sBAAU,CAAC,IAAI,CAAClB,SAAS,EAAEY,KAAK,CAAC;EAC9C;EAEAO,wBAAwBA,CAAA,EAAY;IAClCC,OAAO,CAACC,IAAI,CAAC,6CAA6C,CAAC;IAC3D,OAAO,IAAI;EACb;AACF;AAACC,OAAA,CAAAzB,YAAA,GAAAA,YAAA","ignoreList":[]}
+{"version":3,"names":["_Host","require","_JsiSkCanvas","_JsiSkImage","_JsiSkRect","JsiSkSurface","HostObject","constructor","CanvasKit","ref","Symbol","dispose","flush","_sync","width","height","getCanvas","JsiSkCanvas","makeImageSnapshot","bounds","outputImage","image","Array","from","JsiSkRect","fromValue","undefined","JsiSkImage","getNativeTextureUnstable","console","warn","exports"],"sources":["JsiSkSurface.ts"],"sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  [Symbol.dispose]() {\n    this.ref.dispose();\n  }\n\n  flush(_sync?: boolean) {\n    // CanvasKit has no separate CPU sync; flush() is sufficient on the web backend.\n    this.ref.flush();\n  }\n\n  width() {\n    return this.ref.width();\n  }\n\n  height() {\n    return this.ref.height();\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    if (outputImage) {\n      outputImage.ref = image;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  getNativeTextureUnstable(): unknown {\n    console.warn(\"getBackendTexture is not implemented on Web\");\n    return null;\n  }\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEO,MAAMI,YAAY,SACfC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAY,EAAE;IAC9C,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,SAAS,CAAC;EAClC;EAEA,CAACC,MAAM,CAACC,OAAO,IAAI;IACjB,IAAI,CAACF,GAAG,CAACE,OAAO,CAAC,CAAC;EACpB;EAEAC,KAAKA,CAACC,KAAe,EAAE;IACrB;IACA,IAAI,CAACJ,GAAG,CAACG,KAAK,CAAC,CAAC;EAClB;EAEAE,KAAKA,CAAA,EAAG;IACN,OAAO,IAAI,CAACL,GAAG,CAACK,KAAK,CAAC,CAAC;EACzB;EAEAC,MAAMA,CAAA,EAAG;IACP,OAAO,IAAI,CAACN,GAAG,CAACM,MAAM,CAAC,CAAC;EAC1B;EAEAC,SAASA,CAAA,EAAa;IACpB,OAAO,IAAIC,wBAAW,CAAC,IAAI,CAACT,SAAS,EAAE,IAAI,CAACC,GAAG,CAACO,SAAS,CAAC,CAAC,CAAC;EAC9D;EAEAE,iBAAiBA,CAACC,MAAe,EAAEC,WAAwB,EAAW;IACpE,MAAMC,KAAK,GAAG,IAAI,CAACZ,GAAG,CAACS,iBAAiB,CACtCC,MAAM,GACFG,KAAK,CAACC,IAAI,CAACC,oBAAS,CAACC,SAAS,CAAC,IAAI,CAACjB,SAAS,EAAEW,MAAM,CAAC,CAAC,GACvDO,SACN,CAAC;IACD,IAAIN,WAAW,EAAE;MACfA,WAAW,CAACX,GAAG,GAAGY,KAAK;IACzB;IACA,OAAO,IAAIM,sBAAU,CAAC,IAAI,CAACnB,SAAS,EAAEa,KAAK,CAAC;EAC9C;EAEAO,wBAAwBA,CAAA,EAAY;IAClCC,OAAO,CAACC,IAAI,CAAC,6CAA6C,CAAC;IAC3D,OAAO,IAAI;EACb;AACF;AAACC,OAAA,CAAA1B,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/commonjs/sksg/Container.native.d.ts

@@ -7,6 +7,7 @@ declare class NativeReanimatedContainer extends Container {
     private mapperId;
     private picture;
     constructor(Skia: Skia, nativeId: number);
+    unmount(): void;
     redraw(): void;
 }
 export declare const createContainer: (Skia: Skia, nativeId: number) => StaticContainer | NativeReanimatedContainer;

package/lib/commonjs/sksg/Container.native.js

@@ -36,9 +36,20 @@ class NativeReanimatedContainer extends _StaticContainer.Container {
     _defineProperty(this, "picture", void 0);
     this.picture = Skia.Picture.MakePicture(null);
   }
+  unmount() {
+    super.unmount();
+    if (this.mapperId !== null) {
+      // The mapper closure retains the recorder and its resources (e.g.
+      // images) on the UI runtime and keeps updating the picture of an
+      // unmounted view — stop it or it leaks for the lifetime of the app.
+      _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
+    }
+  }
   redraw() {
     if (this.mapperId !== null) {
       _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
     }
     if (this.unmounted) {
       return;

package/lib/commonjs/sksg/Container.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_ReanimatedRecorder","_StaticContainer","_Visitor","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","nativeDrawOnscreen","nativeId","recorder","picture","play","setJsiProperty","NativeReanimatedContainer","Container","constructor","Skia","Picture","MakePicture","redraw","mapperId","Rea","stopMapper","unmounted","ReanimatedRecorder","visit","root","sharedValues","getSharedValues","sharedRecorder","getRecorder","runOnUI","length","startMapper","applyUpdates","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.native.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia, SkPicture } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\nimport type { JsiRecorder } from \"../skia/types/Recorder\";\n\nimport { ReanimatedRecorder } from \"./Recorder/ReanimatedRecorder\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\nimport { visit } from \"./Recorder/Visitor\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst nativeDrawOnscreen = (\n  nativeId: number,\n  recorder: JsiRecorder,\n  picture: SkPicture\n) => {\n  \"worklet\";\n\n  //const start = performance.now();\n  recorder.play(picture);\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass NativeReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n  private picture: SkPicture;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n    this.picture = Skia.Picture.MakePicture(null)!;\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new ReanimatedRecorder(this.Skia);\n    const { nativeId, picture } = this;\n    visit(recorder, this.root);\n    const sharedValues = recorder.getSharedValues();\n    const sharedRecorder = recorder.getRecorder();\n    // Draw first frame\n    Rea.runOnUI(() => {\n      \"worklet\";\n      nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n    })();\n    // Animate\n    if (sharedValues.length > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        sharedRecorder.applyUpdates(sharedValues);\n        nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n      }, sharedValues);\n    }\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new NativeReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_ReanimatedRecorder","_StaticContainer","_Visitor","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","nativeDrawOnscreen","nativeId","recorder","picture","play","setJsiProperty","NativeReanimatedContainer","Container","constructor","Skia","Picture","MakePicture","unmount","mapperId","Rea","stopMapper","redraw","unmounted","ReanimatedRecorder","visit","root","sharedValues","getSharedValues","sharedRecorder","getRecorder","runOnUI","length","startMapper","applyUpdates","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.native.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia, SkPicture } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\nimport type { JsiRecorder } from \"../skia/types/Recorder\";\n\nimport { ReanimatedRecorder } from \"./Recorder/ReanimatedRecorder\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\nimport { visit } from \"./Recorder/Visitor\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst nativeDrawOnscreen = (\n  nativeId: number,\n  recorder: JsiRecorder,\n  picture: SkPicture\n) => {\n  \"worklet\";\n\n  //const start = performance.now();\n  recorder.play(picture);\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass NativeReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n  private picture: SkPicture;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n    this.picture = Skia.Picture.MakePicture(null)!;\n  }\n\n  unmount() {\n    super.unmount();\n    if (this.mapperId !== null) {\n      // The mapper closure retains the recorder and its resources (e.g.\n      // images) on the UI runtime and keeps updating the picture of an\n      // unmounted view — stop it or it leaks for the lifetime of the app.\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new ReanimatedRecorder(this.Skia);\n    const { nativeId, picture } = this;\n    visit(recorder, this.root);\n    const sharedValues = recorder.getSharedValues();\n    const sharedRecorder = recorder.getRecorder();\n    // Draw first frame\n    Rea.runOnUI(() => {\n      \"worklet\";\n      nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n    })();\n    // Animate\n    if (sharedValues.length > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        sharedRecorder.applyUpdates(sharedValues);\n        nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n      }, sharedValues);\n    }\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new NativeReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/sksg/Container.web.d.ts

@@ -6,6 +6,7 @@ declare class ReanimatedContainer extends Container {
     private nativeId;
     private mapperId;
     constructor(Skia: Skia, nativeId: number);
+    unmount(): void;
     redraw(): void;
 }
 export declare const createContainer: (Skia: Skia, nativeId: number) => StaticContainer | ReanimatedContainer;

package/lib/commonjs/sksg/Container.web.js

@@ -42,9 +42,20 @@ class ReanimatedContainer extends _StaticContainer.Container {
     this.nativeId = nativeId;
     _defineProperty(this, "mapperId", null);
   }
+  unmount() {
+    super.unmount();
+    if (this.mapperId !== null) {
+      // The mapper closure retains the recording and keeps updating the
+      // picture of an unmounted view — stop it or it leaks for the
+      // lifetime of the app.
+      _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
+    }
+  }
   redraw() {
     if (this.mapperId !== null) {
       _ReanimatedProxy.default.stopMapper(this.mapperId);
+      this.mapperId = null;
     }
     if (this.unmounted) {
       return;

package/lib/commonjs/sksg/Container.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_Recorder","_Visitor","_Player","_DrawingContext","_StaticContainer","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","drawOnscreen","Skia","nativeId","recording","rec","PictureRecorder","canvas","beginRecording","ctx","createDrawingContext","paintPool","replay","commands","picture","finishRecordingAsPicture","dispose","setJsiProperty","ReanimatedContainer","Container","constructor","redraw","mapperId","Rea","stopMapper","unmounted","recorder","Recorder","visit","root","record","getRecording","animationValues","size","startMapper","Array","from","runOnUI","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.web.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\n\nimport type { Recording } from \"./Recorder/Recorder\";\nimport { Recorder } from \"./Recorder/Recorder\";\nimport { visit } from \"./Recorder/Visitor\";\nimport { replay } from \"./Recorder/Player\";\nimport { createDrawingContext } from \"./Recorder/DrawingContext\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst drawOnscreen = (Skia: Skia, nativeId: number, recording: Recording) => {\n  \"worklet\";\n  const rec = Skia.PictureRecorder();\n  const canvas = rec.beginRecording();\n  //const start = performance.now();\n\n  const ctx = createDrawingContext(Skia, recording.paintPool, canvas);\n  replay(ctx, recording.commands);\n  const picture = rec.finishRecordingAsPicture();\n  rec.dispose();\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass ReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new Recorder();\n    visit(recorder, this.root);\n    const record = recorder.getRecording();\n    const { animationValues } = record;\n    this.recording = {\n      commands: record.commands,\n      paintPool: record.paintPool,\n    };\n    const { nativeId, Skia, recording } = this;\n    if (animationValues.size > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        drawOnscreen(Skia, nativeId, recording!);\n      }, Array.from(animationValues));\n    }\n    Rea.runOnUI(() => {\n      \"worklet\";\n      drawOnscreen(Skia, nativeId, recording!);\n    })();\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new ReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_ReanimatedProxy","_interopRequireDefault","require","_renderHelpers","_Recorder","_Visitor","_Player","_DrawingContext","_StaticContainer","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","SkiaViewApi","globalThis","drawOnscreen","Skia","nativeId","recording","rec","PictureRecorder","canvas","beginRecording","ctx","createDrawingContext","paintPool","replay","commands","picture","finishRecordingAsPicture","dispose","setJsiProperty","ReanimatedContainer","Container","constructor","unmount","mapperId","Rea","stopMapper","redraw","unmounted","recorder","Recorder","visit","root","record","getRecording","animationValues","size","startMapper","Array","from","runOnUI","createContainer","HAS_REANIMATED_3","StaticContainer","exports"],"sources":["Container.web.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\n\nimport type { Recording } from \"./Recorder/Recorder\";\nimport { Recorder } from \"./Recorder/Recorder\";\nimport { visit } from \"./Recorder/Visitor\";\nimport { replay } from \"./Recorder/Player\";\nimport { createDrawingContext } from \"./Recorder/DrawingContext\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\n// create local reference for `strictGlobal` option in Worklets\nconst { SkiaViewApi } = globalThis;\n\nconst drawOnscreen = (Skia: Skia, nativeId: number, recording: Recording) => {\n  \"worklet\";\n  const rec = Skia.PictureRecorder();\n  const canvas = rec.beginRecording();\n  //const start = performance.now();\n\n  const ctx = createDrawingContext(Skia, recording.paintPool, canvas);\n  replay(ctx, recording.commands);\n  const picture = rec.finishRecordingAsPicture();\n  rec.dispose();\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass ReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n  }\n\n  unmount() {\n    super.unmount();\n    if (this.mapperId !== null) {\n      // The mapper closure retains the recording and keeps updating the\n      // picture of an unmounted view — stop it or it leaks for the\n      // lifetime of the app.\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n      this.mapperId = null;\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new Recorder();\n    visit(recorder, this.root);\n    const record = recorder.getRecording();\n    const { animationValues } = record;\n    this.recording = {\n      commands: record.commands,\n      paintPool: record.paintPool,\n    };\n    const { nativeId, Skia, recording } = this;\n    if (animationValues.size > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        drawOnscreen(Skia, nativeId, recording!);\n      }, Array.from(animationValues));\n    }\n    Rea.runOnUI(() => {\n      \"worklet\";\n      drawOnscreen(Skia, nativeId, recording!);\n    })();\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new ReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/specs/NativeSkiaModule.web.d.ts

@@ -4,7 +4,9 @@ import type { SkiaPictureViewHandle } from "../views/SkiaPictureView.web";
 export type ISkiaViewApiWeb = ISkiaViewApi & {
     views: Record<string, SkiaPictureViewHandle>;
     deferedPictures: Record<string, SkPicture>;
+    unregisteredViews: Set<string>;
     registerView(nativeId: string, view: SkiaPictureViewHandle): void;
+    unregisterView(nativeId: string): void;
 };
 declare const _default: {};
 export default _default;

package/lib/commonjs/specs/NativeSkiaModule.web.js

@@ -9,23 +9,37 @@ exports.default = void 0;
 global.SkiaViewApi = {
   views: {},
   deferedPictures: {},
+  unregisteredViews: new Set(),
   deferedOnSize: {},
   web: true,
   registerView(nativeId, view) {
+    this.unregisteredViews.delete(nativeId);
     // Maybe a picture for this view was already set
     if (this.deferedPictures[nativeId]) {
       view.setPicture(this.deferedPictures[nativeId]);
+      delete this.deferedPictures[nativeId];
     }
     this.views[nativeId] = view;
   },
+  unregisterView(nativeId) {
+    // Views must be removed on unmount: the handle's closures capture the
+    // canvas element, so a stale entry retains the whole detached DOM tree.
+    this.unregisteredViews.add(nativeId);
+    delete this.views[nativeId];
+    delete this.deferedPictures[nativeId];
+  },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   setJsiProperty(nativeId, name, value) {
     if (name === "picture") {
-      if (!this.views[`${nativeId}`]) {
-        this.deferedPictures[`${nativeId}`] = value;
-      } else {
-        this.views[`${nativeId}`].setPicture(value);
+      const id = `${nativeId}`;
+      if (this.views[id]) {
+        this.views[id].setPicture(value);
+      } else if (!this.unregisteredViews.has(id)) {
+        this.deferedPictures[id] = value;
       }
+      // Otherwise the view has unmounted (e.g. a trailing animation frame):
+      // drop the picture instead of deferring it for an id that will never
+      // register again, which would retain it forever.
     }
   },
   size(nativeId) {
@@ -39,14 +53,25 @@ global.SkiaViewApi = {
     }
   },
   requestRedraw(nativeId) {
-    this.views[`${nativeId}`].redraw();
+    var _this$views;
+    // The view may already have unmounted (e.g. a trailing animation frame).
+    (_this$views = this.views[`${nativeId}`]) === null || _this$views === void 0 || _this$views.redraw();
   },
   makeImageSnapshot(nativeId, rect) {
-    return this.views[`${nativeId}`].makeImageSnapshot(rect);
+    const view = this.views[`${nativeId}`];
+    if (!view) {
+      throw new Error(`Cannot make image snapshot: view with nativeID ${nativeId} is not registered (it may have unmounted)`);
+    }
+    return view.makeImageSnapshot(rect);
   },
   makeImageSnapshotAsync(nativeId, rect) {
     return new Promise((resolve, reject) => {
-      const result = this.views[`${nativeId}`].makeImageSnapshot(rect);
+      const view = this.views[`${nativeId}`];
+      if (!view) {
+        reject(new Error(`Cannot make image snapshot: view with nativeID ${nativeId} is not registered (it may have unmounted)`));
+        return;
+      }
+      const result = view.makeImageSnapshot(rect);
       if (result) {
         resolve(result);
       } else {

package/lib/commonjs/specs/NativeSkiaModule.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["global","SkiaViewApi","views","deferedPictures","deferedOnSize","web","registerView","nativeId","view","setPicture","setJsiProperty","name","value","size","getSize","width","height","requestRedraw","redraw","makeImageSnapshot","rect","makeImageSnapshotAsync","Promise","resolve","reject","result","Error","_default","exports","default"],"sources":["NativeSkiaModule.web.ts"],"sourcesContent":["/* eslint-disable import/no-anonymous-default-export */\nimport type { SkPicture, SkRect } from \"../skia/types\";\nimport type { ISkiaViewApi } from \"../views/types\";\nimport type { SkiaPictureViewHandle } from \"../views/SkiaPictureView.web\";\n\nexport type ISkiaViewApiWeb = ISkiaViewApi & {\n  views: Record<string, SkiaPictureViewHandle>;\n  deferedPictures: Record<string, SkPicture>;\n  registerView(nativeId: string, view: SkiaPictureViewHandle): void;\n};\n\nglobal.SkiaViewApi = {\n  views: {},\n  deferedPictures: {},\n  deferedOnSize: {},\n  web: true,\n  registerView(nativeId: string, view: SkiaPictureViewHandle) {\n    // Maybe a picture for this view was already set\n    if (this.deferedPictures[nativeId]) {\n      view.setPicture(this.deferedPictures[nativeId] as SkPicture);\n    }\n    this.views[nativeId] = view;\n  },\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  setJsiProperty(nativeId: number, name: string, value: any) {\n    if (name === \"picture\") {\n      if (!this.views[`${nativeId}`]) {\n        this.deferedPictures[`${nativeId}`] = value;\n      } else {\n        this.views[`${nativeId}`].setPicture(value);\n      }\n    }\n  },\n  size(nativeId: number) {\n    if (this.views[`${nativeId}`]) {\n      return this.views[`${nativeId}`].getSize();\n    } else {\n      return { width: 0, height: 0 };\n    }\n  },\n  requestRedraw(nativeId: number) {\n    this.views[`${nativeId}`].redraw();\n  },\n  makeImageSnapshot(nativeId: number, rect?: SkRect) {\n    return this.views[`${nativeId}`].makeImageSnapshot(rect);\n  },\n  makeImageSnapshotAsync(nativeId: number, rect?: SkRect) {\n    return new Promise((resolve, reject) => {\n      const result = this.views[`${nativeId}`].makeImageSnapshot(rect);\n      if (result) {\n        resolve(result);\n      } else {\n        reject(new Error(\"Failed to make image snapshot\"));\n      }\n    });\n  },\n} as ISkiaViewApiWeb;\n\n// eslint-disable-next-line import/no-default-export\nexport default {};\n"],"mappings":";;;;;;AAAA;;AAWAA,MAAM,CAACC,WAAW,GAAG;EACnBC,KAAK,EAAE,CAAC,CAAC;EACTC,eAAe,EAAE,CAAC,CAAC;EACnBC,aAAa,EAAE,CAAC,CAAC;EACjBC,GAAG,EAAE,IAAI;EACTC,YAAYA,CAACC,QAAgB,EAAEC,IAA2B,EAAE;IAC1D;IACA,IAAI,IAAI,CAACL,eAAe,CAACI,QAAQ,CAAC,EAAE;MAClCC,IAAI,CAACC,UAAU,CAAC,IAAI,CAACN,eAAe,CAACI,QAAQ,CAAc,CAAC;IAC9D;IACA,IAAI,CAACL,KAAK,CAACK,QAAQ,CAAC,GAAGC,IAAI;EAC7B,CAAC;EACD;EACAE,cAAcA,CAACH,QAAgB,EAAEI,IAAY,EAAEC,KAAU,EAAE;IACzD,IAAID,IAAI,KAAK,SAAS,EAAE;MACtB,IAAI,CAAC,IAAI,CAACT,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,EAAE;QAC9B,IAAI,CAACJ,eAAe,CAAC,GAAGI,QAAQ,EAAE,CAAC,GAAGK,KAAK;MAC7C,CAAC,MAAM;QACL,IAAI,CAACV,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,CAACE,UAAU,CAACG,KAAK,CAAC;MAC7C;IACF;EACF,CAAC;EACDC,IAAIA,CAACN,QAAgB,EAAE;IACrB,IAAI,IAAI,CAACL,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,EAAE;MAC7B,OAAO,IAAI,CAACL,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,CAACO,OAAO,CAAC,CAAC;IAC5C,CAAC,MAAM;MACL,OAAO;QAAEC,KAAK,EAAE,CAAC;QAAEC,MAAM,EAAE;MAAE,CAAC;IAChC;EACF,CAAC;EACDC,aAAaA,CAACV,QAAgB,EAAE;IAC9B,IAAI,CAACL,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,CAACW,MAAM,CAAC,CAAC;EACpC,CAAC;EACDC,iBAAiBA,CAACZ,QAAgB,EAAEa,IAAa,EAAE;IACjD,OAAO,IAAI,CAAClB,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,CAACY,iBAAiB,CAACC,IAAI,CAAC;EAC1D,CAAC;EACDC,sBAAsBA,CAACd,QAAgB,EAAEa,IAAa,EAAE;IACtD,OAAO,IAAIE,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtC,MAAMC,MAAM,GAAG,IAAI,CAACvB,KAAK,CAAC,GAAGK,QAAQ,EAAE,CAAC,CAACY,iBAAiB,CAACC,IAAI,CAAC;MAChE,IAAIK,MAAM,EAAE;QACVF,OAAO,CAACE,MAAM,CAAC;MACjB,CAAC,MAAM;QACLD,MAAM,CAAC,IAAIE,KAAK,CAAC,+BAA+B,CAAC,CAAC;MACpD;IACF,CAAC,CAAC;EACJ;AACF,CAAoB;;AAEpB;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACe,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["global","SkiaViewApi","views","deferedPictures","unregisteredViews","Set","deferedOnSize","web","registerView","nativeId","view","delete","setPicture","unregisterView","add","setJsiProperty","name","value","id","has","size","getSize","width","height","requestRedraw","_this$views","redraw","makeImageSnapshot","rect","Error","makeImageSnapshotAsync","Promise","resolve","reject","result","_default","exports","default"],"sources":["NativeSkiaModule.web.ts"],"sourcesContent":["/* eslint-disable import/no-anonymous-default-export */\nimport type { SkPicture, SkRect } from \"../skia/types\";\nimport type { ISkiaViewApi } from \"../views/types\";\nimport type { SkiaPictureViewHandle } from \"../views/SkiaPictureView.web\";\n\nexport type ISkiaViewApiWeb = ISkiaViewApi & {\n  views: Record<string, SkiaPictureViewHandle>;\n  deferedPictures: Record<string, SkPicture>;\n  unregisteredViews: Set<string>;\n  registerView(nativeId: string, view: SkiaPictureViewHandle): void;\n  unregisterView(nativeId: string): void;\n};\n\nglobal.SkiaViewApi = {\n  views: {},\n  deferedPictures: {},\n  unregisteredViews: new Set<string>(),\n  deferedOnSize: {},\n  web: true,\n  registerView(nativeId: string, view: SkiaPictureViewHandle) {\n    this.unregisteredViews.delete(nativeId);\n    // Maybe a picture for this view was already set\n    if (this.deferedPictures[nativeId]) {\n      view.setPicture(this.deferedPictures[nativeId] as SkPicture);\n      delete this.deferedPictures[nativeId];\n    }\n    this.views[nativeId] = view;\n  },\n  unregisterView(nativeId: string) {\n    // Views must be removed on unmount: the handle's closures capture the\n    // canvas element, so a stale entry retains the whole detached DOM tree.\n    this.unregisteredViews.add(nativeId);\n    delete this.views[nativeId];\n    delete this.deferedPictures[nativeId];\n  },\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  setJsiProperty(nativeId: number, name: string, value: any) {\n    if (name === \"picture\") {\n      const id = `${nativeId}`;\n      if (this.views[id]) {\n        this.views[id].setPicture(value);\n      } else if (!this.unregisteredViews.has(id)) {\n        this.deferedPictures[id] = value;\n      }\n      // Otherwise the view has unmounted (e.g. a trailing animation frame):\n      // drop the picture instead of deferring it for an id that will never\n      // register again, which would retain it forever.\n    }\n  },\n  size(nativeId: number) {\n    if (this.views[`${nativeId}`]) {\n      return this.views[`${nativeId}`].getSize();\n    } else {\n      return { width: 0, height: 0 };\n    }\n  },\n  requestRedraw(nativeId: number) {\n    // The view may already have unmounted (e.g. a trailing animation frame).\n    this.views[`${nativeId}`]?.redraw();\n  },\n  makeImageSnapshot(nativeId: number, rect?: SkRect) {\n    const view = this.views[`${nativeId}`];\n    if (!view) {\n      throw new Error(\n        `Cannot make image snapshot: view with nativeID ${nativeId} is not registered (it may have unmounted)`\n      );\n    }\n    return view.makeImageSnapshot(rect);\n  },\n  makeImageSnapshotAsync(nativeId: number, rect?: SkRect) {\n    return new Promise((resolve, reject) => {\n      const view = this.views[`${nativeId}`];\n      if (!view) {\n        reject(\n          new Error(\n            `Cannot make image snapshot: view with nativeID ${nativeId} is not registered (it may have unmounted)`\n          )\n        );\n        return;\n      }\n      const result = view.makeImageSnapshot(rect);\n      if (result) {\n        resolve(result);\n      } else {\n        reject(new Error(\"Failed to make image snapshot\"));\n      }\n    });\n  },\n} as ISkiaViewApiWeb;\n\n// eslint-disable-next-line import/no-default-export\nexport default {};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/specs/SkiaPictureViewNativeComponent.d.ts

@@ -4,6 +4,7 @@ export interface NativeProps extends ViewProps {
     debug?: boolean;
     opaque?: boolean;
     colorSpace?: string;
+    highBitDepth?: boolean;
     androidWarmup?: boolean;
     pointerEvents?: WithDefault<"auto" | "none" | "box-none" | "box-only", "auto">;
 }

package/lib/commonjs/specs/SkiaPictureViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_default","exports","default","codegenNativeComponent"],"sources":["SkiaPictureViewNativeComponent.ts"],"sourcesContent":["import { codegenNativeComponent, type ViewProps } from \"react-native\";\nimport type { WithDefault } from \"react-native/Libraries/Types/CodegenTypes\";\n\n// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore - pointerEvents needs to be redeclared for codegen to generate native bindings\nexport interface NativeProps extends ViewProps {\n  debug?: boolean;\n  opaque?: boolean;\n  colorSpace?: string;\n  androidWarmup?: boolean;\n  pointerEvents?: WithDefault<\n    \"auto\" | \"none\" | \"box-none\" | \"box-only\",\n    \"auto\"\n  >;\n}\n\n// eslint-disable-next-line import/no-default-export\nexport default codegenNativeComponent<NativeProps>(\"SkiaPictureView\");\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGA;AACA;AAYA;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACe,IAAAC,mCAAsB,EAAc,iBAAiB,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_default","exports","default","codegenNativeComponent"],"sources":["SkiaPictureViewNativeComponent.ts"],"sourcesContent":["import { codegenNativeComponent, type ViewProps } from \"react-native\";\nimport type { WithDefault } from \"react-native/Libraries/Types/CodegenTypes\";\n\n// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore - pointerEvents needs to be redeclared for codegen to generate native bindings\nexport interface NativeProps extends ViewProps {\n  debug?: boolean;\n  opaque?: boolean;\n  colorSpace?: string;\n  highBitDepth?: boolean;\n  androidWarmup?: boolean;\n  pointerEvents?: WithDefault<\n    \"auto\" | \"none\" | \"box-none\" | \"box-only\",\n    \"auto\"\n  >;\n}\n\n// eslint-disable-next-line import/no-default-export\nexport default codegenNativeComponent<NativeProps>(\"SkiaPictureView\");\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGA;AACA;AAaA;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACe,IAAAC,mCAAsB,EAAc,iBAAiB,CAAC","ignoreList":[]}

package/lib/commonjs/views/SkiaPictureView.js

@@ -86,6 +86,7 @@ class SkiaPictureView extends _react.default.Component {
       mode,
       debug = false,
       opaque = false,
+      highBitDepth = false,
       androidWarmup = false,
       ...viewProps
     } = this.props;
@@ -94,6 +95,7 @@ class SkiaPictureView extends _react.default.Component {
       nativeID: `${this._nativeId}`,
       debug: debug,
       opaque: opaque,
+      highBitDepth: highBitDepth,
       androidWarmup: androidWarmup
     }, viewProps));
   }