diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 618a64ecd..f3b9052c9 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -96,7 +96,6 @@ const BrewRenderer = (props)=>{ lang : '', errors : [], currentEditorCursorPageNum : 1, - currentBrewRendererPageNum : 1, themeBundle : {}, onPageChange : ()=>{}, ...props @@ -154,17 +153,16 @@ const BrewRenderer = (props)=>{ if(index == props.currentEditorCursorPageNum - 1) //Already rendered before this step return false; - if(Math.abs(index - props.currentBrewRendererPageNum - 1) <= 3) + if(Math.abs(index - centerPage - 1) <= 3) return true; return false; }; - const renderDummyPage = (index)=>{ - return
+ const renderDummyPage = (index)=> +
; - }; const renderStyle = ()=>{ const themeStyles = props.themeBundle?.joinedStyles ?? ''; @@ -223,8 +221,7 @@ const BrewRenderer = (props)=>{ }; const renderPages = (checkHoists = false)=>{ - - if(props.errors && props.errors.length) + if(props.errors?.length) return renderedPages; if(rawPages.length != renderedPages.length) { // Re-render all pages when page count changes @@ -246,7 +243,7 @@ const BrewRenderer = (props)=>{ 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. + props.hoisted = true; // Only fully hoist once. return renderedPages; }; @@ -337,7 +334,7 @@ const BrewRenderer = (props)=>{ {emitClick();}} + onClick={emitClick} sandbox='allow-same-origin allow-modals allow-top-navigation' >
{ lang={currentBrew.lang} onPageChange={setCurrentBrewRendererPageNum} currentEditorCursorPageNum={currentEditorCursorPageNum} - currentBrewRendererPageNum={currentBrewRendererPageNum} allowPrint={true} /> diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index ef2853792..1d35ef0e1 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -141,7 +141,6 @@ const HomePage =(props)=>{ themeBundle={themeBundle} onPageChange={setCurrentBrewRendererPageNum} currentEditorCursorPageNum={currentEditorCursorPageNum} - currentBrewRendererPageNum={currentBrewRendererPageNum} />
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index c4eee3e8d..edf4d2125 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -188,7 +188,6 @@ const NewPage = (props)=>{ lang={currentBrew.lang} onPageChange={setCurrentBrewRendererPageNum} currentEditorCursorPageNum={currentEditorCursorPageNum} - currentBrewRendererPageNum={currentBrewRendererPageNum} allowPrint={true} /> diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 99ef3e35c..5280fc850 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -149,7 +149,6 @@ const SharePage = (props)=>{ theme={currentBrew.theme} themeBundle={themeBundle} onPageChange={handleBrewRendererPageChange} - currentBrewRendererPageNum={currentBrewRendererPageNum} allowPrint={true} />