diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index a37671219..75a07c7d1 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -85,7 +85,6 @@ const BrewPage = (props)=>{ //v=====--------------------< Brew Renderer Component >-------------------=====v// let renderedPages = []; -let renderedPageTexts = []; const pageTemplates = []; let rawPages = []; @@ -93,7 +92,6 @@ const BrewRenderer = (props)=>{ props = { text : '', style : '', - version : 1, renderer : 'legacy', lang : '', errors : [], @@ -232,15 +230,12 @@ const BrewRenderer = (props)=>{ if(rawPages.length != renderedPages.length) { // Re-render all pages when page count changes renderedPages.length = 0; - renderedPageTexts.length = 0; pageTemplates.length = 0; } // Render currently-edited page first so cross-page effects (variables, links) can propagate out first - if(rawPages.length > props.currentEditorCursorPageNum -1) { + if(rawPages.length > props.currentEditorCursorPageNum -1) renderedPages[props.currentEditorCursorPageNum - 1] = renderPage(rawPages[props.currentEditorCursorPageNum - 1], props.currentEditorCursorPageNum - 1); - renderedPageTexts[props.currentEditorCursorPageNum - 1] = rawPages[props.currentEditorCursorPageNum - 1]; - } _.forEach(rawPages, (page, index)=>{ const varsOnPageRegex = /([!$]?)\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g; // Find out if there are any vars on the page. @@ -248,12 +243,8 @@ const BrewRenderer = (props)=>{ !props.hoisted && (page.match(varsOnPageRegex)); // forceRender forces pages outside of the PPR range to render if true. // This is necessary on the first load to fully populate the variable table. - - const pageTextChanged = renderedPageTexts[index] !== page; - - if(((isInView(index) && pageTextChanged) || !renderedPages[index] || forceRender) && typeof window !== 'undefined') { - renderedPages[index] = renderPage(page, index); // Render any page not yet rendered, but only re-render changed pages in PPR range - renderedPageTexts[index] = page; + if((isInView(index) || !renderedPages[index] || forceRender) && typeof window !== 'undefined'){ + renderedPages[index] = renderPage(page, index); // Render any page not yet rendered, but only re-render those in PPR range } }); if(!props.hoisted) { props.hoisted = true; } // Only fully hoist once. @@ -322,10 +313,7 @@ const BrewRenderer = (props)=>{ }; const renderedStyle = useMemo(()=>renderStyle(), [props.style, props.themeBundle]); - renderedPages = useMemo( - ()=>renderPages(), - [props.version, props.currentBrewRendererPageNum, props.currentEditorCursorPageNum, displayOptions] - ); + renderedPages = useMemo(()=>renderPages(), [props.text, displayOptions]); return ( <> diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index c0ed712f9..57667ca6e 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -289,7 +289,6 @@ const EditPage = (props)=>{ text={currentBrew.text} style={currentBrew.style} renderer={currentBrew.renderer} - version={currentBrew.version} themeBundle={themeBundle} errors={HTMLErrors} lang={currentBrew.lang} diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index 477934506..0ac78f0e1 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -138,7 +138,6 @@ const HomePage =(props)=>{ text={currentBrew.text} style={currentBrew.style} renderer={currentBrew.renderer} - version={currentBrew.version} themeBundle={themeBundle} onPageChange={setCurrentBrewRendererPageNum} currentEditorCursorPageNum={currentEditorCursorPageNum} diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 92fda514a..c7b6c7160 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -183,7 +183,6 @@ const NewPage = (props)=>{ text={currentBrew.text} style={currentBrew.style} renderer={currentBrew.renderer} - version={currentBrew.version} themeBundle={themeBundle} errors={HTMLErrors} lang={currentBrew.lang} diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index a8a6802fd..8d2a5b0f0 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -159,7 +159,6 @@ const SharePage = (props)=>{ style={currentBrew.style} lang={currentBrew.lang} renderer={currentBrew.renderer} - version={currentBrew.version} theme={currentBrew.theme} themeBundle={themeBundle} onPageChange={handleBrewRendererPageChange}