@react-three/fiber 9.0.0-rc.5 → 9.0.0-rc.7

package/dist/{events-a7b08b1a.esm.js → events-12fa3319.esm.js}

@@ -12,29 +12,29 @@ var threeTypes = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
-/**
- * Returns the instance's initial (outmost) root.
+/**
+ * Returns the instance's initial (outmost) root.
  */
 function findInitialRoot(instance) {
   let root = instance.root;
   while (root.getState().previousRoot) root = root.getState().previousRoot;
   return root;
 }
-/**
- * Safely flush async effects when testing, simulating a legacy root.
+/**
+ * Safely flush async effects when testing, simulating a legacy root.
  */
 const act = React.act;
 const isOrthographicCamera = def => def && def.isOrthographicCamera;
 const isRef = obj => obj && obj.hasOwnProperty('current');
 
-/**
- * An SSR-friendly useLayoutEffect.
- *
- * React currently throws a warning when using useLayoutEffect on the server.
- * To get around it, we can conditionally useEffect on the server (no-op) and
- * useLayoutEffect elsewhere.
- *
- * @see https://github.com/facebook/react/issues/14927
+/**
+ * An SSR-friendly useLayoutEffect.
+ *
+ * React currently throws a warning when using useLayoutEffect on the server.
+ * To get around it, we can conditionally useEffect on the server (no-op) and
+ * useLayoutEffect elsewhere.
+ *
+ * @see https://github.com/facebook/react/issues/14927
  */
 const useIsomorphicLayoutEffect = /* @__PURE__ */((_window$document, _window$navigator) => typeof window !== 'undefined' && (((_window$document = window.document) == null ? void 0 : _window$document.createElement) || ((_window$navigator = window.navigator) == null ? void 0 : _window$navigator.product) === 'ReactNative'))() ? React.useLayoutEffect : React.useEffect;
 function useMutableCallback(fn) {
@@ -42,8 +42,8 @@ function useMutableCallback(fn) {
   useIsomorphicLayoutEffect(() => void (ref.current = fn), [fn]);
   return ref;
 }
-/**
- * Bridges renderer Context and StrictMode from a primary renderer.
+/**
+ * Bridges renderer Context and StrictMode from a primary renderer.
  */
 function useBridge() {
   const fiber = useFiber();
@@ -95,8 +95,8 @@ function calculateDpr(dpr) {
   return Array.isArray(dpr) ? Math.min(Math.max(dpr[0], target), dpr[1]) : dpr;
 }
 
-/**
- * Returns instance root state
+/**
+ * Returns instance root state
  */
 function getRootState(obj) {
   var _r3f;
@@ -204,10 +204,7 @@ function prepare(target, root, type, props) {
       handlers: {},
       isHidden: false
     };
-    if (object) {
-      object.__r3f = instance;
-      if (type) applyProps(object, instance.props);
-    }
+    if (object) object.__r3f = instance;
   }
   return instance;
 }
@@ -357,6 +354,7 @@ function applyProps(object, props) {
     if (instance && EVENT_REGEX.test(prop)) {
       if (typeof value === 'function') instance.handlers[prop] = value;else delete instance.handlers[prop];
       instance.eventCount = Object.keys(instance.handlers).length;
+      continue;
     }
 
     // Ignore setting undefined props
@@ -459,9 +457,9 @@ function makeId(event) {
   return (event.eventObject || event.object).uuid + '/' + event.index + event.instanceId;
 }
 
-/**
- * Release pointer captures.
- * This is called by releasePointerCapture in the API, and when an object is removed.
+/**
+ * Release pointer captures.
+ * This is called by releasePointerCapture in the API, and when an object is removed.
  */
 function releaseInternalPointerCapture(capturedMap, obj, captures, pointerId) {
   const captureData = captures.get(obj);
@@ -597,7 +595,19 @@ function createEvents(store) {
         stopped: false
       };
       for (const hit of intersections) {
-        const state = getRootState(hit.object);
+        let state = getRootState(hit.object);
+
+        // If the object is not managed by R3F, it might be parented to an element which is.
+        // Traverse upwards until we find a managed parent and use its state instead.
+        if (!state) {
+          hit.object.traverseAncestors(obj => {
+            const parentState = getRootState(obj);
+            if (parentState) {
+              state = parentState;
+              return false;
+            }
+          });
+        }
         if (state) {
           const {
             raycaster,
@@ -796,19 +806,19 @@ function createEvents(store) {
         if (!(instance != null && instance.eventCount)) return;
         const handlers = instance.handlers;
 
-        /*
-        MAYBE TODO, DELETE IF NOT: 
-          Check if the object is captured, captured events should not have intersects running in parallel
-          But wouldn't it be better to just replace capturedMap with a single entry?
-          Also, are we OK with straight up making picking up multiple objects impossible?
-          
-        const pointerId = (data as ThreeEvent<PointerEvent>).pointerId        
-        if (pointerId !== undefined) {
-          const capturedMeshSet = internal.capturedMap.get(pointerId)
-          if (capturedMeshSet) {
-            const captured = capturedMeshSet.get(eventObject)
-            if (captured && captured.localState.stopped) return
-          }
+        /*
+        MAYBE TODO, DELETE IF NOT: 
+          Check if the object is captured, captured events should not have intersects running in parallel
+          But wouldn't it be better to just replace capturedMap with a single entry?
+          Also, are we OK with straight up making picking up multiple objects impossible?
+          
+        const pointerId = (data as ThreeEvent<PointerEvent>).pointerId        
+        if (pointerId !== undefined) {
+          const capturedMeshSet = internal.capturedMap.get(pointerId)
+          if (capturedMeshSet) {
+            const captured = capturedMeshSet.get(eventObject)
+            if (captured && captured.localState.stopped) return
+          }
         }*/
 
         if (isPointerMove) {
@@ -1099,11 +1109,11 @@ const createStore = (invalidate, advance) => {
   return rootStore;
 };
 
-/**
- * Exposes an object's {@link Instance}.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#useInstanceHandle
- *
- * **Note**: this is an escape hatch to react-internal fields. Expect this to change significantly between versions.
+/**
+ * Exposes an object's {@link Instance}.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#useInstanceHandle
+ *
+ * **Note**: this is an escape hatch to react-internal fields. Expect this to change significantly between versions.
  */
 function useInstanceHandle(ref) {
   const instance = React.useRef(null);
@@ -1111,9 +1121,9 @@ function useInstanceHandle(ref) {
   return instance;
 }
 
-/**
- * Returns the R3F Canvas' Zustand store. Useful for [transient updates](https://github.com/pmndrs/zustand#transient-updates-for-often-occurring-state-changes).
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usestore
+/**
+ * Returns the R3F Canvas' Zustand store. Useful for [transient updates](https://github.com/pmndrs/zustand#transient-updates-for-often-occurring-state-changes).
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usestore
  */
 function useStore() {
   const store = React.useContext(context);
@@ -1121,18 +1131,18 @@ function useStore() {
   return store;
 }
 
-/**
- * Accesses R3F's internal state, containing renderer, canvas, scene, etc.
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usethree
+/**
+ * Accesses R3F's internal state, containing renderer, canvas, scene, etc.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usethree
  */
 function useThree(selector = state => state, equalityFn) {
   return useStore()(selector, equalityFn);
 }
 
-/**
- * Executes a callback before render in a shared frame loop.
- * Can order effects with render priority or manually render with a positive priority.
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe
+/**
+ * Executes a callback before render in a shared frame loop.
+ * Can order effects with render priority or manually render with a positive priority.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe
  */
 function useFrame(callback, renderPriority = 0) {
   const store = useStore();
@@ -1144,9 +1154,9 @@ function useFrame(callback, renderPriority = 0) {
   return null;
 }
 
-/**
- * Returns a node graph of an object with named nodes & materials.
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usegraph
+/**
+ * Returns a node graph of an object with named nodes & materials.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#usegraph
  */
 function useGraph(object) {
   return React.useMemo(() => buildGraph(object), [object]);
@@ -1182,11 +1192,11 @@ function loadingFn(extensions, onProgress) {
   };
 }
 
-/**
- * Synchronously loads and caches assets with a three loader.
- *
- * Note: this hook's caller must be wrapped with `React.Suspense`
- * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useloader
+/**
+ * Synchronously loads and caches assets with a three loader.
+ *
+ * Note: this hook's caller must be wrapped with `React.Suspense`
+ * @see https://docs.pmnd.rs/react-three-fiber/api/hooks#useloader
  */
 function useLoader(loader, input, extensions, onProgress) {
   // Use suspense to load async assets
@@ -1198,16 +1208,16 @@ function useLoader(loader, input, extensions, onProgress) {
   return Array.isArray(input) ? results : results[0];
 }
 
-/**
- * Preloads an asset into cache as a side-effect.
+/**
+ * Preloads an asset into cache as a side-effect.
  */
 useLoader.preload = function (loader, input, extensions) {
   const keys = Array.isArray(input) ? input : [input];
   return preload(loadingFn(extensions), [loader, ...keys]);
 };
 
-/**
- * Removes a loaded asset from cache.
+/**
+ * Removes a loaded asset from cache.
  */
 useLoader.clear = function (loader, input) {
   const keys = Array.isArray(input) ? input : [input];
@@ -1233,6 +1243,8 @@ const NoEventPriority = 0;
 // https://github.com/microsoft/TypeScript/issues/37079
 
 const catalogue = {};
+const PREFIX_REGEX = /^three(?=[A-Z])/;
+const toPascalCase = type => `${type[0].toUpperCase()}${type.slice(1)}`;
 let i = 0;
 const isConstructor = object => typeof object === 'function';
 function extend(objects) {
@@ -1260,6 +1272,8 @@ function validateInstance(type, props) {
 }
 function createInstance(type, props, root) {
   var _props$object;
+  // Remove three* prefix from elements
+  type = type.replace(PREFIX_REGEX, '');
   validateInstance(type, props);
 
   // Regenerate the R3F instance for primitives to simulate a new object
@@ -1303,17 +1317,16 @@ function handleContainerEffects(parent, child, beforeChild) {
   if (!child.object) {
     var _child$props$object, _child$props$args;
     // Get target from catalogue
-    const name = `${child.type[0].toUpperCase()}${child.type.slice(1)}`;
-    const target = catalogue[name];
+    const target = catalogue[toPascalCase(child.type)];
 
     // Create object
     child.object = (_child$props$object = child.props.object) != null ? _child$props$object : new target(...((_child$props$args = child.props.args) != null ? _child$props$args : []));
     child.object.__r3f = child;
-
-    // Set initial props
-    applyProps(child.object, child.props);
   }
 
+  // Set initial props
+  applyProps(child.object, child.props);
+
   // Append instance
   if (child.props.attach) {
     attach(parent, child);
@@ -1325,7 +1338,6 @@ function handleContainerEffects(parent, child, beforeChild) {
       child.object.dispatchEvent({
         type: 'added'
       });
-      // expect-error https://github.com/mrdoob/three.js/pull/16934
       parent.object.dispatchEvent({
         type: 'childadded',
         child: child.object
@@ -1471,8 +1483,7 @@ function swapInstances() {
     if (parent) {
       var _instance$props$objec, _instance$props$args;
       // Get target from catalogue
-      const name = `${instance.type[0].toUpperCase()}${instance.type.slice(1)}`;
-      const target = catalogue[name];
+      const target = catalogue[toPascalCase(instance.type)];
 
       // Create object
       instance.object = (_instance$props$objec = instance.props.object) != null ? _instance$props$objec : new target(...((_instance$props$args = instance.props.args) != null ? _instance$props$args : []));
@@ -1641,20 +1652,6 @@ const shallowLoose = {
   objects: 'shallow',
   strict: false
 };
-async function createRendererInstance(gl, canvas) {
-  const defaultProps = {
-    canvas: canvas,
-    powerPreference: 'high-performance',
-    antialias: true,
-    alpha: true
-  };
-  const customRenderer = typeof gl === 'function' ? await gl(defaultProps) : gl;
-  if (isRenderer(customRenderer)) return customRenderer;
-  return new THREE.WebGLRenderer({
-    ...defaultProps,
-    ...gl
-  });
-}
 function computeInitialSize(canvas, size) {
   if (!size && typeof HTMLCanvasElement !== 'undefined' && canvas instanceof HTMLCanvasElement && canvas.parentElement) {
     const {
@@ -1732,10 +1729,13 @@ function createRoot(canvas) {
 
   // Locals
   let onCreated;
-  let configured = false;
   let lastCamera;
+  let configured = false;
+  let pending = null;
   return {
     async configure(props = {}) {
+      let resolve;
+      pending = new Promise(_resolve => resolve = _resolve);
       let {
         gl: glConfig,
         size: propsSize,
@@ -1758,9 +1758,26 @@ function createRoot(canvas) {
 
       // Set up renderer (one time only!)
       let gl = state.gl;
-      if (!state.gl) state.set({
-        gl: gl = await createRendererInstance(glConfig, canvas)
-      });
+      if (!state.gl) {
+        const defaultProps = {
+          canvas: canvas,
+          powerPreference: 'high-performance',
+          antialias: true,
+          alpha: true
+        };
+        const customRenderer = typeof glConfig === 'function' ? await glConfig(defaultProps) : glConfig;
+        if (isRenderer(customRenderer)) {
+          gl = customRenderer;
+        } else {
+          gl = new THREE.WebGLRenderer({
+            ...defaultProps,
+            ...glConfig
+          });
+        }
+        state.set({
+          gl
+        });
+      }
 
       // Set up raycaster (one time only!)
       let raycaster = state.raycaster;
@@ -1939,17 +1956,20 @@ function createRoot(canvas) {
       // Set locals
       onCreated = onCreatedCallback;
       configured = true;
+      resolve();
       return this;
     },
     render(children) {
       // The root has to be configured before it can be rendered
-      if (!configured) throw "The root has to be configured before it can be rendered, call 'configure' first!";
-      reconciler.updateContainer( /*#__PURE__*/jsx(Provider, {
-        store: store,
-        children: children,
-        onCreated: onCreated,
-        rootElement: canvas
-      }), fiber, null, () => undefined);
+      if (!configured && !pending) this.configure();
+      pending.then(() => {
+        reconciler.updateContainer( /*#__PURE__*/jsx(Provider, {
+          store: store,
+          children: children,
+          onCreated: onCreated,
+          rootElement: canvas
+        }), fiber, null, () => undefined);
+      });
       return store;
     },
     unmount() {
@@ -2022,10 +2042,10 @@ function Portal({
   children,
   container
 }) {
-  /** This has to be a component because it would not be able to call useThree/useStore otherwise since
-   *  if this is our environment, then we are not in r3f's renderer but in react-dom, it would trigger
-   *  the "R3F hooks can only be used within the Canvas component!" warning:
-   *  <Canvas>
+  /** This has to be a component because it would not be able to call useThree/useStore otherwise since
+   *  if this is our environment, then we are not in r3f's renderer but in react-dom, it would trigger
+   *  the "R3F hooks can only be used within the Canvas component!" warning:
+   *  <Canvas>
    *    {createPortal(...)} */
   const {
     events,
@@ -2117,21 +2137,21 @@ const globalEffects = new Set();
 const globalAfterEffects = new Set();
 const globalTailEffects = new Set();
 
-/**
- * Adds a global render callback which is called each frame.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addEffect
+/**
+ * Adds a global render callback which is called each frame.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addEffect
  */
 const addEffect = callback => createSubs(callback, globalEffects);
 
-/**
- * Adds a global after-render callback which is called each frame.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addAfterEffect
+/**
+ * Adds a global after-render callback which is called each frame.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addAfterEffect
  */
 const addAfterEffect = callback => createSubs(callback, globalAfterEffects);
 
-/**
- * Adds a global callback which is called when rendering stops.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addTail
+/**
+ * Adds a global callback which is called when rendering stops.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#addTail
  */
 const addTail = callback => createSubs(callback, globalTailEffects);
 function run(effects, timestamp) {
@@ -2203,7 +2223,7 @@ function loop(timestamp) {
       repeat += update(timestamp, state);
     }
   }
-  useFrameInProgress = true;
+  useFrameInProgress = false;
 
   // Run after-effects
   flushGlobalEffects('after', timestamp);
@@ -2219,9 +2239,9 @@ function loop(timestamp) {
   }
 }
 
-/**
- * Invalidates the view, requesting a frame to be rendered. Will globally invalidate unless passed a root's state.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#invalidate
+/**
+ * Invalidates the view, requesting a frame to be rendered. Will globally invalidate unless passed a root's state.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#invalidate
  */
 function invalidate(state, frames = 1) {
   var _state$gl$xr2;
@@ -2248,9 +2268,9 @@ function invalidate(state, frames = 1) {
   }
 }
 
-/**
- * Advances the frameloop and runs render effects, useful for when manually rendering via `frameloop="never"`.
- * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#advance
+/**
+ * Advances the frameloop and runs render effects, useful for when manually rendering via `frameloop="never"`.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/additional-exports#advance
  */
 function advance(timestamp, runGlobalEffects = true, state, frame) {
   if (runGlobalEffects) flushGlobalEffects('before', timestamp);
@@ -2282,7 +2302,7 @@ function createPointerEvents(store) {
     compute(event, state, previous) {
       // https://github.com/pmndrs/react-three-fiber/pull/782
       // Events trigger outside of canvas when moved, use offsetX/Y by default and allow overrides
-      state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
+      state.pointer.set((event.offsetX - state.size.left) / state.size.width * 2 - 1, -((event.offsetY - state.size.top) / state.size.height) * 2 + 1);
       state.raycaster.setFromCamera(state.pointer, state.camera);
     },
     connected: undefined,