From 41e1ed7bd1b6c5b056aca8bcc356880eeefbf595 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 26 Jul 2021 10:29:31 +1200 Subject: [PATCH 1/3] Fix issue with undefined Style tab data --- client/homebrew/brewRenderer/brewRenderer.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 440db1ce3..6401001ed 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -122,6 +122,11 @@ const BrewRenderer = createClass({ ; }, + renderStyle : function() { + if(!this.props.style) return; + return
${this.props.style} ` }} />; + }, + renderPage : function(pageText, index){ if(this.props.renderer == 'legacy') return
; @@ -189,7 +194,9 @@ const BrewRenderer = createClass({
{/* Apply CSS from Style tab */} -
${this.props.style} ` }} /> + {this.state.isMounted + ? this.renderStyle() + : null} {/* Render pages from Markdown tab */} {this.state.isMounted From cac5aa2475f6c0a9c45f23a6b1d373af6c092f31 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Jul 2021 19:23:27 +1200 Subject: [PATCH 2/3] Combine renderStyle and renderPages logic --- client/homebrew/brewRenderer/brewRenderer.jsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 6401001ed..78ea3d6c2 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -193,14 +193,13 @@ const BrewRenderer = createClass({
- {/* Apply CSS from Style tab */} + {/* Apply CSS and render pages from Markdown tab */} {this.state.isMounted - ? this.renderStyle() - : null} - - {/* Render pages from Markdown tab */} - {this.state.isMounted - ? this.renderPages() + ? + <> + {this.renderStyle()} + {this.renderPages()} + : null}
From 577a434e17d6dc3e08279f398547eb2ea0aab0ac Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Jul 2021 19:24:36 +1200 Subject: [PATCH 3/3] Slight change to `isMounted` logic --- client/homebrew/brewRenderer/brewRenderer.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 78ea3d6c2..d80ac0f64 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -195,12 +195,12 @@ const BrewRenderer = createClass({
{/* Apply CSS and render pages from Markdown tab */} {this.state.isMounted - ? + && <> {this.renderStyle()} {this.renderPages()} - : null} + }