From 5d8279cc0df59ed79f49588524d3d2d2c054ac49 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 5 Jan 2022 21:22:01 -0500 Subject: [PATCH] more plumbing --- fakeyou/src/App.tsx | 12 ++ fakeyou/src/AppWrapper.tsx | 17 ++- fakeyou/src/v2/view/NewVocodesContainer.tsx | 11 ++ .../tts_model_list/MultiDropdownSearch.tsx | 119 ++++++++++-------- .../tts/tts_model_list/TtsModelListFc.tsx | 11 ++ 5 files changed, 111 insertions(+), 59 deletions(-) diff --git a/fakeyou/src/App.tsx b/fakeyou/src/App.tsx index abb390c015..b094648b22 100644 --- a/fakeyou/src/App.tsx +++ b/fakeyou/src/App.tsx @@ -38,6 +38,12 @@ interface Props { allTtsCategoriesByTokenMap: Map, allTtsModelsByTokenMap: Map, + ttsModelsByCategoryToken: Map>, + + dropdownCategories: TtsCategory[][], + setDropdownCategories: (dropdownCategories: TtsCategory[][]) => void, + selectedCategories: TtsCategory[], + setSelectedCategories: (selectedCategories: TtsCategory[]) => void, } interface State { @@ -456,6 +462,12 @@ class App extends React.Component { allTtsCategoriesByTokenMap={this.props.allTtsCategoriesByTokenMap} allTtsModelsByTokenMap={this.props.allTtsModelsByTokenMap} + ttsModelsByCategoryToken={this.props.ttsModelsByCategoryToken} + + dropdownCategories={this.props.dropdownCategories} + setDropdownCategories={this.props.setDropdownCategories} + selectedCategories={this.props.selectedCategories} + setSelectedCategories={this.props.setSelectedCategories} currentTtsModelSelected={this.state.currentTtsModelSelected} setCurrentTtsModelSelected={this.setCurrentTtsModelSelected} diff --git a/fakeyou/src/AppWrapper.tsx b/fakeyou/src/AppWrapper.tsx index f37cc6901a..11ae196a7e 100644 --- a/fakeyou/src/AppWrapper.tsx +++ b/fakeyou/src/AppWrapper.tsx @@ -23,6 +23,12 @@ export function AppWrapper(props: Props) { const [allCategoriesByTokenMap, setAllCategoriesByTokenMap] = useState>(new Map()); const [allTtsModelsByTokenMap, setAllTtsModelsByTokenMap] = useState>(new Map()); + // Lookup by foreign key + // A TTS voice is attached to every category up the tree from the leaf. + // We recursively build this, 1) to ensure we can access a voice at all levels + // of specificity, and 2) to prune empty categories. + const [ttsModelsByCategoryToken, setTtsModelsByCategoryToken] = useState>>(new Map()); + // Outer array has length of at least one, one element per - // Inner array contains the categories in each level. - // Structure: [dropdownLevel][categories] - const [dropdownCategories, setDropdownCategories] = useState([]); +// // Outer array has length of at least one, one element per