From 35a5f1645defe600f4f41cdbd881043aab68e61c Mon Sep 17 00:00:00 2001
From: Red Adaya <red.adaya@gmail.com>
Date: Mon, 6 May 2024 21:03:49 +0800
Subject: [PATCH] remove inputModel dep prop in Markdown component

---
 src/app/bookmarks/bookmarks.tsx       |  2 +-
 src/app/common/elements/markdown.tsx  | 19 +++++++------------
 src/app/common/modals/alert.tsx       |  6 +-----
 src/app/common/modals/userinput.tsx   |  6 +-----
 src/app/pluginsview/pluginsview.tsx   |  2 +-
 src/app/sidebar/aichat.tsx            |  7 +------
 src/app/workspace/cmdinput/aichat.tsx |  6 +-----
 src/plugins/code/code.tsx             |  6 +-----
 src/plugins/markdown/markdown.tsx     |  1 -
 src/plugins/openai/openai.tsx         |  6 +-----
 10 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/src/app/bookmarks/bookmarks.tsx b/src/app/bookmarks/bookmarks.tsx
index b17120f7d..31e31953d 100644
--- a/src/app/bookmarks/bookmarks.tsx
+++ b/src/app/bookmarks/bookmarks.tsx
@@ -207,7 +207,7 @@ class Bookmark extends React.Component<BookmarkProps, {}> {
                 <div className="bookmark-id-div">{bm.bookmarkid.substr(0, 8)}</div>
                 <div className="bookmark-content">
                     <If condition={hasDesc}>
-                        <Markdown inputModel={GlobalModel.inputModel} text={markdown} extraClassName="bottom-margin" />
+                        <Markdown text={markdown} extraClassName="bottom-margin" />
                     </If>
                     <CmdStrCode
                         cmdstr={bm.cmdstr}
diff --git a/src/app/common/elements/markdown.tsx b/src/app/common/elements/markdown.tsx
index df047d529..1fca32a5f 100644
--- a/src/app/common/elements/markdown.tsx
+++ b/src/app/common/elements/markdown.tsx
@@ -31,7 +31,7 @@ function CodeRenderer(props: any): any {
 
 @mobxReact.observer
 class CodeBlockMarkdown extends React.Component<
-    { inputModel: any; children: React.ReactNode; codeSelectSelectedIndex?: number; uuid: string },
+    { children: React.ReactNode; codeSelectSelectedIndex?: number; uuid: string },
     {}
 > {
     blockIndex: number;
@@ -40,13 +40,12 @@ class CodeBlockMarkdown extends React.Component<
     constructor(props) {
         super(props);
         this.blockRef = React.createRef();
-        this.blockIndex = props.inputModel.addCodeBlockToCodeSelect(this.blockRef, this.props.uuid);
+        this.blockIndex = GlobalModel.inputModel.addCodeBlockToCodeSelect(this.blockRef, this.props.uuid);
     }
 
     render() {
-        const inputModel = this.props.inputModel;
         const clickHandler = (e: React.MouseEvent<HTMLElement>, blockIndex: number) => {
-            inputModel.setCodeSelectSelectedCodeBlock(blockIndex);
+            GlobalModel.inputModel.setCodeSelectSelectedCodeBlock(blockIndex);
         };
         let selected = this.blockIndex == this.props.codeSelectSelectedIndex;
         return (
@@ -63,7 +62,7 @@ class CodeBlockMarkdown extends React.Component<
 
 @mobxReact.observer
 class Markdown extends React.Component<
-    { inputModel: any; text: string; style?: any; extraClassName?: string; codeSelect?: boolean },
+    { text: string; style?: any; extraClassName?: string; codeSelect?: boolean },
     {}
 > {
     curUuid: string;
@@ -77,11 +76,7 @@ class Markdown extends React.Component<
     codeBlockRenderer(props: any, codeSelect: boolean, codeSelectIndex: number, curUuid: string): any {
         if (codeSelect) {
             return (
-                <CodeBlockMarkdown
-                    inputModel={this.props.inputModel}
-                    codeSelectSelectedIndex={codeSelectIndex}
-                    uuid={curUuid}
-                >
+                <CodeBlockMarkdown codeSelectSelectedIndex={codeSelectIndex} uuid={curUuid}>
                     {props.children}
                 </CodeBlockMarkdown>
             );
@@ -98,9 +93,9 @@ class Markdown extends React.Component<
     }
 
     render() {
-        let { text, inputModel } = this.props;
+        let { text } = this.props;
         let codeSelect = this.props.codeSelect;
-        let curCodeSelectIndex = inputModel.getCodeSelectSelectedIndex();
+        let curCodeSelectIndex = GlobalModel.inputModel.getCodeSelectSelectedIndex();
         let markdownComponents = {
             a: LinkRenderer,
             h1: (props) => HeaderRenderer(props, 1),
diff --git a/src/app/common/modals/alert.tsx b/src/app/common/modals/alert.tsx
index a550255d8..245bdd62d 100644
--- a/src/app/common/modals/alert.tsx
+++ b/src/app/common/modals/alert.tsx
@@ -42,11 +42,7 @@ class AlertModal extends React.Component<{}, {}> {
                 <Modal.Header onClose={this.closeModal} title={title} keybindings={true} />
                 <div className="wave-modal-body">
                     <If condition={message?.markdown}>
-                        <Markdown
-                            inputModel={GlobalModel.inputModel}
-                            text={message?.message ?? ""}
-                            extraClassName="bottom-margin"
-                        />
+                        <Markdown text={message?.message ?? ""} extraClassName="bottom-margin" />
                     </If>
                     <If condition={!message?.markdown}>{message?.message}</If>
                     <If condition={message?.confirmflag}>
diff --git a/src/app/common/modals/userinput.tsx b/src/app/common/modals/userinput.tsx
index 30c974187..98e40a3be 100644
--- a/src/app/common/modals/userinput.tsx
+++ b/src/app/common/modals/userinput.tsx
@@ -64,11 +64,7 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                 <div className="wave-modal-dialog">
                     <div className="userinput-query">
                         <If condition={userInputRequest.markdown}>
-                            <Markdown
-                                inputModel={GlobalModel.inputModel}
-                                text={userInputRequest.querytext}
-                                extraClassName="bottom-margin"
-                            />
+                            <Markdown text={userInputRequest.querytext} extraClassName="bottom-margin" />
                         </If>
                         <If condition={!userInputRequest.markdown}>{userInputRequest.querytext}</If>
                     </div>
diff --git a/src/app/pluginsview/pluginsview.tsx b/src/app/pluginsview/pluginsview.tsx
index 9061303f3..7cfab2f09 100644
--- a/src/app/pluginsview/pluginsview.tsx
+++ b/src/app/pluginsview/pluginsview.tsx
@@ -78,7 +78,7 @@ class PluginsView extends React.Component<{}, {}> {
                     {plugin.readme && (
                         <div className="plugin-readme">
                             <div className="plugin-label">{"Readme"}</div>
-                            <Markdown inputModel={GlobalModel.inputModel} text={plugin.readme} />
+                            <Markdown text={plugin.readme} />
                         </div>
                     )}
                 </div>
diff --git a/src/app/sidebar/aichat.tsx b/src/app/sidebar/aichat.tsx
index b632c96e8..1890171e6 100644
--- a/src/app/sidebar/aichat.tsx
+++ b/src/app/sidebar/aichat.tsx
@@ -115,11 +115,7 @@ class ChatContent extends React.Component<{ chatWindowRef }, {}> {
                         <div className="chat-msg-header">
                             <i className="fa-sharp fa-solid fa-sparkles"></i>
                         </div>
-                        <Markdown
-                            inputModel={GlobalModel.inputModel}
-                            text={chatItem.assistantresponse.message}
-                            codeSelect
-                        />
+                        <Markdown text={chatItem.assistantresponse.message} codeSelect />
                     </>
                 );
             }
@@ -287,7 +283,6 @@ class AIChat extends React.Component<{}, {}> {
     }
 
     onArrowDownPressed(): boolean {
-        console.log("got here");
         const currentRef = this.textAreaRef.current;
         const inputModel = GlobalModel.inputModel;
         if (currentRef == null) {
diff --git a/src/app/workspace/cmdinput/aichat.tsx b/src/app/workspace/cmdinput/aichat.tsx
index e9769df18..410e24125 100644
--- a/src/app/workspace/cmdinput/aichat.tsx
+++ b/src/app/workspace/cmdinput/aichat.tsx
@@ -224,11 +224,7 @@ class AIChat extends React.Component<{}, {}> {
                             <i className="fa-sharp fa-solid fa-sparkles"></i>
                             <div className="chat-username">AI Assistant</div>
                         </div>
-                        <Markdown
-                            inputModel={GlobalModel.inputModel}
-                            text={chatItem.assistantresponse.message}
-                            codeSelect
-                        />
+                        <Markdown text={chatItem.assistantresponse.message} codeSelect />
                     </span>
                 );
             }
diff --git a/src/plugins/code/code.tsx b/src/plugins/code/code.tsx
index a35cda954..21742e227 100644
--- a/src/plugins/code/code.tsx
+++ b/src/plugins/code/code.tsx
@@ -461,11 +461,7 @@ class SourceCodeRenderer extends React.Component<
                 ref={this.markdownRef}
                 onScroll={() => this.handleDivScroll()}
             >
-                <Markdown
-                    inputModel={GlobalModel.inputModel}
-                    text={this.state.code}
-                    style={{ width: "100%", padding: "1rem" }}
-                />
+                <Markdown text={this.state.code} style={{ width: "100%", padding: "1rem" }} />
             </div>
         );
     }
diff --git a/src/plugins/markdown/markdown.tsx b/src/plugins/markdown/markdown.tsx
index 26ea7ccb5..a7ff7f2f7 100644
--- a/src/plugins/markdown/markdown.tsx
+++ b/src/plugins/markdown/markdown.tsx
@@ -79,7 +79,6 @@ class SimpleMarkdownRenderer extends React.Component<
                     }}
                 >
                     <Markdown
-                        inputModel={GlobalModel.inputModel}
                         text={this.markdownText.get()}
                         style={{ maxHeight: opts.maxSize.height, maxWidth: DefaultMaxMarkdownWidth }}
                     />
diff --git a/src/plugins/openai/openai.tsx b/src/plugins/openai/openai.tsx
index 0288d53af..ecd43a5dc 100644
--- a/src/plugins/openai/openai.tsx
+++ b/src/plugins/openai/openai.tsx
@@ -208,11 +208,7 @@ class OpenAIRenderer extends React.Component<{ model: OpenAIRendererModel }> {
                             paddingRight: 5,
                         }}
                     >
-                        <Markdown
-                            inputModel={GlobalModel.aichatModel}
-                            text={message}
-                            style={{ maxHeight: opts.maxSize.height }}
-                        />
+                        <Markdown text={message} style={{ maxHeight: opts.maxSize.height }} />
                     </div>
                 </div>
             </div>