@react-three/fiber 8.16.8 → 8.17.1

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-ca3a789d.cjs.dev.js');
+var events = require('../../dist/events-c54ce65e.cjs.dev.js');
 var React = require('react');
 var THREE = require('three');
 var reactNative = require('react-native');
@@ -15,9 +15,9 @@ var base64Js = require('base64-js');
 var buffer = require('buffer');
 require('react-reconciler/constants');
 require('zustand');
+require('suspend-react');
 require('react-reconciler');
 require('scheduler');
-require('suspend-react');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -41,88 +41,6 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 
-/** Default R3F event manager for react-native */
-function createTouchEvents(store) {
-  const {
-    handlePointer
-  } = index.createEvents(store);
-  const handleTouch = (event, name) => {
-    event.persist()
-
-    // Apply offset
-    ;
-    event.nativeEvent.offsetX = event.nativeEvent.locationX;
-    event.nativeEvent.offsetY = event.nativeEvent.locationY;
-
-    // Emulate DOM event
-    const callback = handlePointer(name);
-    callback(event.nativeEvent);
-    return true;
-  };
-  const responder = reactNative.PanResponder.create({
-    onStartShouldSetPanResponder: () => true,
-    onMoveShouldSetPanResponder: () => true,
-    onMoveShouldSetPanResponderCapture: () => true,
-    onPanResponderTerminationRequest: () => true,
-    onStartShouldSetPanResponderCapture: e => handleTouch(e, 'onPointerCapture'),
-    onPanResponderStart: e => handleTouch(e, 'onPointerDown'),
-    onPanResponderMove: e => handleTouch(e, 'onPointerMove'),
-    onPanResponderEnd: (e, state) => {
-      handleTouch(e, 'onPointerUp');
-      if (Math.hypot(state.dx, state.dy) < 20) handleTouch(e, 'onClick');
-    },
-    onPanResponderRelease: e => handleTouch(e, 'onPointerLeave'),
-    onPanResponderTerminate: e => handleTouch(e, 'onLostPointerCapture'),
-    onPanResponderReject: e => handleTouch(e, 'onLostPointerCapture')
-  });
-  return {
-    priority: 1,
-    enabled: true,
-    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.raycaster.setFromCamera(state.pointer, state.camera);
-    },
-    connected: undefined,
-    handlers: responder.panHandlers,
-    update: () => {
-      var _internal$lastEvent;
-      const {
-        events,
-        internal
-      } = store.getState();
-      if ((_internal$lastEvent = internal.lastEvent) != null && _internal$lastEvent.current && events.handlers) {
-        handlePointer('onPointerMove')(internal.lastEvent.current);
-      }
-    },
-    connect: () => {
-      const {
-        set,
-        events
-      } = store.getState();
-      events.disconnect == null ? void 0 : events.disconnect();
-      set(state => ({
-        events: {
-          ...state.events,
-          connected: true
-        }
-      }));
-    },
-    disconnect: () => {
-      const {
-        set
-      } = store.getState();
-      set(state => ({
-        events: {
-          ...state.events,
-          connected: false
-        }
-      }));
-    }
-  };
-}
-
 /**
  * A native canvas which accepts threejs elements as children.
  * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
@@ -131,7 +49,7 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   children,
   style,
   gl,
-  events = createTouchEvents,
+  events: events$1 = events.createPointerEvents,
   shadows,
   linear,
   flat,
@@ -149,7 +67,7 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   // 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(() => index.extend(THREE__namespace), []);
+  React__namespace.useMemo(() => events.extend(THREE__namespace), []);
   const Bridge = itsFine.useContextBridge();
   const [{
     width,
@@ -165,7 +83,7 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   const [canvas, setCanvas] = React__namespace.useState(null);
   const [bind, setBind] = React__namespace.useState();
   React__namespace.useImperativeHandle(forwardedRef, () => viewRef.current);
-  const handlePointerMissed = index.useMutableCallback(onPointerMissed);
+  const handlePointerMissed = events.useMutableCallback(onPointerMissed);
   const [block, setBlock] = React__namespace.useState(false);
   const [error, setError] = React__namespace.useState(undefined);
 
@@ -194,27 +112,91 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   // Called on context create or swap
   // https://github.com/pmndrs/react-three-fiber/pull/2297
   const onContextCreate = React__namespace.useCallback(context => {
-    const canvasShim = {
+    const listeners = new Map();
+    const canvas = {
+      style: {},
       width: context.drawingBufferWidth,
       height: context.drawingBufferHeight,
-      style: {},
-      addEventListener: () => {},
-      removeEventListener: () => {},
+      clientWidth: context.drawingBufferWidth,
       clientHeight: context.drawingBufferHeight,
       getContext: (_, {
         antialias = false
       }) => {
         setAntialias(antialias);
         return context;
+      },
+      addEventListener(type, listener) {
+        let callbacks = listeners.get(type);
+        if (!callbacks) {
+          callbacks = [];
+          listeners.set(type, callbacks);
+        }
+        callbacks.push(listener);
+      },
+      removeEventListener(type, listener) {
+        const callbacks = listeners.get(type);
+        if (callbacks) {
+          const index = callbacks.indexOf(listener);
+          if (index !== -1) callbacks.splice(index, 1);
+        }
+      },
+      dispatchEvent(event) {
+        Object.assign(event, {
+          target: this
+        });
+        const callbacks = listeners.get(event.type);
+        if (callbacks) {
+          for (const callback of callbacks) {
+            callback(event);
+          }
+        }
+      },
+      setPointerCapture() {
+        // TODO
+      },
+      releasePointerCapture() {
+        // TODO
       }
     };
-    root.current = index.createRoot(canvasShim);
-    setCanvas(canvasShim);
+
+    // TODO: this is wrong but necessary to trick controls
+    // @ts-ignore
+    canvas.ownerDocument = canvas;
+    canvas.getRootNode = () => canvas;
+    root.current = events.createRoot(canvas);
+    setCanvas(canvas);
+    function handleTouch(gestureEvent, type) {
+      gestureEvent.persist();
+      canvas.dispatchEvent(Object.assign(gestureEvent.nativeEvent, {
+        type,
+        offsetX: gestureEvent.nativeEvent.locationX,
+        offsetY: gestureEvent.nativeEvent.locationY,
+        pointerType: 'touch'
+      }));
+      return true;
+    }
+    const responder = reactNative.PanResponder.create({
+      onStartShouldSetPanResponder: () => true,
+      onMoveShouldSetPanResponder: () => true,
+      onMoveShouldSetPanResponderCapture: () => true,
+      onPanResponderTerminationRequest: () => true,
+      onStartShouldSetPanResponderCapture: e => handleTouch(e, 'pointercapture'),
+      onPanResponderStart: e => handleTouch(e, 'pointerdown'),
+      onPanResponderMove: e => handleTouch(e, 'pointermove'),
+      onPanResponderEnd: (e, state) => {
+        handleTouch(e, 'pointerup');
+        if (Math.hypot(state.dx, state.dy) < 20) handleTouch(e, 'click');
+      },
+      onPanResponderRelease: e => handleTouch(e, 'pointerleave'),
+      onPanResponderTerminate: e => handleTouch(e, 'lostpointercapture'),
+      onPanResponderReject: e => handleTouch(e, 'lostpointercapture')
+    });
+    setBind(responder.panHandlers);
   }, []);
   if (root.current && width > 0 && height > 0) {
     root.current.configure({
       gl,
-      events,
+      events: events$1,
       shadows,
       linear,
       flat,
@@ -238,9 +220,6 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
       onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
       // Overwrite onCreated to apply RN bindings
       onCreated: state => {
-        // Bind events after creation
-        setBind(state.events.handlers);
-
         // Bind render to RN bridge
         const context = state.gl.getContext();
         const renderFrame = state.gl.render.bind(state.gl);
@@ -252,10 +231,10 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
       }
     });
     root.current.render( /*#__PURE__*/jsxRuntime.jsx(Bridge, {
-      children: /*#__PURE__*/jsxRuntime.jsx(index.ErrorBoundary, {
+      children: /*#__PURE__*/jsxRuntime.jsx(events.ErrorBoundary, {
         set: setError,
         children: /*#__PURE__*/jsxRuntime.jsx(React__namespace.Suspense, {
-          fallback: /*#__PURE__*/jsxRuntime.jsx(index.Block, {
+          fallback: /*#__PURE__*/jsxRuntime.jsx(events.Block, {
             set: setBlock
           }),
           children: children
@@ -265,22 +244,27 @@ const CanvasImpl = /*#__PURE__*/React__namespace.forwardRef(({
   }
   React__namespace.useEffect(() => {
     if (canvas) {
-      return () => index.unmountComponentAtNode(canvas);
+      return () => events.unmountComponentAtNode(canvas);
     }
   }, [canvas]);
   return /*#__PURE__*/jsxRuntime.jsx(reactNative.View, {
-    ...props,
     ref: viewRef,
     onLayout: onLayout,
     style: {
       flex: 1,
       ...style
     },
-    ...bind,
-    children: width > 0 && /*#__PURE__*/jsxRuntime.jsx(expoGl.GLView, {
-      msaaSamples: antialias ? 4 : 0,
-      onContextCreate: onContextCreate,
-      style: reactNative.StyleSheet.absoluteFill
+    children: /*#__PURE__*/jsxRuntime.jsx(reactNative.View, {
+      ...props,
+      style: {
+        flex: 1
+      },
+      children: width > 0 && /*#__PURE__*/jsxRuntime.jsx(expoGl.GLView, {
+        ...bind,
+        msaaSamples: antialias ? 4 : 0,
+        onContextCreate: onContextCreate,
+        style: reactNative.StyleSheet.absoluteFill
+      })
     })
   });
 });
@@ -298,6 +282,88 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(p
   });
 });
 
+/** Default R3F event manager for react-native */
+function createTouchEvents(store) {
+  const {
+    handlePointer
+  } = events.createEvents(store);
+  const handleTouch = (event, name) => {
+    event.persist()
+
+    // Apply offset
+    ;
+    event.nativeEvent.offsetX = event.nativeEvent.locationX;
+    event.nativeEvent.offsetY = event.nativeEvent.locationY;
+
+    // Emulate DOM event
+    const callback = handlePointer(name);
+    callback(event.nativeEvent);
+    return true;
+  };
+  const responder = reactNative.PanResponder.create({
+    onStartShouldSetPanResponder: () => true,
+    onMoveShouldSetPanResponder: () => true,
+    onMoveShouldSetPanResponderCapture: () => true,
+    onPanResponderTerminationRequest: () => true,
+    onStartShouldSetPanResponderCapture: e => handleTouch(e, 'onPointerCapture'),
+    onPanResponderStart: e => handleTouch(e, 'onPointerDown'),
+    onPanResponderMove: e => handleTouch(e, 'onPointerMove'),
+    onPanResponderEnd: (e, state) => {
+      handleTouch(e, 'onPointerUp');
+      if (Math.hypot(state.dx, state.dy) < 20) handleTouch(e, 'onClick');
+    },
+    onPanResponderRelease: e => handleTouch(e, 'onPointerLeave'),
+    onPanResponderTerminate: e => handleTouch(e, 'onLostPointerCapture'),
+    onPanResponderReject: e => handleTouch(e, 'onLostPointerCapture')
+  });
+  return {
+    priority: 1,
+    enabled: true,
+    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.raycaster.setFromCamera(state.pointer, state.camera);
+    },
+    connected: undefined,
+    handlers: responder.panHandlers,
+    update: () => {
+      var _internal$lastEvent;
+      const {
+        events,
+        internal
+      } = store.getState();
+      if ((_internal$lastEvent = internal.lastEvent) != null && _internal$lastEvent.current && events.handlers) {
+        handlePointer('onPointerMove')(internal.lastEvent.current);
+      }
+    },
+    connect: () => {
+      const {
+        set,
+        events
+      } = store.getState();
+      events.disconnect == null ? void 0 : events.disconnect();
+      set(state => ({
+        events: {
+          ...state.events,
+          connected: true
+        }
+      }));
+    },
+    disconnect: () => {
+      const {
+        set
+      } = store.getState();
+      set(state => ({
+        events: {
+          ...state.events,
+          connected: false
+        }
+      }));
+    }
+  };
+}
+
 // http://stackoverflow.com/questions/105034
 function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
@@ -459,32 +525,34 @@ function polyfills() {
 
 if (reactNative.Platform.OS !== 'web') polyfills();
 
-exports.ReactThreeFiber = index.threeTypes;
-exports._roots = index.roots;
-exports.act = index.act;
-exports.addAfterEffect = index.addAfterEffect;
-exports.addEffect = index.addEffect;
-exports.addTail = index.addTail;
-exports.advance = index.advance;
-exports.applyProps = index.applyProps;
-exports.buildGraph = index.buildGraph;
-exports.context = index.context;
-exports.createEvents = index.createEvents;
-exports.createPortal = index.createPortal;
-exports.createRoot = index.createRoot;
-exports.dispose = index.dispose;
-exports.extend = index.extend;
-exports.flushGlobalEffects = index.flushGlobalEffects;
-exports.getRootState = index.getRootState;
-exports.invalidate = index.invalidate;
-exports.reconciler = index.reconciler;
-exports.render = index.render;
-exports.unmountComponentAtNode = index.unmountComponentAtNode;
-exports.useFrame = index.useFrame;
-exports.useGraph = index.useGraph;
-exports.useInstanceHandle = index.useInstanceHandle;
-exports.useLoader = index.useLoader;
-exports.useStore = index.useStore;
-exports.useThree = index.useThree;
+exports.ReactThreeFiber = events.threeTypes;
+exports._roots = events.roots;
+exports.act = events.act;
+exports.addAfterEffect = events.addAfterEffect;
+exports.addEffect = events.addEffect;
+exports.addTail = events.addTail;
+exports.advance = events.advance;
+exports.applyProps = events.applyProps;
+exports.buildGraph = events.buildGraph;
+exports.context = events.context;
+exports.createEvents = events.createEvents;
+exports.createPointerEvents = events.createPointerEvents;
+exports.createPortal = events.createPortal;
+exports.createRoot = events.createRoot;
+exports.dispose = events.dispose;
+exports.extend = events.extend;
+exports.flushGlobalEffects = events.flushGlobalEffects;
+exports.flushSync = events.flushSync;
+exports.getRootState = events.getRootState;
+exports.invalidate = events.invalidate;
+exports.reconciler = events.reconciler;
+exports.render = events.render;
+exports.unmountComponentAtNode = events.unmountComponentAtNode;
+exports.useFrame = events.useFrame;
+exports.useGraph = events.useGraph;
+exports.useInstanceHandle = events.useInstanceHandle;
+exports.useLoader = events.useLoader;
+exports.useStore = events.useStore;
+exports.useThree = events.useThree;
 exports.Canvas = Canvas;
 exports.events = createTouchEvents;