Merge pull request #10 from MakingSpiderSense/feature/holdable/94-grip-up-after-reparent

Move `grip-up` event to after reparent to allow for custom rotations on release

Author: MakingSpiderSense

src/components/holdable/holdable.js

@@ -392,11 +392,6 @@ AFRAME.registerComponent("holdable", {
     },
     onGripUp: function (evt) {
         if (!this.isHeld || !this.holdingHand) return;
-        // Emit grip-up event with details
-        this.el.emit("grip-up", {
-            hand: this.holdingHand,
-            entity: this.el,
-        });
         this.el.object3D.updateMatrixWorld(true);
         // Reparent back to the original parent.
         this.originalParent.object3D.attach(this.el.object3D);
@@ -466,6 +461,12 @@ AFRAME.registerComponent("holdable", {
         }
         // Modifiers - Clear saved component states
         this.savedComponentStates = {};
+        // Emit grip-up event with details
+        // Note: Located here so that entity is reparented back and modifiers are restored if applicable.
+        this.el.emit("grip-up", {
+            hand: this.holdingHand,
+            entity: this.el,
+        });
         // Simulate pulling the raycaster away by temporarily setting the raycaster's far value to 0, then restoring it. This lets the user grab the object again without moving the controller away first.
         const handEls = document.querySelectorAll("[meta-touch-controls], [oculus-touch-controls], [hand-controls]");
         if (handEls) {