@react-three/rapier 0.14.0-rc.0 → 0.14.0-rc.1

package/dist/declarations/src/utils/utils-collider.d.ts

@@ -31,5 +31,51 @@ export declare const getColliderArgsFromGeometry: (geometry: BufferGeometry, col
     args: unknown[];
     offset: Vector3;
 };
-export declare const useColliderEvents: (getCollider: () => Collider, props: ColliderProps, events: EventMap) => void;
+export declare const getActiveCollisionEventsFromProps: (props?: ColliderProps) => {
+    collision: boolean;
+    contactForce: boolean;
+};
+export declare const useColliderEvents: (getCollider: () => Collider, props: ColliderProps, events: EventMap, activeEvents?: {
+    collision?: boolean;
+    contactForce?: boolean;
+}) => void;
+export declare const cleanRigidBodyPropsForCollider: (props?: RigidBodyProps) => {
+    linearVelocity?: import("..").Vector3Array | undefined;
+    angularVelocity?: import("..").Vector3Array | undefined;
+    dominanceGroup?: number | undefined;
+    position?: import("@react-three/fiber").Vector3 | undefined;
+    rotation?: import("@react-three/fiber").Euler | undefined;
+    colliders?: RigidBodyAutoCollider | undefined;
+    friction?: number | undefined;
+    restitution?: number | undefined;
+    collisionGroups?: number | undefined;
+    solverGroups?: number | undefined;
+    onSleep?(): void;
+    onWake?(): void;
+    lockRotations?: boolean | undefined;
+    lockTranslations?: boolean | undefined;
+    enabledRotations?: import("..").Boolean3Array | undefined;
+    enabledTranslations?: import("..").Boolean3Array | undefined;
+    userData?: {
+        [key: string]: any;
+    } | undefined;
+    includeInvisible?: boolean | undefined;
+    transformState?: ((state: import("../components/Physics").RigidBodyState) => import("../components/Physics").RigidBodyState) | undefined;
+    name?: string | undefined;
+    shape?: ColliderShape | undefined;
+    args?: any;
+    principalAngularInertia?: import("..").Vector3Array | undefined;
+    restitutionCombineRule?: import("@dimforge/rapier3d-compat").CoefficientCombineRule | undefined;
+    frictionCombineRule?: import("@dimforge/rapier3d-compat").CoefficientCombineRule | undefined;
+    quaternion?: import("@react-three/fiber").Quaternion | undefined;
+    scale?: import("@react-three/fiber").Vector3 | undefined;
+    density?: number | undefined;
+    massProperties?: {
+        mass: number;
+        centerOfMass: import("@dimforge/rapier3d-compat").Vector;
+        principalAngularInertia: import("@dimforge/rapier3d-compat").Vector;
+        angularInertiaLocalFrame: import("@dimforge/rapier3d-compat").Rotation;
+    } | undefined;
+    sensor?: boolean | undefined;
+};
 export {};

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

@@ -199,6 +199,41 @@ const useRaf = callback => {
   }, []);
 };
 
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -365,7 +400,7 @@ const createColliderPropsFromChildren = ({
   ignoreMeshColliders: _ignoreMeshColliders = true,
   options
 }) => {
-  const colliderProps = [];
+  const childColliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
 
@@ -386,13 +421,16 @@ const createColliderPropsFromChildren = ({
         args,
         offset
       } = getColliderArgsFromGeometry(geometry, options.colliders || "cuboid");
-      colliderProps.push(_objectSpread2(_objectSpread2({}, options), {}, {
+
+      const colliderProps = _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(options)), {}, {
         args: args,
         shape: shape,
         rotation: [rotationEuler.x, rotationEuler.y, rotationEuler.z],
         position: [_position.x + offset.x * worldScale.x, _position.y + offset.y * worldScale.y, _position.z + offset.z * worldScale.z],
         scale: [worldScale.x, worldScale.y, worldScale.z]
-      }));
+      });
+
+      childColliderProps.push(colliderProps);
     }
   };
 
