fix: simplify logic for modal

Author: shleewhite

packages/components/src/components/hds/flyout/index.ts

@@ -150,7 +150,7 @@ export default class HdsFlyout extends Component<HdsFlyoutSignature> {
     });
 
     return () => {
-            // if the <dialog> is removed from the dom while open we emulate the close event
+      // if the <dialog> is removed from the dom while open we emulate the close event
       if (this._element && this._isOpen) {
         this._element.dispatchEvent(new Event('close'));
 
@@ -163,8 +163,8 @@ export default class HdsFlyout extends Component<HdsFlyoutSignature> {
       }
 
       document.removeEventListener('click', this._clickHandler, true);
-    }
-    });
+    };
+  });
 
   @action
   willDestroyNode(): void {

packages/components/src/components/hds/modal/index.ts

@@ -9,11 +9,9 @@ import { action } from '@ember/object';
 import { assert } from '@ember/debug';
 import { getElementId } from '../../../utils/hds-get-element-id.ts';
 import { buildWaiter } from '@ember/test-waiters';
-import { registerDestructor } from '@ember/destroyable';
 import { modifier } from 'ember-modifier';
 
 import type { WithBoundArgs } from '@glint/template';
-import type Owner from '@ember/owner';
 import type { HdsModalSizes, HdsModalColors } from './types.ts';
 
 import HdsDialogPrimitiveHeaderComponent from '../dialog-primitive/header.ts';
@@ -66,26 +64,6 @@ export default class HdsModal extends Component<HdsModalSignature> {
   private _bodyInitialOverflowValue = '';
   private _clickHandler!: (event: MouseEvent) => void;
 
-  constructor(owner: Owner, args: HdsModalSignature['Args']) {
-    super(owner, args);
-
-    registerDestructor(this, (): void => {
-      // if the <dialog> is removed from the dom while open we emulate the close event
-      if (this._element && this._isOpen) {
-        this._element.dispatchEvent(new Event('close'));
-
-        this._element.removeEventListener(
-          'close',
-          // eslint-disable-next-line @typescript-eslint/unbound-method
-          this.registerOnCloseCallback,
-          true
-        );
-      }
-
-      document.removeEventListener('click', this._clickHandler, true);
-    });
-  }
-
   get isDismissDisabled(): boolean {
     return this.args.isDismissDisabled ?? false;
   }
@@ -211,6 +189,22 @@ export default class HdsModal extends Component<HdsModalSignature> {
       capture: true,
       passive: false,
     });
+
+    return () => {
+      // if the <dialog> is removed from the dom while open we emulate the close event
+      if (this._element && this._isOpen) {
+        this._element.dispatchEvent(new Event('close'));
+
+        this._element.removeEventListener(
+          'close',
+          // eslint-disable-next-line @typescript-eslint/unbound-method
+          this.registerOnCloseCallback,
+          true
+        );
+      }
+
+      document.removeEventListener('click', this._clickHandler, true);
+    };
   });
 
   @action