diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 7cc3c7ef6..2a35f81bd 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -51,7 +51,6 @@ const EditPage = (props)=>{ const [currentBrew, setCurrentBrew] = useState(props.brew); const [saveGoogle, setSaveGoogle] = useState(!!props.brew.googleId); const [error, setError] = useState(null); - const [HTMLErrors, setHTMLErrors] = useState(hbfm.validate(props.brew.text)); const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed); const [alertNoGoogleToTransfer, setAlertNoGoogleToTransfer] = useState(false); const [alertOwnershipToTransfer, setAlertOwnershipToTransfer] = useState(false); @@ -90,8 +89,6 @@ const EditPage = (props)=>{ }; const save = async (brew, saveToGoogle)=>{ - setHTMLErrors(hbfm.validate(brew.text)); - await updateHistory(brew).catch(console.error); await versionHistoryGarbageCollection().catch(console.error); @@ -217,8 +214,6 @@ const EditPage = (props)=>{ }; const { - handleSplitMove, - handleBrewChange, toggleAutoSave, clearError, renderSaveButton, @@ -229,8 +224,6 @@ const EditPage = (props)=>{ } = useCommonEditPageFunctions({ saveGoogle, setError, - HTMLErrors, - setHTMLErrors, currentBrew, setCurrentBrew, useLocalStorage, diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index 8364c533f..f3b734bfb 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -46,7 +46,6 @@ const HomePage =(props)=>{ const [currentBrew, setCurrentBrew] = useState(props.brew); const [saveGoogle, setSaveGoogle] = useState(global.account?.googleId ? true : false); const [error, setError] = useState(undefined); - const [HTMLErrors, setHTMLErrors] = useState(hbfm.validate(props.brew.text)); const lastSavedBrew = useRef(_.cloneDeep(props.brew)); @@ -82,18 +81,12 @@ const HomePage =(props)=>{ }; const { - handleSplitMove, - handleBrewChange, clearError, renderSaveButton, - renderPanels, - unsavedChanges, - trySave + renderPanels } = useCommonEditPageFunctions({ saveGoogle, setError, - HTMLErrors, - setHTMLErrors, currentBrew, setCurrentBrew, useLocalStorage, diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 18fb4a521..ca65c17bb 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -46,7 +46,6 @@ const NewPage = (props)=>{ const [currentBrew, setCurrentBrew] = useState(props.brew); const [saveGoogle, setSaveGoogle] = useState(global.account?.googleId ? true : false); const [error, setError] = useState(null); - const [HTMLErrors, setHTMLErrors] = useState(hbfm.validate(props.brew.text)); const lastSavedBrew = useRef(_.cloneDeep(props.brew)); @@ -131,16 +130,12 @@ const NewPage = (props)=>{ ); const { - handleSplitMove, - handleBrewChange, clearError, renderSaveButton, renderPanels } = useCommonEditPageFunctions({ saveGoogle, setError, - HTMLErrors, - setHTMLErrors, currentBrew, setCurrentBrew, useLocalStorage, diff --git a/client/homebrew/utils/commonEditPageFunctions.jsx b/client/homebrew/utils/commonEditPageFunctions.jsx index c8badf858..ac7d804bc 100644 --- a/client/homebrew/utils/commonEditPageFunctions.jsx +++ b/client/homebrew/utils/commonEditPageFunctions.jsx @@ -20,8 +20,6 @@ export default function useCommonEditPageFunctions(dependencies) { const { saveGoogle, setError, - HTMLErrors, - setHTMLErrors, currentBrew, setCurrentBrew, useLocalStorage, @@ -40,12 +38,13 @@ export default function useCommonEditPageFunctions(dependencies) { userThemes = {} } = dependencies; - const [isSaving, setIsSaving] = useState(false); - const [lastSavedTime, setLastSavedTime] = useState(new Date()); - const [autoSaveEnabled, setAutoSaveEnabled] = useState(!sandbox); + const [isSaving, setIsSaving] = useState(false); + const [lastSavedTime, setLastSavedTime] = useState(new Date()); + const [autoSaveEnabled, setAutoSaveEnabled] = useState(!sandbox); const [warnUnsavedChanges, setWarnUnsavedChanges] = useState(true); - const [unsavedChanges, setUnsavedChanges] = useState(false); - const [themeBundle, setThemeBundle] = useState({}); + const [unsavedChanges, setUnsavedChanges] = useState(false); + const [themeBundle, setThemeBundle] = useState({}); + const [HTMLErrors, setHTMLErrors] = useState(hbfm.validate(currentBrew.text)); const [currentEditorViewPageNum, setCurrentEditorViewPageNum] = useState(1); const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1); @@ -61,7 +60,6 @@ export default function useCommonEditPageFunctions(dependencies) { const autoSavePref = !sandbox && JSON.parse(localStorage.getItem(AUTOSAVE_KEY) ?? true); setAutoSaveEnabled(autoSavePref); setWarnUnsavedChanges(!autoSavePref); - setHTMLErrors(hbfm.validate(currentBrew.text)); fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme); const handleControlKeys = (e)=>{ @@ -148,6 +146,7 @@ export default function useCommonEditPageFunctions(dependencies) { saveTimeout.current = setTimeout(async ()=>{ setIsSaving(true); setError(null); + setHTMLErrors(hbfm.validate(currentBrew.text)); await save(currentBrew, saveToGoogle) .catch((err)=>{ setError(err);