@shopify/react-native-skia 1.4.2 → 1.5.1

package/lib/module/views/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./SkiaPictureView\";\nexport * from \"./SkiaDomView\";\nexport * from \"./types\";\nexport * from \"./useTouchHandler\";\n"],"mappings":"AAAA,cAAc,mBAAmB;AACjC,cAAc,eAAe;AAC7B,cAAc,SAAS;AACvB,cAAc,mBAAmB","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./SkiaPictureView\";\nexport * from \"./SkiaDomView\";\nexport * from \"./types\";\n"],"mappings":"AAAA,cAAc,mBAAmB;AACjC,cAAc,eAAe;AAC7B,cAAc,SAAS","ignoreList":[]}

package/lib/module/views/types.d.ts

@@ -7,36 +7,11 @@ export type NativeSkiaViewProps = ViewProps & {
     mode?: DrawMode;
     debug?: boolean;
 };
-export declare enum TouchType {
-    Start = 0,
-    Active = 1,
-    End = 2,
-    Cancelled = 3
-}
-export interface TouchInfo {
-    x: number;
-    y: number;
-    force: number;
-    type: TouchType;
-    id: number;
-    timestamp: number;
-}
 export interface DrawingInfo {
     width: number;
     height: number;
     timestamp: number;
-    touches: Array<Array<TouchInfo>>;
 }
