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

package/dist/{events-60ed2d7b.cjs.prod.js → events-79ccf613.cjs.prod.js}

@@ -38,29 +38,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__namespace.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__namespace.useLayoutEffect : React__namespace.useEffect;
 function useMutableCallback(fn) {
@@ -68,8 +68,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 = itsFine.useFiber();
@@ -121,8 +121,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;
@@ -230,10 +230,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;
 }
@@ -485,9 +482,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);
@@ -822,19 +819,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) {
@@ -1125,11 +1122,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__namespace.useRef(null);
@@ -1137,9 +1134,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__namespace.useContext(context);
@@ -1147,18 +1144,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();
@@ -1170,9 +1167,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__namespace.useMemo(() => buildGraph(object), [object]);
@@ -1208,11 +1205,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
@@ -1224,16 +1221,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 suspendReact.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];
@@ -1335,11 +1332,11 @@ function handleContainerEffects(parent, child, beforeChild) {
     // 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);
@@ -1351,7 +1348,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
@@ -2048,10 +2044,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,
@@ -2143,21 +2139,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) {
@@ -2229,7 +2225,7 @@ function loop(timestamp) {
       repeat += update(timestamp, state);
     }
   }
-  useFrameInProgress = true;
+  useFrameInProgress = false;
 
   // Run after-effects
   flushGlobalEffects('after', timestamp);
@@ -2245,9 +2241,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;
@@ -2274,9 +2270,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);
@@ -2308,7 +2304,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,

package/dist/react-three-fiber.cjs.dev.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var events = require('./events-b4061ace.cjs.dev.js');
+var events = require('./events-4464c9d4.cjs.dev.js');
 var React = require('react');
 var THREE = require('three');
-var createDebounce = require('debounce');
+var useMeasure = require('react-use-measure');
 var itsFine = require('its-fine');
 var jsxRuntime = require('react/jsx-runtime');
 require('react-reconciler/constants');
