@react-three/rapier 1.5.0 → 2.0.0

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

@@ -1,7 +1,7 @@
 import { Vector3 as Vector3$1, Quaternion as Quaternion$1, ActiveEvents, ColliderDesc, EventQueue, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
 import { useFrame, useThree } from '@react-three/fiber';
-import React, { useRef, useEffect, memo, useMemo, useContext, useState, createContext, useCallback, forwardRef, Fragment } from 'react';
+import React, { useRef, useEffect, memo, useMemo, useContext, useState, createContext, useCallback, Fragment } from 'react';
 import { Quaternion, Euler, Vector3, Object3D, Matrix4, BufferAttribute, MathUtils, DynamicDrawUsage } from 'three';
 import { suspend } from 'suspend-react';
 import { mergeVertices } from 'three-stdlib';
@@ -119,7 +119,7 @@ const vectorToTuple = v => {
   return [v];
 };
 function useConst(initialValue) {
-  const ref = useRef();
+  const ref = useRef(undefined);
   if (ref.current === undefined) {
     ref.current = {
       value: typeof initialValue === "function" ? initialValue() : initialValue
@@ -183,7 +183,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -195,13 +195,13 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
 
-const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale", "softCcdPrediction"];
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale", "softCcdPrediction", "ref"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice();
 
@@ -992,11 +992,25 @@ function _extends() {
   }, _extends.apply(null, arguments);
 }
 
+// Need to catch the case where forwardedRef is a function... how to do that?
+const useForwardedRef = (forwardedRef, defaultValue = null) => {
+  const innerRef = useRef(defaultValue);
+
+  // Update the forwarded ref when the inner ref changes
+  if (forwardedRef && typeof forwardedRef !== "function") {
+    if (!forwardedRef.current) {
+      forwardedRef.current = innerRef.current;
+    }
+    return forwardedRef;
+  }
+  return innerRef;
+};
+
 /**
  * Initiate an instance and return a safe getter
  */
 const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
-  const ref = useRef();
+  const ref = useRef(undefined);
   const getInstance = useCallback(() => {
     if (!ref.current) {
       ref.current = createFn();
@@ -1015,6 +1029,156 @@ const useImperativeInstance = (createFn, destroyFn, dependencyList) => {
   return getInstance;
 };
 
+const rigidBodyDescFromOptions = options => {
+  var _options$canSleep;
+  const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
+  const desc = new RigidBodyDesc(type);
+
+  // Apply immutable options
+  desc.canSleep = (_options$canSleep = options === null || options === void 0 ? void 0 : options.canSleep) !== null && _options$canSleep !== void 0 ? _options$canSleep : true;
+  return desc;
+};
+const createRigidBodyState = ({
+  rigidBody,
+  object,
+  setMatrix,
+  getMatrix,
+  worldScale,
+  meshType: _meshType = "mesh"
+}) => {
+  object.updateWorldMatrix(true, false);
+  const invertedWorldMatrix = object.parent.matrixWorld.clone().invert();
+  return {
+    object,
+    rigidBody,
+    invertedWorldMatrix,
+    setMatrix: setMatrix ? setMatrix : matrix => {
+      object.matrix.copy(matrix);
+    },
+    getMatrix: getMatrix ? getMatrix : matrix => matrix.copy(object.matrix),
+    scale: worldScale || object.getWorldScale(_scale).clone(),
+    isSleeping: false,
+    meshType: _meshType
+  };
+};
+const immutableRigidBodyOptions = ["args", "colliders", "canSleep"];
+const mutableRigidBodyOptions = {
+  gravityScale: (rb, value) => {
+    rb.setGravityScale(value, true);
+  },
+  additionalSolverIterations(rb, value) {
+    rb.setAdditionalSolverIterations(value);
+  },
+  linearDamping: (rb, value) => {
+    rb.setLinearDamping(value);
+  },
+  angularDamping: (rb, value) => {
+    rb.setAngularDamping(value);
+  },
+  dominanceGroup: (rb, value) => {
+    rb.setDominanceGroup(value);
+  },
+  enabledRotations: (rb, [x, y, z]) => {
+    rb.setEnabledRotations(x, y, z, true);
+  },
+  enabledTranslations: (rb, [x, y, z]) => {
+    rb.setEnabledTranslations(x, y, z, true);
+  },
+  lockRotations: (rb, value) => {
+    rb.lockRotations(value, true);
+  },
+  lockTranslations: (rb, value) => {
+    rb.lockTranslations(value, true);
+  },
+  angularVelocity: (rb, [x, y, z]) => {
+    rb.setAngvel({
+      x,
+      y,
+      z
+    }, true);
+  },
+  linearVelocity: (rb, [x, y, z]) => {
+    rb.setLinvel({
+      x,
+      y,
+      z
+    }, true);
+  },
+  ccd: (rb, value) => {
+    rb.enableCcd(value);
+  },
+  softCcdPrediction: (rb, value) => {
+    rb.setSoftCcdPrediction(value);
+  },
+  userData: (rb, value) => {
+    rb.userData = value;
+  },
+  type(rb, value) {
+    rb.setBodyType(rigidBodyTypeFromString(value), true);
+  },
+  position: () => {},
+  rotation: () => {},
+  quaternion: () => {},
+  scale: () => {}
+};
+const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
+const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
+  if (!rigidBody) {
+    return;
+  }
+  const state = states.get(rigidBody.handle);
+  if (state) {
+    if (updateTranslations) {
+      state.object.updateWorldMatrix(true, false);
+      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
+      rigidBody.setTranslation(_position, false);
+      rigidBody.setRotation(_rotation, false);
+    }
+    mutableRigidBodyOptionKeys.forEach(key => {
+      if (key in options) {
+        mutableRigidBodyOptions[key](rigidBody, options[key]);
+      }
+    });
+  }
+};
+const useUpdateRigidBodyOptions = (getRigidBody, props, states, updateTranslations = true) => {
+  // TODO: Improve this, split each prop into its own effect
+  const mutablePropsAsFlatArray = useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
+    return vectorToTuple(props[key]);
+  }), [props]);
+  useEffect(() => {
+    const rigidBody = getRigidBody();
+    setRigidBodyOptions(rigidBody, props, states, updateTranslations);
+  }, mutablePropsAsFlatArray);
+};
+const useRigidBodyEvents = (getRigidBody, props, events) => {
+  const {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit,
+    onContactForce
+  } = props;
+  const eventHandlers = {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit,
+    onContactForce
+  };
+  useEffect(() => {
+    const rigidBody = getRigidBody();
+    events.set(rigidBody.handle, eventHandlers);
+    return () => {
+      events.delete(rigidBody.handle);
+    };
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+};
+
 /**
  * Takes an object resembling a Vector3 and returs a Three.Vector3
  * @category Math helpers
@@ -1065,25 +1229,11 @@ const euler = ({
   return new Euler(x, y, z);
 };
 
-// Need to catch the case where forwardedRef is a function... how to do that?
-const useForwardedRef = (forwardedRef, defaultValue = null) => {
-  const innerRef = useRef(defaultValue);
-
-  // Update the forwarded ref when the inner ref changes
-  if (forwardedRef && typeof forwardedRef !== "function") {
-    if (!forwardedRef.current) {
-      forwardedRef.current = innerRef.current;
-    }
-    return forwardedRef;
-  }
-  return innerRef;
-};
-
 /**
  * A collider is a shape that can be attached to a rigid body to define its physical properties.
  * @internal
  */
-const AnyCollider = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedRef) => {
+const AnyCollider = /*#__PURE__*/memo(props => {
   const {
     children,
     position,
@@ -1098,16 +1248,18 @@ const AnyCollider = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedR
     colliderStates
   } = useRapier();
   const rigidBodyContext = useRigidBodyContext();
-  const colliderRef = useForwardedRef(forwardedRef);
+  const colliderRef = useForwardedRef(props.ref);
   const objectRef = useRef(null);
 
   // We spread the props out here to make sure that the ref is updated when the props change.
-  const immutablePropArray = immutableColliderOptions.flatMap(key => Array.isArray(props[key]) ? [...props[key]] : props[key]);
+  const immutablePropArray = immutableColliderOptions.flatMap(key =>
+  // Array.isArray(props[key]) ? [...props[key]] : props[key]
+  Array.isArray(props[key]) ? props[key] : [props[key]]);
   const getInstance = useImperativeInstance(() => {
     const worldScale = objectRef.current.getWorldScale(vec3());
     const collider = createColliderFromOptions(props, world, worldScale, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.getRigidBody);
-    if (typeof forwardedRef == "function") {
-      forwardedRef(collider);
+    if (typeof props.ref == "function") {
+      props.ref(collider);
     }
     colliderRef.current = collider;
     return collider;
@@ -1136,7 +1288,7 @@ const AnyCollider = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedR
     ref: objectRef,
     name: name
   }, children);
-}));
+});
 /**
  * A cuboid collider shape
  * @category Colliders
@@ -1239,165 +1391,16 @@ const ConvexHullCollider = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PU
 })));
 ConvexHullCollider.displayName = "ConvexHullCollider";
 
-const rigidBodyDescFromOptions = options => {
-  var _options$canSleep;
-  const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
-  const desc = new RigidBodyDesc(type);
-
-  // Apply immutable options
-  desc.canSleep = (_options$canSleep = options === null || options === void 0 ? void 0 : options.canSleep) !== null && _options$canSleep !== void 0 ? _options$canSleep : true;
-  return desc;
-};
-const createRigidBodyState = ({
-  rigidBody,
-  object,
-  setMatrix,
-  getMatrix,
-  worldScale,
-  meshType: _meshType = "mesh"
-}) => {
-  object.updateWorldMatrix(true, false);
-  const invertedWorldMatrix = object.parent.matrixWorld.clone().invert();
-  return {
-    object,
-    rigidBody,
-    invertedWorldMatrix,
-    setMatrix: setMatrix ? setMatrix : matrix => {
-      object.matrix.copy(matrix);
-    },
-    getMatrix: getMatrix ? getMatrix : matrix => matrix.copy(object.matrix),
-    scale: worldScale || object.getWorldScale(_scale).clone(),
-    isSleeping: false,
-    meshType: _meshType
-  };
-};
-const immutableRigidBodyOptions = ["args", "colliders", "canSleep"];
-const mutableRigidBodyOptions = {
-  gravityScale: (rb, value) => {
-    rb.setGravityScale(value, true);
-  },
-  additionalSolverIterations(rb, value) {
-    rb.setAdditionalSolverIterations(value);
-  },
-  linearDamping: (rb, value) => {
-    rb.setLinearDamping(value);
-  },
-  angularDamping: (rb, value) => {
-    rb.setAngularDamping(value);
-  },
-  dominanceGroup: (rb, value) => {
-    rb.setDominanceGroup(value);
-  },
-  enabledRotations: (rb, [x, y, z]) => {
-    rb.setEnabledRotations(x, y, z, true);
-  },
-  enabledTranslations: (rb, [x, y, z]) => {
-    rb.setEnabledTranslations(x, y, z, true);
-  },
-  lockRotations: (rb, value) => {
-    rb.lockRotations(value, true);
-  },
-  lockTranslations: (rb, value) => {
-    rb.lockTranslations(value, true);
-  },
-  angularVelocity: (rb, [x, y, z]) => {
-    rb.setAngvel({
-      x,
-      y,
-      z
-    }, true);
-  },
-  linearVelocity: (rb, [x, y, z]) => {
-    rb.setLinvel({
-      x,
-      y,
-      z
-    }, true);
-  },
-  ccd: (rb, value) => {
-    rb.enableCcd(value);
-  },
-  softCcdPrediction: (rb, value) => {
-    rb.setSoftCcdPrediction(value);
-  },
-  userData: (rb, value) => {
-    rb.userData = value;
-  },
-  type(rb, value) {
-    rb.setBodyType(rigidBodyTypeFromString(value), true);
-  },
-  position: () => {},
-  rotation: () => {},
-  quaternion: () => {},
-  scale: () => {}
-};
-const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
-const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
-  if (!rigidBody) {
-    return;
-  }
-  const state = states.get(rigidBody.handle);
-  if (state) {
-    if (updateTranslations) {
-      state.object.updateWorldMatrix(true, false);
-      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
-      rigidBody.setTranslation(_position, false);
-      rigidBody.setRotation(_rotation, false);
-    }
-    mutableRigidBodyOptionKeys.forEach(key => {
-      if (key in options) {
-        mutableRigidBodyOptions[key](rigidBody, options[key]);
-      }
-    });
-  }
-};
-const useUpdateRigidBodyOptions = (getRigidBody, props, states, updateTranslations = true) => {
-  // TODO: Improve this, split each prop into its own effect
-  const mutablePropsAsFlatArray = useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
-    return vectorToTuple(props[key]);
-  }), [props]);
-  useEffect(() => {
-    const rigidBody = getRigidBody();
-    setRigidBodyOptions(rigidBody, props, states, updateTranslations);
-  }, mutablePropsAsFlatArray);
-};
-const useRigidBodyEvents = (getRigidBody, props, events) => {
-  const {
-    onWake,
-    onSleep,
-    onCollisionEnter,
-    onCollisionExit,
-    onIntersectionEnter,
-    onIntersectionExit,
-    onContactForce
-  } = props;
-  const eventHandlers = {
-    onWake,
-    onSleep,
-    onCollisionEnter,
-    onCollisionExit,
-    onIntersectionEnter,
-    onIntersectionExit,
-    onContactForce
-  };
-  useEffect(() => {
-    const rigidBody = getRigidBody();
-    events.set(rigidBody.handle, eventHandlers);
-    return () => {
-      events.delete(rigidBody.handle);
-    };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
-};
-
-const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];
+const _excluded$1 = ["ref", "children", "type", "position", "rotation", "scale", "quaternion", "transformState"];
 const RigidBodyContext = /*#__PURE__*/createContext(undefined);
 const useRigidBodyContext = () => useContext(RigidBodyContext);
 /**
  * A rigid body is a physical object that can be simulated by the physics engine.
  * @category Components
  */
-const RigidBody = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedRef) => {
+const RigidBody = /*#__PURE__*/memo(props => {
   const {
+      ref,
       children,
       type,
       position,
@@ -1408,7 +1411,7 @@ const RigidBody = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedRef
     } = props,
     objectProps = _objectWithoutProperties(props, _excluded$1);
   const objectRef = useRef(null);
-  const rigidBodyRef = useForwardedRef(forwardedRef);
+  const rigidBodyRef = useForwardedRef(ref);
   const {
     world,
     rigidBodyStates,
@@ -1429,8 +1432,8 @@ const RigidBody = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedRef
   const getRigidBody = useImperativeInstance(() => {
     const desc = rigidBodyDescFromOptions(mergedOptions);
     const rigidBody = world.createRigidBody(desc);
-    if (typeof forwardedRef === "function") {
-      forwardedRef(rigidBody);
+    if (typeof ref === "function") {
+      ref(rigidBody);
     }
     rigidBodyRef.current = rigidBody;
     return rigidBody;
@@ -1473,7 +1476,7 @@ const RigidBody = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedRef
   }), children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React.createElement(AnyCollider, _extends({
     key: index
   }, colliderProps)))));
-}));
+});
 RigidBody.displayName = "RigidBody";
 
 /**
@@ -1510,9 +1513,14 @@ const MeshCollider = /*#__PURE__*/memo(props => {
 });
 MeshCollider.displayName = "MeshCollider";
 
