From 66b839d241abb59ada69aee0c650e4ccdb457b6e Mon Sep 17 00:00:00 2001
From: David Sevilla Martin <me@datitisev.me>
Date: Wed, 18 Mar 2020 16:50:48 -0400
Subject: [PATCH] common: rework Component#render again to simplify substite
 m(class, props)

Can be used instead of m(DiscussionList, app.cache.discussionList.props), for example - it's now app.cache.discussionList.render()
---
 js/src/common/Component.ts                   | 13 +------------
 js/src/forum/components/CommentPost.tsx      |  2 +-
 js/src/forum/components/IndexPage.tsx        |  2 +-
 js/src/forum/components/NotificationGrid.tsx |  3 ++-
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/js/src/common/Component.ts b/js/src/common/Component.ts
index d433907df..08e6d3e76 100644
--- a/js/src/common/Component.ts
+++ b/js/src/common/Component.ts
@@ -65,18 +65,7 @@ export default class Component<T extends ComponentProps = any> implements ClassC
     }
 
     render() {
-        return m.fragment(
-            {
-                ...this.props,
-                oninit: (...args) => this.oninit(...args),
-                oncreate: (...args) => this.oncreate(...args),
-                onbeforeupdate: (...args) => this.onbeforeupdate(...args),
-                onupdate: (...args) => this.onupdate.bind(...args),
-                onbeforeremove: (...args) => this.onbeforeremove.bind(...args),
-                onremove: (...args) => this.onremove.bind(...args),
-            },
-            this.view()
-        );
+        return m(this.constructor, this.props);
     }
 
     static component(props: ComponentProps | any = {}, children?: Mithril.Children) {
diff --git a/js/src/forum/components/CommentPost.tsx b/js/src/forum/components/CommentPost.tsx
index ea0ebe477..dc382051a 100644
--- a/js/src/forum/components/CommentPost.tsx
+++ b/js/src/forum/components/CommentPost.tsx
@@ -20,7 +20,7 @@ export default class CommentPost extends Post {
      */
     revealContent: boolean = false;
 
-    postUser: Vnode<{}, PostUser>;
+    postUser!: Vnode<{}, PostUser>;
 
     oninit(vnode) {
         super.oninit(vnode);
diff --git a/js/src/forum/components/IndexPage.tsx b/js/src/forum/components/IndexPage.tsx
index d5e174f95..89063a372 100644
--- a/js/src/forum/components/IndexPage.tsx
+++ b/js/src/forum/components/IndexPage.tsx
@@ -76,7 +76,7 @@ export default class IndexPage extends Page {
     view() {
         if (!app.cache.discussionList) return;
 
-        const discussionList = m(DiscussionList, app.cache.discussionList.props);
+        const discussionList = app.cache.discussionList.render();
 
         return (
             <div className="IndexPage">
diff --git a/js/src/forum/components/NotificationGrid.tsx b/js/src/forum/components/NotificationGrid.tsx
index b8e046573..3c3c96d48 100644
--- a/js/src/forum/components/NotificationGrid.tsx
+++ b/js/src/forum/components/NotificationGrid.tsx
@@ -15,7 +15,7 @@ export type NotificationItem = {
     name: string;
 
     /**
-     * The icon to display in the column header/notificatio grid row.
+     * The icon to display in the column header/notification grid row.
      */
     icon: string;
 
@@ -60,6 +60,7 @@ export default class NotificationGrid extends Component<NotificationGridProps> {
                     state: !!preference,
                     disabled: typeof preference === 'undefined',
                     onchange: () => this.toggle([key]),
+                    oninit: vnode => (this.inputs[key] = vnode.state),
                 });
             })
         );