-export type ExtendedTouchInfo = TouchInfo & {
-    velocityX: number;
-    velocityY: number;
-};
-export type TouchHandlers = {
-    onStart?: (touchInfo: TouchInfo) => void;
-    onActive?: (touchInfo: ExtendedTouchInfo) => void;
-    onEnd?: (touchInfo: ExtendedTouchInfo) => void;
-};
-export type TouchHandler = (touchInfo: Array<Array<TouchInfo>>) => void;
 export interface ISkiaViewApi {
     setJsiProperty: <T>(nativeId: number, name: string, value: T) => void;
     requestRedraw: (nativeId: number) => void;
@@ -68,5 +43,4 @@ export interface SkiaPictureViewProps extends SkiaBaseViewProps {
 }
 export interface SkiaDomViewProps extends SkiaBaseViewProps {
     root?: RenderNode<GroupProps>;
-    onTouch?: TouchHandler;
 }

package/lib/module/views/types.js

@@ -1,8 +1,2 @@
-export let TouchType = /*#__PURE__*/function (TouchType) {
-  TouchType[TouchType["Start"] = 0] = "Start";
-  TouchType[TouchType["Active"] = 1] = "Active";
-  TouchType[TouchType["End"] = 2] = "End";
-  TouchType[TouchType["Cancelled"] = 3] = "Cancelled";
-  return TouchType;
-}({});
+export {};
 //# sourceMappingURL=types.js.map

package/lib/module/views/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["TouchType"],"sources":["types.ts"],"sourcesContent":["import type { ViewProps } from \"react-native\";\n\nimport type { GroupProps, RenderNode } from \"../dom/types\";\nimport type { SkImage, SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport type { SharedValueType } from \"../renderer/processors/Animations/Animations\";\n\nexport type DrawMode = \"continuous\" | \"default\";\n\nexport type NativeSkiaViewProps = ViewProps & {\n  mode?: DrawMode;\n  debug?: boolean;\n};\n\nexport enum TouchType {\n  Start,\n  Active,\n  End,\n  Cancelled,\n}\n\nexport interface TouchInfo {\n  x: number;\n  y: number;\n  force: number;\n  type: TouchType;\n  id: number;\n  timestamp: number;\n}\n\nexport interface DrawingInfo {\n  width: number;\n  height: number;\n  timestamp: number;\n  touches: Array<Array<TouchInfo>>;\n}\n\nexport type ExtendedTouchInfo = TouchInfo & {\n  // points per second\n  velocityX: number;\n  velocityY: number;\n};\n\nexport type TouchHandlers = {\n  onStart?: (touchInfo: TouchInfo) => void;\n  onActive?: (touchInfo: ExtendedTouchInfo) => void;\n  onEnd?: (touchInfo: ExtendedTouchInfo) => void;\n};\n\nexport type TouchHandler = (touchInfo: Array<Array<TouchInfo>>) => void;\n\nexport interface ISkiaViewApi {\n  setJsiProperty: <T>(nativeId: number, name: string, value: T) => void;\n  requestRedraw: (nativeId: number) => void;\n  makeImageSnapshot: (nativeId: number, rect?: SkRect) => SkImage;\n  makeImageSnapshotAsync: (nativeId: number, rect?: SkRect) => Promise<SkImage>;\n}\n\nexport interface SkiaBaseViewProps extends ViewProps {\n  /**\n   * Sets the drawing mode for the skia view. There are two drawing\n   * modes, \"continuous\" and \"default\", where the continuous mode will\n   * continuously redraw the view, and the default mode will only\n   * redraw when any of the regular react properties are changed like\n   * sizes and margins.\n   */\n  mode?: DrawMode;\n  /**\n   * When set to true the view will display information about the\n   * average time it takes to render.\n   */\n  debug?: boolean;\n  /**\n   * Pass an animated value to the onSize property to get updates when\n   * the Skia view is resized.\n   */\n  onSize?: SharedValueType<SkSize>;\n}\n\nexport interface SkiaPictureViewProps extends SkiaBaseViewProps {\n  picture?: SkPicture;\n}\n\nexport interface SkiaDomViewProps extends SkiaBaseViewProps {\n  root?: RenderNode<GroupProps>;\n  onTouch?: TouchHandler;\n}\n"],"mappings":"AAaA,WAAYA,SAAS,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { ViewProps } from \"react-native\";\n\nimport type { GroupProps, RenderNode } from \"../dom/types\";\nimport type { SkImage, SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport type { SharedValueType } from \"../renderer/processors/Animations/Animations\";\n\nexport type DrawMode = \"continuous\" | \"default\";\n\nexport type NativeSkiaViewProps = ViewProps & {\n  mode?: DrawMode;\n  debug?: boolean;\n};\n\nexport interface DrawingInfo {\n  width: number;\n  height: number;\n  timestamp: number;\n}\n\nexport interface ISkiaViewApi {\n  setJsiProperty: <T>(nativeId: number, name: string, value: T) => void;\n  requestRedraw: (nativeId: number) => void;\n  makeImageSnapshot: (nativeId: number, rect?: SkRect) => SkImage;\n  makeImageSnapshotAsync: (nativeId: number, rect?: SkRect) => Promise<SkImage>;\n}\n\nexport interface SkiaBaseViewProps extends ViewProps {\n  /**\n   * Sets the drawing mode for the skia view. There are two drawing\n   * modes, \"continuous\" and \"default\", where the continuous mode will\n   * continuously redraw the view, and the default mode will only\n   * redraw when any of the regular react properties are changed like\n   * sizes and margins.\n   */\n  mode?: DrawMode;\n  /**\n   * When set to true the view will display information about the\n   * average time it takes to render.\n   */\n  debug?: boolean;\n  /**\n   * Pass an animated value to the onSize property to get updates when\n   * the Skia view is resized.\n   */\n  onSize?: SharedValueType<SkSize>;\n}\n\nexport interface SkiaPictureViewProps extends SkiaBaseViewProps {\n  picture?: SkPicture;\n}\n\nexport interface SkiaDomViewProps extends SkiaBaseViewProps {\n  root?: RenderNode<GroupProps>;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/module/web/WithSkiaWeb.js

@@ -17,7 +17,10 @@ export const WithSkiaWeb = ({
       console.warn("<WithSkiaWeb /> is only necessary on web. Consider not using on native.");
     }
     return getComponent();
-  }), [getComponent, opts]);
+  }),
+  // We we to run this only once.
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  []);
   return /*#__PURE__*/React.createElement(Suspense, {
     fallback: fallback !== null && fallback !== void 0 ? fallback : null
   }, /*#__PURE__*/React.createElement(Inner, componentProps));