-const _excluded = ["children", "instances", "colliderNodes", "position", "rotation", "quaternion", "scale"];
-const InstancedRigidBodies = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, forwardedRef) => {
-  const rigidBodiesRef = useForwardedRef(forwardedRef, []);
+const _excluded = ["ref"],
+  _excluded2 = ["children", "instances", "colliderNodes", "position", "rotation", "quaternion", "scale"];
+const InstancedRigidBodies = /*#__PURE__*/memo(_ref => {
+  let {
+      ref
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
+  const rigidBodiesRef = useForwardedRef(ref, []);
   const objectRef = useRef(null);
   const instanceWrapperRef = useRef(null);
   const {
@@ -1528,7 +1536,7 @@ const InstancedRigidBodies = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, f
 
       // rigid body specific props, and r3f-object props
     } = props,
-    rigidBodyProps = _objectWithoutProperties(props, _excluded);
+    rigidBodyProps = _objectWithoutProperties(props, _excluded2);
   const childColliderProps = useChildColliderProps(objectRef, _objectSpread2(_objectSpread2({}, props), {}, {
     children: undefined
   }));
@@ -1576,14 +1584,16 @@ const InstancedRigidBodies = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, f
   }), /*#__PURE__*/React.createElement("object3D", {
     ref: instanceWrapperRef
   }, children), instances === null || instances === void 0 ? void 0 : instances.map((instance, index) => /*#__PURE__*/React.createElement(RigidBody, _extends({}, rigidBodyProps, instance, {
-    ref: body => rigidBodiesRef.current[index] = body,
+    ref: body => {
+      rigidBodiesRef.current[index] = body;
+    },
     transformState: state => applyInstancedState(state, index)
   }), /*#__PURE__*/React.createElement(React.Fragment, null, colliderNodes.map((node, index) => /*#__PURE__*/React.createElement(Fragment, {
     key: index
   }, node)), childColliderProps.map((colliderProps, colliderIndex) => /*#__PURE__*/React.createElement(AnyCollider, _extends({
     key: colliderIndex
   }, colliderProps)))))));
-}));
+});
 InstancedRigidBodies.displayName = "InstancedRigidBodies";
 
 /**
@@ -1593,7 +1603,7 @@ const useImpulseJoint = (body1, body2, params) => {
   const {
     world
   } = useRapier();
-  const jointRef = useRef();
+  const jointRef = useRef(undefined);
   useImperativeInstance(() => {
     if (body1.current && body2.current) {
       const newJoint = world.createImpulseJoint(params, body1.current, body2.current, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",
@@ -9,24 +9,25 @@
     "dist"
   ],
   "devDependencies": {
-    "@react-three/drei": "9.112.0",
-    "@react-three/fiber": "8.17.7",
-    "@react-three/test-renderer": "8.2.1",
-    "@types/react-dom": "18.0.2",
-    "@types/three": "0.168.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "three": "0.168.0"
+    "@react-three/drei": "10.0.1",
+    "@react-three/fiber": "9.0.4",
+    "@react-three/test-renderer": "9.0.1",
+    "@types/react": "19.0.8",
+    "@types/react-dom": "19.0.3",
+    "@types/three": "0.172.0",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "three": "0.172.0"
   },
   "peerDependencies": {
-    "@react-three/fiber": ">=8.9.0",
-    "react": ">=18.0.0",
-    "three": ">=0.139.0"
+    "@react-three/fiber": "^9.0.4",
+    "react": "^19",
+    "three": ">=0.159.0"
   },
   "dependencies": {
     "@dimforge/rapier3d-compat": "0.14.0",
     "suspend-react": "^0.1.3",
-    "three-stdlib": "^2.29.4"
+    "three-stdlib": "^2.35.12"
   },
   "repository": "https://github.com/pmndrs/react-three-rapier/tree/master/packages/react-three-rapier"
 }