From d72b8b8d8e7188a4211fb04237cad76709897d92 Mon Sep 17 00:00:00 2001
From: Alexander Skvortsov <sasha.skvortsov109@gmail.com>
Date: Thu, 11 Nov 2021 19:53:44 -0500
Subject: [PATCH] Fix some typing errors

---
 js/src/admin/components/ExtensionPage.tsx  | 4 ++--
 js/src/common/utils/BasicEditorDriver.ts   | 6 +++---
 js/src/forum/components/DiscussionPage.tsx | 4 +---
 js/src/forum/components/Search.tsx         | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/js/src/admin/components/ExtensionPage.tsx b/js/src/admin/components/ExtensionPage.tsx
index 964e89176..fa7f70751 100644
--- a/js/src/admin/components/ExtensionPage.tsx
+++ b/js/src/admin/components/ExtensionPage.tsx
@@ -150,7 +150,7 @@ export default class ExtensionPage<Attrs extends ExtensionPageAttrs = ExtensionP
   }
 
   topItems() {
-    const items = new ItemList();
+    const items = new ItemList<Mithril.Children>();
 
     items.add('version', <span className="ExtensionVersion">{this.extension.version}</span>);
 
@@ -181,7 +181,7 @@ export default class ExtensionPage<Attrs extends ExtensionPageAttrs = ExtensionP
   }
 
   infoItems() {
-    const items = new ItemList();
+    const items = new ItemList<Mithril.Children>();
 
     const links = this.extension.links;
 
diff --git a/js/src/common/utils/BasicEditorDriver.ts b/js/src/common/utils/BasicEditorDriver.ts
index 98d48683e..9f638e703 100644
--- a/js/src/common/utils/BasicEditorDriver.ts
+++ b/js/src/common/utils/BasicEditorDriver.ts
@@ -12,7 +12,7 @@ export default class BasicEditorDriver implements EditorDriverInterface {
     this.build(dom, params);
   }
 
-  build(dom: HTMLElement, params: EditorDriverParams) {
+  protected build(dom: HTMLElement, params: EditorDriverParams) {
     this.el.className = params.classNames.join(' ');
     this.el.disabled = params.disabled;
     this.el.placeholder = params.placeholder;
@@ -43,8 +43,8 @@ export default class BasicEditorDriver implements EditorDriverInterface {
     dom.append(this.el);
   }
 
-  keyHandlers(params: EditorDriverParams): ItemList {
-    const items = new ItemList();
+  protected keyHandlers(params: EditorDriverParams) {
+    const items = new ItemList<(e: KeyboardEvent) => void>();
 
     items.add('submit', function (e: KeyboardEvent) {
       if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
diff --git a/js/src/forum/components/DiscussionPage.tsx b/js/src/forum/components/DiscussionPage.tsx
index 231f5c936..df188ebdb 100644
--- a/js/src/forum/components/DiscussionPage.tsx
+++ b/js/src/forum/components/DiscussionPage.tsx
@@ -238,11 +238,9 @@ export default class DiscussionPage<CustomAttrs extends IDiscussionPageAttrs = I
 
   /**
    * Build an item list for the contents of the sidebar.
-   *
-   * @return {ItemList}
    */
   sidebarItems() {
-    const items = new ItemList();
+    const items = new ItemList<Mithril.Vnode>();
 
     items.add(
       'controls',
diff --git a/js/src/forum/components/Search.tsx b/js/src/forum/components/Search.tsx
index a38ff4424..bf45be748 100644
--- a/js/src/forum/components/Search.tsx
+++ b/js/src/forum/components/Search.tsx
@@ -281,8 +281,8 @@ export default class Search<T extends SearchAttrs = SearchAttrs> extends Compone
   /**
    * Build an item list of SearchSources.
    */
-  sourceItems(): ItemList {
-    const items = new ItemList();
+  sourceItems(): ItemList<SearchSource> {
+    const items = new ItemList<SearchSource>();
 
     if (app.forum.attribute('canViewForum')) items.add('discussions', new DiscussionsSearchSource());
     if (app.forum.attribute('canSearchUsers')) items.add('users', new UsersSearchSource());