@@ -402,7 +440,7 @@ const createColliderPropsFromChildren = ({
     object.traverseVisible(colliderFromChild);
   }
 
-  return colliderProps;
+  return childColliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
   switch (colliders) {
@@ -458,7 +496,17 @@ const getColliderArgsFromGeometry = (geometry, colliders) => {
     offset: new three.Vector3()
   };
 };
-const useColliderEvents = (getCollider, props, events) => {
+const getActiveCollisionEventsFromProps = props => {
+  return {
+    collision: !!(props !== null && props !== void 0 && props.onCollisionEnter || props !== null && props !== void 0 && props.onCollisionExit || props !== null && props !== void 0 && props.onIntersectionEnter || props !== null && props !== void 0 && props.onIntersectionExit),
+    contactForce: !!(props !== null && props !== void 0 && props.onContactForce)
+  };
+};
+const useColliderEvents = (getCollider, props, events,
+/**
+ * The RigidBody can pass down active events to the collider without attaching the event listners
+ */
+activeEvents = {}) => {
   const {
     onCollisionEnter,
     onCollisionExit,
@@ -470,8 +518,12 @@ const useColliderEvents = (getCollider, props, events) => {
     const collider = getCollider();
 
     if (collider) {
-      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
-      const hasContactForceEvent = !!onContactForce;
+      const {
+        collision: collisionEventsActive,
+        contactForce: contactForceEventsActive
+      } = getActiveCollisionEventsFromProps(props);
+      const hasCollisionEvent = collisionEventsActive || activeEvents.collision;
+      const hasContactForceEvent = contactForceEventsActive || activeEvents.contactForce;
 
       if (hasCollisionEvent && hasContactForceEvent) {
         collider.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS | rapier3dCompat.ActiveEvents.CONTACT_FORCE_EVENTS);
@@ -495,7 +547,12 @@ const useColliderEvents = (getCollider, props, events) => {
         events.delete(collider.handle);
       }
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce, activeEvents]);
+};
+const cleanRigidBodyPropsForCollider = (props = {}) => {
+  const rest = _objectWithoutProperties(props, _excluded$2);
+
+  return rest;
 };
 
 const useMutableCallback = fn => {
@@ -1028,40 +1085,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
 /**
  * Initiate an instance and return a safe getter
  */
@@ -1174,10 +1197,10 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
   }, []);
   React.useImperativeHandle(forwardedRef, () => getInstance());
   const mergedProps = React.useMemo(() => {
-    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+    return _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options)), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(getInstance, mergedProps, colliderStates);
-  useColliderEvents(getInstance, mergedProps, colliderEvents);
+  useColliderEvents(getInstance, mergedProps, colliderEvents, getActiveCollisionEventsFromProps(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options));
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     position: position,
     rotation: rotation,
@@ -1425,7 +1448,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   const eventHandlers = {
     onWake,
@@ -1433,7 +1457,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   };
   React.useEffect(() => {
     const rigidBody = getRigidBody();
@@ -1441,7 +1466,7 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     return () => {
       events.delete(rigidBody.handle);
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
 };
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];

package/dist/react-three-rapier.cjs.prod.js

@@ -199,6 +199,41 @@ const useRaf = callback => {
   }, []);
 };
 
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -365,7 +400,7 @@ const createColliderPropsFromChildren = ({
   ignoreMeshColliders: _ignoreMeshColliders = true,
   options
 }) => {
-  const colliderProps = [];
+  const childColliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
 
@@ -386,13 +421,16 @@ const createColliderPropsFromChildren = ({
         args,
         offset
       } = getColliderArgsFromGeometry(geometry, options.colliders || "cuboid");
-      colliderProps.push(_objectSpread2(_objectSpread2({}, options), {}, {
+
+      const colliderProps = _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(options)), {}, {
         args: args,
         shape: shape,
         rotation: [rotationEuler.x, rotationEuler.y, rotationEuler.z],
         position: [_position.x + offset.x * worldScale.x, _position.y + offset.y * worldScale.y, _position.z + offset.z * worldScale.z],
         scale: [worldScale.x, worldScale.y, worldScale.z]
-      }));
+      });
+
+      childColliderProps.push(colliderProps);
     }
   };
 