package/lib/module/web/WithSkiaWeb.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","lazy","Suspense","Platform","LoadSkiaWeb","WithSkiaWeb","getComponent","fallback","opts","componentProps","Inner","OS","console","warn","createElement"],"sources":["WithSkiaWeb.tsx"],"sourcesContent":["import type { ComponentProps, ComponentType } from \"react\";\nimport React, { useMemo, lazy, Suspense } from \"react\";\n\nimport { Platform } from \"../Platform\";\n\nimport { LoadSkiaWeb } from \"./LoadSkiaWeb\";\n\ntype NonOptionalKeys<T> = {\n  [k in keyof T]-?: undefined extends T[k] ? never : k;\n}[keyof T];\n\ntype WithSkiaProps<TProps> = {\n  fallback?: ComponentProps<typeof Suspense>[\"fallback\"];\n  getComponent: () => Promise<{ default: ComponentType<TProps> }>;\n  opts?: Parameters<typeof LoadSkiaWeb>[0];\n} & (NonOptionalKeys<TProps> extends never\n  ? {\n      componentProps?: TProps;\n    }\n  : {\n      componentProps: TProps;\n    });\n\nexport const WithSkiaWeb = <TProps extends object>({\n  getComponent,\n  fallback,\n  opts,\n  componentProps,\n}: WithSkiaProps<TProps>) => {\n  const Inner = useMemo(\n    // TODO: investigate\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    (): any =>\n      lazy(async () => {\n        if (Platform.OS === \"web\") {\n          await LoadSkiaWeb(opts);\n        } else {\n          console.warn(\n            \"<WithSkiaWeb /> is only necessary on web. Consider not using on native.\"\n          );\n        }\n        return getComponent();\n      }),\n    [getComponent, opts]\n  );\n  return (\n    <Suspense fallback={fallback ?? null}>\n      <Inner {...componentProps} />\n    </Suspense>\n  );\n};\n"],"mappings":"AACA,OAAOA,KAAK,IAAIC,OAAO,EAAEC,IAAI,EAAEC,QAAQ,QAAQ,OAAO;AAEtD,SAASC,QAAQ,QAAQ,aAAa;AAEtC,SAASC,WAAW,QAAQ,eAAe;AAkB3C,OAAO,MAAMC,WAAW,GAAGA,CAAwB;EACjDC,YAAY;EACZC,QAAQ;EACRC,IAAI;EACJC;AACqB,CAAC,KAAK;EAC3B,MAAMC,KAAK,GAAGV,OAAO;EACnB;EACA;EACA,mBACEC,IAAI,CAAC,YAAY;IACf,IAAIE,QAAQ,CAACQ,EAAE,KAAK,KAAK,EAAE;MACzB,MAAMP,WAAW,CAACI,IAAI,CAAC;IACzB,CAAC,MAAM;MACLI,OAAO,CAACC,IAAI,CACV,yEACF,CAAC;IACH;IACA,OAAOP,YAAY,CAAC,CAAC;EACvB,CAAC,CAAC,EACJ,CAACA,YAAY,EAAEE,IAAI,CACrB,CAAC;EACD,oBACET,KAAA,CAAAe,aAAA,CAACZ,QAAQ;IAACK,QAAQ,EAAEA,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAI;EAAK,gBACnCR,KAAA,CAAAe,aAAA,CAACJ,KAAK,EAAKD,cAAiB,CACpB,CAAC;AAEf,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useMemo","lazy","Suspense","Platform","LoadSkiaWeb","WithSkiaWeb","getComponent","fallback","opts","componentProps","Inner","OS","console","warn","createElement"],"sources":["WithSkiaWeb.tsx"],"sourcesContent":["import type { ComponentProps, ComponentType } from \"react\";\nimport React, { useMemo, lazy, Suspense } from \"react\";\n\nimport { Platform } from \"../Platform\";\n\nimport { LoadSkiaWeb } from \"./LoadSkiaWeb\";\n\ntype NonOptionalKeys<T> = {\n  [k in keyof T]-?: undefined extends T[k] ? never : k;\n}[keyof T];\n\ntype WithSkiaProps<TProps> = {\n  fallback?: ComponentProps<typeof Suspense>[\"fallback\"];\n  getComponent: () => Promise<{ default: ComponentType<TProps> }>;\n  opts?: Parameters<typeof LoadSkiaWeb>[0];\n} & (NonOptionalKeys<TProps> extends never\n  ? {\n      componentProps?: TProps;\n    }\n  : {\n      componentProps: TProps;\n    });\n\nexport const WithSkiaWeb = <TProps extends object>({\n  getComponent,\n  fallback,\n  opts,\n  componentProps,\n}: WithSkiaProps<TProps>) => {\n  const Inner = useMemo(\n    // TODO: investigate\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    (): any =>\n      lazy(async () => {\n        if (Platform.OS === \"web\") {\n          await LoadSkiaWeb(opts);\n        } else {\n          console.warn(\n            \"<WithSkiaWeb /> is only necessary on web. Consider not using on native.\"\n          );\n        }\n        return getComponent();\n      }),\n    // We we to run this only once.\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    []\n  );\n  return (\n    <Suspense fallback={fallback ?? null}>\n      <Inner {...componentProps} />\n    </Suspense>\n  );\n};\n"],"mappings":"AACA,OAAOA,KAAK,IAAIC,OAAO,EAAEC,IAAI,EAAEC,QAAQ,QAAQ,OAAO;AAEtD,SAASC,QAAQ,QAAQ,aAAa;AAEtC,SAASC,WAAW,QAAQ,eAAe;AAkB3C,OAAO,MAAMC,WAAW,GAAGA,CAAwB;EACjDC,YAAY;EACZC,QAAQ;EACRC,IAAI;EACJC;AACqB,CAAC,KAAK;EAC3B,MAAMC,KAAK,GAAGV,OAAO;EACnB;EACA;EACA,mBACEC,IAAI,CAAC,YAAY;IACf,IAAIE,QAAQ,CAACQ,EAAE,KAAK,KAAK,EAAE;MACzB,MAAMP,WAAW,CAACI,IAAI,CAAC;IACzB,CAAC,MAAM;MACLI,OAAO,CAACC,IAAI,CACV,yEACF,CAAC;IACH;IACA,OAAOP,YAAY,CAAC,CAAC;EACvB,CAAC,CAAC;EACJ;EACA;EACA,EACF,CAAC;EACD,oBACEP,KAAA,CAAAe,aAAA,CAACZ,QAAQ;IAACK,QAAQ,EAAEA,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAI;EAAK,gBACnCR,KAAA,CAAAe,aAAA,CAACJ,KAAK,EAAKD,cAAiB,CACpB,CAAC;AAEf,CAAC","ignoreList":[]}

