Skip to content

Add fullscreen toggle for mini map #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YoavTC wants to merge 1 commit into
base: casual
Choose a base branch
from
+17 −8
Open

Add fullscreen toggle for mini map #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions components/gameUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useState, useRef } from "react"
import { useEffect, useState, useRef, useCallback } from "react"
import dynamic from "next/dynamic";
import { FaMap } from "react-icons/fa";
import useWindowDimensions from "./useWindowDimensions";
Expand Down Expand Up @@ -398,6 +398,15 @@ export default function GameUI({ inCoolMathGames, inGameDistribution, miniMapSho
}
}, [onboarding?.round])

const toggleMiniMapFullscreen = useCallback(() => {
setMiniMapFullscreen((prev) => {
if (!prev) {
setMiniMapExpanded(true)
}
return !prev
})
}, [])


useEffect(() => {
function keydown(e) {
Expand All @@ -409,6 +418,10 @@ export default function GameUI({ inCoolMathGames, inGameDistribution, miniMapSho
if(explanationModalShown) return;
// Don't handle space during onboarding completion - let home button handle it
if(onboarding?.completed) return;
if((e.key === 'm' || e.key === 'M') && !e.repeat && !showAnswer) {
toggleMiniMapFullscreen()
return;
}
if(singlePlayerRound?.done && e.key === ' ') {
loadLocationFunc()
return;
Expand All @@ -424,7 +437,7 @@ export default function GameUI({ inCoolMathGames, inGameDistribution, miniMapSho
return () => {
document.removeEventListener('keydown', keydown);
}
}, [pinPoint, showAnswer, onboarding, explanationModalShown, singlePlayerRound])
}, [pinPoint, showAnswer, onboarding, explanationModalShown, singlePlayerRound, toggleMiniMapFullscreen])

useEffect(() => {
if (!loading && latLong && width > 600 && !isTouchScreen) {
Expand All @@ -442,6 +455,7 @@ export default function GameUI({ inCoolMathGames, inGameDistribution, miniMapSho
setHintShown(true);
setHintsUsedThisGame((prev) => prev + 1);
}

useEffect(() => {
loadLocation()
if(singlePlayerRound) {
Expand Down Expand Up @@ -653,12 +667,7 @@ session={session}/>

{!showAnswer && (
<div className="mapCornerBtns desktop" style={{ visibility: miniMapExpanded ? 'visible' : 'hidden' }}>
<button className="cornerBtn" onClick={() => {
setMiniMapFullscreen(!miniMapFullscreen)
if(!miniMapFullscreen) {
setMiniMapExpanded(true)
}
}}>{miniMapFullscreen ? (
<button className="cornerBtn" onClick={toggleMiniMapFullscreen}>{miniMapFullscreen ? (
<FaMinimize />
) : (
<FaExpand />
Expand Down