0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-07 03:22:38 +00:00

Default brew in getDefaultProps, don't get localstorage when cloning

This commit is contained in:
Trevor Buckner
2022-09-03 01:32:42 -04:00
parent 8d10800cb6
commit b4be9bb741
2 changed files with 29 additions and 42 deletions

View File

@@ -29,39 +29,28 @@ const NewPage = createClass({
brew : { brew : {
text : '', text : '',
style : undefined, style : undefined,
shareId : null,
editId : null,
createdAt : null,
updatedAt : null,
gDrive : false,
title : '', title : '',
description : '', description : '',
tags : '', renderer : 'V3'
published : false,
authors : [],
systems : []
} }
}; };
}, },
getInitialState : function() { getInitialState : function() {
const brew = this.props.brew; let brew = this.props.brew;
if(this.props.brew.shareId) {
brew = {
text : brew.text ?? '',
style : brew.style ?? undefined,
title : brew.title ?? '',
description : brew.description ?? '',
renderer : brew.renderer ?? 'legacy'
};
}
return { return {
brew : { brew : brew,
text : brew.text || '',
style : brew.style || undefined,
gDrive : false,
title : brew.title || '',
description : brew.description || '',
tags : brew.tags || '',
published : false,
authors : [],
systems : brew.systems || [],
renderer : brew.renderer || 'V3'
},
isSaving : false, isSaving : false,
saveGoogle : (global.account && global.account.googleId ? true : false), saveGoogle : (global.account && global.account.googleId ? true : false),
errors : null, errors : null,
@@ -74,23 +63,21 @@ const NewPage = createClass({
const brew = this.state.brew; const brew = this.state.brew;
if(typeof window !== 'undefined') { //Load from localStorage if in client browser if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
const brewStorage = localStorage.getItem(BREWKEY); const brewStorage = localStorage.getItem(BREWKEY);
const styleStorage = localStorage.getItem(STYLEKEY); const styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY)); const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
if(!brew.text || !brew.style){ brew.text = brewStorage ?? brew.text;
brew.text = brew.text || (brewStorage ?? ''); brew.style = styleStorage ?? brew.style;
brew.style = brew.style || (styleStorage ?? undefined);
// brew.title = metaStorage?.title || this.state.brew.title; // brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description; // brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = brew.renderer || metaStorage?.renderer; brew.renderer = metaStorage?.renderer ?? brew.renderer;
this.setState({ this.setState({
brew : brew brew : brew
}); });
} }
}
localStorage.setItem(BREWKEY, brew.text); localStorage.setItem(BREWKEY, brew.text);
localStorage.setItem(STYLEKEY, brew.style); localStorage.setItem(STYLEKEY, brew.style);