package/lib/typescript/lib/commonjs/mock/index.d.ts

@@ -7,7 +7,6 @@ export function Mock(CanvasKit: any): {
     useComputedValue: () => {
         current: number;
     };
-    useTouchHandler: () => undefined;
     useTiming: () => {
         current: number;
     };

package/lib/typescript/lib/commonjs/views/SkiaBaseWebView.d.ts

@@ -32,7 +32,6 @@ export class SkiaBaseWebView extends SkiaBaseWebView_base {
      */
     tick(): void;
     _redrawRequests: number | undefined;
-    _touches: any[] | undefined;
     requestId: number | undefined;
     redraw(): void;
     /**
@@ -45,8 +44,6 @@ export class SkiaBaseWebView extends SkiaBaseWebView_base {
      * @param mode Drawing mode to use.
      */
     setDrawMode(mode: any): void;
-    handleTouchEvent(evt: any, touchType: any): void;
-    createTouchHandler(touchType: any): (evt: any) => void;
     render(): any;
 }
 import _JsiSkSurface = require("../skia/web/JsiSkSurface");

package/lib/typescript/lib/commonjs/views/SkiaDomView.web.d.ts

@@ -1,5 +1,5 @@
 export const __esModule: boolean;
 export class SkiaDomView extends _SkiaBaseWebView.SkiaBaseWebView {
-    renderInCanvas(canvas: any, touches: any): void;
+    renderInCanvas(canvas: any): void;
 }
 import _SkiaBaseWebView = require("./SkiaBaseWebView");

package/lib/typescript/lib/commonjs/views/types.d.ts

@@ -1,2 +1 @@
 export const __esModule: boolean;
-export const TouchType: {};

package/lib/typescript/lib/module/mock/index.d.ts

@@ -6,7 +6,6 @@ export function Mock(CanvasKit: any): {
     useComputedValue: () => {
         current: number;
     };
-    useTouchHandler: () => undefined;
     useTiming: () => {
         current: number;
     };

package/lib/typescript/lib/module/views/SkiaBaseWebView.d.ts

@@ -29,7 +29,6 @@ export class SkiaBaseWebView extends React.Component<any, any, any> {
      */
     tick(): void;
     _redrawRequests: number | undefined;
-    _touches: any[] | undefined;
     requestId: number | undefined;
     redraw(): void;
     /**
@@ -42,8 +41,6 @@ export class SkiaBaseWebView extends React.Component<any, any, any> {
      * @param mode Drawing mode to use.
      */
     setDrawMode(mode: any): void;
-    handleTouchEvent(evt: any, touchType: any): void;
-    createTouchHandler(touchType: any): (evt: any) => void;
     render(): React.CElement<import("react-native").ViewProps, import("react-native").View>;
 }
 import React from "react";

package/lib/typescript/lib/module/views/SkiaDomView.web.d.ts

@@ -1,4 +1,4 @@
 export class SkiaDomView extends SkiaBaseWebView {
-    renderInCanvas(canvas: any, touches: any): void;
+    renderInCanvas(canvas: any): void;
 }
 import { SkiaBaseWebView } from "./SkiaBaseWebView";

package/lib/typescript/lib/module/views/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./SkiaPictureView";
 export * from "./SkiaDomView";
 export * from "./types";
-export * from "./useTouchHandler";

package/lib/typescript/lib/module/views/types.d.ts

@@ -1 +1 @@
-export let TouchType: {};
+export {};

package/lib/typescript/src/renderer/Canvas.d.ts

@@ -1,11 +1,10 @@
 import React from "react";
 import type { RefObject, ReactNode, FunctionComponent } from "react";
 import { SkiaDomView } from "../views";
-import type { TouchHandler, SkiaBaseViewProps } from "../views";
+import type { SkiaBaseViewProps } from "../views";
 export declare const useCanvasRef: () => React.RefObject<SkiaDomView>;
 export interface CanvasProps extends SkiaBaseViewProps {
     ref?: RefObject<SkiaDomView>;
     children: ReactNode;
-    onTouch?: TouchHandler;
 }
 export declare const Canvas: FunctionComponent<CanvasProps & React.RefAttributes<SkiaDomView>>;

package/lib/typescript/src/views/SkiaBaseWebView.d.ts

@@ -1,13 +1,10 @@
 import React from "react";
-import type { PointerEvent } from "react";
 import type { SkRect, SkCanvas } from "../skia/types";
-import type { DrawMode, SkiaBaseViewProps, TouchInfo } from "./types";
-import { TouchType } from "./types";
+import type { DrawMode, SkiaBaseViewProps } from "./types";
 export declare abstract class SkiaBaseWebView<TProps extends SkiaBaseViewProps> extends React.Component<TProps> {
     constructor(props: TProps);
     private _surface;
     private _unsubscriptions;
-    private _touches;
     private _canvas;
     private _canvasRef;
     private _mode;
@@ -33,7 +30,7 @@ export declare abstract class SkiaBaseWebView<TProps extends SkiaBaseViewProps>
     /**
      * Override to render
      */
-    protected abstract renderInCanvas(canvas: SkCanvas, touches: TouchInfo[]): void;
+    protected abstract renderInCanvas(canvas: SkCanvas): void;
     /**
      * Sends a redraw request to the native SkiaView.
      */
@@ -49,12 +46,6 @@ export declare abstract class SkiaBaseWebView<TProps extends SkiaBaseViewProps>
      * @param mode Drawing mode to use.
      */
     setDrawMode(mode: DrawMode): void;
-    private handleTouchEvent;
-    createTouchHandler(touchType: TouchType): (evt: PointerEvent) => void;
-    private onStart;
-    private onActive;
-    private onCancel;
-    private onEnd;
     private onLayout;
     render(): React.JSX.Element;
 }

package/lib/typescript/src/views/SkiaDomView.web.d.ts

@@ -1,7 +1,7 @@
 import type { SkCanvas } from "../skia/types";
 import { SkiaBaseWebView } from "./SkiaBaseWebView";
-import type { SkiaDomViewProps, TouchInfo } from "./types";
+import type { SkiaDomViewProps } from "./types";
 export declare class SkiaDomView extends SkiaBaseWebView<SkiaDomViewProps> {
     constructor(props: SkiaDomViewProps);
-    protected renderInCanvas(canvas: SkCanvas, touches: TouchInfo[]): void;
+    protected renderInCanvas(canvas: SkCanvas): void;
 }

package/lib/typescript/src/views/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./SkiaPictureView";
 export * from "./SkiaDomView";
 export * from "./types";
-export * from "./useTouchHandler";

package/lib/typescript/src/views/types.d.ts

@@ -7,36 +7,11 @@ export type NativeSkiaViewProps = ViewProps & {
     mode?: DrawMode;
     debug?: boolean;
 };
-export declare enum TouchType {
-    Start = 0,
-    Active = 1,
-    End = 2,
-    Cancelled = 3
-}
-export interface TouchInfo {
-    x: number;
-    y: number;
-    force: number;
-    type: TouchType;
-    id: number;
-    timestamp: number;
-}
 export interface DrawingInfo {
     width: number;
     height: number;
     timestamp: number;
-    touches: Array<Array<TouchInfo>>;
 }
-export type ExtendedTouchInfo = TouchInfo & {
-    velocityX: number;
-    velocityY: number;
-};
-export type TouchHandlers = {
-    onStart?: (touchInfo: TouchInfo) => void;
-    onActive?: (touchInfo: ExtendedTouchInfo) => void;
-    onEnd?: (touchInfo: ExtendedTouchInfo) => void;
-};
-export type TouchHandler = (touchInfo: Array<Array<TouchInfo>>) => void;
 export interface ISkiaViewApi {
     setJsiProperty: <T>(nativeId: number, name: string, value: T) => void;
     requestRedraw: (nativeId: number) => void;
@@ -68,5 +43,4 @@ export interface SkiaPictureViewProps extends SkiaBaseViewProps {
 }
 export interface SkiaDomViewProps extends SkiaBaseViewProps {
     root?: RenderNode<GroupProps>;
-    onTouch?: TouchHandler;
 }

package/libs/ios/libskottie.xcframework/Info.plist

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskparagraph.xcframework/Info.plist

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskparagraph.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskparagraph.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskshaper.xcframework/Info.plist

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libsvg.xcframework/Info.plist

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -41,12 +41,9 @@
     "e2e": "E2E=true yarn test -i e2e",
     "release": "semantic-release",
     "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module",
-    "build-skia-ios-framework": "ts-node ./scripts/build-skia-ios-framework.ts",
-    "build-skia-ios": "ts-node ./scripts/build-skia-ios.ts && yarn build-skia-ios-framework",
-    "build-skia-android": "ts-node ./scripts/build-skia-android.ts",
     "clean-skia": "yarn rimraf ./libs && yarn rimraf ../../externals/skia/out",
-    "copy-skia-headers": "ts-node ./scripts/copy-skia-module-headers.ts",
-    "build-skia": "yarn rimraf ./libs && yarn build-skia-ios && yarn build-skia-android && yarn copy-skia-headers",
+    "build-skia": "ts-node ./scripts/build-skia.ts",
+    "copy-skia-headers": "ts-node ./scripts/copy-skia-headers.ts",
     "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
     "clang-format-ios": "find ios/ -iname '*.h' -o -iname '*.mm' -o -iname '*.cpp' | xargs clang-format -i",
     "clang-format-android": "find android/cpp/ -iname '*.h' -o -iname '*.m' -o -iname '*.cpp' | xargs clang-format -i",

package/src/mock/index.ts

@@ -26,7 +26,6 @@ export const Mock = (CanvasKit: CanvasKit) => {
     // Skia Animations
     useValue: NoopValue,
     useComputedValue: NoopValue,
-    useTouchHandler: Noop,
     useTiming: NoopValue,
     useLoop: NoopValue,
     useSpring: NoopValue,

package/src/renderer/Canvas.tsx

@@ -16,7 +16,7 @@ import type { LayoutChangeEvent } from "react-native";
 
 import { SkiaDomView } from "../views";
 import { Skia } from "../skia/Skia";
-import type { TouchHandler, SkiaBaseViewProps } from "../views";
+import type { SkiaBaseViewProps } from "../views";
 import { SkiaJSDomView } from "../views/SkiaJSDomView";
 
 import { SkiaRoot } from "./Reconciler";
@@ -27,7 +27,6 @@ export const useCanvasRef = () => useRef<SkiaDomView>(null);
 export interface CanvasProps extends SkiaBaseViewProps {
   ref?: RefObject<SkiaDomView>;
   children: ReactNode;
-  onTouch?: TouchHandler;
 }
 
 const useOnSizeEvent = (
@@ -56,7 +55,6 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
       style,
       debug,
       mode,
-      onTouch,
       onSize: _onSize,
       onLayout: _onLayout,
       ...props
@@ -96,7 +94,6 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
           ref={ref}
           style={style}
           root={root.dom}
-          onTouch={onTouch}
           onLayout={onLayout}
           mode={mode}
           debug={debug}
@@ -111,7 +108,6 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
           ref={ref as any}
           style={style}
           root={root.dom}
-          onTouch={onTouch}
           onLayout={onLayout}
           mode={mode}
           debug={debug}

package/src/renderer/__tests__/setup.tsx

@@ -164,13 +164,11 @@ export const importSkia = (): typeof SkiaExports => {
   const offscreen = require("../Offscreen");
   // TODO: to remove
   const animation = require("../../animation");
-  const useTouchHandler = require("../../views/useTouchHandler");
   return {
     ...skia,
     ...renderer,
     ...animation,
     ...offscreen,
-    ...useTouchHandler,
   };
 };
 

package/src/skia/web/JsiSkia.ts

@@ -131,5 +131,5 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   Video: createVideo.bind(null, CanvasKit),
   Context: (_surface: bigint, _width: number, _height: number) => {
     throw new Error("Not implemented on React Native Web");
-  }
+  },
 });