Combine handleText/Style/Snippet/Meta functions into common function

Also adds any related imports and key names

client/homebrew/editor/editor.jsx

@@ -40,11 +40,8 @@ const Editor = createClass({
 				style : ''
 			},
 
-			onTextChange  : ()=>{},
+			onBrewChange : ()=>{},
-			onStyleChange : ()=>{},
+			reportError  : ()=>{},
-			onMetaChange  : ()=>{},
-			onSnipChange  : ()=>{},
-			reportError   : ()=>{},
 
 			onCursorPageChange : ()=>{},
 			onViewPageChange   : ()=>{},
@@ -438,7 +435,7 @@ const Editor = createClass({
 					language='gfm'
 					view={this.state.view}
 					value={this.props.brew.text}
-					onChange={this.props.onTextChange}
+					onChange={this.props.onBrewChange('text')}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
 					style={{  height: `calc(100% - ${this.state.snippetbarHeight}px)` }} />
@@ -451,7 +448,7 @@ const Editor = createClass({
 					language='css'
 					view={this.state.view}
 					value={this.props.brew.style ?? DEFAULT_STYLE_TEXT}
-					onChange={this.props.onStyleChange}
+					onChange={this.props.onBrewChange('style')}
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
@@ -467,7 +464,7 @@ const Editor = createClass({
 				<MetadataEditor
 					metadata={this.props.brew}
 					themeBundle={this.props.themeBundle}
-					onChange={this.props.onMetaChange}
+					onChange={this.props.onBrewChange('metadata')}
 					reportError={this.props.reportError}
 					userThemes={this.props.userThemes}/>
 			</>;
@@ -481,7 +478,7 @@ const Editor = createClass({
 					language='gfm'
 					view={this.state.view}
 					value={this.props.brew.snippets}
-					onChange={this.props.onSnipChange}
+					onChange={this.props.onBrewChange('snippets')}
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}

client/homebrew/navbar/share.navitem.jsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import dedent from 'dedent-tabs';
+import Nav from 'naturalcrit/nav/nav.jsx';
+
+	const getShareId = (brew)=>(
+		brew.googleId && !brew.stubbed
+			? brew.googleId + brew.shareId
+			: brew.shareId
+	);
+
+	const getRedditLink = (brew)=>{
+		const text = dedent`
+			Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
+
+			**[Homebrewery Link](${global.config.baseUrl}/share/${getShareId(brew)})**`;
+
+		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
+	};
+
+export default ({brew}) => (
+	<Nav.dropdown>
+		<Nav.item color='teal' icon='fas fa-share-alt'>
+			share
+		</Nav.item>
+		<Nav.item color='blue' href={`/share/${getShareId(brew)}`}>
+			view
+		</Nav.item>
+		<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}}>
+			copy url
+		</Nav.item>
+		<Nav.item color='blue' href={getRedditLink(brew)} newTab rel='noopener noreferrer'>
+			post to reddit
+		</Nav.item>
+	</Nav.dropdown>
+);

client/homebrew/pages/editPage/editPage.jsx

@@ -1,536 +1,420 @@
 /* eslint-disable max-lines */
-require('./editPage.less');
+import './editPage.less';
-const React = require('react');
-const _ = require('lodash');
-const createClass = require('create-react-class');
-import {makePatches, applyPatches, stringifyPatches, parsePatches} from '@sanity/diff-match-patch';
-import { md5 } from 'hash-wasm';
-import { gzipSync, strToU8 } from 'fflate';
 
-import request from '../../utils/request-middleware.js';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
-const { Meta } = require('vitreum/headtags');
+import request                                from '../../utils/request-middleware.js';
+import Markdown                               from 'naturalcrit/markdown.js';
 
-const Nav = require('naturalcrit/nav/nav.jsx');
+import _                                 from 'lodash';;
-const Navbar = require('../../navbar/navbar.jsx');
+import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
+import { md5 }                           from 'hash-wasm';
+import { gzipSync, strToU8 }             from 'fflate';
+import { Meta }                          from 'vitreum/headtags';
 
-const NewBrew = require('../../navbar/newbrew.navitem.jsx');
+import Nav                       from 'naturalcrit/nav/nav.jsx';
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
+import Navbar                    from '../../navbar/navbar.jsx';
-const PrintNavItem = require('../../navbar/print.navitem.jsx');
+import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
-const ErrorNavItem = require('../../navbar/error-navitem.jsx');
+import AccountNavItem            from '../../navbar/account.navitem.jsx';
-const Account = require('../../navbar/account.navitem.jsx');
+import ShareNavItem              from '../../navbar/share.navitem.jsx';
-const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+import ErrorNavItem              from '../../navbar/error-navitem.jsx';
-const VaultNavItem = require('../../navbar/vault.navitem.jsx');
+import HelpNavItem               from '../../navbar/help.navitem.jsx';
+import VaultNavItem              from '../../navbar/vault.navitem.jsx';
+import PrintNavItem              from '../../navbar/print.navitem.jsx';
+import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx';
 
-const SplitPane = require('client/components/splitPane/splitPane.jsx');
+import SplitPane    from 'client/components/splitPane/splitPane.jsx';
-const Editor = require('../../editor/editor.jsx');
+import Editor       from '../../editor/editor.jsx';
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
 
-const LockNotification = require('./lockNotification/lockNotification.jsx');
+import LockNotification from './lockNotification/lockNotification.jsx';
 
-import Markdown from 'naturalcrit/markdown.js';
+import { DEFAULT_BREW_LOAD }                  from '../../../../server/brewDefaults.js';
-
+import { printCurrentBrew, fetchThemeBundle } from '../../../../shared/helpers.js';
-const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
-const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js');
 
 import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
 
-const googleDriveIcon = require('../../googleDrive.svg');
+import googleDriveIcon from '../../googleDrive.svg';
 
 const SAVE_TIMEOUT = 10000;
+const UNSAVED_WARNING_TIMEOUT = 900000; //Warn user afer 15 minutes of unsaved changes
+const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds
 
-const EditPage = createClass({
+const BREWKEY  = 'homebrewery-new';
-	displayName     : 'EditPage',
+const STYLEKEY = 'homebrewery-new-style';
-	getDefaultProps : function() {
+const SNIPKEY  = 'homebrewery-new-snippets';
-		return {
+const METAKEY  = 'homebrewery-new-meta';
-			brew : DEFAULT_BREW_LOAD
-		};
-	},
 
-	getInitialState : function() {
+const EditPage = (props)=>{
-		return {
+	props = {
-			brew                       : this.props.brew,
+		brew : DEFAULT_BREW_LOAD,
-			isSaving                   : false,
+		...props
-			unsavedChanges             : false,
+	};
-			alertTrashedGoogleBrew     : this.props.brew.trashed,
-			alertLoginToTransfer       : false,
-			saveGoogle                 : this.props.brew.googleId ? true : false,
-			confirmGoogleTransfer      : false,
-			error                      : null,
-			htmlErrors                 : Markdown.validate(this.props.brew.text),
-			url                        : '',
-			autoSave                   : true,
-			autoSaveWarning            : false,
-			unsavedTime                : new Date(),
-			currentEditorViewPageNum   : 1,
-			currentEditorCursorPageNum : 1,
-			currentBrewRendererPageNum : 1,
-			displayLockMessage         : this.props.brew.lock || false,
-			themeBundle                : {}
-		};
-	},
 
-	editor    : React.createRef(null),
+	const [currentBrew               , setCurrentBrew               ] = useState(props.brew);
-	savedBrew : null,
+	const [isSaving                  , setIsSaving                  ] = useState(false);
+	const [lastSavedTime             , setLastSavedTime             ] = useState(new Date());
+  const [saveGoogle                , setSaveGoogle                ] = useState(!!props.brew.googleId);
+	const [error                     , setError                     ] = useState(null);
+	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
+	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum  ] = useState(1);
+	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
+	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
+	const [themeBundle               , setThemeBundle               ] = useState({});
+	const [unsavedChanges            , setUnsavedChanges            ] = useState(false);
+	const [alertTrashedGoogleBrew    , setAlertTrashedGoogleBrew    ] = useState(props.brew.trashed);
+	const [alertLoginToTransfer      , setAlertLoginToTransfer      ] = useState(false);
+	const [confirmGoogleTransfer     , setConfirmGoogleTransfer     ] = useState(false);
+	const [autoSaveEnabled           , setAutoSaveEnabled           ] = useState(true);
+	const [warnUnsavedChanges        , setWarnUnsavedChanges        ] = useState(true);
 
-	componentDidMount : function(){
+	const editorRef          = useRef(null);
-		this.setState({
+	const lastSavedBrew      = useRef(_.cloneDeep(props.brew));
-			url : window.location.href
+	const saveTimeout        = useRef(null);
-		});
+	const warnUnsavedTimeout = useRef(null);
+	const trySaveRef         = useRef(trySave); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
+	const unsavedChangesRef  = useRef(unsavedChanges); // Similarly, onBeforeUnload lives outside React and needs ref to unsavedChanges
 
-		this.savedBrew = JSON.parse(JSON.stringify(this.props.brew)); //Deep copy
+	const useLocalStorage = false;
 
-		this.setState({ autoSave: JSON.parse(localStorage.getItem('AUTOSAVE_ON')) ?? true }, ()=>{
+	useEffect(()=>{
-			if(this.state.autoSave){
+		const autoSavePref = JSON.parse(localStorage.getItem('AUTOSAVE_ON') ?? true);
-				this.trySave();
+		setAutoSaveEnabled(autoSavePref);
-			} else {
+		setWarnUnsavedChanges(!autoSavePref);
-				this.setState({ autoSaveWarning: true });
+		setHTMLErrors(Markdown.validate(currentBrew.text));
+		fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
+
+		const handleControlKeys = (e)=>{
+			if(!(e.ctrlKey || e.metaKey)) return;
+			if(e.keyCode === 83) trySaveRef.current(true);
+			if(e.keyCode === 80) printCurrentBrew();
+			if([83, 80].includes(e.keyCode)) {
+				e.stopPropagation();
+				e.preventDefault();
 			}
-		});
+		};
 
+		document.addEventListener('keydown', handleControlKeys);
 		window.onbeforeunload = ()=>{
-			if(this.state.isSaving || this.state.unsavedChanges){
+			if(unsavedChangesRef.current)
 				return 'You have unsaved changes!';
-			}
 		};
+		return ()=>{
+			document.removeEventListener('keydown', handleControlKeys);
+			window.onBeforeUnload = null;
+		};
+	}, []);
 
-		this.setState((prevState)=>({
+	useEffect(()=>{
-			htmlErrors : Markdown.validate(prevState.brew.text)
+		trySaveRef.current = trySave;
-		}));
+		unsavedChangesRef.current = unsavedChanges;
+	});
 
-		fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, this.props.brew.renderer, this.props.brew.theme);
+	useEffect(()=>{
+		const hasChange = !_.isEqual(currentBrew, lastSavedBrew.current);
+		setUnsavedChanges(hasChange);
 
-		document.addEventListener('keydown', this.handleControlKeys);
+		if(autoSaveEnabled) trySave(false, hasChange);
-	},
+	}, [currentBrew]);
-	componentWillUnmount : function() {
+
-		window.onbeforeunload = function(){};
+	const handleSplitMove = ()=>{
-		document.removeEventListener('keydown', this.handleControlKeys);
+		editorRef.current?.update();
-	},
+	};
-	componentDidUpdate : function(){
+
-		const hasChange = this.hasChanges();
+	const handleEditorViewPageChange = (pageNumber)=>{
-		if(this.state.unsavedChanges != hasChange){
+		setCurrentEditorViewPageNum(pageNumber);
-			this.setState({
+	};
-				unsavedChanges : hasChange
+
-			});
+	const handleEditorCursorPageChange = (pageNumber)=>{
+		setCurrentEditorCursorPageNum(pageNumber);
+	};
+
+	const handleBrewRendererPageChange = (pageNumber)=>{
+		setCurrentBrewRendererPageNum(pageNumber);
+	};
+
+	const handleBrewChange = (field) => (value, subfield) => {	//'text', 'style', 'snippets', 'metadata'
+		if (subfield == 'renderer' || subfield == 'theme')
+			fetchThemeBundle(setError, setThemeBundle, value.renderer, value.theme);
+
+		//If there are HTML errors, run the validator on every change to give quick feedback
+		if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
+			setHTMLErrors(Markdown.validate(value));
+
+		if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
+		else                    setCurrentBrew(prev => ({ ...prev, [field]: value }));
+
+		if(useLocalStorage) {
+			if(field == 'text')     localStorage.setItem(BREWKEY, value);
+			if(field == 'style')    localStorage.setItem(STYLEKEY, value);
+			if(field == 'snippets') localStorage.setItem(SNIPKEY, value);
+			if(field == 'metadata') localStorage.setItem(METAKEY, JSON.stringify({
+				renderer : value.renderer,
+				theme    : value.theme,
+				lang     : value.lang
+			}));
 		}
-	},
+	};
 
-	handleControlKeys : function(e){
+	const updateBrew = (newData)=>setCurrentBrew((prevBrew)=>({
-		if(!(e.ctrlKey || e.metaKey)) return;
+		...prevBrew,
-		const S_KEY = 83;
+		style    : newData.style,
-		const P_KEY = 80;
+		text     : newData.text,
-		if(e.keyCode == S_KEY) this.trySave(true);
+		snippets : newData.snippets
-		if(e.keyCode == P_KEY) printCurrentBrew();
+	}));
-		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
 
-	handleSplitMove : function(){
+	const resetWarnUnsavedTimer = ()=>{
-		this.editor.current.update();
+		setTimeout(()=>setWarnUnsavedChanges(false), UNSAVED_WARNING_POPUP_TIMEOUT); // Hide the warning after 4 seconds
-	},
+		clearTimeout(warnUnsavedTimeout.current);
+		warnUnsavedTimeout.current = setTimeout(()=>setWarnUnsavedChanges(true), UNSAVED_WARNING_TIMEOUT); // 15 minutes between unsaved work warnings
+	};
 
-	handleEditorViewPageChange : function(pageNumber){
+	const handleGoogleClick = ()=>{
-		this.setState({ currentEditorViewPageNum: pageNumber });
-	},
-
-	handleEditorCursorPageChange : function(pageNumber){
-		this.setState({ currentEditorCursorPageNum: pageNumber });
-	},
-
-	handleBrewRendererPageChange : function(pageNumber){
-		this.setState({ currentBrewRendererPageNum: pageNumber });
-	},
-
-	handleTextChange : function(text){
-		//If there are errors, run the validator on every change to give quick feedback
-		let htmlErrors = this.state.htmlErrors;
-		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
-
-		this.setState((prevState)=>({
-			brew       : { ...prevState.brew, text: text },
-			htmlErrors : htmlErrors,
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-	},
-
-	handleSnipChange : function(snippet){
-		//If there are errors, run the validator on every change to give quick feedback
-		let htmlErrors = this.state.htmlErrors;
-		if(htmlErrors.length) htmlErrors = Markdown.validate(snippet);
-
-		this.setState((prevState)=>({
-			brew           : { ...prevState.brew, snippets: snippet },
-			unsavedChanges : true,
-			htmlErrors     : htmlErrors,
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-	},
-
-	handleStyleChange : function(style){
-		this.setState((prevState)=>({
-			brew : { ...prevState.brew, style: style }
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-	},
-
-	handleMetaChange : function(metadata, field=undefined){
-		if(field == 'theme' || field == 'renderer')	// Fetch theme bundle only if theme or renderer was changed
-			fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, metadata.renderer, metadata.theme);
-
-		this.setState((prevState)=>({
-			brew : {
-				...prevState.brew,
-				...metadata
-			}
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-	},
-
-	hasChanges : function(){
-		return !_.isEqual(this.state.brew, this.savedBrew);
-	},
-
-	updateBrew : function(newData){
-		this.setState((prevState)=>({
-			brew : {
-				...prevState.brew,
-				style    : newData.style,
-				text     : newData.text,
-				snippets : newData.snippets
-			}
-		}));
-	},
-
-	trySave : function(immediate=false){
-		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
-		if(this.state.isSaving)
-			return;
-
-		if(immediate) {
-			this.debounceSave();
-			this.debounceSave.flush();
-			return;
-		}
-		
-		if(this.hasChanges())
-			this.debounceSave();
-		else
-			this.debounceSave.cancel();
-	},
-
-	handleGoogleClick : function(){
 		if(!global.account?.googleId) {
-			this.setState({
+			setAlertLoginToTransfer(true);
-				alertLoginToTransfer : true
-			});
 			return;
 		}
-		this.setState((prevState)=>({
-			confirmGoogleTransfer : !prevState.confirmGoogleTransfer
-		}));
-		this.setState({
-			error    : null
-		});
-	},
 
-	closeAlerts : function(event){
+		setConfirmGoogleTransfer((prev)=>!prev);
-		event.stopPropagation();	//Only handle click once so alert doesn't reopen
+		setError(null);
-		this.setState({
+	};
-			alertTrashedGoogleBrew : false,
-			alertLoginToTransfer   : false,
-			confirmGoogleTransfer  : false
-		});
-	},
 
-	toggleGoogleStorage : function(){
+	const closeAlerts = (e)=>{
-		this.setState((prevState)=>({
+		e.stopPropagation(); //Only handle click once so alert doesn't reopen
-			saveGoogle : !prevState.saveGoogle,
+		setAlertTrashedGoogleBrew(false);
-			error      : null
+		setAlertLoginToTransfer(false);
-		}), ()=>this.trySave(true));
+		setConfirmGoogleTransfer(false);
-	},
+	};
 
-	save : async function(){
+	const toggleGoogleStorage = ()=>{
-		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();
+		setSaveGoogle((prev)=>!prev);
+		setError(null);
+		trySave(true);
+	};
 
-		const brewState       = this.state.brew; // freeze the current state
+	const trySave = (immediate = false, hasChanges = true)=>{
-		const preSaveSnapshot = { ...brewState };
+		clearTimeout(saveTimeout.current);
+		if(isSaving) return;
+		if(!hasChanges && !immediate) return;
+		const newTimeout = immediate ? 0 : SAVE_TIMEOUT;
 
-		this.setState((prevState)=>({
+		saveTimeout.current = setTimeout(async ()=>{
-			isSaving   : true,
+			setIsSaving(true);
-			error      : null,
+			setError(null);
-			htmlErrors : Markdown.validate(prevState.brew.text)
+			await save(currentBrew, saveGoogle)
-		}));
+			.catch((err)=>{
+				setError(err);
+			});
+			setIsSaving(false);
+			setLastSavedTime(new Date());
+			if(!autoSaveEnabled) resetWarnUnsavedTimer();
+		}, newTimeout);
+	};
 
-		await updateHistory(this.state.brew).catch(console.error);
+	const save = async (brew, saveToGoogle)=>{
+		setHTMLErrors(Markdown.validate(brew.text));
+
+		await updateHistory(brew).catch(console.error);
 		await versionHistoryGarbageCollection().catch(console.error);
 
 		//Prepare content to send to server
-		const brew          = { ...brewState };
+		const brewToSave = {
-		brew.text           = brew.text.normalize('NFC');
+			...brew,
-		this.savedBrew.text = this.savedBrew.text.normalize('NFC');
+			text      : brew.text.normalize('NFC'),
-		brew.pageCount      = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
+			pageCount : ((brew.renderer === 'legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1,
-		brew.patches        = stringifyPatches(makePatches(encodeURI(this.savedBrew.text), encodeURI(brew.text)));
+			patches   : stringifyPatches(makePatches(encodeURI(lastSavedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
-		brew.hash           = await md5(this.savedBrew.text);
+			hash      : await md5(lastSavedBrew.current.text),
-		//brew.text           = undefined; - Temporary parallel path
+			textBin   : undefined,
-		brew.textBin        = undefined;
+			version   : lastSavedBrew.current.version
+		};
 
-		const compressedBrew = gzipSync(strToU8(JSON.stringify(brew)));
+		const compressedBrew = gzipSync(strToU8(JSON.stringify(brewToSave)));
+		const transfer = saveToGoogle === _.isNil(brew.googleId);
+		const params = transfer ? `?${saveToGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : '';
 
-		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
-		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
 		const res = await request
-			.put(`/api/update/${brew.editId}${params}`)
+			.put(`/api/update/${brewToSave.editId}${params}`)
 			.set('Content-Encoding', 'gzip')
 			.set('Content-Type', 'application/json')
 			.send(compressedBrew)
 			.catch((err)=>{
-				console.log('Error Updating Local Brew');
+				console.error('Error Updating Local Brew');
-				this.setState({ error: err });
+				setError(err);
 			});
 		if(!res) return;
 
-		this.savedBrew = {
+		const updatedFields = {
-			...preSaveSnapshot,
+			googleId : res.body.googleId ?? null,
-			googleId : res.body.googleId ? res.body.googleId : null,
+			editId   : res.body.editId,
-			editId 	 : res.body.editId,
 			shareId  : res.body.shareId,
 			version  : res.body.version
 		};
 
-		this.setState((prevState) => ({
+		lastSavedBrew.current = {
-			brew: {
+			...brew,
-				...prevState.brew,
+			...updatedFields
-				googleId : res.body.googleId ? res.body.googleId : null,
+		};
-				editId 	 : res.body.editId,
-				shareId  : res.body.shareId,
-				version  : res.body.version
-			},
-			isSaving    : false,
-			unsavedTime : new Date()
-		}), ()=>{
-			this.setState({ unsavedChanges : this.hasChanges() });
-		});
 
-		history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
+		setCurrentBrew((prevBrew)=>({
-	},
+			...prevBrew,
+			...updatedFields
+		}));
 
-	renderGoogleDriveIcon : function(){
+		history.replaceState(null, null, `/edit/${res.body.editId}`);
-		return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+	};
-			<img src={googleDriveIcon} className={this.state.saveGoogle ? '' : 'inactive'} alt='Google Drive icon'/>
 
-			{this.state.confirmGoogleTransfer &&
+	const renderGoogleDriveIcon = ()=>(
-				<div className='errorContainer' onClick={this.closeAlerts}>
+		<Nav.item className='googleDriveStorage' onClick={handleGoogleClick}>
-					{ this.state.saveGoogle
+			<img src={googleDriveIcon} className={saveGoogle ? '' : 'inactive'} alt='Google Drive icon' />
-						?	`Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?`
+
-						: `Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?`
+			{confirmGoogleTransfer && (
-					}
+				<div className='errorContainer' onClick={closeAlerts}>
+					{saveGoogle
+						? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?'
+						: 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'}
 					<br />
-					<div className='confirm' onClick={this.toggleGoogleStorage}>
+					<div className='confirm' onClick={toggleGoogleStorage}> Yes </div>
-						Yes
+					<div className='deny'>                                  No  </div>
-					</div>
-					<div className='deny'>
-						No
-					</div>
 				</div>
-			}
+			)}
 
-			{this.state.alertLoginToTransfer &&
+			{alertLoginToTransfer && (
-				<div className='errorContainer' onClick={this.closeAlerts}>
+				<div className='errorContainer' onClick={closeAlerts}>
-					You must be signed in to a Google account to transfer
+					You must be signed in to a Google account to transfer between the homebrewery and Google Drive!
-					between the homebrewery and Google Drive!
+					<a target='_blank' rel='noopener noreferrer' href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
-					<a target='_blank' rel='noopener noreferrer'
+						<div className='confirm'> Sign In </div>
-						href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
-						<div className='confirm'>
-							Sign In
-						</div>
 					</a>
-					<div className='deny'>
+					<div className='deny'>      Not Now </div>
-						Not Now
-					</div>
 				</div>
-			}
+			)}
 
-			{this.state.alertTrashedGoogleBrew &&
+			{alertTrashedGoogleBrew && (
-				<div className='errorContainer' onClick={this.closeAlerts}>
+				<div className='errorContainer' onClick={closeAlerts}>
-				This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
+					This brew is currently in your Trash folder on Google Drive!<br />
-					<div className='confirm'>
+					If you want to keep it, make sure to move it before it is deleted permanently!<br />
-						OK
+					<div className='confirm'> OK </div>
-					</div>
 				</div>
-			}
+			)}
-		</Nav.item>;
+		</Nav.item>
-	},
+	);
-
-	renderSaveButton : function(){
 
+	const renderSaveButton = ()=>{
 		// #1 - Currently saving, show SAVING
-		if(this.state.isSaving){
+		if(isSaving)
 			return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>;
-		}
 
 		// #2 - Unsaved changes exist, autosave is OFF and warning timer has expired, show AUTOSAVE WARNING
-		if(this.state.unsavedChanges && this.state.autoSaveWarning){
+		if(unsavedChanges && warnUnsavedChanges) {
-			this.setAutosaveWarning();
+			resetWarnUnsavedTimer();
-			const elapsedTime = Math.round((new Date() - this.state.unsavedTime) / 1000 / 60);
+			const elapsedTime = Math.round((new Date() - lastSavedTime) / 1000 / 60);
-			const text = elapsedTime == 0 ? 'Autosave is OFF.' : `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
+			const text = elapsedTime === 0
+				? 'Autosave is OFF.'
+				: `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
 
 			return <Nav.item className='save error' icon='fas fa-exclamation-circle'>
-			Reminder...
+							Reminder...
-				<div className='errorContainer'>
+				<div className='errorContainer'>{text}</div>
-					{text}
-				</div>
 			</Nav.item>;
 		}
 
 		// #3 - Unsaved changes exist, click to save, show SAVE NOW
-		// Use trySave(true) instead of save() to use debounced save function
+		if(unsavedChanges)
-		if(this.state.unsavedChanges){
+			return <Nav.item className='save' onClick={()=>trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
-			return <Nav.item className='save' onClick={()=>this.trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
+
-		}
 		// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
-		if(this.state.autoSave){
+		if(autoSaveEnabled)
 			return <Nav.item className='save saved'>auto-saved.</Nav.item>;
-		}
+
 		// DEFAULT - No unsaved changes, show SAVED
 		return <Nav.item className='save saved'>saved.</Nav.item>;
-	},
+	};
 
-	handleAutoSave : function(){
+	const toggleAutoSave = ()=>{
-		if(this.warningTimer) clearTimeout(this.warningTimer);
+		clearTimeout(warnUnsavedTimeout.current);
-		this.setState((prevState)=>({
+		clearTimeout(saveTimeout.current);
-			autoSave        : !prevState.autoSave,
+		localStorage.setItem('AUTOSAVE_ON', JSON.stringify(!autoSaveEnabled));
-			autoSaveWarning : prevState.autoSave
+		setAutoSaveEnabled(!autoSaveEnabled);
-		}), ()=>{
+		setWarnUnsavedChanges(autoSaveEnabled);
-			localStorage.setItem('AUTOSAVE_ON', JSON.stringify(this.state.autoSave));
+	};
-		});
-	},
 
-	setAutosaveWarning : function(){
+	const renderAutoSaveButton = ()=>(
-		setTimeout(()=>this.setState({ autoSaveWarning: false }), 4000);                           // 4 seconds to display
+		<Nav.item onClick={toggleAutoSave}>
-		this.warningTimer = setTimeout(()=>{this.setState({ autoSaveWarning: true });}, 900000);   // 15 minutes between warnings
+			Autosave <i className={autoSaveEnabled ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
-		this.warningTimer;
+		</Nav.item>
-	},
+	);
 
-	errorReported : function(error) {
+	const clearError = ()=>{
-		this.setState({
+		setError(null);
-			error
+		setIsSaving(false);
-		});
+	};
-	},
-
-	renderAutoSaveButton : function(){
-		return <Nav.item onClick={this.handleAutoSave}>
-			Autosave <i className={this.state.autoSave ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
-		</Nav.item>;
-	},
-
-	processShareId : function() {
-		return this.state.brew.googleId && !this.state.brew.stubbed ?
-					 this.state.brew.googleId + this.state.brew.shareId :
-					 this.state.brew.shareId;
-	},
-
-	getRedditLink : function(){
-
-		const shareLink = this.processShareId();
-		const systems = this.props.brew.systems.length > 0 ? ` [${this.props.brew.systems.join(' - ')}]` : '';
-		const title = `${this.props.brew.title} ${systems}`;
-		const text = `Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
-
-**[Homebrewery Link](${global.config.baseUrl}/share/${shareLink})**`;
-
-		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title.toWellFormed())}&text=${encodeURIComponent(text)}`;
-	},
-
-	clearError : function(){
-		setState({
-			error    : null,
-			isSaving : false
-		})
-	},
-
-	renderNavbar : function(){
-		const shareLink = this.processShareId();
 
+	const renderNavbar = ()=>{
 		return <Navbar>
 			<Nav.section>
-				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
+				<Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
 			</Nav.section>
 
 			<Nav.section>
-				{this.renderGoogleDriveIcon()}
+				{renderGoogleDriveIcon()}
-				{this.state.error ?
+				{error
-					<ErrorNavItem error={this.state.error} clearError={this.clearError}></ErrorNavItem> :
+					? <ErrorNavItem error={error} clearError={clearError} />
-					<Nav.dropdown className='save-menu'>
+					: <Nav.dropdown className='save-menu'>
-						{this.renderSaveButton()}
+						{renderSaveButton()}
-						{this.renderAutoSaveButton()}
+						{renderAutoSaveButton()}
-					</Nav.dropdown>
+					</Nav.dropdown>}
-				}
+				<NewBrewItem/>
-				<NewBrew />
 				<HelpNavItem/>
-				<Nav.dropdown>
+				<ShareNavItem brew={currentBrew} />
-					<Nav.item color='teal' icon='fas fa-share-alt'>
-						share
-					</Nav.item>
-					<Nav.item color='blue' href={`/share/${shareLink}`}>
-						view
-					</Nav.item>
-					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${shareLink}`);}}>
-						copy url
-					</Nav.item>
-					<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>
-						post to reddit
-					</Nav.item>
-				</Nav.dropdown>
 				<PrintNavItem />
 				<VaultNavItem />
-				<RecentNavItem brew={this.state.brew} storageKey='edit' />
+				<RecentNavItem brew={currentBrew} storageKey='edit' />
-				<Account />
+				<AccountNavItem/>
 			</Nav.section>
-
 		</Navbar>;
-	},
+	};
 
-	render : function(){
+	return (
-		return <div className='editPage sitePage'>
+		<div className='editPage sitePage'>
 			<Meta name='robots' content='noindex, nofollow' />
-			{this.renderNavbar()}
 
-			{this.props.brew.lock && <LockNotification shareId={this.props.brew.shareId} message={this.props.brew.lock.editMessage} reviewRequested={this.props.brew.lock.reviewRequested} />}
+			{renderNavbar()}
+
+			{currentBrew.lock && <LockNotification shareId={currentBrew.shareId} message={currentBrew.lock.editMessage} reviewRequested={currentBrew.lock.reviewRequested}/>}
+
 			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove}>
+				<SplitPane onDragFinish={handleSplitMove}>
 					<Editor
-						ref={this.editor}
+						ref={editorRef}
-						brew={this.state.brew}
+						brew={currentBrew}
-						onTextChange={this.handleTextChange}
+						onBrewChange={handleBrewChange}
-						onStyleChange={this.handleStyleChange}
+						reportError={setError}
-						onSnipChange={this.handleSnipChange}
+						renderer={currentBrew.renderer}
-						onMetaChange={this.handleMetaChange}
+						userThemes={props.userThemes}
-						reportError={this.errorReported}
+						themeBundle={themeBundle}
-						renderer={this.state.brew.renderer}
+						updateBrew={updateBrew}
-						userThemes={this.props.userThemes}
+						onCursorPageChange={handleEditorCursorPageChange}
-						themeBundle={this.state.themeBundle}
+						onViewPageChange={handleEditorViewPageChange}
-						updateBrew={this.updateBrew}
+						currentEditorViewPageNum={currentEditorViewPageNum}
-						onCursorPageChange={this.handleEditorCursorPageChange}
+						currentEditorCursorPageNum={currentEditorCursorPageNum}
-						onViewPageChange={this.handleEditorViewPageChange}
+						currentBrewRendererPageNum={currentBrewRendererPageNum}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
-						text={this.state.brew.text}
+						text={currentBrew.text}
-						style={this.state.brew.style}
+						style={currentBrew.style}
-						renderer={this.state.brew.renderer}
+						renderer={currentBrew.renderer}
-						theme={this.state.brew.theme}
+						theme={currentBrew.theme}
-						themeBundle={this.state.themeBundle}
+						themeBundle={themeBundle}
-						errors={this.state.htmlErrors}
+						errors={HTMLErrors}
-						lang={this.state.brew.lang}
+						lang={currentBrew.lang}
-						onPageChange={this.handleBrewRendererPageChange}
+						onPageChange={handleBrewRendererPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
+						currentEditorViewPageNum={currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
+						currentEditorCursorPageNum={currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
+						currentBrewRendererPageNum={currentBrewRendererPageNum}
 						allowPrint={true}
 					/>
 				</SplitPane>
 			</div>
-		</div>;
+		</div>
-	}
+	);
-});
+};
 
 module.exports = EditPage;

client/homebrew/pages/homePage/homePage.jsx

@@ -3,6 +3,7 @@ import './homePage.less';
 import React                           from 'react';
 import { useEffect, useState, useRef } from 'react';
 import request                         from '../../utils/request-middleware.js';
+import Markdown                        from 'naturalcrit/markdown.js';
 import { Meta }                        from 'vitreum/headtags';
 
 import Nav                             from 'naturalcrit/nav/nav.jsx';
@@ -21,6 +22,11 @@ import BrewRenderer                    from '../../brewRenderer/brewRenderer.jsx
 
 import { DEFAULT_BREW }                from '../../../../server/brewDefaults.js';
 
+const BREWKEY  = 'homebrewery-new';
+const STYLEKEY = 'homebrewery-new-style';
+const SNIPKEY  = 'homebrewery-new-snippets';
+const METAKEY  = 'homebrewery-new-meta';
+
 const HomePage =(props)=>{
 	props = {
 		brew : DEFAULT_BREW,
@@ -28,9 +34,10 @@ const HomePage =(props)=>{
     ...props
   };
 
-	const [brew                      , setBrew]                       = useState(props.brew);
+	const [currentBrew               , setCurrentBrew]                = useState(props.brew);
 	const [welcomeText               , setWelcomeText]                = useState(props.brew.text);
 	const [error                     , setError]                      = useState(undefined);
+	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
 	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum]   = useState(1);
 	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
 	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
@@ -39,13 +46,15 @@ const HomePage =(props)=>{
 
 	const editorRef = useRef(null);
 
+	const useLocalStorage = false;
+
 	useEffect(()=>{
-		fetchThemeBundle(setError, setThemeBundle, brew.renderer, brew.theme);
+		fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
 	}, []);
 
 	const save = ()=>{
 		request.post('/api')
-			.send(brew)
+			.send(currentBrew)
 			.end((err, res)=>{
 				if(err) {
 					setError(err);
@@ -72,8 +81,27 @@ const HomePage =(props)=>{
 		setCurrentBrewRendererPageNum(pageNumber);
 	};
 
-	const handleTextChange = (text)=>{
+	const handleBrewChange = (field) => (value, subfield) => {	//'text', 'style', 'snippets', 'metadata'
-		setBrew((prevBrew) => ({ ...prevBrew, text }));
+		if (subfield == 'renderer' || subfield == 'theme')
+			fetchThemeBundle(setError, setThemeBundle, value.renderer, value.theme);
+
+		//If there are HTML errors, run the validator on every change to give quick feedback
+		if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
+			setHTMLErrors(Markdown.validate(value));
+
+		if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
+		else                    setCurrentBrew(prev => ({ ...prev, [field]: value }));
+
+		if(useLocalStorage) {
+			if(field == 'text')     localStorage.setItem(BREWKEY, value);
+			if(field == 'style')    localStorage.setItem(STYLEKEY, value);
+			if(field == 'snippets') localStorage.setItem(SNIPKEY, value);
+			if(field == 'metadata') localStorage.setItem(METAKEY, JSON.stringify({
+				renderer : value.renderer,
+				theme    : value.theme,
+				lang     : value.lang
+			}));
+		}
 	};
 
 	const clearError = ()=>{
@@ -105,9 +133,9 @@ const HomePage =(props)=>{
 				<SplitPane onDragFinish={handleSplitMove}>
 					<Editor
 						ref={editorRef}
-						brew={brew}
+						brew={currentBrew}
-						onTextChange={handleTextChange}
+						onBrewChange={handleBrewChange}
-						renderer={brew.renderer}
+						renderer={currentBrew.renderer}
 						showEditButtons={false}
 						themeBundle={themeBundle}
 						onCursorPageChange={handleEditorCursorPageChange}
@@ -117,9 +145,9 @@ const HomePage =(props)=>{
 						currentBrewRendererPageNum={currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
-						text={brew.text}
+						text={currentBrew.text}
-						style={brew.style}
+						style={currentBrew.style}
-						renderer={brew.renderer}
+						renderer={currentBrew.renderer}
 						onPageChange={handleBrewRendererPageChange}
 						currentEditorViewPageNum={currentEditorViewPageNum}
 						currentEditorCursorPageNum={currentEditorCursorPageNum}
@@ -128,7 +156,7 @@ const HomePage =(props)=>{
 					/>
 				</SplitPane>
 			</div>
-			<div className={`floatingSaveButton${welcomeText !== brew.text ? ' show' : ''}`} onClick={save}>
+			<div className={`floatingSaveButton${welcomeText !== currentBrew.text ? ' show' : ''}`} onClick={save}>
 				Save current <i className='fas fa-save' />
 			</div>
 

client/homebrew/pages/newPage/newPage.jsx

@@ -22,12 +22,13 @@ import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '.
 
 const BREWKEY  = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
+const SNIPKEY  = 'homebrewery-new-snippets';
 const METAKEY  = 'homebrewery-new-meta';
-const SAVEKEY  = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`;
+const SAVEKEYPREFIX  = 'HOMEBREWERY-DEFAULT-SAVE-LOCATION-';
 
-const NewPage = (props)=>{
+const NewPage = (props) => {
 	props = {
-		brew : DEFAULT_BREW,
+		brew: DEFAULT_BREW,
 		...props
 	};
 
@@ -43,12 +44,14 @@ const NewPage = (props)=>{
 
 	const editorRef = useRef(null);
 
-	useEffect(()=>{
+	const useLocalStorage = true;
+
+	useEffect(() => {
 		document.addEventListener('keydown', handleControlKeys);
 		loadBrew();
 		fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
 
-		return ()=>{
+		return () => {
 			document.removeEventListener('keydown', handleControlKeys);
 		};
 	}, []);
@@ -67,6 +70,7 @@ const NewPage = (props)=>{
 			brew.lang     = metaStorage?.lang     ?? brew.lang;
 		}
 
+		const SAVEKEY = `${SAVEKEYPREFIX}${global.account?.username}`;
 		const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY';
 
 		setCurrentBrew(brew);
@@ -80,13 +84,13 @@ const NewPage = (props)=>{
 			window.history.replaceState({}, window.location.title, '/new/');
 	};
 
-	const handleControlKeys = (e)=>{
+	const handleControlKeys = (e) => {
-		if(!(e.ctrlKey || e.metaKey)) return;
+		if (!(e.ctrlKey || e.metaKey)) return;
 		const S_KEY = 83;
 		const P_KEY = 80;
-		if(e.keyCode === S_KEY) save();
+		if (e.keyCode === S_KEY) save();
-		if(e.keyCode === P_KEY) printCurrentBrew();
+		if (e.keyCode === P_KEY) printCurrentBrew();
-		if(e.keyCode === S_KEY || e.keyCode === P_KEY) {
+		if (e.keyCode === S_KEY || e.keyCode === P_KEY) {
 			e.preventDefault();
 			e.stopPropagation();
 		}
@@ -99,55 +103,42 @@ const NewPage = (props)=>{
 	const handleEditorViewPageChange = (pageNumber)=>{
 		setCurrentEditorViewPageNum(pageNumber);
 	};
-
+	
 	const handleEditorCursorPageChange = (pageNumber)=>{
 		setCurrentEditorCursorPageNum(pageNumber);
 	};
-
+	
 	const handleBrewRendererPageChange = (pageNumber)=>{
 		setCurrentBrewRendererPageNum(pageNumber);
 	};
 
-	const handleTextChange = (text)=>{
+	const handleBrewChange = (field) => (value, subfield) => {	//'text', 'style', 'snippets', 'metadata'
+		if (subfield == 'renderer' || subfield == 'theme')
+			fetchThemeBundle(setError, setThemeBundle, value.renderer, value.theme);
+
 		//If there are HTML errors, run the validator on every change to give quick feedback
-		if(HTMLErrors.length)
+		if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
-			HTMLErrors = Markdown.validate(text);
+			setHTMLErrors(Markdown.validate(value));
 
-		setHTMLErrors(HTMLErrors);
+		if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
-		setCurrentBrew((prevBrew)=>({ ...prevBrew, text }));
+		else                    setCurrentBrew(prev => ({ ...prev, [field]: value }));
-		localStorage.setItem(BREWKEY, text);
+
+		if(useLocalStorage) {
+			if(field == 'text')     localStorage.setItem(BREWKEY, value);
+			if(field == 'style')    localStorage.setItem(STYLEKEY, value);
+			if(field == 'snippets') localStorage.setItem(SNIPKEY, value);
+			if(field == 'metadata') localStorage.setItem(METAKEY, JSON.stringify({
+				renderer : value.renderer,
+				theme    : value.theme,
+				lang     : value.lang
+			}));
+		}
 	};
 
-	const handleStyleChange = (style)=>{
+	const save = async () => {
-		setCurrentBrew((prevBrew)=>({ ...prevBrew, style }));
-		localStorage.setItem(STYLEKEY, style);
-	};
-
-	const handleSnipChange = (snippet)=>{
-		//If there are HTML errors, run the validator on every change to give quick feedback
-		if(HTMLErrors.length)
-			HTMLErrors = Markdown.validate(snippet);
-
-		setHTMLErrors(HTMLErrors);
-		setCurrentBrew((prevBrew)=>({ ...prevBrew, snippets: snippet }));
-	};
-
-	const handleMetaChange = (metadata, field = undefined)=>{
-		if(field === 'theme' || field === 'renderer')
-			fetchThemeBundle(setError, setThemeBundle, metadata.renderer, metadata.theme);
-
-		setCurrentBrew((prev)=>({ ...prev, ...metadata }));
-		localStorage.setItem(METAKEY, JSON.stringify({
-			renderer : metadata.renderer,
-			theme    : metadata.theme,
-			lang     : metadata.lang
-		}));
-	};
-
-	const save = async ()=>{
   	setIsSaving(true);
 
-		const updatedBrew = { ...currentBrew };
+		let updatedBrew = { ...currentBrew };
 		splitTextStyleAndMetadata(updatedBrew);
 
 		const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^\\page$/gm;
@@ -156,13 +147,13 @@ const NewPage = (props)=>{
 		const res = await request
 			.post(`/api${saveGoogle ? '?saveToGoogle=true' : ''}`)
 			.send(updatedBrew)
-			.catch((err)=>{
+			.catch((err) => {
 				setIsSaving(false);
 				setError(err);
 			});
 
-		setIsSaving(false);
+		setIsSaving(false)
-		if(!res) return;
+		if (!res) return;
 
 		const savedBrew = res.body;
 
@@ -189,7 +180,7 @@ const NewPage = (props)=>{
 		setIsSaving(false);
 	};
 
-	const renderNavbar = ()=>(
+	const renderNavbar = () => (
 		<Navbar>
 			<Nav.section>
 				<Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
@@ -208,17 +199,14 @@ const NewPage = (props)=>{
 	);
 
 	return (
-		<div className='newPage sitePage'>
+			<div className='newPage sitePage'>
 			{renderNavbar()}
 			<div className='content'>
 				<SplitPane onDragFinish={handleSplitMove}>
 					<Editor
 						ref={editorRef}
 						brew={currentBrew}
-						onTextChange={handleTextChange}
+						onBrewChange={handleBrewChange}
-						onStyleChange={handleStyleChange}
-						onMetaChange={handleMetaChange}
-						onSnipChange={handleSnipChange}
 						renderer={currentBrew.renderer}
 						userThemes={props.userThemes}
 						themeBundle={themeBundle}

package.json

@@ -138,16 +138,16 @@
   "devDependencies": {
     "@stylistic/stylelint-plugin": "^4.0.0",
     "babel-plugin-transform-import-meta": "^2.3.3",
-    "eslint": "^9.34.0",
+    "eslint": "^9.35.0",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^16.3.0",
-    "jest": "^30.0.5",
+    "jest": "^30.1.3",
     "jest-expect-message": "^1.1.3",
     "jsdom-global": "^3.0.2",
     "postcss-less": "^6.0.0",
-    "stylelint": "^16.23.1",
+    "stylelint": "^16.24.0",
-    "stylelint-config-recess-order": "^7.2.0",
+    "stylelint-config-recess-order": "^7.3.0",
     "stylelint-config-recommended": "^17.0.0",
     "supertest": "^7.1.4"
   }

shared/naturalcrit/codeEditor/codeEditor.less

@@ -38,15 +38,6 @@
 		animation-duration : 0.4s;
 	}
 
-	.CodeMirror-vscrollbar {
-		&::-webkit-scrollbar { width : 20px; }
-		&::-webkit-scrollbar-thumb {
-			width      : 20px;
-			background : linear-gradient(90deg, #858585 15px, #808080 15px);
-		}
-	}
-
-
 	//.cm-tab {
 	//  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
 	//}

themes/V3/UnearthedArcana/settings.json

@@ -0,0 +1,6 @@
+{
+  "name" : "UnearthedArcana",
+  "renderer" : "V3",
+  "baseTheme" : false,
+  "baseSnippets" : false
+}

themes/V3/UnearthedArcana/style.less

@@ -0,0 +1,38 @@
+@import (less) './themes/fonts/5e/fonts.less';
+@import (less) './themes/assets/assets.less';
+
+:root {
+	//Colors
+	--HB_Color_Background            : #FFFFFF; // White
+	--HB_Color_WatercolorStain       : #000000; // Black
+}
+
+.page {
+	font-family: Cambria,Georgia,serif;
+	font-size: 14px;
+	h1, h2, h3, h4 {
+  		font-variant: small-caps;
+  		font-weight: normal;
+	}
+	h1 {
+		column-span: all;
+		-webkit-column-span: all;
+		font-size: 40px;
+	}
+	h2 {
+		font-size: 26px;
+	}
+	h3 {
+		font-size: 20px;
+		border-bottom: 2px solid black;
+	}
+	h4 {
+		font-size: 18px;
+	}
+	h5 {
+		font-size: 16px;
+	}
+	h6 {
+		font-size: 14px;
+	}
+}

themes/themes.json

@@ -35,6 +35,13 @@
       "baseTheme": "Blank",
       "baseSnippets": "5ePHB",
       "path": "Journal"
+    },
+    "UnearthedArcana": {
+      "name": "UnearthedArcana",
+      "renderer": "V3",
+      "baseTheme": false,
+      "baseSnippets": false,
+      "path": "UnearthedArcana"
     }
   }
 }