@react-three/drei 9.89.1 → 9.89.2

package/core/useTexture.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),r=require("@react-three/fiber"),t=require("react");const u=e=>e===Object(e)&&!Array.isArray(e)&&"function"!=typeof e;function a(a,s){const o=r.useThree((e=>e.gl)),c=r.useLoader(e.TextureLoader,u(a)?Object.values(a):a);if(t.useLayoutEffect((()=>{null==s||s(c)}),[s]),t.useEffect((()=>{if("initTexture"in o){(Array.isArray(c)?c:[c]).forEach(o.initTexture)}}),[o,c]),u(a)){const e=Object.keys(a),r={};return e.forEach((t=>Object.assign(r,{[t]:c[e.indexOf(t)]}))),r}return c}a.preload=t=>r.useLoader.preload(e.TextureLoader,t),a.clear=t=>r.useLoader.clear(e.TextureLoader,t),exports.IsObject=u,exports.useTexture=a;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three"),r=require("@react-three/fiber"),t=require("react");const u=e=>e===Object(e)&&!Array.isArray(e)&&"function"!=typeof e;function o(o,a){const s=r.useThree((e=>e.gl)),c=r.useLoader(e.TextureLoader,u(o)?Object.values(o):o);if(t.useLayoutEffect((()=>{null==a||a(c)}),[a]),t.useEffect((()=>{if("initTexture"in s){(Array.isArray(c)?c:[c]).forEach(s.initTexture)}}),[s,c]),u(o)){const e={};let r=0;for(const t in o)e[t]=c[r++];return e}return c}o.preload=t=>r.useLoader.preload(e.TextureLoader,t),o.clear=t=>r.useLoader.clear(e.TextureLoader,t),exports.IsObject=u,exports.useTexture=o;

package/core/useTexture.d.ts

@@ -1,8 +1,9 @@
 import { Texture } from 'three';
 export declare const IsObject: (url: any) => url is Record<string, string>;
-export declare function useTexture<Url extends string[] | string | Record<string, string>>(input: Url, onLoad?: (texture: Texture | Texture[]) => void): Url extends any[] ? Texture[] : Url extends object ? {
-    [key in keyof Url]: Texture;
+export type MappedTextureType<T extends string[] | string | Record<string, string>> = T extends any[] ? Texture[] : T extends Record<string, string> ? {
+    [key in keyof T]: Texture;
 } : Texture;
+export declare function useTexture<Url extends string[] | string | Record<string, string>>(input: Url, onLoad?: (texture: MappedTextureType<Url>) => void): MappedTextureType<Url>;
 export declare namespace useTexture {
     var preload: (url: string) => undefined;
     var clear: (input: string | string[]) => void;

package/core/useTexture.js

@@ -20,11 +20,9 @@ function useTexture(input, onLoad) {
     }
   }, [gl, textures]);
   if (IsObject(input)) {
-    const keys = Object.keys(input);
     const keyed = {};
-    keys.forEach(key => Object.assign(keyed, {
-      [key]: textures[keys.indexOf(key)]
-    }));
+    let i = 0;
+    for (const key in input) keyed[key] = textures[i++];
     return keyed;
   } else {
     return textures;