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

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

@@ -2,21 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var hooks = require('../../dist/hooks-dd693347.cjs.dev.js');
-var THREE = require('three');
+var hooks = require('../../dist/hooks-6526f63c.cjs.dev.js');
+var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
+var THREE = require('three');
+var reactNative = require('react-native');
+var expoGl = require('expo-gl');
 var constants = require('react-reconciler/constants');
 var Pressability = require('react-native/Libraries/Pressability/Pressability');
-var reactNative = require('react-native');
 var expoAsset = require('expo-asset');
 var expoFileSystem = require('expo-file-system');
 var base64Arraybuffer = require('base64-arraybuffer');
 var suspendReact = require('suspend-react');
-var _extends = require('@babel/runtime/helpers/extends');
-var expoGl = require('expo-gl');
-var pick = require('lodash-es/pick');
-var omit = require('lodash-es/omit');
 require('react-reconciler');
+require('scheduler');
 require('zustand');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -30,20 +29,20 @@ function _interopNamespace(e) {
         var d = Object.getOwnPropertyDescriptor(e, k);
         Object.defineProperty(n, k, d.get ? d : {
           enumerable: true,
-          get: function () { return e[k]; }
+          get: function () {
+            return e[k];
+          }
         });
       }
     });
   }
-  n["default"] = e;
+  n['default'] = e;
   return Object.freeze(n);
 }
 
