From 9fc2e5e2c067ef1505316c6cefc638ce8b143c13 Mon Sep 17 00:00:00 2001
From: David Wheatley <hi@davwheat.dev>
Date: Mon, 20 Jun 2022 03:52:25 +0100
Subject: [PATCH] fix(extension typings): remove some accessibility modifiers
 from `Component` (#3437)

---
 framework/core/js/src/common/Component.ts         | 10 +++++-----
 framework/core/js/src/forum/components/Search.tsx |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/framework/core/js/src/common/Component.ts b/framework/core/js/src/common/Component.ts
index ac2178909..36c12a83e 100644
--- a/framework/core/js/src/common/Component.ts
+++ b/framework/core/js/src/common/Component.ts
@@ -33,14 +33,14 @@ export default abstract class Component<Attrs extends ComponentAttrs = Component
   /**
    * The root DOM element for the component.
    */
-  protected element!: Element;
+  element!: Element;
 
   /**
    * The attributes passed into the component.
    *
    * @see https://mithril.js.org/components.html#passing-data-to-components
    */
-  protected attrs!: Attrs;
+  attrs!: Attrs;
 
   /**
    * Class component state that is persisted between redraws.
@@ -53,7 +53,7 @@ export default abstract class Component<Attrs extends ComponentAttrs = Component
    *
    * This is `undefined` by default.
    */
-  protected state!: State;
+  state!: State;
 
   /**
    * @inheritdoc
@@ -109,7 +109,7 @@ export default abstract class Component<Attrs extends ComponentAttrs = Component
    * @returns the jQuery object for the DOM node
    * @final
    */
-  protected $(selector?: string): JQuery {
+  $(selector?: string): JQuery {
     const $element = $(this.element) as JQuery<HTMLElement>;
 
     return selector ? $element.find(selector) : $element;
@@ -156,5 +156,5 @@ export default abstract class Component<Attrs extends ComponentAttrs = Component
    *
    * This can be used to assign default values for missing, optional attrs.
    */
-  protected static initAttrs<T>(attrs: T): void {}
+  static initAttrs<T>(attrs: T): void {}
 }
diff --git a/framework/core/js/src/forum/components/Search.tsx b/framework/core/js/src/forum/components/Search.tsx
index 032156bb9..4d04d51be 100644
--- a/framework/core/js/src/forum/components/Search.tsx
+++ b/framework/core/js/src/forum/components/Search.tsx
@@ -71,11 +71,11 @@ export default class Search<T extends SearchAttrs = SearchAttrs> extends Compone
    */
   // TODO: [Flarum 2.0] Remove this.
   // @ts-expect-error This is a get accessor, while superclass defines this as a property. This is needed to prevent breaking changes, however.
-  protected get state() {
+  get state() {
     fireDeprecationWarning('`state` property of the Search component is deprecated', '3212');
     return this.searchState;
   }
-  protected set state(state: SearchState) {
+  set state(state: SearchState) {
     // Workaround to prevent triggering deprecation warnings due to Mithril
     // setting state to undefined when creating components
     state !== undefined && fireDeprecationWarning('`state` property of the Search component is deprecated', '3212');
@@ -107,7 +107,7 @@ export default class Search<T extends SearchAttrs = SearchAttrs> extends Compone
 
   protected navigator!: KeyboardNavigatable;
 
-  protected searchTimeout?: NodeJS.Timeout;
+  protected searchTimeout?: number;
 
   private updateMaxHeightHandler?: () => void;
 
@@ -240,7 +240,7 @@ export default class Search<T extends SearchAttrs = SearchAttrs> extends Compone
         if (!query) return;
 
         if (search.searchTimeout) clearTimeout(search.searchTimeout);
-        search.searchTimeout = setTimeout(() => {
+        search.searchTimeout = window.setTimeout(() => {
           if (state.isCached(query)) return;
 
           if (query.length >= (search.constructor as typeof Search).MIN_SEARCH_LEN) {