@@ -36,201 +36,7 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
-var createDebounce__default = /*#__PURE__*/_interopDefault(createDebounce);
-
-/* eslint-disable react-hooks/rules-of-hooks */
-function useMeasure({
-  debounce,
-  scroll,
-  polyfill,
-  offsetSize
-} = {
-  debounce: 0,
-  scroll: false,
-  offsetSize: false
-}) {
-  const ResizeObserver = polyfill || typeof window !== 'undefined' && window.ResizeObserver;
-  const [bounds, set] = React.useState({
-    left: 0,
-    top: 0,
-    width: 0,
-    height: 0,
-    bottom: 0,
-    right: 0,
-    x: 0,
-    y: 0
-  });
-
-  // In test mode
-  if (!ResizeObserver) {
-    // @ts-ignore
-    bounds.width = 1280;
-    // @ts-ignore
-    bounds.height = 800;
-    return [() => {}, bounds, () => {}];
-  }
-
-  // keep all state in a ref
-  const state = React.useRef({
-    element: null,
-    scrollContainers: null,
-    resizeObserver: null,
-    lastBounds: bounds,
-    orientationHandler: null
-  });
-
-  // set actual debounce values early, so effects know if they should react accordingly
-  const scrollDebounce = debounce ? typeof debounce === 'number' ? debounce : debounce.scroll : null;
-  const resizeDebounce = debounce ? typeof debounce === 'number' ? debounce : debounce.resize : null;
-
-  // make sure to update state only as long as the component is truly mounted
-  const mounted = React.useRef(false);
-  React.useEffect(() => {
-    mounted.current = true;
-    return () => void (mounted.current = false);
-  });
-
-  // memoize handlers, so event-listeners know when they should update
-  const [forceRefresh, resizeChange, scrollChange] = React.useMemo(() => {
-    const callback = () => {
-      if (!state.current.element) return;
-      const {
-        left,
-        top,
-        width,
-        height,
-        bottom,
-        right,
-        x,
-        y
-      } = state.current.element.getBoundingClientRect();
-      const size = {
-        left,
-        top,
-        width,
-        height,
-        bottom,
-        right,
-        x,
-        y
-      };
-      if (state.current.element instanceof HTMLElement && offsetSize) {
-        size.height = state.current.element.offsetHeight;
-        size.width = state.current.element.offsetWidth;
-      }
-      Object.freeze(size);
-      if (mounted.current && !areBoundsEqual(state.current.lastBounds, size)) set(state.current.lastBounds = size);
-    };
-    return [callback, resizeDebounce ? createDebounce__default["default"](callback, resizeDebounce) : callback, scrollDebounce ? createDebounce__default["default"](callback, scrollDebounce) : callback];
-  }, [set, offsetSize, scrollDebounce, resizeDebounce]);
-
-  // cleanup current scroll-listeners / observers
-  function removeListeners() {
-    if (state.current.scrollContainers) {
-      state.current.scrollContainers.forEach(element => element.removeEventListener('scroll', scrollChange, true));
-      state.current.scrollContainers = null;
-    }
-    if (state.current.resizeObserver) {
-      state.current.resizeObserver.disconnect();
-      state.current.resizeObserver = null;
-    }
-    if (state.current.orientationHandler) {
-      if ('orientation' in screen && 'removeEventListener' in screen.orientation) {
-        screen.orientation.removeEventListener('change', state.current.orientationHandler);
-      } else if ('onorientationchange' in window) {
-        window.removeEventListener('orientationchange', state.current.orientationHandler);
-      }
-    }
-  }
-
-  // add scroll-listeners / observers
-  function addListeners() {
-    var _state$current$resize;
-    if (!state.current.element) return;
-    state.current.resizeObserver = new ResizeObserver(resizeChange);
-    (_state$current$resize = state.current.resizeObserver) == null ? void 0 : _state$current$resize.observe(state.current.element);
-    if (scroll && state.current.scrollContainers) {
-      state.current.scrollContainers.forEach(scrollContainer => scrollContainer.addEventListener('scroll', scrollChange, {
-        capture: true,
-        passive: true
-      }));
-    }
-
-    // Handle orientation changes
-    state.current.orientationHandler = () => {
-      scrollChange();
-    };
-
-    // Use screen.orientation if available
-    if ('orientation' in screen && 'addEventListener' in screen.orientation) {
-      screen.orientation.addEventListener('change', state.current.orientationHandler);
-    } else if ('onorientationchange' in window) {
-      // Fallback to orientationchange event
-      window.addEventListener('orientationchange', state.current.orientationHandler);
-    }
-  }
-
-  // the ref we expose to the user
-  const ref = node => {
-    if (!node || node === state.current.element) return;
-    removeListeners();
-    state.current.element = node;
-    state.current.scrollContainers = findScrollContainers(node);
-    addListeners();
-  };
-
-  // add general event listeners
-  useOnWindowScroll(scrollChange, Boolean(scroll));
-  useOnWindowResize(resizeChange);
-
-  // respond to changes that are relevant for the listeners
-  React.useEffect(() => {
-    removeListeners();
-    addListeners();
-  }, [scroll, scrollChange, resizeChange]);
-
-  // remove all listeners when the components unmounts
-  React.useEffect(() => removeListeners, []);
-  return [ref, bounds, forceRefresh];
-}
-
-// Adds native resize listener to window
-function useOnWindowResize(onWindowResize) {
-  React.useEffect(() => {
-    const cb = onWindowResize;
-    window.addEventListener('resize', cb);
-    return () => void window.removeEventListener('resize', cb);
-  }, [onWindowResize]);
-}
-function useOnWindowScroll(onScroll, enabled) {
-  React.useEffect(() => {
-    if (enabled) {
-      const cb = onScroll;
-      window.addEventListener('scroll', cb, {
-        capture: true,
-        passive: true
-      });
-      return () => void window.removeEventListener('scroll', cb, true);
-    }
-  }, [onScroll, enabled]);
-}
-
-// Returns a list of scroll offsets
-function findScrollContainers(element) {
-  const result = [];
-  if (!element || element === document.body) return result;
-  const {
-    overflow,
-    overflowX,
-    overflowY
-  } = window.getComputedStyle(element);
-  if ([overflow, overflowX, overflowY].some(prop => prop === 'auto' || prop === 'scroll')) result.push(element);
-  return [...result, ...findScrollContainers(element.parentElement)];
-}
-
-// Checks if element boundaries are equal
-const keys = ['x', 'y', 'top', 'bottom', 'left', 'right', 'width', 'height'];
-const areBoundsEqual = (a, b) => keys.every(key => a[key] === b[key]);
+var useMeasure__default = /*#__PURE__*/_interopDefault(useMeasure);
 
 function CanvasImpl({
   ref,
@@ -262,7 +68,7 @@ function CanvasImpl({
   // their own elements by using the createRoot API instead
   React__namespace.useMemo(() => events.extend(THREE__namespace), []);
   const Bridge = events.useBridge();
-  const [containerRef, containerRect] = useMeasure({
+  const [containerRef, containerRect] = useMeasure__default["default"]({
     scroll: true,
     debounce: {
       scroll: 50,
@@ -373,9 +179,9 @@ function CanvasImpl({
   });
 }
 
-/**
- * A DOM canvas which accepts threejs elements as children.
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
+/**
+ * A DOM canvas which accepts threejs elements as children.
+ * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
  */
 function Canvas(props) {
   return /*#__PURE__*/jsxRuntime.jsx(itsFine.FiberProvider, {