refactor(mon-pix): replace will-destroy modifier with willDestroy lif…

…ecycle
1024pix · Jan 15, 2025 · bc71ebe · bc71ebe
1 parent 98bf4d4
commit bc71ebe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/mon-pix/app/components/challenge-item/challenge-item-qroc.hbs b/mon-pix/app/components/challenge-item/challenge-item-qroc.hbs
@@ -1,4 +1,4 @@
-<form {{will-destroy this.removeEmbedAutoEventListener}} {{on "submit" this.validateAnswer}}>
+<form {{on "submit" this.validateAnswer}}>
   {{#if this.showProposal}}
     <div class="rounded-panel__row challenge-response {{if @answer 'challenge-response--locked'}}">
       <h2 class="sr-only">{{t "pages.challenge.parts.answer-input"}}</h2>
@@ -138,4 +138,4 @@
       @isAdjustedCourseForAccessibility={{@assessment.certificationCourse.isAdjustedForAccessibility}}
     />
   {{/if}}
-</form>
+</form>
diff --git a/mon-pix/app/components/challenge-item/challenge-item-qroc.js b/mon-pix/app/components/challenge-item/challenge-item-qroc.js
@@ -1,3 +1,4 @@
+import { registerDestructor } from '@ember/destroyable';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
@@ -52,6 +53,9 @@ export default class ChallengeItemQroc extends ChallengeItemGeneric {
   _addEventListener() {
     this.postMessageHandler = this._receiveEmbedMessage.bind(this);
     window.addEventListener('message', this.postMessageHandler);
+    registerDestructor(this, () => {
+      window.removeEventListener('message', this.postMessageHandler);
+    });
   }
 
   _receiveEmbedMessage(event) {
@@ -107,11 +111,6 @@ export default class ChallengeItemQroc extends ChallengeItemGeneric {
     this.qrocProposalAnswerValue = value;
   }
 
-  @action
-  removeEmbedAutoEventListener() {
-    window.removeEventListener('message', this.postMessageHandler);
-  }
-
   get _blocks() {
     return proposalsAsBlocks(this.args.challenge.proposals).map((block) => {
       block.randomName = generateRandomString(block.input);

diff --git a/mon-pix/app/components/challenge/item.hbs b/mon-pix/app/components/challenge/item.hbs
@@ -1,6 +1,5 @@
 <article
   class="rounded-panel rounded-panel--no-margin-bottom challenge-item"
-  {{will-destroy this.clearFocusOutEventListener}}
   data-challenge-id="{{@challenge.id}}"
   role="article"
 >

diff --git a/mon-pix/app/components/challenge/item.js b/mon-pix/app/components/challenge/item.js
@@ -1,3 +1,4 @@
+import { registerDestructor } from '@ember/destroyable';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { ensureSafeComponent } from '@embroider/util';
@@ -44,7 +45,7 @@ export default class Item extends Component {
 
   _setFocusOutEventListener() {
     document.addEventListener(FOCUSEDOUT_EVENT_NAME, this._focusedoutListener);
-
+    registerDestructor(this, () => this.clearFocusOutEventListener);
     this._hadFocus = document.hasFocus();
     this._pollHasFocusInterval = setInterval(this._pollHasFocus, FOCUSEDOUT_INTERVAL);
   }