From d27e07b6203c85cb8b30be09f3813e39d0e7cf41 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 31 Aug 2022 18:53:47 +1200 Subject: [PATCH 1/2] Load from local storage in componentDidMount --- client/homebrew/pages/newPage/newPage.jsx | 43 +++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index d79d56564..8b05a76e7 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -48,20 +48,6 @@ const NewPage = createClass({ getInitialState : function() { const brew = this.props.brew; - if(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)); - - if(!brew.text || !brew.style){ - brew.text = brew.text || (brewStorage ?? ''); - brew.style = brew.style || (styleStorage ?? undefined); - // brew.title = metaStorage?.title || this.state.brew.title; - // brew.description = metaStorage?.description || this.state.brew.description; - brew.renderer = metaStorage?.renderer || brew.renderer; - } - } - return { brew : { text : brew.text || '', @@ -84,12 +70,31 @@ const NewPage = createClass({ }, componentDidMount : function() { - localStorage.setItem(BREWKEY, this.state.brew.text); - localStorage.setItem(STYLEKEY, this.state.brew.style); - localStorage.setItem(METAKEY, JSON.stringify({ - 'renderer' : this.state.brew.renderer - })); document.addEventListener('keydown', this.handleControlKeys); + + const brew = this.props.brew; + + if(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)); + + if(!brew.text || !brew.style){ + brew.text = brew.text || (brewStorage ?? ''); + brew.style = brew.style || (styleStorage ?? undefined); + // brew.title = metaStorage?.title || this.state.brew.title; + // brew.description = metaStorage?.description || this.state.brew.description; + brew.renderer = metaStorage?.renderer || brew.renderer; + + this.setState({ + brew : brew + }); + } + } + + localStorage.setItem(BREWKEY, brew.text); + localStorage.setItem(STYLEKEY, brew.style); + localStorage.setItem(METAKEY, JSON.stringify({'renderer' : brew.renderer})); }, componentWillUnmount : function() { document.removeEventListener('keydown', this.handleControlKeys); From 165a15e10608dc9c47b50e4e8df69ffe9104b1f7 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Wed, 31 Aug 2022 08:43:18 -0400 Subject: [PATCH 2/2] Update newPage.jsx --- client/homebrew/pages/newPage/newPage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 8b05a76e7..3986916a5 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -84,7 +84,7 @@ const NewPage = createClass({ brew.style = brew.style || (styleStorage ?? undefined); // brew.title = metaStorage?.title || this.state.brew.title; // brew.description = metaStorage?.description || this.state.brew.description; - brew.renderer = metaStorage?.renderer || brew.renderer; + brew.renderer = brew.renderer || metaStorage?.renderer; this.setState({ brew : brew