Make install modal global with state moved to zustand

Author: arielj

src/frontend/App.tsx

@@ -19,6 +19,7 @@ import { ThemeProvider, createTheme } from '@mui/material/styles'
 import LogFileUploadDialog from './components/UI/LogFileUploadDialog'
 import UploadedLogFilesList from './screens/Settings/sections/LogSettings/components/UploadedLogFilesList'
 import { TourProvider } from './state/TourContext'
+import { InstallGameWrapper } from './screens/Library/components/InstallModal'
 
 function Root() {
   const {
@@ -61,6 +62,7 @@ function Root() {
                 type={isSettingsModalOpen.type}
               />
             )}
+            <InstallGameWrapper />
             <ExternalLinkDialog />
             <LogFileUploadDialog />
             <UploadedLogFilesList />

src/frontend/screens/Game/GamePage/index.tsx

@@ -39,7 +39,6 @@ import {
 import GamePicture from '../GamePicture'
 import TimeContainer from '../TimeContainer'
 
-import { InstallModal } from 'frontend/screens/Library/components'
 import { install } from 'frontend/helpers/library'
 import { hasProgress } from 'frontend/hooks/hasProgress'
 import ErrorComponent from 'frontend/components/UI/ErrorComponent'
@@ -72,6 +71,7 @@ import { hasHelp } from 'frontend/hooks/hasHelp'
 import Genres from './components/Genres'
 import ReleaseDate from './components/ReleaseDate'
 import { hasKnownFixes } from 'frontend/hooks/hasKnownFixes'
+import { openInstallGameModal } from 'frontend/state/InstallGameModal'
 
 export default React.memo(function GamePage(): JSX.Element | null {
   const { appName, runner } = useParams() as { appName: string; runner: Runner }
@@ -83,7 +83,6 @@ export default React.memo(function GamePage(): JSX.Element | null {
 
   const { gameInfo: locationGameInfo } = location.state
 
-  const [showModal, setShowModal] = useState({ game: '', show: false })
   const [showUninstallModal, setShowUninstallModal] = useState(false)
   const [wikiInfo, setWikiInfo] = useState<WikiInfo | null>(null)
 
@@ -263,7 +262,7 @@ export default React.memo(function GamePage(): JSX.Element | null {
   }
 
   function handleModal() {
-    setShowModal({ game: appName, show: true })
+    openInstallGameModal({ appName, runner, gameInfo })
   }
 
   let hasUpdate = false
@@ -374,14 +373,6 @@ export default React.memo(function GamePage(): JSX.Element | null {
               className="backgroundImage"
             />
           )}
-        {gameInfo.runner !== 'sideload' && showModal.show && (
-          <InstallModal
-            appName={showModal.game}
-            runner={runner}
-            backdropClick={() => setShowModal({ game: '', show: false })}
-            gameInfo={gameInfo}
-          />
-        )}
         {showUninstallModal && (
           <UninstallModal
             appName={appName}

src/frontend/screens/Game/GameSubMenu/index.tsx

@@ -9,10 +9,10 @@ import { useTranslation } from 'react-i18next'
 import ContextProvider from 'frontend/state/ContextProvider'
 import { NavLink } from 'react-router-dom'
 
-import { InstallModal } from 'frontend/screens/Library/components'
 import { CircularProgress } from '@mui/material'
 import UninstallModal from 'frontend/components/UI/UninstallModal'
 import GameContext from '../GameContext'
+import { openInstallGameModal } from 'frontend/state/InstallGameModal'
 
 interface Props {
   appName: string
@@ -59,7 +59,6 @@ export default function GamesSubmenu({
   const [hasShortcuts, setHasShortcuts] = useState(false)
   const [eosOverlayEnabled, setEosOverlayEnabled] = useState<boolean>(false)
   const [eosOverlayRefresh, setEosOverlayRefresh] = useState<boolean>(false)
-  const [showModal, setShowModal] = useState(false)
   const eosOverlayAppName = '98bc04bc842e4906993fd6d6644ffb8d'
   const [showUninstallModal, setShowUninstallModal] = useState(false)
   const [protonDBurl, setProtonDBurl] = useState(
@@ -147,7 +146,7 @@ export default function GamesSubmenu({
   }
 
   function handleEdit() {
-    setShowModal(true)
+    openInstallGameModal({ appName, runner, gameInfo })
   }
 
   async function handleEosOverlay() {
@@ -379,13 +378,6 @@ export default function GamesSubmenu({
           )}
         </div>
       </div>
-      {showModal && (
-        <InstallModal
-          appName={appName}
-          runner={runner}
-          backdropClick={() => setShowModal(false)}
-        />
-      )}
     </>
   )
 }

src/frontend/screens/Library/components/InstallModal/index.tsx

@@ -20,10 +20,13 @@ import WineSelector from './WineSelector'
 import { SelectField } from 'frontend/components/UI'
 import { useTranslation } from 'react-i18next'
 import ThirdPartyDialog from './ThirdPartyDialog'
+import {
+  closeInstallGameModal,
+  useInstallGameModal
+} from 'frontend/state/InstallGameModal'
 
 type Props = {
   appName: string
-  backdropClick: () => void
   runner: Runner
   gameInfo?: GameInfo | null
 }
@@ -35,12 +38,7 @@ export type AvailablePlatforms = {
   icon: IconDefinition
 }[]
 
-export default React.memo(function InstallModal({
-  appName,
-  backdropClick,
-  runner,
-  gameInfo = null
-}: Props) {
+function InstallModal({ appName, runner, gameInfo = null }: Props) {
   const { platform } = useContext(ContextProvider)
   const { t } = useTranslation('gamepage')
 
@@ -155,10 +153,12 @@ export default React.memo(function InstallModal({
   const showDownloadDialog = !isSideload && gameInfo
   const isThirdPartyManagedApp = gameInfo && !!gameInfo.thirdPartyManagedApp
 
+  const closeModal = () => closeInstallGameModal()
+
   return (
     <div className="InstallModal">
       <Dialog
-        onClose={backdropClick}
+        onClose={closeModal}
         showCloseButton
         className="InstallModal__dialog"
       >
@@ -169,7 +169,7 @@ export default React.memo(function InstallModal({
             winePrefix={winePrefix}
             wineVersion={wineVersion}
             availablePlatforms={availablePlatforms}
-            backdropClick={backdropClick}
+            backdropClick={closeModal}
             platformToInstall={platformToInstall}
             gameInfo={gameInfo}
             crossoverBottle={crossoverBottle}
@@ -197,7 +197,7 @@ export default React.memo(function InstallModal({
             winePrefix={winePrefix}
             wineVersion={wineVersion}
             availablePlatforms={availablePlatforms}
-            backdropClick={backdropClick}
+            backdropClick={closeModal}
             platformToInstall={platformToInstall}
             gameInfo={gameInfo}
             crossoverBottle={crossoverBottle}
@@ -223,7 +223,7 @@ export default React.memo(function InstallModal({
             winePrefix={winePrefix}
             wineVersion={wineVersion}
             availablePlatforms={availablePlatforms}
-            backdropClick={backdropClick}
+            backdropClick={closeModal}
             platformToInstall={platformToInstall}
             appName={appName}
             crossoverBottle={crossoverBottle}
@@ -246,4 +246,20 @@ export default React.memo(function InstallModal({
       </Dialog>
     </div>
   )
-})
+}
+
+export function InstallGameWrapper() {
+  const installGameModalState = useInstallGameModal()
+
+  if (!installGameModalState.isOpen) {
+    return <></>
+  }
+
+  return (
+    <InstallModal
+      appName={installGameModalState.appName!}
+      runner={installGameModalState.runner!}
+      gameInfo={installGameModalState.gameInfo}
+    />
+  )
+}

src/frontend/screens/Library/components/index.tsx

@@ -27,23 +27,16 @@ import {
   sideloadedCategories
 } from 'frontend/helpers/library'
 import RecentlyPlayed from './components/RecentlyPlayed'
-import { InstallModal } from './components'
 import LibraryContext from './LibraryContext'
 import { Category, PlatformsFilters, StoresFilters } from 'frontend/types'
 import { hasHelp } from 'frontend/hooks/hasHelp'
 import EmptyLibraryMessage from './components/EmptyLibrary'
 import CategoriesManager from './components/CategoriesManager'
 import LibraryTour from './components/LibraryTour'
+import { openInstallGameModal } from 'frontend/state/InstallGameModal'
 
 const storage = window.localStorage
 
-type ModalState = {
-  game: string
-  show: boolean
-  runner: Runner
-  gameInfo: GameInfo | null
-}
-
 export default React.memo(function Library(): JSX.Element {
   const { t } = useTranslation()
 
@@ -181,12 +174,6 @@ export default React.memo(function Library(): JSX.Element {
 
   const [showCategories, setShowCategories] = useState(false)
 
-  const [showModal, setShowModal] = useState<ModalState>({
-    game: '',
-    show: false,
-    runner: 'legendary',
-    gameInfo: null
-  })
   const [sortDescending, setSortDescending] = useState(
     JSON.parse(storage?.getItem('sortDescending') || 'false')
   )
@@ -246,7 +233,7 @@ export default React.memo(function Library(): JSX.Element {
     runner: Runner,
     gameInfo: GameInfo | null
   ) {
-    setShowModal({ game: appName, show: true, runner, gameInfo })
+    openInstallGameModal({ appName, runner, gameInfo })
   }
 
   // cache list of games being installed
@@ -666,22 +653,6 @@ export default React.memo(function Library(): JSX.Element {
         <ArrowDropUp id="backToTopArrow" className="material-icons" />
       </button>
 
-      {showModal.show && (
-        <InstallModal
-          appName={showModal.game}
-          runner={showModal.runner}
-          gameInfo={showModal.gameInfo}
-          backdropClick={() =>
-            setShowModal({
-              game: '',
-              show: false,
-              runner: 'legendary',
-              gameInfo: null
-            })
-          }
-        />
-      )}
-
       {showCategories && <CategoriesManager />}
     </LibraryContext.Provider>
   )

src/frontend/screens/Library/index.tsx

@@ -23,7 +23,6 @@ import { getGameInfo, getLegendaryConfig, notify } from '../helpers'
 import { i18n, t, TFunction } from 'i18next'
 
 import ContextProvider from './ContextProvider'
-import { InstallModal } from 'frontend/screens/Library/components'
 
 import {
   configStore,
@@ -964,7 +963,6 @@ class GlobalState extends PureComponent<Props> {
 
   render() {
     const {
-      showInstallModal,
       language,
       epic,
       gog,
@@ -1060,18 +1058,6 @@ class GlobalState extends PureComponent<Props> {
         }}
       >
         {this.props.children}
-        {showInstallModal.show && (
-          <InstallModal
-            appName={showInstallModal.appName}
-            runner={showInstallModal.runner}
-            gameInfo={showInstallModal.gameInfo}
-            backdropClick={() =>
-              this.setState({
-                showInstallModal: { ...showInstallModal, show: false }
-              })
-            }
-          />
-        )}
       </ContextProvider.Provider>
     )
   }

src/frontend/state/GlobalState.tsx

@@ -0,0 +1,38 @@
+import { GameInfo, Runner } from 'common/types'
+import { create } from 'zustand'
+
+interface InstallGameModalState {
+  isOpen: boolean
+  appName?: string
+  runner?: Runner
+  gameInfo: GameInfo | null
+}
+
+export const useInstallGameModal = create<InstallGameModalState>()(() => ({
+  isOpen: false,
+  gameInfo: null
+}))
+
+interface OpenInstallGameModalParams {
+  appName: string
+  runner: Runner
+  gameInfo: GameInfo | null
+}
+export const openInstallGameModal = ({
+  appName,
+  runner,
+  gameInfo
+}: OpenInstallGameModalParams) => {
+  useInstallGameModal.setState({
+    isOpen: true,
+    appName,
+    runner,
+    gameInfo
+  })
+}
+
+export const closeInstallGameModal = () => {
+  useInstallGameModal.setState({
+    isOpen: false
+  })
+}