fixed broken avatar proximity interactions

ProjektAdLer · Nov 27, 2023 · 6da3487 · 6da3487
1 parent 8322c3a
commit 6da3487
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Components/Core/Presentation/Babylon/Door/DoorController.ts b/src/Components/Core/Presentation/Babylon/Door/DoorController.ts
@@ -51,9 +51,9 @@ export default class DoorController implements IDoorController {
 
   @bind
   private onAvatarInteractableChange(isInteractable: boolean): void {
-    if (isInteractable) {
+    if (isInteractable && this.proximityToolTipId === -1) {
       this.proximityToolTipId = this.displayTooltip();
-    } else if (this.proximityToolTipId !== -1) {
+    } else if (!isInteractable && this.proximityToolTipId !== -1) {
       this.bottomTooltipPresenter.hide(this.proximityToolTipId);
       this.proximityToolTipId = -1;
     }

diff --git a/src/Components/Core/Presentation/Babylon/LearningElements/LearningElementController.ts b/src/Components/Core/Presentation/Babylon/LearningElements/LearningElementController.ts
@@ -28,7 +28,7 @@ export default class LearningElementController
   @bind
   pointerOver(): void {
     if (this.proximityToolTipId === -1 && this.hoverToolTipId === -1) {
-      this.proximityToolTipId = this.displayTooltip();
+      this.hoverToolTipId = this.displayTooltip();
       this.scaleUpIcon();
     }
   }
@@ -55,12 +55,13 @@ export default class LearningElementController
 
   @bind
   private onAvatarInteractableChange(isInteractable: boolean): void {
-    if (isInteractable) {
+    if (isInteractable && this.proximityToolTipId === -1) {
       this.proximityToolTipId = this.displayTooltip();
       this.scaleUpIcon();
-    } else if (this.proximityToolTipId !== -1) {
+    } else if (!isInteractable && this.proximityToolTipId !== -1) {
       this.bottomTooltipPresenter.hide(this.proximityToolTipId);
       this.resetIconScale();
+      this.proximityToolTipId = -1;
     }
   }