@@ -402,7 +440,7 @@ const createColliderPropsFromChildren = ({
     object.traverseVisible(colliderFromChild);
   }
 
-  return colliderProps;
+  return childColliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
   switch (colliders) {
@@ -458,7 +496,17 @@ const getColliderArgsFromGeometry = (geometry, colliders) => {
     offset: new three.Vector3()
   };
 };
-const useColliderEvents = (getCollider, props, events) => {
+const getActiveCollisionEventsFromProps = props => {
+  return {
+    collision: !!(props !== null && props !== void 0 && props.onCollisionEnter || props !== null && props !== void 0 && props.onCollisionExit || props !== null && props !== void 0 && props.onIntersectionEnter || props !== null && props !== void 0 && props.onIntersectionExit),
+    contactForce: !!(props !== null && props !== void 0 && props.onContactForce)
+  };
+};
+const useColliderEvents = (getCollider, props, events,
+/**
+ * The RigidBody can pass down active events to the collider without attaching the event listners
+ */
+activeEvents = {}) => {
   const {
     onCollisionEnter,
     onCollisionExit,
@@ -470,8 +518,12 @@ const useColliderEvents = (getCollider, props, events) => {
     const collider = getCollider();
 
     if (collider) {
-      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
-      const hasContactForceEvent = !!onContactForce;
+      const {
+        collision: collisionEventsActive,
+        contactForce: contactForceEventsActive
+      } = getActiveCollisionEventsFromProps(props);
+      const hasCollisionEvent = collisionEventsActive || activeEvents.collision;
+      const hasContactForceEvent = contactForceEventsActive || activeEvents.contactForce;
 
       if (hasCollisionEvent && hasContactForceEvent) {
         collider.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS | rapier3dCompat.ActiveEvents.CONTACT_FORCE_EVENTS);
@@ -495,7 +547,12 @@ const useColliderEvents = (getCollider, props, events) => {
         events.delete(collider.handle);
       }
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce, activeEvents]);
+};
+const cleanRigidBodyPropsForCollider = (props = {}) => {
+  const rest = _objectWithoutProperties(props, _excluded$2);
+
+  return rest;
 };
 
 const useMutableCallback = fn => {
@@ -1028,40 +1085,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
 /**
  * Initiate an instance and return a safe getter
  */
@@ -1174,10 +1197,10 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((prop
   }, []);
   React.useImperativeHandle(forwardedRef, () => getInstance());
   const mergedProps = React.useMemo(() => {
-    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+    return _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options)), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(getInstance, mergedProps, colliderStates);
-  useColliderEvents(getInstance, mergedProps, colliderEvents);
+  useColliderEvents(getInstance, mergedProps, colliderEvents, getActiveCollisionEventsFromProps(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options));
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     position: position,
     rotation: rotation,
@@ -1425,7 +1448,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   const eventHandlers = {
     onWake,
@@ -1433,7 +1457,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   };
   React.useEffect(() => {
     const rigidBody = getRigidBody();
@@ -1441,7 +1466,7 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     return () => {
       events.delete(rigidBody.handle);
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
 };
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];

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

@@ -174,6 +174,41 @@ const useRaf = callback => {
   }, []);
 };
 
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const _excluded$2 = ["mass", "linearDamping", "angularDamping", "type", "onCollisionEnter", "onCollisionExit", "onIntersectionEnter", "onIntersectionExit", "onContactForce", "children", "canSleep", "ccd", "gravityScale"];
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -340,7 +375,7 @@ const createColliderPropsFromChildren = ({
   ignoreMeshColliders: _ignoreMeshColliders = true,
   options
 }) => {
-  const colliderProps = [];
+  const childColliderProps = [];
   object.updateWorldMatrix(true, false);
   const invertedParentMatrixWorld = object.matrixWorld.clone().invert();
 
@@ -361,13 +396,16 @@ const createColliderPropsFromChildren = ({
         args,
         offset
       } = getColliderArgsFromGeometry(geometry, options.colliders || "cuboid");
-      colliderProps.push(_objectSpread2(_objectSpread2({}, options), {}, {
+
+      const colliderProps = _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(options)), {}, {
         args: args,
         shape: shape,
         rotation: [rotationEuler.x, rotationEuler.y, rotationEuler.z],
         position: [_position.x + offset.x * worldScale.x, _position.y + offset.y * worldScale.y, _position.z + offset.z * worldScale.z],
         scale: [worldScale.x, worldScale.y, worldScale.z]
-      }));
+      });
+
+      childColliderProps.push(colliderProps);
     }
   };
 
@@ -377,7 +415,7 @@ const createColliderPropsFromChildren = ({
     object.traverseVisible(colliderFromChild);
   }
 
-  return colliderProps;
+  return childColliderProps;
 };
 const getColliderArgsFromGeometry = (geometry, colliders) => {
   switch (colliders) {
@@ -433,7 +471,17 @@ const getColliderArgsFromGeometry = (geometry, colliders) => {
     offset: new Vector3()
   };
 };
-const useColliderEvents = (getCollider, props, events) => {
+const getActiveCollisionEventsFromProps = props => {
+  return {
+    collision: !!(props !== null && props !== void 0 && props.onCollisionEnter || props !== null && props !== void 0 && props.onCollisionExit || props !== null && props !== void 0 && props.onIntersectionEnter || props !== null && props !== void 0 && props.onIntersectionExit),
+    contactForce: !!(props !== null && props !== void 0 && props.onContactForce)
+  };
+};
+const useColliderEvents = (getCollider, props, events,
+/**
+ * The RigidBody can pass down active events to the collider without attaching the event listners
+ */
+activeEvents = {}) => {
   const {
     onCollisionEnter,
     onCollisionExit,
@@ -445,8 +493,12 @@ const useColliderEvents = (getCollider, props, events) => {
     const collider = getCollider();
 
     if (collider) {
-      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
-      const hasContactForceEvent = !!onContactForce;
+      const {
+        collision: collisionEventsActive,
+        contactForce: contactForceEventsActive
+      } = getActiveCollisionEventsFromProps(props);
+      const hasCollisionEvent = collisionEventsActive || activeEvents.collision;
+      const hasContactForceEvent = contactForceEventsActive || activeEvents.contactForce;
 
       if (hasCollisionEvent && hasContactForceEvent) {
         collider.setActiveEvents(ActiveEvents.COLLISION_EVENTS | ActiveEvents.CONTACT_FORCE_EVENTS);
@@ -470,7 +522,12 @@ const useColliderEvents = (getCollider, props, events) => {
         events.delete(collider.handle);
       }
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce, activeEvents]);
+};
+const cleanRigidBodyPropsForCollider = (props = {}) => {
+  const rest = _objectWithoutProperties(props, _excluded$2);
+
+  return rest;
 };
 
 const useMutableCallback = fn => {
@@ -1003,40 +1060,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
 /**
  * Initiate an instance and return a safe getter
  */
@@ -1149,10 +1172,10 @@ const AnyCollider = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, forwarded
   }, []);
   useImperativeHandle(forwardedRef, () => getInstance());
   const mergedProps = useMemo(() => {
-    return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
+    return _objectSpread2(_objectSpread2({}, cleanRigidBodyPropsForCollider(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options)), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(getInstance, mergedProps, colliderStates);
-  useColliderEvents(getInstance, mergedProps, colliderEvents);
+  useColliderEvents(getInstance, mergedProps, colliderEvents, getActiveCollisionEventsFromProps(rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options));
   return /*#__PURE__*/React.createElement("object3D", {
     position: position,
     rotation: rotation,
@@ -1400,7 +1423,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   const eventHandlers = {
     onWake,
@@ -1408,7 +1432,8 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   };
   useEffect(() => {
     const rigidBody = getRigidBody();
@@ -1416,7 +1441,7 @@ const useRigidBodyEvents = (getRigidBody, props, events) => {
     return () => {
       events.delete(rigidBody.handle);
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
 };
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion", "transformState"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "0.14.0-rc.0",
+  "version": "0.14.0-rc.1",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",