Merge branch 'main' into fix/skia-value-name

Author: wcandillon

example/src/Examples/API/Images.tsx

@@ -26,10 +26,24 @@ const rects = [
 ];
 
 export const Images = () => {
+  // Verifies that the error handler for images are working correctly.
+  useImage(new Uint8Array([0, 0, 0, 255]), (err) => {
+    if (err.message !== "Could not load data") {
+      throw new Error(
+        `Expected error message to be 'Could not load data' - got '${err.message}'`
+      );
+    }
+  });
+  useImage("https://reactjs.org/invalid.jpg", (err) => {
+    if (err.message !== "Could not load data") {
+      throw new Error(
+        `Expected error message to be 'Could not load data' - got '${err.message}'`
+      );
+    }
+  });
+
   const oslo = useImage(require("../../assets/oslo.jpg"));
-  if (oslo === null) {
-    return null;
-  }
+
   return (
     <ScrollView>
       {fits.map((fit, i) => (
@@ -47,14 +61,16 @@ export const Images = () => {
                     height={height}
                     color="lightblue"
                   />
-                  <Image
-                    image={oslo}
-                    x={x}
-                    y={y}
-                    width={width}
-                    height={height}
-                    fit={fit}
-                  />
+                  {oslo ? (
+                    <Image
+                      image={oslo}
+                      x={x}
+                      y={y}
+                      width={width}
+                      height={height}
+                      fit={fit}
+                    />
+                  ) : null}
                 </React.Fragment>
               );
             })}

example/src/Examples/API/SVG.tsx

@@ -6,12 +6,11 @@ const { width, height } = Dimensions.get("window");
 
 export const SVG = () => {
   const svg = useSVG(require("./tiger.svg"));
-  if (svg === null) {
-    return null;
-  }
   return (
     <Canvas style={{ flex: 1 }}>
-      <ImageSVG svg={svg} x={0} y={0} width={width / 2} height={height / 2} />
+      {svg ? (
+        <ImageSVG svg={svg} x={0} y={0} width={width / 2} height={height / 2} />
+      ) : null}
     </Canvas>
   );
 };

package/src/animation/functions/interpolateColors.ts

@@ -1,7 +1,6 @@
 import { mix } from "../../renderer";
-import type { Color } from "../../skia";
+import type { Color, SkColor } from "../../skia";
 import { Skia } from "../../skia";
-import type { SkColor } from "../../skia/Color";
 
 import { interpolate } from "./interpolate";
 

package/src/index.ts

@@ -1,5 +1,4 @@
 import "./skia/NativeSetup";
-
 export * from "./renderer";
 export * from "./views";
 export * from "./skia";

package/src/renderer/Canvas.tsx

@@ -19,11 +19,10 @@ import ReactReconciler from "react-reconciler";
 
 import { SkiaView, useDrawCallback } from "../views";
 import type { TouchHandler } from "../views";
-import { Skia } from "../skia";
-import type { FontMgr } from "../skia/FontMgr/FontMgr";
+import { Skia, SkiaPaint } from "../skia";
+import type { FontMgr } from "../skia";
 import { useValue } from "../values/hooks/useValue";
 import type { SkiaValue } from "../values/types";
-import { SkiaPaint } from "../skia/Paint/Paint";
 
 import { debug as hostDebug, skHostConfig } from "./HostConfig";
 // import { debugTree } from "./nodes";

package/src/renderer/DrawingContext.ts

@@ -1,8 +1,7 @@
 import type { RefObject } from "react";
 
 import type { DrawingInfo, SkiaView } from "../views";
-import type { SkCanvas, SkPaint } from "../skia";
-import type { FontMgr } from "../skia/FontMgr/FontMgr";
+import type { FontMgr, SkCanvas, SkPaint } from "../skia";
 
 import type { Vector } from "./processors/math/Vector";
 

package/src/renderer/components/Blend.tsx

@@ -1,10 +1,9 @@
 import type { ReactNode } from "react";
 import React from "react";
 
-import { isImageFilter, Skia, BlendMode } from "../../skia";
+import { isImageFilter, Skia, BlendMode, isShader } from "../../skia";
 import { createDeclaration } from "../nodes";
 import type { AnimatedProps, SkEnum } from "../processors";
-import { isShader } from "../../skia/Shader/Shader";
 import { enumKey } from "../processors/Paint";
 
 interface BlendProps {

package/src/renderer/components/Compose.tsx

@@ -1,11 +1,9 @@
 import React from "react";
 import type { ReactNode } from "react";
 
-import { Skia } from "../../skia";
+import { Skia, isImageFilter, isColorFilter } from "../../skia";
 import { createDeclaration } from "../nodes/Declaration";
 import type { AnimatedProps } from "../processors/Animations/Animations";
-import { isColorFilter } from "../../skia/ColorFilter/ColorFilter";
-import { isImageFilter } from "../../skia/ImageFilter/ImageFilter";
 
 export interface ComposeProps {
   children: ReactNode | ReactNode[];

package/src/renderer/components/colorFilters/Lerp.tsx

@@ -1,10 +1,9 @@
 import React from "react";
 import type { ReactNode } from "react";
 
-import { Skia } from "../../../skia";
+import { Skia, isColorFilter } from "../../../skia";
 import { createDeclaration } from "../../nodes/Declaration";
 import type { AnimatedProps } from "../../processors/Animations/Animations";
-import { isColorFilter } from "../../../skia/ColorFilter/ColorFilter";
 
 import { composeColorFilter } from "./Compose";
 

package/src/renderer/components/imageFilters/DisplacementMap.tsx

@@ -1,11 +1,10 @@
 import React from "react";
 import type { ReactNode } from "react";
 
-import { Skia } from "../../../skia";
+import { Skia, ColorChannel } from "../../../skia";
 import { createDeclaration } from "../../nodes";
 import type { SkEnum, AnimatedProps } from "../../processors";
 import { enumKey } from "../../processors";
-import { ColorChannel } from "../../../skia/ImageFilter/ImageFilterFactory";
 
 import { getInput } from "./getInput";