Merge branch 'master' into alyssa-starter

1 files changed, 7 insertions, 7 deletions

diff --git a/src/client/views/ObservableReactComponent.tsx b/src/client/views/ObservableReactComponent.tsx
index 34da82b6c..bb7a07f0e 100644
--- a/src/client/views/ObservableReactComponent.tsx
+++ b/src/client/views/ObservableReactComponent.tsx
@@ -8,27 +8,27 @@ import JsxParser from 'react-jsx-parser';
  * This is an abstract class that serves as the base for a PDF-style or Marquee-style
  * menu. To use this class, look at PDFMenu.tsx or MarqueeOptionsMenu.tsx for an example.
  */
-export abstract class ObservableReactComponent<T> extends React.Component<T, {}> {
+export abstract class ObservableReactComponent<T> extends React.Component<T, object> {
     @observable _props: React.PropsWithChildren<T>;
-    constructor(props: any) {
+    constructor(props: React.PropsWithChildren<T>) {
         super(props);
         this._props = props;
         makeObservable(this);
     }
     componentDidUpdate(prevProps: Readonly<T>): void {
         Object.keys(prevProps)
-            .filter(pkey => (prevProps as any)[pkey] !== (this.props as any)[pkey])
+            .filter(pkey => (prevProps as {[key:string]: unknown})[pkey] !== (this.props as  {[key:string]: unknown})[pkey])
             .forEach(action(pkey => {
-                (this._props as any)[pkey] = (this.props as any)[pkey];
+                (this._props as  {[key:string]: unknown})[pkey] = (this.props as  {[key:string]: unknown})[pkey];
             })); // prettier-ignore
     }
 }
 
 class ObserverJsxParser1 extends JsxParser {
-    constructor(props: any) {
+    constructor(props: object) {
         super(props);
-        observer(this as any);
+        observer(this as typeof JsxParser);
     }
 }
 
-export const ObserverJsxParser: typeof JsxParser = ObserverJsxParser1 as any;
+export const ObserverJsxParser = ObserverJsxParser1 as typeof JsxParser;