@react-three/drei 9.116.3 → 9.117.0

package/core/Text3D.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as THREE from 'three';
 import { MeshProps, Node } from '@react-three/fiber';
 import { TextGeometryParameters } from 'three-stdlib';
-import { FontData } from './useFont';
+import { useFont } from './useFont';
 import { ForwardRefComponent } from '../helpers/ts-utils';
 declare global {
     namespace JSX {
@@ -12,7 +12,7 @@ declare global {
     }
 }
 type Text3DProps = {
-    font: FontData | string;
+    font: Parameters<typeof useFont>[0];
     bevelSegments?: number;
     smooth?: number;
 } & Omit<TextGeometryParameters, 'font'> & MeshProps;

package/core/useFont.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three-stdlib"),r=require("suspend-react");let t=null;async function n(r){const n=await async function(e){return"string"==typeof e?await(await fetch(e)).json():e}(r);return a=n,t||(t=new e.FontLoader),t.parse(a);var a}function a(e){return r.suspend(n,[e])}a.preload=e=>r.preload(n,[e]),a.clear=e=>r.clear([e]),exports.useFont=a;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three-stdlib"),r=require("suspend-react");let n=null,t=null;async function a(r){if("string"==typeof r){var n;const u=await fetch(r);if(null!=(n=u.headers.get("Content-Type"))&&n.includes("application/json"))return await u.json();{const r=await u.arrayBuffer();return a=r,t||(t=new e.TTFLoader),t.parse(a)}}return r;var a}async function u(r){return function(r){return n||(n=new e.FontLoader),n.parse(r)}(await a(r))}function s(e){return r.suspend(u,[e])}s.preload=e=>r.preload(u,[e]),s.clear=e=>r.clear([e]),exports.useFont=s;

package/core/useFont.js

@@ -1,19 +1,37 @@
-import { FontLoader } from 'three-stdlib';
+import { FontLoader, TTFLoader } from 'three-stdlib';
 import { suspend, preload, clear } from 'suspend-react';
 
 let fontLoader = null;
-async function loadFontData(font) {
-  return typeof font === 'string' ? await (await fetch(font)).json() : font;
-}
+let ttfLoader = null;
 function parseFontData(fontData) {
   if (!fontLoader) {
     fontLoader = new FontLoader();
   }
   return fontLoader.parse(fontData);
 }
+function parseTtfArrayBuffer(ttfData) {
+  if (!ttfLoader) {
+    ttfLoader = new TTFLoader();
+  }
+  return ttfLoader.parse(ttfData);
+}
+async function loadFontData(font) {
+  if (typeof font === 'string') {
+    var _res$headers$get;
+    const res = await fetch(font);
+    if ((_res$headers$get = res.headers.get('Content-Type')) != null && _res$headers$get.includes('application/json')) {
+      return await res.json();
+    } else {
+      const arrayBuffer = await res.arrayBuffer();
+      return parseTtfArrayBuffer(arrayBuffer);
+    }
+  } else {
+    return font;
+  }
+}
 async function loader(font) {
-  const data = await loadFontData(font);
-  return parseFontData(data);
+  const fontData = await loadFontData(font);
+  return parseFontData(fontData);
 }
 function useFont(font) {
   return suspend(loader, [font]);