-var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
+var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 var Pressability__default = /*#__PURE__*/_interopDefault(Pressability);
-var pick__default = /*#__PURE__*/_interopDefault(pick);
-var omit__default = /*#__PURE__*/_interopDefault(omit);
 
 // @ts-ignore
 const EVENTS = {
@@ -113,7 +112,7 @@ function createTouchEvents(store) {
         events
       } = store.getState();
       events.disconnect == null ? void 0 : events.disconnect();
-      const manager = new Pressability__default["default"](events == null ? void 0 : events.handlers);
+      const manager = new Pressability__default['default'](events == null ? void 0 : events.handlers);
       set(state => ({
         events: { ...state.events,
           connected: manager
@@ -138,127 +137,6 @@ function createTouchEvents(store) {
   };
 }
 
-const CANVAS_PROPS = ['gl', 'events', 'size', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', // 'dpr',
-'performance', 'clock', 'raycaster', 'camera', 'onPointerMissed', 'onCreated']; // 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 in the browser.
-
-const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? React__namespace.useLayoutEffect : React__namespace.useEffect;
-
-function Block({
-  set
-}) {
-  useIsomorphicLayoutEffect(() => {
-    set(new Promise(() => null));
-    return () => set(false);
-  }, []);
-  return null;
-}
-
-class ErrorBoundary extends React__namespace.Component {
-  constructor(...args) {
-    super(...args);
-    this.state = {
-      error: false
-    };
-  }
-
-  componentDidCatch(error) {
-    this.props.set(error);
-  }
-
-  render() {
-    return this.state.error ? null : this.props.children;
-  }
-
-}
-
-ErrorBoundary.getDerivedStateFromError = () => ({
-  error: true
-});
-
-const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
-  children,
-  fallback,
-  style,
-  events,
-  nativeRef_EXPERIMENTAL,
-  onContextCreate,
-  ...props
-}, forwardedRef) => {
-  const canvasProps = pick__default["default"](props, CANVAS_PROPS);
-  const viewProps = omit__default["default"](props, CANVAS_PROPS);
-  const [context, setContext] = React__namespace.useState(null);
-  const [{
-    width,
-    height
-  }, setSize] = React__namespace.useState({
-    width: 0,
-    height: 0
-  });
-  const [bind, setBind] = React__namespace.useState();
-  const [block, setBlock] = React__namespace.useState(false);
-  const [error, setError] = React__namespace.useState(false); // Suspend this component if block is a promise (2nd run)
-
-  if (block) throw block; // Throw exception outwards if anything within canvas throws
-
-  if (error) throw error;
-  const onLayout = React__namespace.useCallback(e => {
-    const {
-      width,
-      height
-    } = e.nativeEvent.layout;
-    setSize({
-      width,
-      height
-    });
-  }, []); // Execute JSX in the reconciler as a layout-effect
-
-  useIsomorphicLayoutEffect(() => {
-    if (width > 0 && height > 0 && context) {
-      const store = render( /*#__PURE__*/React__namespace.createElement(ErrorBoundary, {
-        set: setError
-      }, /*#__PURE__*/React__namespace.createElement(React__namespace.Suspense, {
-        fallback: /*#__PURE__*/React__namespace.createElement(Block, {
-          set: setBlock
-        })
-      }, children)), context, { ...canvasProps,
-        size: {
-          width,
-          height
-        },
-        events: events || createTouchEvents
-      });
-      const state = store.getState();
-      setBind(state.events.connected.getEventHandlers());
-    }
-  }, [width, height, children, context, canvasProps]);
-  useIsomorphicLayoutEffect(() => {
-    return () => {
-      if (context) unmountComponentAtNode(context);
-    };
-  }, []);
-  return /*#__PURE__*/React__namespace.createElement(reactNative.View, _extends({}, viewProps, {
-    ref: forwardedRef,
-    onLayout: onLayout,
-    style: {
-      flex: 1,
-      ...style
-    }
-  }, bind), width > 0 && /*#__PURE__*/React__namespace.createElement(expoGl.GLView, {
-    nativeRef_EXPERIMENTAL: ref => {
-      if (nativeRef_EXPERIMENTAL && !nativeRef_EXPERIMENTAL.current) {
-        nativeRef_EXPERIMENTAL.current = ref;
-      }
-    },
-    onContextCreate: async gl => {
-      await (onContextCreate == null ? void 0 : onContextCreate(gl));
-      setContext(gl);
-    },
-    style: reactNative.StyleSheet.absoluteFill
-  }));
-});
-
 /**
  * Generates an asset based on input type.
  */
@@ -293,8 +171,6 @@ function loadingFn(extensions, onProgress) {
     if (extensions) extensions(loader); // Go through the urls and load them
 
     return Promise.all(input.map(entry => new Promise(async (res, reject) => {
-      var _parse, _ref;
-
       // Construct URL
       const url = typeof entry === 'string' ? loader.path + entry : entry; // There's no Image in native, so we create & pass a data texture instead
 
@@ -341,7 +217,7 @@ function loadingFn(extensions, onProgress) {
       } = await getAsset(url).downloadAsync();
       const arrayBuffer = await toBuffer(localUri); // Parse it
 
-      const parsed = (_parse = (_ref = loader).parse) == null ? void 0 : _parse.call(_ref, arrayBuffer, undefined, data => {
+      const parsed = loader.parse == null ? void 0 : loader.parse(arrayBuffer, undefined, data => {
         if (data.scene) Object.assign(data, hooks.buildGraph(data.scene));
         res(data);
       }, error => reject(`Could not load ${url}: ${error.message}`)); // Respect synchronous parsers which don't have callbacks
@@ -423,84 +299,90 @@ const createRendererInstance = (gl, context) => {
 
 function createRoot(context, config) {
   return {
-    render: element => render(element, context, config),
-    unmount: () => unmountComponentAtNode(context)
-  };
-}
-
-function render(element, context, {
-  gl,
-  size = {
-    width: 0,
-    height: 0
-  },
-  events,
-  onCreated,
-  ...props
-} = {}) {
-  var _store;
-
-  let root = roots.get(context);
-  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 size
-    if (state.size.width !== size.width || state.size.height !== size.height) state.setSize(size.width, size.height); // For some props we want to reset the entire root
-    // Changes to the color-space
-
-    const linearChanged = props.linear !== state.internal.lastProps.linear;
+    render: element => {
+      var _store;
+
+      let {
+        gl,
+        size = {
+          width: 0,
+          height: 0
+        },
+        events,
+        onCreated,
+        ...props
+      } = config || {};
+      let root = roots.get(context);
+      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 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(context);
+          fiber = undefined;
+        }
+      }
 
-    if (linearChanged) {
-      unmountComponentAtNode(context);
-      fiber = undefined;
-    }
-  }
+      if (!fiber) {
+        // If no root has been found, make one
+        // Create gl
+        const glRenderer = createRendererInstance(gl, context); // Create store
+
+        store = hooks.createStore(applyProps, invalidate, advance, {
+          gl: glRenderer,
+          size,
+          ...props,
+          // expo-gl can only render at native dpr/resolution
+          // https://github.com/expo/expo-three/issues/39
+          dpr: reactNative.PixelRatio.get()
+        });
+        const state = store.getState(); // Create renderer
 
-  if (!fiber) {
-    // If no root has been found, make one
-    // Create gl
-    const glRenderer = createRendererInstance(gl, context); // Create store
-
-    store = hooks.createStore(applyProps, invalidate, advance, {
-      gl: glRenderer,
-      size,
-      ...props,
-      // expo-gl can only render at native dpr/resolution
-      // https://github.com/expo/expo-three/issues/39
-      dpr: reactNative.PixelRatio.get()
-    });
-    const state = store.getState(); // Create renderer
+        fiber = reconciler.createContainer(store, constants.ConcurrentRoot, false, null); // Map it
 
-    fiber = reconciler.createContainer(store, constants.ConcurrentRoot, false, null); // Map it
+        roots.set(context, {
+          fiber,
+          store
+        }); // Store event manager internally and connect it
 
-    roots.set(context, {
-      fiber,
-      store
-    }); // Store event manager internally and connect it
+        if (events) {
+          var _state$get$events$con, _state$get$events;
 
-    if (events) {
-      var _state$get$events$con, _state$get$events;
+          state.set({
+            events: events(store)
+          });
+          (_state$get$events$con = (_state$get$events = state.get().events).connect) == null ? void 0 : _state$get$events$con.call(_state$get$events, context);
+        }
+      }
 
-      state.set({
-        events: events(store)
-      });
-      (_state$get$events$con = (_state$get$events = state.get().events).connect) == null ? void 0 : _state$get$events$con.call(_state$get$events, context);
-    }
-  }
+      if (store && fiber) {
+        reconciler.updateContainer( /*#__PURE__*/React__namespace.createElement(Provider, {
+          store: store,
+          element: element,
+          onCreated: onCreated
+        }), fiber, null, () => undefined);
+        return store;
+      } else {
+        throw 'Error creating root!';
+      }
+    },
+    unmount: () => unmountComponentAtNode(context)
+  };
+}
 
-  if (store && fiber) {
-    reconciler.updateContainer( /*#__PURE__*/React__namespace.createElement(Provider, {
-      store: store,
-      element: element,
-      onCreated: onCreated
-    }), fiber, null, () => undefined);
-    return store;
-  } else {
-    throw 'Error creating root!';
-  }
+function render(element, context, config = {}) {
+  console.warn('R3F.render is no longer supported in React 18. Use createRoot instead!');
+  return createRoot(context, config).render(element);
 }
 
 function Provider({
@@ -552,7 +434,7 @@ function unmountComponentAtNode(context, callback) {
   }
 }
 
-const act = reconciler.act;
+const act = React__namespace.unstable_act;
 
 function createPortal(children, container) {
   return reconciler.createPortal(children, container, null, null);
@@ -564,6 +446,123 @@ reconciler.injectIntoDevTools({
   version: '18.0.0'
 });
 
+const CANVAS_PROPS = ['gl', 'events', 'shadows', 'linear', 'flat', 'orthographic', 'frameloop', 'performance', 'clock', 'raycaster', 'camera', 'onPointerMissed', 'onCreated'];
+
+function Block({
+  set
+}) {
+  React__namespace.useLayoutEffect(() => {
+    set(new Promise(() => null));
+    return () => set(false);
+  }, [set]);
+  return null;
+}
+
+class ErrorBoundary extends React__namespace.Component {
+  constructor(...args) {
+    super(...args);
+    this.state = {
+      error: false
+    };
+  }
+
+  componentDidCatch(error) {
+    this.props.set(error);
+  }
+
+  render() {
+    return this.state.error ? null : this.props.children;
+  }
+
+}
+
+ErrorBoundary.getDerivedStateFromError = () => ({
+  error: true
+});
+
+const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
+  children,
+  fallback,
+  style,
+  events,
+  nativeRef_EXPERIMENTAL,
+  onContextCreate,
+  ...props
+}, forwardedRef) => {
+  // Create a known catalogue of Threejs-native elements
+  // This will include the entire THREE namespace by default, users can extend
+  // their own elements by using the createRoot API instead
+  React__namespace.useMemo(() => hooks.extend(THREE__namespace), []);
+  const [{
+    width,
+    height
+  }, setSize] = React__namespace.useState({
+    width: 0,
+    height: 0
+  });
+  const [context, setContext] = React__namespace.useState(null);
+  const [bind, setBind] = React__namespace.useState();
+  const canvasProps = hooks.pick(props, CANVAS_PROPS);
+  const viewProps = hooks.omit(props, CANVAS_PROPS);
+  const [block, setBlock] = React__namespace.useState(false);
+  const [error, setError] = React__namespace.useState(false); // Suspend this component if block is a promise (2nd run)
+
+  if (block) throw block; // Throw exception outwards if anything within canvas throws
+
+  if (error) throw error;
+  const onLayout = React__namespace.useCallback(e => {
+    const {
+      width,
+      height
+    } = e.nativeEvent.layout;
+    setSize({
+      width,
+      height
+    });
+  }, []);
+
+  if (width > 0 && height > 0 && context) {
+    const store = createRoot(context, { ...canvasProps,
+      size: {
+        width,
+        height
+      },
+      events: events || createTouchEvents
+    }).render( /*#__PURE__*/React__namespace.createElement(ErrorBoundary, {
+      set: setError
+    }, /*#__PURE__*/React__namespace.createElement(React__namespace.Suspense, {
+      fallback: /*#__PURE__*/React__namespace.createElement(Block, {
+        set: setBlock
+      })
+    }, children)));
+    const state = store.getState();
+    setBind(state.events.connected.getEventHandlers());
+  }
+
+  React__namespace.useEffect(() => {
+    return () => unmountComponentAtNode(context);
+  }, [context]);
+  return /*#__PURE__*/React__namespace.createElement(reactNative.View, _extends({}, viewProps, {
+    ref: forwardedRef,
+    onLayout: onLayout,
+    style: {
+      flex: 1,
+      ...style
+    }
+  }, bind), width > 0 && /*#__PURE__*/React__namespace.createElement(expoGl.GLView, {
+    nativeRef_EXPERIMENTAL: ref => {
+      if (nativeRef_EXPERIMENTAL && !nativeRef_EXPERIMENTAL.current) {
+        nativeRef_EXPERIMENTAL.current = ref;
+      }
+    },
+    onContextCreate: async gl => {
+      await (onContextCreate == null ? void 0 : onContextCreate(gl));
+      setContext(gl);
+    },
+    style: reactNative.StyleSheet.absoluteFill
+  }));
+});
+
 exports.ReactThreeFiber = hooks.threeTypes;
 exports.addAfterEffect = hooks.addAfterEffect;
 exports.addEffect = hooks.addEffect;