chore: init colorspace as null

Mirrors mrdoob/three.js#25899
pmndrs · Apr 21, 2023 · 21723b3 · 21723b3
1 parent ccc52af
commit 21723b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/fiber/src/core/utils.ts b/packages/fiber/src/core/utils.ts
@@ -10,7 +10,7 @@ import { Dpr, Renderer, RootState, Size } from './store'
  */
 export const hasColorSpace = <
   T extends Renderer | THREE.Texture | object,
-  P = T extends Renderer ? { outputColorSpace: string } : { colorSpace: string },
+  P = T extends Renderer ? { outputColorSpace: string | null } : { colorSpace: string | null },
 >(
   object: T,
 ): object is T & P => 'colorSpace' in object || 'outputColorSpace' in object

diff --git a/packages/fiber/tests/core/renderer.test.tsx b/packages/fiber/tests/core/renderer.test.tsx
@@ -740,7 +740,7 @@ describe('renderer', () => {
   })
 
   it('should respect color management preferences via gl', async () => {
-    const texture = new THREE.Texture() as THREE.Texture & { colorSpace?: string }
+    const texture = new THREE.Texture() as THREE.Texture & { colorSpace?: string | null }
     let key = 0
     function Test() {
       return <meshBasicMaterial key={key++} map={texture} />
@@ -749,7 +749,7 @@ describe('renderer', () => {
     const LinearEncoding = 3000
     const sRGBEncoding = 3001
 
-    let gl: THREE.WebGLRenderer & { outputColorSpace?: string } = null!
+    let gl: THREE.WebGLRenderer & { outputColorSpace?: string | null } = null!
     await act(async () => (gl = root.render(<Test />).getState().gl))
     expect(gl.outputEncoding).toBe(sRGBEncoding)
     expect(gl.toneMapping).toBe(THREE.ACESFilmicToneMapping)
@@ -764,8 +764,8 @@ describe('renderer', () => {
     const SRGBColorSpace = 'srgb'
     const LinearSRGBColorSpace = 'srgb-linear'
 
-    gl.outputColorSpace ??= ''
-    texture.colorSpace ??= ''
+    gl.outputColorSpace ??= null
+    texture.colorSpace ??= null
 
     await act(async () => root.configure({ linear: true }).render(<Test />))
     expect(gl.outputColorSpace).toBe(LinearSRGBColorSpace)