Convert useVoiceData() to TS, remove leftover enabledVoices stuff

Author: AbeJellinek

…/read-aloud/components/use-voice-data.js …/read-aloud/components/use-voice-data.tssrc/common/read-aloud/components/use-voice-data.js renamed to src/common/read-aloud/components/use-voice-data.ts src/common/read-aloud/components/use-voice-data.js renamed to src/common/read-aloud/components/use-voice-data.ts

@@ -1,17 +1,23 @@
 import { useEffect, useMemo, useState } from 'react';
 import { BrowserReadAloudProvider } from '../browser/provider';
+import { BrowserReadAloudVoice } from '../browser/voice';
+import { ErrorState } from '../controller';
 import { RemoteReadAloudProvider, RemoteVoicesError } from '../remote/provider';
-import { resolveLanguage } from '../lang';
-import { getSupportedLanguages } from '../voice';
+import { RemoteInterface } from '../remote';
+import { RemoteReadAloudVoice } from '../remote/voice';
+import { ReadAloudVoice, getSupportedLanguages } from '../voice';
 
 /**
  * Hook that loads all voices and manages language state.
  */
-export function useVoiceData({ lang, remoteInterface, persistedEnabledVoices }) {
-	let [allBrowserVoices, setAllBrowserVoices] = useState(null);
-	let [allRemoteVoices, setAllRemoteVoices] = useState(null);
-	let [browserVoicesError, setBrowserVoicesError] = useState(null);
-	let [remoteVoicesError, setRemoteVoicesError] = useState(null);
+export function useVoiceData({ lang, remoteInterface }: {
+	lang: string;
+	remoteInterface?: RemoteInterface;
+}) {
+	let [allBrowserVoices, setAllBrowserVoices] = useState<BrowserReadAloudVoice[] | null>(null);
+	let [allRemoteVoices, setAllRemoteVoices] = useState<RemoteReadAloudVoice[] | null>(null);
+	let [browserVoicesError, setBrowserVoicesError] = useState<ErrorState | null>(null);
+	let [remoteVoicesError, setRemoteVoicesError] = useState<ErrorState | null>(null);
 	let [selectedLang, setSelectedLang] = useState(lang);
 
 	// Fetch browser voices
@@ -35,15 +41,17 @@ export function useVoiceData({ lang, remoteInterface, persistedEnabledVoices })
 			}
 		}
 		fetchVoices();
-		return () => cancelled = true;
+		return () => {
+			cancelled = true;
+		};
 	}, []);
 
 	// Fetch remote voices
 	useEffect(() => {
 		if (!remoteInterface) return undefined;
 		let cancelled = false;
 		async function fetchVoices() {
-			let remoteProvider = new RemoteReadAloudProvider(remoteInterface);
+			let remoteProvider = new RemoteReadAloudProvider(remoteInterface!);
 			try {
 				let voices = await remoteProvider.getVoices();
 				if (!cancelled) {
@@ -60,12 +68,14 @@ export function useVoiceData({ lang, remoteInterface, persistedEnabledVoices })
 			}
 		}
 		fetchVoices();
-		return () => cancelled = true;
+		return () => {
+			cancelled = true;
+		};
 	}, [remoteInterface]);
 
 	let loaded = allBrowserVoices !== null && (allRemoteVoices !== null || !remoteInterface);
 
-	let allVoices = useMemo(
+	let allVoices: ReadAloudVoice[] = useMemo(
 		() => [...(allRemoteVoices || []), ...(allBrowserVoices || [])],
 		[allRemoteVoices, allBrowserVoices]
 	);
@@ -75,13 +85,6 @@ export function useVoiceData({ lang, remoteInterface, persistedEnabledVoices })
 		[allVoices]
 	);
 
-	let enabledVoices = useMemo(() => {
-		if (!persistedEnabledVoices) return null;
-		let resolvedLang = resolveLanguage(selectedLang, [...persistedEnabledVoices.keys()]);
-		if (!resolvedLang) return null;
-		return persistedEnabledVoices.get(resolvedLang) ?? null;
-	}, [persistedEnabledVoices, selectedLang]);
-
 	return {
 		allBrowserVoices,
 		allRemoteVoices,
@@ -92,7 +95,6 @@ export function useVoiceData({ lang, remoteInterface, persistedEnabledVoices })
 		selectedLang,
 		availableLanguages,
 		effectiveLang: selectedLang,
-		enabledVoices,
 		handleLangChange: setSelectedLang,
 	};
 }

src/index.read-aloud-first-run.js

@@ -22,7 +22,6 @@ window.createReadAloudFirstRun = (options) => {
 
 	let popupRef = createRef();
 	let root = createRoot(document.getElementById('read-aloud-first-run'));
-	let enabledVoices = new Map(Object.entries(options.readAloudEnabledVoices || {}));
 
 	function render() {
 		root.render(
@@ -33,7 +32,6 @@ window.createReadAloudFirstRun = (options) => {
 					lang={options.lang}
 					remoteInterface={options.remoteInterface}
 					loggedIn={options.loggedIn}
-					persistedEnabledVoices={enabledVoices}
 					onOpenVoicesPopup={options.onOpenVoicesPopup}
 					onPurchaseCredits={options.onPurchaseCredits}
 					onLogIn={options.onLogIn}
@@ -51,12 +49,5 @@ window.createReadAloudFirstRun = (options) => {
 		return pendingResult;
 	};
 
-	// Exposed so the parent can push updated enabled voices
-	// (e.g. after the Manage Voices dialog closes)
-	window.updateEnabledVoices = (data) => {
-		enabledVoices = new Map(Object.entries(data || {}));
-		render();
-	};
-
 	flushSync(() => render());
 };