@react-three/fiber 8.0.0-beta-03 → 8.0.0-beta-04

package/dist/react-three-fiber.esm.js

@@ -1,76 +1,35 @@
-import { c as createEvents, a as createLoop, b as createRenderer, d as calculateDpr, e as createStore, f as context, g as dispose, i as isRenderer, h as extend, p as pick, o as omit } from './hooks-15c12e3e.esm.js';
-export { t as ReactThreeFiber, k as addAfterEffect, j as addEffect, l as addTail, f as context, g as dispose, h as extend, n as useFrame, q as useGraph, r as useLoader, u as useStore, m as useThree } from './hooks-15c12e3e.esm.js';
+import { c as createEvents, e as extend, p as pick, o as omit, a as createRoot, u as unmountComponentAtNode } from './index-fccd77b0.esm.js';
+export { t as ReactThreeFiber, y as _roots, x as act, v as addAfterEffect, s as addEffect, w as addTail, q as advance, l as applyProps, i as context, j as createPortal, a as createRoot, m as dispose, e as extend, n as invalidate, k as reconciler, r as render, u as unmountComponentAtNode, f as useFrame, g as useGraph, h as useLoader, b as useStore, d as useThree } from './index-fccd77b0.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
 import mergeRefs from 'react-merge-refs';
 import useMeasure from 'react-use-measure';
-import { DefaultEventPriority, ContinuousEventPriority, DiscreteEventPriority, ConcurrentRoot } from 'react-reconciler/constants';
-import 'react-reconciler';
-import 'scheduler';
 import 'suspend-react';
+import 'react-reconciler/constants';
 import 'zustand';
+import 'react-reconciler';
+import 'scheduler';
 
