From 810b02977bf58a38b8f3a1820b24c8893a37f601 Mon Sep 17 00:00:00 2001
From: Edoardo Cavazza <edoardo.cavazza@chialab.it>
Date: Tue, 24 Aug 2021 17:37:33 +0200
Subject: [PATCH] fix: mixin typings

---
 src/mixin.js | 111 +++++++++++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 52 deletions(-)

diff --git a/src/mixin.js b/src/mixin.js
index d0c6119..8c7193e 100644
--- a/src/mixin.js
+++ b/src/mixin.js
@@ -1,63 +1,70 @@
 import { Context } from './Context.js';
 import { windowManager } from './Manager.js';
 
+/**
+ * @typedef {{ context: Context; onFocusEnter(): void; onFocusExit(): void; onFocusDismiss(): ReturnType<import('./Context.js').DismissFunction> }} FocusTrapMixin
+ */
+
 /**
  * Enable focus trap context for components.
- * @template {import('@chialab/dna').ComponentConstructor} T
- * @param {T} superClass The base component class.
+ * @template {import('@chialab/dna').ComponentInstance} T
+ * @param {import('@chialab/dna').ComponentConstructor<T>} superClass The base component class.
  * @param {import('./Context.js').ContextOptions} [options] Focus trap options.
  * @return An extended constructor.
  */
-export const focusTrapMixin = (superClass, options) => class FocusTrapElement extends (/** @type {import('@chialab/dna').ComponentConstructor} */ (superClass)) {
-    /**
-     * @inheritdoc
-     * @param {any[]} args
-     */
-    constructor(...args) {
-        super(...args);
+export const focusTrapMixin = (superClass, options) => {
+    const FocusTrapElement = class FocusTrapElement extends (/** @type {import('@chialab/dna').ComponentConstructor} */ (superClass)) {
+        /**
+         * @inheritdoc
+         */
+        constructor(...args) {
+            super(...args);
+            /**
+             * The keyboard navigation context.
+             * @readonly
+             */
+            this.context = new Context(this, {
+                dismiss: this.onFocusDismiss.bind(this),
+                ...options,
+            });
+            this.addEventListener('focusenter', this.onFocusEnter);
+            this.addEventListener('focusexit', this.onFocusExit);
+        }
+
         /**
-         * The keyboard navigation context.
-         * @readonly
+         * @inheritdoc
          */
-        this.context = new Context(this, {
-            dismiss: this.onFocusDismiss.bind(this),
-            ...options,
-        });
-        this.addEventListener('focusenter', this.onFocusEnter);
-        this.addEventListener('focusexit', this.onFocusExit);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    connectedCallback() {
-        super.disconnectedCallback();
-        windowManager.addContext(this.context);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    disconnectedCallback() {
-        super.disconnectedCallback();
-        windowManager.removeContext(this.context);
-    }
-
-    /**
-     * Callback invoked on focus enter.
-     */
-    onFocusEnter() {}
-
-    /**
-     * Callback invoked on focus exit.
-     */
-    onFocusExit() { }
-
-    /**
-     * Callback invoked on focus dismiss.
-     * @return {ReturnType<import('./Context.js').DismissFunction>}
-     */
-    onFocusDismiss() {
-        return true;
-    }
+        connectedCallback() {
+            super.disconnectedCallback();
+            windowManager.addContext(this.context);
+        }
+
+        /**
+         * @inheritdoc
+         */
+        disconnectedCallback() {
+            super.disconnectedCallback();
+            windowManager.removeContext(this.context);
+        }
+
+        /**
+         * Callback invoked on focus enter.
+         */
+        onFocusEnter() { }
+
+        /**
+         * Callback invoked on focus exit.
+         */
+        onFocusExit() { }
+
+        /**
+         * Callback invoked on focus dismiss.
+         * @return {ReturnType<import('./Context.js').DismissFunction>}
+         */
+        onFocusDismiss() {
+            return true;
+        }
+    };
+
+    return /** @type {import('@chialab/dna').ComponentConstructor<T & FocusTrapMixin>} */ (/** @type {unknown} */(FocusTrapElement));
 };