chore(types): add back ReactThreeFiber namespace, math types (#2674)

pmndrs · Dec 31, 2022 · 0df10bb · 0df10bb
1 parent cec4297
commit 0df10bb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/packages/fiber/src/index.tsx b/packages/fiber/src/index.tsx
@@ -1,4 +1,6 @@
-export * from './core'
+import * as ReactThreeFiber from './three-types'
+export { ReactThreeFiber }
 export * from './three-types'
+export * from './core'
 export * from './web/Canvas'
 export { createPointerEvents as events } from './web/events'
diff --git a/packages/fiber/src/native.tsx b/packages/fiber/src/native.tsx
@@ -1,3 +1,5 @@
+import * as ReactThreeFiber from './three-types'
+export { ReactThreeFiber }
 export * from './three-types'
 export * from './core'
 export * from './native/Canvas'

diff --git a/packages/fiber/src/three-types.ts b/packages/fiber/src/three-types.ts
@@ -6,22 +6,26 @@ type NonFunctionKeys<P> = { [K in keyof P]-?: P[K] extends Function ? never : K
 type Overwrite<P, O> = Omit<P, NonFunctionKeys<O>> & O
 
 interface MathRepresentation {
-  set(...args: any[]): any
+  set(...args: number[]): any
 }
 interface VectorRepresentation extends MathRepresentation {
   setScalar(s: number): any
 }
-type WithMathProps<P> = {
-  [K in keyof P]: P[K] extends infer M
-    ? M extends THREE.Color
-      ? ConstructorParameters<typeof THREE.Color> | THREE.ColorRepresentation
-      : M extends MathRepresentation
-      ? M extends VectorRepresentation
-        ? M | Parameters<M['set']> | Parameters<M['setScalar']>[0]
-        : M | Parameters<M['set']>
-      : M
-    : P[K]
-}
+
+export type MathType<T extends MathRepresentation> = T extends THREE.Color
+  ? ConstructorParameters<typeof THREE.Color> | THREE.ColorRepresentation
+  : T extends VectorRepresentation | THREE.Layers
+  ? T | Parameters<T['set']> | number
+  : T | Parameters<T['set']>
+
+export type Vector2 = MathType<THREE.Vector2>
+export type Vector3 = MathType<THREE.Vector3>
+export type Vector4 = MathType<THREE.Vector4>
+export type Color = MathType<THREE.Color>
+export type Layers = MathType<THREE.Layers>
+export type Quaternion = MathType<THREE.Quaternion>
+
+type WithMathProps<P> = { [K in keyof P]: P[K] extends MathRepresentation ? MathType<P[K]> : P[K] }
 
 interface RaycastableRepresentation {
   raycast(raycaster: THREE.Raycaster, intersects: THREE.Intersection[]): void

diff --git a/packages/fiber/tests/__snapshots__/index.test.tsx.snap b/packages/fiber/tests/__snapshots__/index.test.tsx.snap
@@ -12,6 +12,7 @@ Array [
   "Canvas",
   "CanvasProps",
   "Catalogue",
+  "Color",
   "ComputeFunction",
   "ConditionalType",
   "ConstructorRepresentation",
@@ -35,13 +36,17 @@ Array [
   "Instance",
   "InstanceProps",
   "Intersection",
+  "Layers",
   "LegacyAlways",
   "Loader",
   "LoaderProto",
   "LoaderResult",
   "LoaderReturnType",
+  "MathType",
   "ObjectMap",
   "Performance",
+  "Quaternion",
+  "ReactThreeFiber",
   "ReconcilerRoot",
   "RenderCallback",
   "RenderProps",
@@ -58,6 +63,9 @@ Array [
   "ThreeEvent",
   "UpdateCallback",
   "UpdateSubscription",
+  "Vector2",
+  "Vector3",
+  "Vector4",
   "Viewport",
   "XRManager",
   "_roots",