fix(types): r153 colors overload fix

pmndrs · Jul 12, 2023 · 1af68c1 · 1af68c1
1 parent 0e45425
commit 1af68c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/fiber/src/core/reconciler.ts b/packages/fiber/src/core/reconciler.ts
@@ -20,7 +20,14 @@ export interface Catalogue {
   [name: string]: ConstructorRepresentation
 }
 
-export type Args<T> = T extends ConstructorRepresentation ? ConstructorParameters<T> : any[]
+// TODO: handle constructor overloads
+// https://github.com/pmndrs/react-three-fiber/pull/2931
+// https://github.com/microsoft/TypeScript/issues/37079
+export type Args<T> = T extends ConstructorRepresentation
+  ? T extends typeof THREE.Color
+    ? [r: number, g: number, b: number] | [color: THREE.ColorRepresentation]
+    : ConstructorParameters<T>
+  : any[]
 
 export interface InstanceProps<T = any, P = any> {
   args?: Args<P>

diff --git a/packages/fiber/src/three-types.ts b/packages/fiber/src/three-types.ts
@@ -1,5 +1,5 @@
 import type * as THREE from 'three'
-import type { EventHandlers, InstanceProps, ConstructorRepresentation } from './core'
+import type { Args, EventHandlers, InstanceProps, ConstructorRepresentation } from './core'
 import type { Mutable, Overwrite } from './core/utils'
 
 export { Overwrite }
@@ -12,7 +12,7 @@ interface VectorRepresentation extends MathRepresentation {
 }
 
 export type MathType<T extends MathRepresentation | THREE.Euler> = T extends THREE.Color
-  ? ConstructorParameters<typeof THREE.Color> | THREE.ColorRepresentation
+  ? Args<typeof THREE.Color> | THREE.ColorRepresentation
   : T extends VectorRepresentation | THREE.Layers | THREE.Euler
   ? T | Parameters<T['set']> | number
   : T | Parameters<T['set']>