-// @ts-ignore
-const CLICK = 'click';
-const CONTEXTMENU = 'contextmenu';
-const DBLCLICK = 'dblclick';
-const POINTERCANCEL = 'pointercancel';
-const POINTERDOWN = 'pointerdown';
-const POINTERUP = 'pointerup';
-const POINTERMOVE = 'pointermove';
-const POINTEROUT = 'pointerout';
-const POINTEROVER = 'pointerover';
-const POINTERENTER = 'pointerenter';
-const POINTERLEAVE = 'pointerleave';
-const WHEEL = 'wheel'; // https://github.com/facebook/react/tree/main/packages/react-reconciler#getcurrenteventpriority
-// Gives React a clue as to how import the current interaction is
-
-function getEventPriority() {
-  var _window, _window$event;
-
-  let name = (_window = window) == null ? void 0 : (_window$event = _window.event) == null ? void 0 : _window$event.type;
-
-  switch (name) {
-    case CLICK:
-    case CONTEXTMENU:
-    case DBLCLICK:
-    case POINTERCANCEL:
-    case POINTERDOWN:
-    case POINTERUP:
-      return DiscreteEventPriority;
-
-    case POINTERMOVE:
-    case POINTEROUT:
-    case POINTEROVER:
-    case POINTERENTER:
-    case POINTERLEAVE:
-    case WHEEL:
-      return ContinuousEventPriority;
-
-    default:
-      return DefaultEventPriority;
-  }
-}
+const DOM_EVENTS = {
+  onClick: ['click', false],
+  onContextMenu: ['contextmenu', false],
+  onDoubleClick: ['dblclick', false],
+  onWheel: ['wheel', true],
+  onPointerDown: ['pointerdown', true],
+  onPointerUp: ['pointerup', true],
+  onPointerLeave: ['pointerleave', true],
+  onPointerMove: ['pointermove', true],
+  onPointerCancel: ['pointercancel', true],
+  onLostPointerCapture: ['lostpointercapture', true]
+};
 function createPointerEvents(store) {
   const {
     handlePointer
   } = createEvents(store);
-  const names = {
-    onClick: [CLICK, false],
-    onContextMenu: [CONTEXTMENU, false],
-    onDoubleClick: [DBLCLICK, false],
-    onWheel: [WHEEL, true],
-    onPointerDown: [POINTERDOWN, true],
-    onPointerUp: [POINTERUP, true],
-    onPointerLeave: [POINTERLEAVE, true],
-    onPointerMove: [POINTERMOVE, true],
-    onPointerCancel: [POINTERCANCEL, true],
-    onLostPointerCapture: ['lostpointercapture', true]
-  };
   return {
     connected: false,
-    handlers: Object.keys(names).reduce((acc, key) => ({ ...acc,
+    handlers: Object.keys(DOM_EVENTS).reduce((acc, key) => ({ ...acc,
       [key]: handlePointer(key)
     }), {}),
     connect: target => {
@@ -87,7 +46,7 @@ function createPointerEvents(store) {
         }
       }));
       Object.entries((_events$handlers = events == null ? void 0 : events.handlers) != null ? _events$handlers : []).forEach(([name, event]) => {
-        const [eventName, passive] = names[name];
+        const [eventName, passive] = DOM_EVENTS[name];
         target.addEventListener(eventName, event, {
           passive
         });
@@ -104,7 +63,7 @@ function createPointerEvents(store) {
 
         Object.entries((_events$handlers2 = events.handlers) != null ? _events$handlers2 : []).forEach(([name, event]) => {
           if (events && events.connected instanceof HTMLElement) {
-            const [eventName] = names[name];
+            const [eventName] = DOM_EVENTS[name];
             events.connected.removeEventListener(eventName, event);
           }
         });
@@ -118,189 +77,6 @@ function createPointerEvents(store) {
   };
 }
 
-const roots = new Map();
-const {
-  invalidate,
-  advance
-} = createLoop(roots);
-const {
-  reconciler,
-  applyProps
-} = createRenderer(roots, getEventPriority);
-
-const createRendererInstance = (gl, canvas) => {
-  const customRenderer = typeof gl === 'function' ? gl(canvas) : gl;
-  if (isRenderer(customRenderer)) return customRenderer;
-  const renderer = new THREE.WebGLRenderer({
-    powerPreference: 'high-performance',
-    canvas: canvas,
-    antialias: true,
-    alpha: true,
-    ...gl
-  }); // Set color management
-
-  renderer.outputEncoding = THREE.sRGBEncoding;
-  renderer.toneMapping = THREE.ACESFilmicToneMapping; // Set gl props
-
-  if (gl) applyProps(renderer, gl);
-  return renderer;
-};
-
-function createRoot(canvas, config) {
-  return {
-    render: element => {
-      var _store;
-
-      let {
-        gl,
-        size,
-        events,
-        onCreated,
-        ...props
-      } = config || {}; // Allow size to take on container bounds initially
-
-      if (!size) {
-        var _canvas$parentElement, _canvas$parentElement2, _canvas$parentElement3, _canvas$parentElement4;
-
-        size = {
-          width: (_canvas$parentElement = (_canvas$parentElement2 = canvas.parentElement) == null ? void 0 : _canvas$parentElement2.clientWidth) != null ? _canvas$parentElement : 0,
-          height: (_canvas$parentElement3 = (_canvas$parentElement4 = canvas.parentElement) == null ? void 0 : _canvas$parentElement4.clientHeight) != null ? _canvas$parentElement3 : 0
-        };
-      }
-
-      let root = roots.get(canvas);
-      let fiber = root == null ? void 0 : root.fiber;
-      let store = root == null ? void 0 : root.store;
-      let state = (_store = store) == null ? void 0 : _store.getState();
-
-      if (fiber && state) {
-        // When a root was found, see if any fundamental props must be changed or exchanged
-        // Check pixelratio
-        if (props.dpr !== undefined && state.viewport.dpr !== calculateDpr(props.dpr)) state.setDpr(props.dpr); // Check size
-
-        if (state.size.width !== size.width || state.size.height !== size.height) state.setSize(size.width, size.height); // Check frameloop
-
-        if (state.frameloop !== props.frameloop) state.setFrameloop(props.frameloop); // For some props we want to reset the entire root
-        // Changes to the color-space
-
-        const linearChanged = props.linear !== state.internal.lastProps.linear;
-
-        if (linearChanged) {
-          unmountComponentAtNode(canvas);
-          fiber = undefined;
-        }
-      }
-
-      if (!fiber) {
-        // If no root has been found, make one
-        // Create gl
-        const glRenderer = createRendererInstance(gl, canvas); // Create store
-
-        store = createStore(applyProps, invalidate, advance, {
-          gl: glRenderer,
-          size,
-          ...props
-        });
-        const state = store.getState(); // Create renderer
-
-        fiber = reconciler.createContainer(store, ConcurrentRoot, false, null); // Map it
-
-        roots.set(canvas, {
-          fiber,
-          store
-        }); // Store events internally
-
-        if (events) state.set({
-          events: events(store)
-        });
-      }
-
-      if (store && fiber) {
-        reconciler.updateContainer( /*#__PURE__*/React.createElement(Provider, {
-          store: store,
-          element: element,
-          onCreated: onCreated,
-          target: canvas
-        }), fiber, null, () => undefined);
-        return store;
-      } else {
-        throw 'Error creating root!';
-      }
-    },
-    unmount: () => unmountComponentAtNode(canvas)
-  };
-}
-
-function render(element, canvas, config = {}) {
-  console.warn('R3F.render is no longer supported in React 18. Use createRoot instead!');
-  return createRoot(canvas, config).render(element);
-}
-
-function Provider({
-  store,
-  element,
-  onCreated,
-  target
-}) {
-  React.useEffect(() => {
-    const state = store.getState(); // Flag the canvas active, rendering will now begin
-
-    state.set(state => ({
-      internal: { ...state.internal,
-        active: true
-      }
-    })); // Connect events
-
-    state.events.connect == null ? void 0 : state.events.connect(target); // Notifiy that init is completed, the scene graph exists, but nothing has yet rendered
-
-    if (onCreated) onCreated(state); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return /*#__PURE__*/React.createElement(context.Provider, {
-    value: store
-  }, element);
-}
-
-function unmountComponentAtNode(canvas, callback) {
-  const root = roots.get(canvas);
-  const fiber = root == null ? void 0 : root.fiber;
-
-  if (fiber) {
-    const state = root == null ? void 0 : root.store.getState();
-    if (state) state.internal.active = false;
-    reconciler.updateContainer(null, fiber, null, () => {
-      if (state) {
-        setTimeout(() => {
-          try {
-            var _state$gl, _state$gl$renderLists, _state$gl2, _state$gl3;
-
-            state.events.disconnect == null ? void 0 : state.events.disconnect();
-            (_state$gl = state.gl) == null ? void 0 : (_state$gl$renderLists = _state$gl.renderLists) == null ? void 0 : _state$gl$renderLists.dispose == null ? void 0 : _state$gl$renderLists.dispose();
-            (_state$gl2 = state.gl) == null ? void 0 : _state$gl2.forceContextLoss == null ? void 0 : _state$gl2.forceContextLoss();
-            if ((_state$gl3 = state.gl) != null && _state$gl3.xr) state.internal.xr.disconnect();
-            dispose(state);
-            roots.delete(canvas);
-            if (callback) callback(canvas);
-          } catch (e) {
-            /* ... */
-          }
-        }, 500);
-      }
-    });
-  }
-}
-
-const act = React.unstable_act;
-
-function createPortal(children, container) {
-  return reconciler.createPortal(children, container, null, null);
-}
-
-reconciler.injectIntoDevTools({
-  bundleType: process.env.NODE_ENV === 'production' ? 0 : 1,
-  rendererPackageName: '@react-three/fiber',
-  version: '18.0.0'
-});
-
 const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'dpr', 'performance', 'clock', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
 
 function Block({
@@ -359,6 +135,7 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
     ...resize
   });
   const canvasRef = React.useRef(null);
+  const [canvas, setCanvas] = React.useState(null);
   const canvasProps = pick(props, CANVAS_PROPS);
   const divProps = omit(props, CANVAS_PROPS);
   const [block, setBlock] = React.useState(false);
@@ -368,8 +145,8 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
 
   if (error) throw error;
 
-  if (width > 0 && height > 0) {
-    createRoot(canvasRef.current, { ...canvasProps,
+  if (width > 0 && height > 0 && canvas) {
+    createRoot(canvas, { ...canvasProps,
       size: {
         width,
         height
@@ -384,10 +161,12 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
     }, children)));
   }
 
-  React.useEffect(() => {
-    const container = canvasRef.current;
-    return () => unmountComponentAtNode(container);
+  React.useLayoutEffect(() => {
+    setCanvas(canvasRef.current);
   }, []);
+  React.useEffect(() => {
+    return () => unmountComponentAtNode(canvas);
+  }, [canvas]);
   return /*#__PURE__*/React.createElement("div", _extends({
     ref: containerRef,
     style: {
@@ -405,4 +184,4 @@ const Canvas = /*#__PURE__*/React.forwardRef(function Canvas({
   }, fallback));
 });
 
-export { Canvas, roots as _roots, act, advance, applyProps, createPortal, createRoot, createPointerEvents as events, invalidate, reconciler, render, unmountComponentAtNode };
+export { Canvas, createPointerEvents as events };