fix: Non-browse game container should work

src/renderer/Util.ts

@@ -8,6 +8,9 @@ import * as path from 'path';
 import { GameOrderChangeEvent } from './components/GameOrder';
 import { Paths } from './Paths';
 import { ViewQuery } from './store/main/types';
+import { GameDragEventData } from './components/pages/BrowsePage';
+import { GameGridItem } from './components/GameGridItem';
+import { GameListItem } from './components/GameListItem';
 
 export const gameDragDataType = 'json/game-drag';
 
@@ -306,3 +309,13 @@ export function getBrowseSubPath(urlPath: string): string {
   }
   return '';
 }
+
+export function findGameDragEventDataGrid(element: EventTarget): GameDragEventData | undefined {
+  const game = findElementAncestor(element as Element, target => GameGridItem.isElement(target), true);
+  if (game) { return GameGridItem.getDragEventData(game); }
+}
+
+export function findGameDragEventDataList(element: EventTarget): GameDragEventData | undefined {
+  const game = findElementAncestor(element as Element, target => GameListItem.isElement(target), true);
+  if (game) { return GameListItem.getDragEventData(game); }
+}

src/renderer/components/RandomGames.tsx

@@ -3,7 +3,7 @@ import { LangContext } from '@renderer/util/lang';
 import { ViewGame } from '@shared/back/types';
 import { LOGOS } from '@shared/constants';
 import * as React from 'react';
-import { findElementAncestor, getExtremeIconURL, getGameImageURL } from '../Util';
+import { findGameDragEventDataGrid, getExtremeIconURL, getGameImageURL } from '../Util';
 import { GameGridItem } from './GameGridItem';
 import { GameItemContainer } from './GameItemContainer';
 import { HomePageBox } from './HomePageBox';
@@ -70,7 +70,7 @@ export function RandomGames(props: RandomGamesProps) {
         onGameContextMenu={onGameContextMenu}
         onGameSelect={onGameSelect}
         onGameLaunch={onLaunchGame}
-        findGameId={findGameId}>
+        findGameDragEventData={findGameDragEventDataGrid}>
         {gameItems}
       </GameItemContainer>
       <SimpleButton
@@ -89,13 +89,3 @@ export function RandomGames(props: RandomGamesProps) {
     </HomePageBox>
   );
 }
-
-/**
- * Try getting a game ID by checking an element and all of its ancestors.
- *
- * @param element Element or sub-element of a game.
- */
-function findGameId(element: EventTarget): string | undefined {
-  const game = findElementAncestor(element as Element, target => GameGridItem.isElement(target), true);
-  if (game) { return GameGridItem.getId(game); }
-}

src/renderer/components/pages/HomePage.tsx

@@ -15,7 +15,7 @@ import ReactMarkdown from 'react-markdown';
 import { Link } from 'react-router-dom';
 import remarkGfm from 'remark-gfm';
 import { Paths } from '../../Paths';
-import { getExtremeIconURL, getGameImageURL, getPlatformIconURL, joinLibraryRoute } from '../../Util';
+import { findGameDragEventDataGrid, getExtremeIconURL, getGameImageURL, getPlatformIconURL, joinLibraryRoute } from '../../Util';
 import { WithPreferencesProps } from '../../containers/withPreferences';
 import { WithSearchProps } from '../../containers/withSearch';
 import { LangContext } from '../../util/lang';
@@ -276,8 +276,10 @@ export function HomePage(props: HomePageProps) {
     if (selectedGotd) {
       window.Shared.back.request(BackIn.GET_GAME, selectedGotd.id)
       .then((fetchedInfo) => {
-        const game = fetchedInfo.game;
-        setLoadedGotd(game);
+        if (fetchedInfo) {
+          const game = fetchedInfo.game;
+          setLoadedGotd(game);
+        }
       });
     }
   }, [selectedGotd]);
@@ -301,7 +303,7 @@ export function HomePage(props: HomePageProps) {
                   onGameContextMenu={(event, gameId) => props.onGameContextMenu(gameId)}
                   onGameSelect={(event, gameId) => props.onGameSelect(gameId)}
                   onGameLaunch={(event, gameId) => props.onLaunchGame(gameId)}
-                  findGameId={() => loadedGotd.id}>
+                  findGameDragEventData={findGameDragEventDataGrid}>
                   <GameGridItem
                     key={loadedGotd.id}
                     id={loadedGotd.id}