From 8c975747c4f2ce9fe25ba8e66ad165af07e26dc5 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 21 Aug 2023 19:33:51 +1200 Subject: [PATCH 1/2] Move save location logic out of ShareID check --- client/homebrew/pages/newPage/newPage.jsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 0bb039bc3..8db025537 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -50,15 +50,13 @@ const NewPage = createClass({ document.addEventListener('keydown', this.handleControlKeys); const brew = this.state.brew; + const output = {}; if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser const brewStorage = localStorage.getItem(BREWKEY); const styleStorage = localStorage.getItem(STYLEKEY); const metaStorage = JSON.parse(localStorage.getItem(METAKEY)); - SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`; - const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY'; - brew.text = brewStorage ?? brew.text; brew.style = styleStorage ?? brew.style; // brew.title = metaStorage?.title || this.state.brew.title; @@ -67,12 +65,15 @@ const NewPage = createClass({ brew.theme = metaStorage?.theme ?? brew.theme; brew.lang = metaStorage?.lang ?? brew.lang; - this.setState({ - brew : brew, - saveGoogle : (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle) - }); + output.brew = brew; } + SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`; + const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY'; + output.saveGoogle = (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle); + + this.setState(output); + localStorage.setItem(BREWKEY, brew.text); if(brew.style) localStorage.setItem(STYLEKEY, brew.style); From 6130d699060e8b16cb4fe713e928013bd2fcea6f Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 21 Aug 2023 12:08:54 -0400 Subject: [PATCH 2/2] Rearranged to avoid obscuring the state `output` variable added an unneeded layer to dig through to understand what is being saved to `setState()` --- client/homebrew/pages/newPage/newPage.jsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 8db025537..470c90b89 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -50,7 +50,6 @@ const NewPage = createClass({ document.addEventListener('keydown', this.handleControlKeys); const brew = this.state.brew; - const output = {}; if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser const brewStorage = localStorage.getItem(BREWKEY); @@ -64,15 +63,15 @@ const NewPage = createClass({ brew.renderer = metaStorage?.renderer ?? brew.renderer; brew.theme = metaStorage?.theme ?? brew.theme; brew.lang = metaStorage?.lang ?? brew.lang; - - output.brew = brew; } SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`; const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY'; - output.saveGoogle = (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle); - this.setState(output); + this.setState({ + brew : brew, + saveGoogle : (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle) + }); localStorage.setItem(BREWKEY, brew.text); if(brew.style)