From c0df8f7cccef956fa7b19f28c41ec83a9f462bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Mon, 21 Sep 2026 23:21:48 +0200 Subject: [PATCH] move to use brew as state in sharepage --- client/homebrew/pages/sharePage/sharePage.jsx | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index d81b4d878..7a14234a7 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -16,8 +16,9 @@ import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; import { printCurrentBrew, fetchThemeBundle } from '@shared/helpers.js'; const SharePage = (props)=>{ - const { brew = DEFAULT_BREW_LOAD, disableMeta = false } = props; + const { disableMeta = false } = props; + const [currentBrew, setCurrentBrew] = useState(props.brew || DEFAULT_BREW_LOAD); const [themeBundle, setThemeBundle] = useState({}); const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1); @@ -37,7 +38,7 @@ const SharePage = (props)=>{ useEffect(()=>{ document.addEventListener('keydown', handleControlKeys); - fetchThemeBundle(undefined, setThemeBundle, brew.renderer, brew.theme); + fetchThemeBundle(undefined, setThemeBundle, currentBrew.renderer, currentBrew.theme); // listen for changes in the brew version const eventSource = new EventSource('/stream'); @@ -45,8 +46,9 @@ const SharePage = (props)=>{ const messageData = JSON.parse(evt.data); if(messageData.eventType == 'brewUpdated'){ - if(messageData.shareId == brew.shareId && messageData.version != brew.version) { - console.log(`brew has been updated, viewing ${brew.version}, new version is ${messageData.version}`); + if(messageData.shareId == currentBrew.shareId && messageData.version != currentBrew.version) { + console.log(`brew has been updated, viewing ${currentBrew.version}, new version is ${messageData.version}`); + console.log('should fetch brew'); } } }); @@ -57,13 +59,13 @@ const SharePage = (props)=>{ }, []); const processShareId = ()=>{ - return brew.googleId && !brew.stubbed ? brew.googleId + brew.shareId : brew.shareId; + return currentBrew.googleId && !currentBrew.stubbed ? currentBrew.googleId + currentBrew.shareId : currentBrew.shareId; }; const renderEditLink = ()=>{ - if(!brew.editId) return null; + if(!currentBrew.editId) return null; - const editLink = brew.googleId && ! brew.stubbed ? brew.googleId + brew.editId : brew.editId; + const editLink = currentBrew.googleId && ! currentBrew.stubbed ? currentBrew.googleId + currentBrew.editId : currentBrew.editId; return ( @@ -74,7 +76,7 @@ const SharePage = (props)=>{ const titleEl = ( - {brew.title} + {currentBrew.title} ); @@ -83,11 +85,11 @@ const SharePage = (props)=>{ - {disableMeta ? titleEl : {titleEl}} + {disableMeta ? titleEl : {titleEl}} - {brew.shareId && ( + {currentBrew.shareId && ( <> @@ -120,18 +122,18 @@ const SharePage = (props)=>{ )} - +