@react-three/fiber 8.15.2 → 8.15.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 8.15.3
+
+### Patch Changes
+
+- beab4344: fix(native): workaround Android content policy for Blob URI
+
 ## 8.15.2
 
 ### Patch Changes

package/native/dist/react-three-fiber-native.cjs.dev.js

@@ -294,47 +294,79 @@ function polyfills() {
 
   // Patch Blob for ArrayBuffer if unsupported
   // https://github.com/facebook/react-native/pull/39276
-  try {
-    new Blob([new ArrayBuffer(4)]);
-  } catch (_) {
-    const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-    BlobManager.createFromParts = function createFromParts(parts, options) {
-      const blobId = uuidv4();
-      const items = parts.map(part => {
-        if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-          const data = base64Js.fromByteArray(new Uint8Array(part));
-          return {
-            data,
-            type: 'string'
-          };
-        } else if (part instanceof Blob) {
-          return {
-            data: part.data,
-            type: 'blob'
-          };
-        } else {
-          return {
-            data: String(part),
-            type: 'string'
-          };
+  if (reactNative.Platform.OS !== 'web') {
+    try {
+      const blob = new Blob([new ArrayBuffer(4)]);
+      const url = URL.createObjectURL(blob);
+      URL.revokeObjectURL(url);
+    } catch (_) {
+      const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
+      let BLOB_URL_PREFIX = null;
+      const {
+        BlobModule
+      } = reactNative.NativeModules;
+      if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
+        BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
+        if (typeof BlobModule.BLOB_URI_HOST === 'string') {
+          BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
         }
-      });
-      const size = items.reduce((acc, curr) => {
-        if (curr.type === 'string') {
-          return acc + global.unescape(encodeURI(curr.data)).length;
-        } else {
-          return acc + curr.data.size;
+      }
+      URL.createObjectURL = function createObjectURL(blob) {
+        const data = blob.data;
+        if (BLOB_URL_PREFIX === null) {
+          // https://github.com/pmndrs/react-three-fiber/issues/3058
+          // throw new Error('Cannot create URL for blob!')
+          return `data:${blob.type};base64,${data._base64}`;
         }
-      }, 0);
-      reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
-      return BlobManager.createFromOptions({
-        blobId,
-        offset: 0,
-        size,
-        type: options ? options.type : '',
-        lastModified: options ? options.lastModified : Date.now()
-      });
-    };
+        return `${BLOB_URL_PREFIX}${data.blobId}?offset=${data.offset}&size=${blob.size}`;
+      };
+      BlobManager.createFromParts = function createFromParts(parts, options) {
+        const blobId = uuidv4();
+        const items = parts.map(part => {
+          if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
+            const data = base64Js.fromByteArray(new Uint8Array(part));
+            return {
+              data,
+              type: 'string'
+            };
+          } else if (part instanceof Blob) {
+            return {
+              data: part.data,
+              type: 'blob'
+            };
+          } else {
+            return {
+              data: String(part),
+              type: 'string'
+            };
+          }
+        });
+        const size = items.reduce((acc, curr) => {
+          if (curr.type === 'string') {
+            return acc + global.unescape(encodeURI(curr.data)).length;
+          } else {
+            return acc + curr.data.size;
+          }
+        }, 0);
+        reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
+        const blob = BlobManager.createFromOptions({
+          blobId,
+          offset: 0,
+          size,
+          type: options ? options.type : '',
+          lastModified: options ? options.lastModified : Date.now()
+        });
+        if (BLOB_URL_PREFIX === null) {
+          let data = '';
+          for (const item of items) {
+            var _item$data$_base;
+            data += (_item$data$_base = item.data._base64) != null ? _item$data$_base : item.data;
+          }
+          blob.data._base64 = data;
+        }
+        return blob;
+      };
+    }
   }
   async function getAsset(input) {
     if (typeof input === 'string') {

package/native/dist/react-three-fiber-native.cjs.prod.js

@@ -294,47 +294,79 @@ function polyfills() {
 
   // Patch Blob for ArrayBuffer if unsupported
   // https://github.com/facebook/react-native/pull/39276
-  try {
-    new Blob([new ArrayBuffer(4)]);
-  } catch (_) {
-    const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-    BlobManager.createFromParts = function createFromParts(parts, options) {
-      const blobId = uuidv4();
-      const items = parts.map(part => {
-        if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-          const data = base64Js.fromByteArray(new Uint8Array(part));
-          return {
-            data,
-            type: 'string'
-          };
-        } else if (part instanceof Blob) {
-          return {
-            data: part.data,
-            type: 'blob'
-          };
-        } else {
-          return {
-            data: String(part),
-            type: 'string'
-          };
+  if (reactNative.Platform.OS !== 'web') {
+    try {
+      const blob = new Blob([new ArrayBuffer(4)]);
+      const url = URL.createObjectURL(blob);
+      URL.revokeObjectURL(url);
+    } catch (_) {
+      const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
+      let BLOB_URL_PREFIX = null;
+      const {
+        BlobModule
+      } = reactNative.NativeModules;
+      if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
+        BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
+        if (typeof BlobModule.BLOB_URI_HOST === 'string') {
+          BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
         }
-      });
-      const size = items.reduce((acc, curr) => {
-        if (curr.type === 'string') {
-          return acc + global.unescape(encodeURI(curr.data)).length;
-        } else {
-          return acc + curr.data.size;
+      }
+      URL.createObjectURL = function createObjectURL(blob) {
+        const data = blob.data;
+        if (BLOB_URL_PREFIX === null) {
+          // https://github.com/pmndrs/react-three-fiber/issues/3058
+          // throw new Error('Cannot create URL for blob!')
+          return `data:${blob.type};base64,${data._base64}`;
         }
-      }, 0);
-      reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
-      return BlobManager.createFromOptions({
-        blobId,
-        offset: 0,
-        size,
-        type: options ? options.type : '',
-        lastModified: options ? options.lastModified : Date.now()
-      });
-    };
+        return `${BLOB_URL_PREFIX}${data.blobId}?offset=${data.offset}&size=${blob.size}`;
+      };
+      BlobManager.createFromParts = function createFromParts(parts, options) {
+        const blobId = uuidv4();
+        const items = parts.map(part => {
+          if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
+            const data = base64Js.fromByteArray(new Uint8Array(part));
+            return {
+              data,
+              type: 'string'
+            };
+          } else if (part instanceof Blob) {
+            return {
+              data: part.data,
+              type: 'blob'
+            };
+          } else {
+            return {
+              data: String(part),
+              type: 'string'
+            };
+          }
+        });
+        const size = items.reduce((acc, curr) => {
+          if (curr.type === 'string') {
+            return acc + global.unescape(encodeURI(curr.data)).length;
+          } else {
+            return acc + curr.data.size;
+          }
+        }, 0);
+        reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
+        const blob = BlobManager.createFromOptions({
+          blobId,
+          offset: 0,
+          size,
+          type: options ? options.type : '',
+          lastModified: options ? options.lastModified : Date.now()
+        });
+        if (BLOB_URL_PREFIX === null) {
+          let data = '';
+          for (const item of items) {
+            var _item$data$_base;
+            data += (_item$data$_base = item.data._base64) != null ? _item$data$_base : item.data;
+          }
+          blob.data._base64 = data;
+        }
+        return blob;
+      };
+    }
   }
   async function getAsset(input) {
     if (typeof input === 'string') {

package/native/dist/react-three-fiber-native.esm.js

@@ -3,7 +3,7 @@ export { t as ReactThreeFiber, x as _roots, v as act, o as addAfterEffect, n as
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
-import { PanResponder, PixelRatio, View, StyleSheet, NativeModules, Image, Platform } from 'react-native';
+import { PanResponder, PixelRatio, View, StyleSheet, Platform, NativeModules, Image } from 'react-native';
 import { GLView } from 'expo-gl';
 import { FiberProvider, useContextBridge } from 'its-fine';
 import { Asset } from 'expo-asset';
@@ -269,47 +269,79 @@ function polyfills() {
 
   // Patch Blob for ArrayBuffer if unsupported
   // https://github.com/facebook/react-native/pull/39276
-  try {
-    new Blob([new ArrayBuffer(4)]);
-  } catch (_) {
-    const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-    BlobManager.createFromParts = function createFromParts(parts, options) {
-      const blobId = uuidv4();
-      const items = parts.map(part => {
-        if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-          const data = fromByteArray(new Uint8Array(part));
-          return {
-            data,
-            type: 'string'
-          };
-        } else if (part instanceof Blob) {
-          return {
-            data: part.data,
-            type: 'blob'
-          };
-        } else {
-          return {
-            data: String(part),
-            type: 'string'
-          };
+  if (Platform.OS !== 'web') {
+    try {
+      const blob = new Blob([new ArrayBuffer(4)]);
+      const url = URL.createObjectURL(blob);
+      URL.revokeObjectURL(url);
+    } catch (_) {
+      const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
+      let BLOB_URL_PREFIX = null;
+      const {
+        BlobModule
+      } = NativeModules;
+      if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
+        BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
+        if (typeof BlobModule.BLOB_URI_HOST === 'string') {
+          BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
         }
-      });
-      const size = items.reduce((acc, curr) => {
-        if (curr.type === 'string') {
-          return acc + global.unescape(encodeURI(curr.data)).length;
-        } else {
-          return acc + curr.data.size;
+      }
+      URL.createObjectURL = function createObjectURL(blob) {
+        const data = blob.data;
+        if (BLOB_URL_PREFIX === null) {
+          // https://github.com/pmndrs/react-three-fiber/issues/3058
+          // throw new Error('Cannot create URL for blob!')
+          return `data:${blob.type};base64,${data._base64}`;
         }
-      }, 0);
-      NativeModules.BlobModule.createFromParts(items, blobId);
-      return BlobManager.createFromOptions({
-        blobId,
-        offset: 0,
-        size,
-        type: options ? options.type : '',
-        lastModified: options ? options.lastModified : Date.now()
-      });
-    };
+        return `${BLOB_URL_PREFIX}${data.blobId}?offset=${data.offset}&size=${blob.size}`;
+      };
+      BlobManager.createFromParts = function createFromParts(parts, options) {
+        const blobId = uuidv4();
+        const items = parts.map(part => {
+          if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
+            const data = fromByteArray(new Uint8Array(part));
+            return {
+              data,
+              type: 'string'
+            };
+          } else if (part instanceof Blob) {
+            return {
+              data: part.data,
+              type: 'blob'
+            };
+          } else {
+            return {
+              data: String(part),
+              type: 'string'
+            };
+          }
+        });
+        const size = items.reduce((acc, curr) => {
+          if (curr.type === 'string') {
+            return acc + global.unescape(encodeURI(curr.data)).length;
+          } else {
+            return acc + curr.data.size;
+          }
+        }, 0);
+        NativeModules.BlobModule.createFromParts(items, blobId);
+        const blob = BlobManager.createFromOptions({
+          blobId,
+          offset: 0,
+          size,
+          type: options ? options.type : '',
+          lastModified: options ? options.lastModified : Date.now()
+        });
+        if (BLOB_URL_PREFIX === null) {
+          let data = '';
+          for (const item of items) {
+            var _item$data$_base;
+            data += (_item$data$_base = item.data._base64) != null ? _item$data$_base : item.data;
+          }
+          blob.data._base64 = data;
+        }
+        return blob;
+      };
+    }
   }
   async function getAsset(input) {
     if (typeof input === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.15.2",
+  "version": "8.15.3",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",