@react-native-ohos/react-native-skia 1.3.9 → 1.3.11

package/LICENSE.md

@@ -1,7 +1,7 @@
-Copyright 2021-present, Shopify Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2021-present, Shopify Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,9 +1,9 @@
-# React Native Skia
-
-High-performance 2d Graphics for React Native using Skia
-
-<img width="400" alt="skia" src="https://user-images.githubusercontent.com/306134/146549218-b7959ad9-0107-4c1c-b439-b96c780f5230.png">
-
-Checkout the full documentation [here](https://shopify.github.io/react-native-skia).
-
+# React Native Skia
+
+High-performance 2d Graphics for React Native using Skia
+
+<img width="400" alt="skia" src="https://user-images.githubusercontent.com/306134/146549218-b7959ad9-0107-4c1c-b439-b96c780f5230.png">
+
+Checkout the full documentation [here](https://shopify.github.io/react-native-skia).
+
 Documentation on the library development is available [here](https://github.com/Shopify/react-native-skia#library-development).

package/package.json

@@ -1,134 +1,136 @@
-{
-  "name": "@react-native-ohos/react-native-skia",
-  "harmony": {
-    "alias": "@shopify/react-native-skia",
-	  "redirectInternalImports": true,
-    "autolinking": {
-      "etsPackageClassName":"SkiaPackage",
-      "cppPackageClassName":"SkiaPackage",
-      "cmakeLibraryTargetName": "rnoh_skia", 
-      "ohPackageName": "@react-native-ohos/react-native-skia"
-    }
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "bin": {
-    "setup-skia-web": "./scripts/setup-canvaskit.js"
-  },
-  "title": "React Native Skia",
-  "version": "1.3.9",
-  "description": "High-performance React Native Graphics using Skia",
-  "main": "lib/module/index.js",
-  "react-native": "src/index.ts",
-  "module": "lib/module/index.js",
-  "types": "lib/typescript/index.d.ts",
-  "files": [
-    "harmony",
-    "src",
-    "lib",
-    "scripts/setup-canvaskit.js"
-  ],
-  "scripts": {
-    "tsc": "tsc --noEmit",
-    "lint": "eslint . --ext .ts,.tsx  --max-warnings 0 --cache",
-    "test": "jest",
-    "e2e": "E2E=true yarn test -i e2e",
-    "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module",
-    "release": "semantic-release"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitcode.com/openharmony-sig/rntpc_react-native-skia.git",
-    "baseUrl": "https://gitcode.com/openharmony-sig/rntpc_react-native-skia"
-  },
-  "keywords": [
-    "react-native"
-  ],
-  "author": "Shopify Inc.",
-  "contributors": [
-    {
-      "name": "Christian Falch",
-      "email": "christian.falch@gmail.com"
-    },
-    {
-      "name": "William Candillon",
-      "email": "wcandillon@gmail.com"
-    }
-  ],
-  "license": "MIT",
-  "licenseFilename": "LICENSE.md",
-  "readmeFilename": "README.md",
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*",
-    "react-native-reanimated": ">=2.0.0",
-    "@shopify/react-native-skia": "1.3.7"
-  },
-  "peerDependenciesMeta": {
-    "react-native-reanimated": {
-      "optional": true
-    },
-    "react-native": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@types/jest": "29.5.6",
-    "@types/pixelmatch": "5.2.4",
-    "@types/pngjs": "6.0.1",
-    "@types/react": "18.2.37",
-    "@types/react-reconciler": "0.26.7",
-    "@types/ws": "8.5.3",
-    "eslint": "8.21.0",
-    "eslint-config-react-native-wcandillon": "3.10.2",
-    "eslint-plugin-reanimated": "2.0.0",
-    "jest": "29.6.4",
-    "jest-diff": "29.7.0",
-    "merge-dirs": "0.2.1",
-    "pixelmatch": "5.3.0",
-    "pngjs": "6.0.0",
-    "react": "18.2.0",
-    "react-native": "0.72.5",
-    "react-native-builder-bob": "0.18.2",
-    "react-native-reanimated": "3.6.2",
-    "ts-jest": "29.1.1",
-    "typescript": "5.1.6",
-    "ws": "8.17.1"
-  },
-  "dependencies": {
-    "canvaskit-wasm": "0.39.1",
-    "react-reconciler": "0.27.0"
-  },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
-  "codegenConfig": {
-    "name": "rnskia",
-    "type": "all",
-    "jsSrcsDir": "src/specs",
-    "android": {
-      "javaPackageName": "com.shopify.reactnative.skia"
-    }
-  },
-  "react-native-builder-bob": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      "commonjs",
-      [
-        "module",
-        {
-          "configFile": "./.babelrc"
-        }
-      ],
-      "typescript"
-    ]
-  },
-  "resolutions": {
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0"
-  }
-}
+{
+  "name": "@react-native-ohos/react-native-skia",
+  "harmony": {
+    "alias": "@shopify/react-native-skia",
+	  "redirectInternalImports": true,
+    "autolinking": {
+      "etsPackageClassName":"SkiaPackage",
+      "cppPackageClassName":"SkiaPackage",
+      "cmakeLibraryTargetName": "rnoh_skia", 
+      "ohPackageName": "@react-native-ohos/react-native-skia"
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "bin": {
+    "setup-skia-web": "./scripts/setup-canvaskit.js"
+  },
+  "title": "React Native Skia",
+  "version": "1.3.11",
+  "description": "High-performance React Native Graphics using Skia",
+  "main": "lib/module/index.js",
+  "react-native": "src/index.ts",
+  "module": "lib/module/index.js",
+  "types": "lib/typescript/index.d.ts",
+  "files": [
+    "harmony",
+    "src",
+    "lib",
+    "scripts/setup-canvaskit.js"
+  ],
+  "scripts": {
+    "tsc": "tsc --noEmit",
+    "lint": "eslint . --ext .ts,.tsx  --max-warnings 0 --cache",
+    "test": "jest",
+    "e2e": "E2E=true yarn test -i e2e",
+    "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module",
+    "release": "semantic-release",
+    "prepack": "node scripts/copy-tgz-to-root.js",
+    "postpack": "node scripts/copy-tgz-to-root.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitcode.com/openharmony-sig/rntpc_react-native-skia.git",
+    "baseUrl": "https://gitcode.com/openharmony-sig/rntpc_react-native-skia"
+  },
+  "keywords": [
+    "react-native"
+  ],
+  "author": "Shopify Inc.",
+  "contributors": [
+    {
+      "name": "Christian Falch",
+      "email": "christian.falch@gmail.com"
+    },
+    {
+      "name": "William Candillon",
+      "email": "wcandillon@gmail.com"
+    }
+  ],
+  "license": "MIT",
+  "licenseFilename": "LICENSE.md",
+  "readmeFilename": "README.md",
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*",
+    "react-native-reanimated": ">=2.0.0",
+    "@shopify/react-native-skia": "1.3.7"
+  },
+  "peerDependenciesMeta": {
+    "react-native-reanimated": {
+      "optional": true
+    },
+    "react-native": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
+    "@types/jest": "29.5.6",
+    "@types/pixelmatch": "5.2.4",
+    "@types/pngjs": "6.0.1",
+    "@types/react": "18.2.37",
+    "@types/react-reconciler": "0.26.7",
+    "@types/ws": "8.5.3",
+    "eslint": "8.21.0",
+    "eslint-config-react-native-wcandillon": "3.10.2",
+    "eslint-plugin-reanimated": "2.0.0",
+    "jest": "29.6.4",
+    "jest-diff": "29.7.0",
+    "merge-dirs": "0.2.1",
+    "pixelmatch": "5.3.0",
+    "pngjs": "6.0.0",
+    "react": "18.2.0",
+    "react-native": "0.72.5",
+    "react-native-builder-bob": "0.18.2",
+    "react-native-reanimated": "3.6.2",
+    "ts-jest": "29.1.1",
+    "typescript": "5.1.6",
+    "ws": "8.17.1"
+  },
+  "dependencies": {
+    "canvaskit-wasm": "0.39.1",
+    "react-reconciler": "0.27.0"
+  },
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "codegenConfig": {
+    "name": "rnskia",
+    "type": "all",
+    "jsSrcsDir": "src/specs",
+    "android": {
+      "javaPackageName": "com.shopify.reactnative.skia"
+    }
+  },
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "lib",
+    "targets": [
+      "commonjs",
+      [
+        "module",
+        {
+          "configFile": "./.babelrc"
+        }
+      ],
+      "typescript"
+    ]
+  },
+  "resolutions": {
+    "@typescript-eslint/eslint-plugin": "6.10.0",
+    "@typescript-eslint/parser": "6.10.0"
+  }
+}

package/scripts/setup-canvaskit.js

@@ -1,105 +1,105 @@
-#!/usr/bin/env node
-/* eslint-disable max-len */
-
-/**
- * A script to automate the setup of `@shopify/react-native-skia` for web.
- * The only requirement is that your project supports a 'static' folder (often named '/public').
- * In `@expo/webpack-config` this is `./web` (default for now).
- *
- * This script does the following:
- * 0. Try to detect if it's an expo project and if the bundler is set to metro
- * 1. Resolve the public path relative to wherever the script is being run.
- * 2. Log out some useful info about the web setup, just in case anything goes wrong.
- * 3. Resolve the installed wasm file `canvaskit-wasm/bin/full/canvaskit.wasm`
- *  from `@shopify/react-native-skia -> canvaskit`.
- * 4. Recursively ensure the path exists and copy the file into the desired location.
- *
- *
- * Usage:
- * $ `npx <script>`
- *
- * On webpack:
- * -> Copies the file to `<project>/web/static/js/canvaskit.wasm`
- * on metro:
- * -> Copies the file to `<project>/public/canvaskit.wasm`
- *
- * Tooling that uses a custom static assets folder, like `/assets` for example:
- * $ `npx <script> assets`
- *
- * -> Copies the file to `<project>/assets/canvaskit.wasm`
- *
- */
-const fs = require("fs");
-const path = require("path");
-
-const args = process.argv.slice(2);
-
-const gray = (text) => `\x1b[90m${text}\x1b[0m`;
-const lime = (text) => `\x1b[32m${text}\x1b[0m`;
-
-function getWetherItsAnExpoProjectWithMetro() {
-  try {
-    const appJsonPath = path.join(process.cwd(), 'app.json');
-
-    console.log(
-      `› Reading Expo settings from (if any):\n  ${gray(appJsonPath)}`
-    );
-
-    const appJson = require(appJsonPath);
-    const isAnExpoProjectWithMetro = appJson.expo && appJson.expo.web && appJson.expo.web.bundler === 'metro';
-    if (isAnExpoProjectWithMetro) {
-      console.log(`  ${gray(`Expo project with metro bundler detected`)}\n`);
-      return true;
-    } else {
-      console.log(`  ${gray(`Metro bundler not detected. Assuming the project is using Webpack.`)}\n`);
-      return false;
-    }
-  } catch (error) {
-    console.log(`  ${gray(`No Expo settings found`)}\n`);
-    return false;
-  }
-}
-
-function getWasmFilePath() {
-  try {
-    return require.resolve("canvaskit-wasm/bin/full/canvaskit.wasm");
-  } catch (error) {
-    console.error(
-      `Could not find 'canvaskit-wasm'. Please install '@shopify/react-native-skia' and ensure it can be resolved from your project: ${process.cwd()}`
-    );
-    process.exit(1);
-  }
-}
-
-function getOutputFilePath(isAnExpoProjectWithMetro) {
-  // Default to using `web` public path.
-  const publicFolder = path.resolve(args[0] || ((isAnExpoProjectWithMetro) ? "public" : "web/static/js"));
-  const publicLocation = "./canvaskit.wasm";
-  const output = path.join(publicFolder, publicLocation);
-
-  console.log(
-    `› Copying 'canvaskit.wasm' file to public folder:\n  ${gray(output)}\n`
-  );
-  return output;
-}
-
-function copyFile(from, to) {
-  const data = fs.readFileSync(from);
-  fs.mkdirSync(path.dirname(to), { recursive: true });
-  fs.writeFileSync(to, data);
-}
-
-(() => {
-  // Automatically detect if it's an expo project with a metro bundler
-  const isAnExpoProjectWithMetro = getWetherItsAnExpoProjectWithMetro();
-
-  // Copy the WASM file to `<static>/canvaskit.wasm`
-  copyFile(getWasmFilePath(), getOutputFilePath(isAnExpoProjectWithMetro));
-
-  console.log(lime("› Success! You are almost there:"));
-  console.log(
-    gray(
-      "› To load React Native Skia Web, follow these instructions : https://shopify.github.io/react-native-skia/docs/getting-started/web"
-    )
-  );
-})();
+#!/usr/bin/env node
+/* eslint-disable max-len */
+
+/**
+ * A script to automate the setup of `@shopify/react-native-skia` for web.
+ * The only requirement is that your project supports a 'static' folder (often named '/public').
+ * In `@expo/webpack-config` this is `./web` (default for now).
+ *
+ * This script does the following:
+ * 0. Try to detect if it's an expo project and if the bundler is set to metro
+ * 1. Resolve the public path relative to wherever the script is being run.
+ * 2. Log out some useful info about the web setup, just in case anything goes wrong.
+ * 3. Resolve the installed wasm file `canvaskit-wasm/bin/full/canvaskit.wasm`
+ *  from `@shopify/react-native-skia -> canvaskit`.
+ * 4. Recursively ensure the path exists and copy the file into the desired location.
+ *
+ *
+ * Usage:
+ * $ `npx <script>`
+ *
+ * On webpack:
+ * -> Copies the file to `<project>/web/static/js/canvaskit.wasm`
+ * on metro:
+ * -> Copies the file to `<project>/public/canvaskit.wasm`
+ *
+ * Tooling that uses a custom static assets folder, like `/assets` for example:
+ * $ `npx <script> assets`
+ *
+ * -> Copies the file to `<project>/assets/canvaskit.wasm`
+ *
+ */
+const fs = require("fs");
+const path = require("path");
+
+const args = process.argv.slice(2);
+
+const gray = (text) => `\x1b[90m${text}\x1b[0m`;
+const lime = (text) => `\x1b[32m${text}\x1b[0m`;
+
+function getWetherItsAnExpoProjectWithMetro() {
+  try {
+    const appJsonPath = path.join(process.cwd(), 'app.json');
+
+    console.log(
+      `› Reading Expo settings from (if any):\n  ${gray(appJsonPath)}`
+    );
+
+    const appJson = require(appJsonPath);
+    const isAnExpoProjectWithMetro = appJson.expo && appJson.expo.web && appJson.expo.web.bundler === 'metro';
+    if (isAnExpoProjectWithMetro) {
+      console.log(`  ${gray(`Expo project with metro bundler detected`)}\n`);
+      return true;
+    } else {
+      console.log(`  ${gray(`Metro bundler not detected. Assuming the project is using Webpack.`)}\n`);
+      return false;
+    }
+  } catch (error) {
+    console.log(`  ${gray(`No Expo settings found`)}\n`);
+    return false;
+  }
+}
+
+function getWasmFilePath() {
+  try {
+    return require.resolve("canvaskit-wasm/bin/full/canvaskit.wasm");
+  } catch (error) {
+    console.error(
+      `Could not find 'canvaskit-wasm'. Please install '@shopify/react-native-skia' and ensure it can be resolved from your project: ${process.cwd()}`
+    );
+    process.exit(1);
+  }
+}
+
+function getOutputFilePath(isAnExpoProjectWithMetro) {
+  // Default to using `web` public path.
+  const publicFolder = path.resolve(args[0] || ((isAnExpoProjectWithMetro) ? "public" : "web/static/js"));
+  const publicLocation = "./canvaskit.wasm";
+  const output = path.join(publicFolder, publicLocation);
+
+  console.log(
+    `› Copying 'canvaskit.wasm' file to public folder:\n  ${gray(output)}\n`
+  );
+  return output;
+}
+
+function copyFile(from, to) {
+  const data = fs.readFileSync(from);
+  fs.mkdirSync(path.dirname(to), { recursive: true });
+  fs.writeFileSync(to, data);
+}
+
+(() => {
+  // Automatically detect if it's an expo project with a metro bundler
+  const isAnExpoProjectWithMetro = getWetherItsAnExpoProjectWithMetro();
+
+  // Copy the WASM file to `<static>/canvaskit.wasm`
+  copyFile(getWasmFilePath(), getOutputFilePath(isAnExpoProjectWithMetro));
+
+  console.log(lime("› Success! You are almost there:"));
+  console.log(
+    gray(
+      "› To load React Native Skia Web, follow these instructions : https://shopify.github.io/react-native-skia/docs/getting-started/web"
+    )
+  );
+})();

package/src/external/reanimated/Video.ts

@@ -0,0 +1,17 @@
+import type { SkImage,SkJSIInstance } from "@shopify/react-native-skia";
+
+export type VideoRotation = 0 | 90 | 180 | 270;
+
+export interface Video extends SkJSIInstance<"Video"> {
+  duration(): number;
+  framerate(): number;
+  nextImage(): SkImage | null;
+  seek(time: number): void;
+  rotation(): VideoRotation;
+  size(): { width: number; height: number };
+  pause(): void;
+  play(): void;
+  setVolume(volume: number): void;
+  setLoop(loop: boolean): void;
+  stop(): void;
+}