@react-three/fiber 8.0.0-beta.5 → 8.0.0-beta.8

package/dist/declarations/src/core/events.d.ts

@@ -5,17 +5,16 @@ export interface Intersection extends THREE.Intersection {
     eventObject: THREE.Object3D;
 }
 export interface IntersectionEvent<TSourceEvent> extends Intersection {
+    eventObject: THREE.Object3D;
     intersections: Intersection[];
-    stopped: boolean;
     unprojectedPoint: THREE.Vector3;
+    pointer: THREE.Vector2;
+    delta: number;
     ray: THREE.Ray;
     camera: Camera;
     stopPropagation: () => void;
-    sourceEvent: TSourceEvent;
     nativeEvent: TSourceEvent;
-    delta: number;
-    spaceX: number;
-    spaceY: number;
+    stopped: boolean;
 }
 export declare type Camera = THREE.OrthographicCamera | THREE.PerspectiveCamera;
 export declare type ThreeEvent<TEvent> = IntersectionEvent<TEvent>;
@@ -47,8 +46,14 @@ export declare type EventHandlers = {
     onPointerCancel?: (event: ThreeEvent<PointerEvent>) => void;
     onWheel?: (event: ThreeEvent<WheelEvent>) => void;
 };
+export declare type FilterFunction = (items: THREE.Intersection[], state: RootState) => THREE.Intersection[];
+export declare type ComputeFunction = (event: DomEvent, root: RootState, previous?: RootState) => void;
 export interface EventManager<TTarget> {
-    connected: TTarget | boolean;
+    enabled: boolean;
+    priority: number;
+    compute?: ComputeFunction;
+    filter?: FilterFunction;
+    connected?: TTarget;
     handlers?: Events;
     connect?: (target: TTarget) => void;
     disconnect?: () => void;

package/dist/declarations/src/core/hooks.d.ts

@@ -1,6 +1,5 @@
 import * as THREE from 'three';
-import * as React from 'react';
-import { StateSelector, EqualityChecker, UseBoundStore } from 'zustand';
+import { StateSelector, EqualityChecker } from 'zustand';
 import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
 import { RootState, RenderCallback } from './store';
 import { ObjectMap } from './utils';
@@ -11,15 +10,16 @@ export declare type Extensions = (loader: THREE.Loader) => void;
 export declare type LoaderResult<T> = T extends any[] ? Loader<T[number]> : Loader<T>;
 export declare type ConditionalType<Child, Parent, Truthy, Falsy> = Child extends Parent ? Truthy : Falsy;
 export declare type BranchingReturn<T, Parent, Coerced> = ConditionalType<T, Parent, Coerced, T>;
-export declare function useStore(): UseBoundStore<RootState, import("zustand").StoreApi<RootState>>;
+declare type noop = (...args: any[]) => any;
+declare type PickFunction<T extends noop> = (...args: Parameters<T>) => ReturnType<T>;
+export declare function useStore(): import("zustand").UseBoundStore<RootState, import("zustand").StoreApi<RootState>>;
 export declare function useThree<T = RootState>(selector?: StateSelector<RootState, T>, equalityFn?: EqualityChecker<T>): T;
-export declare function useInject(state: Partial<RootState>): [React.FC<{
-    children: React.ReactNode;
-}>, UseBoundStore<RootState, import("zustand").StoreApi<RootState>>];
 export declare function useFrame(callback: RenderCallback, renderPriority?: number): null;
 export declare function useGraph(object: THREE.Object3D): ObjectMap;
+export declare function useMemoizedFn<T extends noop>(fn?: T): PickFunction<T>;
 export declare function useLoader<T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U, extensions?: Extensions, onProgress?: (event: ProgressEvent<EventTarget>) => void): U extends any[] ? BranchingReturn<T, GLTF, GLTF & ObjectMap>[] : BranchingReturn<T, GLTF, GLTF & ObjectMap>;
 export declare namespace useLoader {
     var preload: <T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U, extensions?: Extensions | undefined) => undefined;
     var clear: <T, U extends string | string[]>(Proto: new () => LoaderResult<T>, input: U) => void;
 }
