@shopify/react-native-skia 1.11.9-next.1 → 2.0.0-next.1

package/src/Platform/Platform.web.tsx

@@ -98,7 +98,8 @@ const useElementLayout = (ref: RefObject<Div>, onLayout: OnLayout) => {
 const View = (({ children, onLayout, style: rawStyle }: ViewProps) => {
   const style = useMemo(() => (rawStyle ?? {}) as CSSProperties, [rawStyle]);
   const ref = useRef<Div>(null);
-  useElementLayout(ref, onLayout);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  useElementLayout(ref as any, onLayout);
   const cssStyles = useMemo(() => {
     return {
       alignItems: "stretch" as const,

package/src/renderer/Canvas.tsx

@@ -3,6 +3,7 @@ import React, {
   useCallback,
   useEffect,
   useImperativeHandle,
+  useLayoutEffect,
   useMemo,
   useRef,
 } from "react";
@@ -72,10 +73,9 @@ export const Canvas = ({
   // Root
   const root = useMemo(() => new SkiaSGRoot(Skia, nativeId), [nativeId]);
 
-  // Render effects
-  useEffect(() => {
+  useLayoutEffect(() => {
     root.render(children);
-  }, [children, root]);
+  }, [root, children]);
 
   useEffect(() => {
     return () => {

package/src/renderer/__tests__/setup.tsx

@@ -194,6 +194,9 @@ export const mountCanvas = async (element: ReactNode) => {
   return {
     surface: ckSurface,
     root,
+    render: async () => {
+      await root.render(element);
+    },
     draw: async () => {
       await root.render(element);
       root.drawOnCanvas(canvas);
@@ -202,7 +205,8 @@ export const mountCanvas = async (element: ReactNode) => {
 };
 
 export const serialize = async (element: ReactNode) => {
-  const { root } = await mountCanvas(element);
+  const { root, render } = await mountCanvas(element);
+  await render();
   const serialized = serializeNode(root.sg);
   return JSON.stringify(serialized);
 };

package/src/sksg/Elements.tsx

@@ -54,7 +54,7 @@ import type {
 } from "../dom/types";
 import type { SkiaProps } from "../renderer";
 
-declare global {
+declare module "react" {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace JSX {
     interface IntrinsicElements {

package/src/sksg/Reconciler.ts

@@ -43,8 +43,7 @@ export class SkiaSGRoot {
 
   private updateContainer(element: ReactNode) {
     return new Promise((resolve) => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      skiaReconciler.updateContainer(element as any, this.root, null, () => {
+      skiaReconciler.updateContainer(element, this.root, null, () => {
         debug("updateContainer");
         resolve(true);
       });

package/cpp/skia/include/gpu/graphite/LogPriority.h

@@ -1,36 +0,0 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef skgpu_graphite_LogPriority_DEFINED
-#define skgpu_graphite_LogPriority_DEFINED
-
-/**
- * Note: this file may be included in clients' SkUserConfig.h files, so including any other headers
- * in this file should be avoided.
- */
-
-namespace skgpu::graphite {
-/**
- * SKGPU_GRAPHITE_LOWEST_ACTIVE_LOG_PRIORITY can be defined to one of these values (in
- * SkUserConfig.h) to control Graphite's logging behavior.
- *
- * For example:
- * ```
- * #define SKGPU_GRAPHITE_LOWEST_ACTIVE_LOG_PRIORITY skgpu::graphite::LogPriority::kWarning
- * ```
- * Would cause Graphite to log warnings, non-fatal errors, and fatal errors.
- * However, debug logs would be omitted.
- */
-enum class LogPriority : int {
-    kFatal = 0,
-    kError = 1,
-    kWarning = 2,
-    kDebug = 3,
-};
-};  // namespace skgpu::graphite
-
-#endif // skgpu_graphite_LogPriority_DEFINED

package/cpp/skia/include/gpu/graphite/PrecompileContext.h

@@ -1,52 +0,0 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef skgpu_graphite_PrecompileContext_DEFINED
-#define skgpu_graphite_PrecompileContext_DEFINED
-
-#include "include/core/SkRefCnt.h"
-#include "include/private/base/SingleOwner.h"
-
-#include <chrono>
-#include <memory>
-
-namespace skgpu::graphite {
-
-class SharedContext;
-class PrecompileContextPriv;
-class ResourceProvider;
-
-class SK_API PrecompileContext {
-public:
-    ~PrecompileContext();
-
-    /**
-     * Purge Pipelines that haven't been used in the past 'msNotUsed' milliseconds
-     * regardless of whether the pipeline cache is under budget.
-     *
-     * @param msNotUsed   Pipelines not used in these last milliseconds will be cleaned up.
-     */
-    void purgePipelinesNotUsedInMs(std::chrono::milliseconds msNotUsed);
-
-    // Provides access to functions that aren't part of the public API.
-    PrecompileContextPriv priv();
-    const PrecompileContextPriv priv() const;  // NOLINT(readability-const-return-type)
-
-private:
-    friend class PrecompileContextPriv;
-    friend class Context; // for ctor
-
-    PrecompileContext(sk_sp<SharedContext>);
-
-    mutable SingleOwner fSingleOwner;
-    sk_sp<SharedContext> fSharedContext;
-    std::unique_ptr<ResourceProvider> fResourceProvider;
-};
-
-}  // namespace skgpu::graphite
-
-#endif // skgpu_graphite_PrecompileContext_DEFINED

package/cpp/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h

@@ -1,48 +0,0 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
-#define skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
-
-#include "include/core/SkTypes.h"
-
-#include "include/gpu/graphite/BackendTexture.h"
-#include "include/gpu/graphite/TextureInfo.h"
-#include "include/private/base/SkAPI.h"
-
-#import <CoreFoundation/CoreFoundation.h>
-
-namespace skgpu::graphite {
-
-struct SK_API MtlTextureInfo;
-
-namespace TextureInfos {
-SK_API TextureInfo MakeMetal(const MtlTextureInfo&);
-SK_API TextureInfo MakeMetal(CFTypeRef mtlTexture);
-
-SK_API bool GetMtlTextureInfo(const TextureInfo&, MtlTextureInfo*);
-}  // namespace TextureInfos
-
-namespace BackendTextures {
-// The BackendTexture will not call retain or release on the passed in CFTypeRef. Thus the
-// client must keep the CFTypeRef valid until they are no longer using the BackendTexture.
-SK_API BackendTexture MakeMetal(SkISize dimensions, CFTypeRef mtlTexture);
-
-SK_API CFTypeRef GetMtlTexture(const BackendTexture&);
-}  // namespace BackendTextures
-
-namespace BackendSemaphores {
-// TODO(b/286088355) Determine creator's responsibility for setting refcnt.
-SK_API BackendSemaphore MakeMetal(CFTypeRef mtlEvent, uint64_t value);
-
-SK_API CFTypeRef GetMtlEvent(const BackendSemaphore&);
-SK_API uint64_t GetMtlValue(const BackendSemaphore&);
-}  // namespace BackendSemaphores
-
-}  // namespace skgpu::graphite
-
-#endif  // skgpu_graphite_MtlGraphiteTypesUtils_DEFINED