From d0fd2ac6743e5ce129298d383231ef05ba728df6 Mon Sep 17 00:00:00 2001 From: TrainDoctor Date: Wed, 24 Aug 2022 13:47:21 -0700 Subject: Move to using deckyState --- frontend/src/components/DeckyState.tsx | 6 +++++- frontend/src/components/settings/pages/general/Updater.tsx | 11 ++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'frontend/src') diff --git a/frontend/src/components/DeckyState.tsx b/frontend/src/components/DeckyState.tsx index 739da0e1..386880e9 100644 --- a/frontend/src/components/DeckyState.tsx +++ b/frontend/src/components/DeckyState.tsx @@ -66,6 +66,7 @@ export class DeckyState { } interface DeckyStateContext extends PublicDeckyState { + setIsLoaderUpdating(hasUpdate: boolean): void; setActivePlugin(name: string): void; closeActivePlugin(): void; } @@ -91,11 +92,14 @@ export const DeckyStateContextProvider: FC = ({ children, deckyState }) = return () => deckyState.eventBus.removeEventListener('update', onUpdate); }, []); + const setIsLoaderUpdating = (hasUpdate: boolean) => deckyState.setIsLoaderUpdating(hasUpdate); const setActivePlugin = (name: string) => deckyState.setActivePlugin(name); const closeActivePlugin = () => deckyState.closeActivePlugin(); return ( - + {children} ); diff --git a/frontend/src/components/settings/pages/general/Updater.tsx b/frontend/src/components/settings/pages/general/Updater.tsx index 4906c435..1e7c35af 100644 --- a/frontend/src/components/settings/pages/general/Updater.tsx +++ b/frontend/src/components/settings/pages/general/Updater.tsx @@ -3,13 +3,14 @@ import { useEffect, useState } from 'react'; import { FaArrowDown } from 'react-icons/fa'; import { VerInfo, callUpdaterMethod, finishUpdate } from '../../../../updater'; +import { useDeckyState } from '../../../DeckyState'; export default function UpdaterSettings() { const [versionInfo, setVersionInfo] = useState(null); + const [checkingForUpdates, setCheckingForUpdates] = useState(false); + const { isLoaderUpdating, setIsLoaderUpdating } = useDeckyState(); const [updateProgress, setUpdateProgress] = useState(-1); const [reloading, setReloading] = useState(false); - const [checkingForUpdates, setCheckingForUpdates] = useState(false); - const [loaderUpdating, setLoaderUpdating] = useState(false); useEffect(() => { (async () => { @@ -38,7 +39,7 @@ export default function UpdaterSettings() { > {updateProgress == -1 ? ( { @@ -51,12 +52,12 @@ export default function UpdaterSettings() { window.DeckyUpdater = { updateProgress: (i) => { setUpdateProgress(i); - setLoaderUpdating(true); + setIsLoaderUpdating(true); }, finish: async () => { setUpdateProgress(0); setReloading(true); - setLoaderUpdating(false); + setIsLoaderUpdating(false); await finishUpdate(); }, }; -- cgit v1.2.3