+export {};

package/dist/declarations/src/core/index.d.ts

@@ -5,8 +5,8 @@ import { UseBoundStore } from 'zustand';
 import { Renderer, StoreProps, context, RootState, Size } from './store';
 import { extend, Root } from './renderer';
 import { addEffect, addAfterEffect, addTail } from './loop';
-import { EventManager } from './events';
-import { dispose } from './utils';
+import { EventManager, ComputeFunction } from './events';
+import { dispose, getRootState } from './utils';
 declare const roots: Map<Element, Root>;
 declare const invalidate: (state?: RootState | undefined) => void, advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined, frame?: THREE.XRFrame | undefined) => void;
 declare const reconciler: import("react-reconciler").Reconciler<unknown, unknown, unknown, unknown, unknown>, applyProps: typeof import("./utils").applyProps;
@@ -26,9 +26,17 @@ export declare type ReconcilerRoot<TCanvas extends Element> = {
     unmount: () => void;
 };
 declare function createRoot<TCanvas extends Element>(canvas: TCanvas): ReconcilerRoot<TCanvas>;
-declare function render<TCanvas extends Element>(element: React.ReactNode, canvas: TCanvas, config?: RenderProps<TCanvas>): UseBoundStore<RootState>;
+declare function render<TCanvas extends Element>(children: React.ReactNode, canvas: TCanvas, config: RenderProps<TCanvas>): UseBoundStore<RootState>;
 declare function unmountComponentAtNode<TElement extends Element>(canvas: TElement, callback?: (canvas: TElement) => void): void;
-declare function createPortal(children: React.ReactNode, container: THREE.Object3D, state?: Partial<RootState>): React.ReactNode;
+export declare type InjectState = Partial<Omit<RootState, 'set' | 'get' | 'setSize' | 'setFrameloop' | 'setDpr' | 'events' | 'invalidate' | 'advance' | 'performance' | 'internal'> & {
+    events: {
+        enabled?: boolean;
+        priority?: number;
+        compute?: ComputeFunction;
+        connected?: any;
+    };
+}>;
+declare function createPortal(children: React.ReactNode, container: THREE.Object3D, state?: InjectState): React.ReactNode;
 declare const act: any;
 export * from './hooks';
-export { context, render, createRoot, unmountComponentAtNode, createPortal, reconciler, applyProps, dispose, invalidate, advance, extend, addEffect, addAfterEffect, addTail, act, roots as _roots, };
+export { context, render, createRoot, unmountComponentAtNode, createPortal, reconciler, applyProps, dispose, invalidate, advance, extend, addEffect, addAfterEffect, addTail, getRootState, act, roots as _roots, };

package/dist/declarations/src/core/store.d.ts

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import * as React from 'react';
 import * as ReactThreeFiber from '../three-types';
