@react-three/drei 9.121.5 → 9.121.6-rc.1

package/core/useEnvironment.js

@@ -3,7 +3,6 @@ import { CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoa
 import { RGBELoader, EXRLoader } from 'three-stdlib';
 import { HDRJPGLoader, GainMapLoader } from '@monogrid/gainmap-js';
 import { presetsObj } from '../helpers/environment-assets.js';
-import { sRGBEncoding, LinearEncoding } from '../helpers/deprecated.js';
 import { useLayoutEffect } from 'react';
 
 const CUBEMAP_ROOT = 'https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/';
@@ -13,11 +12,9 @@ function useEnvironment({
   files = defaultFiles,
   path = '',
   preset = undefined,
-  encoding = undefined,
+  colorSpace = undefined,
   extensions
 } = {}) {
-  let loader = null;
-  let multiFile = false;
   if (preset) {
     validatePreset(preset);
     files = presetsObj[preset];
@@ -25,34 +22,32 @@ function useEnvironment({
   }
 
   // Everything else
-  multiFile = isArray(files);
+  const multiFile = isArray(files);
   const {
     extension,
     isCubemap
   } = getExtension(files);
-  loader = getLoader(extension);
+  const loader = getLoader(extension);
   if (!loader) throw new Error('useEnvironment: Unrecognized file extension: ' + files);
   const gl = useThree(state => state.gl);
   useLayoutEffect(() => {
     // Only required for gainmap
     if (extension !== 'webp' && extension !== 'jpg' && extension !== 'jpeg') return;
     function clearGainmapTexture() {
-      useLoader.clear(
-      // @ts-expect-error
-      loader, multiFile ? [files] : files);
+      useLoader.clear(loader, multiFile ? [files] : files);
     }
     gl.domElement.addEventListener('webglcontextlost', clearGainmapTexture, {
       once: true
     });
   }, [files, gl.domElement]);
-  const loaderResult = useLoader(
-  // @ts-expect-error
-  loader, multiFile ? [files] : files, loader => {
+  const loaderResult = useLoader(loader, multiFile ? [files] : files, loader => {
     // Gainmap requires a renderer
     if (extension === 'webp' || extension === 'jpg' || extension === 'jpeg') {
+      // @ts-expect-error
       loader.setRenderer(gl);
     }
     loader.setPath == null || loader.setPath(path);
+    // @ts-expect-error
     if (extensions) extensions(loader);
   });
   let texture = multiFile ?
@@ -63,7 +58,7 @@ function useEnvironment({
     texture = (_renderTarget = texture.renderTarget) == null ? void 0 : _renderTarget.texture;
   }
   texture.mapping = isCubemap ? CubeReflectionMapping : EquirectangularReflectionMapping;
-  if ('colorSpace' in texture) texture.colorSpace = (encoding !== null && encoding !== void 0 ? encoding : isCubemap) ? 'srgb' : 'srgb-linear';else texture.encoding = (encoding !== null && encoding !== void 0 ? encoding : isCubemap) ? sRGBEncoding : LinearEncoding;
+  texture.colorSpace = colorSpace !== null && colorSpace !== void 0 ? colorSpace : isCubemap ? 'srgb' : 'srgb-linear';
   return texture;
 }
 const preloadDefaultOptions = {
@@ -98,10 +93,9 @@ useEnvironment.preload = preloadOptions => {
   }
   const loader = getLoader(extension);
   if (!loader) throw new Error('useEnvironment: Unrecognized file extension: ' + files);
-  useLoader.preload(
-  // @ts-expect-error
-  loader, isArray(files) ? [files] : files, loader => {
+  useLoader.preload(loader, isArray(files) ? [files] : files, loader => {
     loader.setPath == null || loader.setPath(path);
+    // @ts-expect-error
     if (extensions) extensions(loader);
   });
 };
@@ -129,9 +123,7 @@ useEnvironment.clear = clearOptions => {
   } = getExtension(files);
   const loader = getLoader(extension);
   if (!loader) throw new Error('useEnvironment: Unrecognized file extension: ' + files);
-  useLoader.clear(
-  // @ts-expect-error
-  loader, isArray(files) ? [files] : files);
+  useLoader.clear(loader, isArray(files) ? [files] : files);
 };
 function validatePreset(preset) {
   if (!(preset in presetsObj)) throw new Error('Preset must be one of: ' + Object.keys(presetsObj).join(', '));

package/core/useIntersect.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { Object3D } from 'three';
-export declare function useIntersect<T extends Object3D>(onChange: (visible: boolean) => void): React.MutableRefObject<T>;
+export declare function useIntersect<T extends Object3D>(onChange: (visible: boolean) => void): React.RefObject<T>;

package/core/useSpriteLoader.d.ts

@@ -51,7 +51,7 @@ export declare function useSpriteLoader<Url extends string>(input: Url | null, j
     loadJsonAndTexture: (textureUrl: string, jsonUrl?: string) => void;
 };
 export declare namespace useSpriteLoader {
-    var preload: (url: string) => undefined;
+    var preload: (url: string) => void;
     var clear: (input: string) => void;
 }
 export {};

package/helpers/deprecated.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});exports.LinearEncoding=3e3,exports.sRGBEncoding=3001,exports.setUpdateRange=(e,t)=>{"updateRanges"in e?e.updateRanges[0]=t:e.updateRange=t};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});exports.setUpdateRange=(e,t)=>{e.updateRanges[0]=t};

package/helpers/deprecated.d.ts

@@ -1,8 +1,5 @@
 import * as THREE from 'three';
 export declare const setUpdateRange: (attribute: THREE.BufferAttribute, updateRange: {
-    offset: number;
+    start: number;
     count: number;
 }) => void;
-export declare const LinearEncoding = 3000;
-export declare const sRGBEncoding = 3001;
-export type TextureEncoding = typeof LinearEncoding | typeof sRGBEncoding;

package/helpers/deprecated.js

@@ -2,19 +2,7 @@
  * Sets `BufferAttribute.updateRange` since r159.
  */
 const setUpdateRange = (attribute, updateRange) => {
-  if ('updateRanges' in attribute) {
-    // r159
-    // @ts-ignore
-    attribute.updateRanges[0] = updateRange;
-  } else {
-    attribute.updateRange = updateRange;
-  }
+  attribute.updateRanges[0] = updateRange;
 };
-const LinearEncoding = 3000;
-const sRGBEncoding = 3001;
 
-/**
- * TextureEncoding was deprecated in r152, and removed in r162.
- */
-
-export { LinearEncoding, sRGBEncoding, setUpdateRange };
+export { setUpdateRange };

package/helpers/ts-utils.d.ts

@@ -1,3 +1,7 @@
 import { ForwardRefExoticComponent, PropsWithoutRef, RefAttributes } from 'react';
 export type NamedArrayTuple<T extends (...args: any) => any> = Parameters<T>;
 export type ForwardRefComponent<P, T> = ForwardRefExoticComponent<PropsWithoutRef<P> & RefAttributes<T>>;
+export type NonFunctionKeys<T> = {
+    [K in keyof T]-?: T[K] extends Function ? never : K;
+}[keyof T];
+export type Overwrite<T, O> = Omit<T, NonFunctionKeys<O>> & O;

package/helpers/useEffectfulState.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-type RefType<T> = React.MutableRefObject<T> | ((state: T) => void);
+type RefType<T> = React.RefObject<T> | ((state: T) => void);
 export declare function useEffectfulState<T>(fn: () => T, deps?: React.DependencyList, cb?: RefType<T>): T | undefined;
 export {};