-import { GetState, SetState, UseBoundStore } from 'zustand';
+import { GetState, SetState, StoreApi, UseBoundStore } from 'zustand';
 import { DomEvent, EventManager, PointerCaptureTarget, ThreeEvent } from './events';
 export interface Intersection extends THREE.Intersection {
     eventObject: THREE.Object3D;
@@ -23,11 +23,6 @@ export declare type Viewport = Size & {
     aspect: number;
 };
 export declare type Camera = THREE.OrthographicCamera | THREE.PerspectiveCamera;
-export declare type Raycaster = THREE.Raycaster & {
-    enabled: boolean;
-    filter?: FilterFunction;
-    computeOffsets?: ComputeOffsetsFunction;
-};
 export declare type RenderCallback = (state: RootState, delta: number, frame?: THREE.XRFrame) => void;
 export declare type Performance = {
     current: number;
@@ -55,45 +50,41 @@ export declare type InternalState = {
     subscribe: (callback: React.MutableRefObject<RenderCallback>, priority?: number) => () => void;
 };
 export declare type RootState = {
+    set: SetState<RootState>;
+    get: GetState<RootState>;
     gl: THREE.WebGLRenderer;
     camera: Camera & {
         manual?: boolean;
     };
-    raycaster: Raycaster;
+    scene: THREE.Scene;
+    raycaster: THREE.Raycaster;
+    clock: THREE.Clock;
     events: EventManager<any>;
     xr: {
         connect: () => void;
         disconnect: () => void;
     };
-    scene: THREE.Scene;
     controls: THREE.EventDispatcher | null;
+    pointer: THREE.Vector2;
     mouse: THREE.Vector2;
-    clock: THREE.Clock;
     linear: boolean;
     flat: boolean;
     frameloop: 'always' | 'demand' | 'never';
     performance: Performance;
     size: Size;
     viewport: Viewport & {
-        getCurrentViewport: (camera?: Camera, target?: THREE.Vector3, size?: Size) => Omit<Viewport, 'dpr' | 'initialDpr'>;
+        getCurrentViewport: (camera?: Camera, target?: THREE.Vector3 | Parameters<THREE.Vector3['set']>, size?: Size) => Omit<Viewport, 'dpr' | 'initialDpr'>;
     };
-    set: SetState<RootState>;
-    get: GetState<RootState>;
     invalidate: () => void;
     advance: (timestamp: number, runGlobalEffects?: boolean) => void;
+    setEvents: (events: EventManager<any>) => void;
     setSize: (width: number, height: number) => void;
     setDpr: (dpr: Dpr) => void;
     setFrameloop: (frameloop?: 'always' | 'demand' | 'never') => void;
     onPointerMissed?: (event: MouseEvent) => void;
+    previousRoot?: UseBoundStore<RootState, StoreApi<RootState>>;
     internal: InternalState;
 };
-export declare type FilterFunction = (items: THREE.Intersection[], state: RootState) => THREE.Intersection[];
-export declare type ComputeOffsetsFunction = (event: any, state: RootState) => {
-    offsetX: number;
-    offsetY: number;
-    width?: number;
-    height?: number;
-};
 export declare type StoreProps = {
     gl: THREE.WebGLRenderer;
     size: Size;
@@ -104,12 +95,12 @@ export declare type StoreProps = {
     frameloop?: 'always' | 'demand' | 'never';
     performance?: Partial<Omit<Performance, 'regress'>>;
     dpr?: Dpr;
-    raycaster?: Partial<Raycaster>;
+    raycaster?: Partial<THREE.Raycaster>;
     camera?: (Camera | Partial<ReactThreeFiber.Object3DNode<THREE.Camera, typeof THREE.Camera> & ReactThreeFiber.Object3DNode<THREE.PerspectiveCamera, typeof THREE.PerspectiveCamera> & ReactThreeFiber.Object3DNode<THREE.OrthographicCamera, typeof THREE.OrthographicCamera>>) & {
         manual?: boolean;
     };
     onPointerMissed?: (event: MouseEvent) => void;
 };
-declare const context: React.Context<UseBoundStore<RootState, import("zustand").StoreApi<RootState>>>;
+declare const context: React.Context<UseBoundStore<RootState, StoreApi<RootState>>>;
 declare const createStore: (invalidate: (state?: RootState | undefined) => void, advance: (timestamp: number, runGlobalEffects?: boolean | undefined, state?: RootState | undefined, frame?: THREE.XRFrame | undefined) => void) => UseBoundStore<RootState>;
 export { createStore, context };

package/dist/declarations/src/core/utils.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { AttachType, Instance, InstanceProps, LocalState } from './renderer';
-import { Dpr } from './store';
+import { Dpr, RootState } from './store';
 export declare const DEFAULT = "__default";
 export declare type DiffSet = {
     memoized: {
@@ -21,6 +21,7 @@ export declare type ObjectMap = {
     };
 };
 export declare function calculateDpr(dpr: Dpr): number;
+export declare const getRootState: (obj: THREE.Object3D) => RootState | undefined;
 export declare function filterKeys<TObj extends {
     [key: string]: any;
 }, TOmit extends boolean, TKey extends keyof TObj>(obj: TObj, omit: TOmit, ...keys: TKey[]): TOmit extends true ? Omit<TObj, TKey> : Pick<TObj, TKey>;