Added mobile support to select dice modal and added padding to mobile modals

This commit is contained in:
Mitchell McCaffrey 2020-09-06 16:24:23 +10:00
parent 68f6860c1f
commit b07b9ff260
5 changed files with 42 additions and 15 deletions

View File

@ -1,28 +1,33 @@
import React from "react"; import React from "react";
import { Flex, Image, Text } from "theme-ui"; import { Flex, Image, Text, Box } from "theme-ui";
function DiceTile({ dice, isSelected, onDiceSelect, onDone }) { function DiceTile({ dice, isSelected, onDiceSelect, onDone, large }) {
return ( return (
<Flex <Flex
onClick={() => onDiceSelect(dice)} onClick={() => onDiceSelect(dice)}
sx={{ sx={{
borderColor: "primary",
borderStyle: isSelected ? "solid" : "none",
borderWidth: "4px",
position: "relative", position: "relative",
width: "150px", width: large ? "49%" : "32%",
height: "150px", height: "0",
paddingTop: large ? "49%" : "32%",
borderRadius: "4px", borderRadius: "4px",
justifyContent: "center", justifyContent: "center",
alignItems: "center", alignItems: "center",
cursor: "pointer", cursor: "pointer",
}} }}
m={2} my={1}
bg="muted" bg="muted"
onDoubleClick={() => onDone(dice)} onDoubleClick={() => onDone(dice)}
> >
<Image <Image
sx={{ width: "100%", height: "100%", objectFit: "contain" }} sx={{
width: "100%",
height: "100%",
objectFit: "contain",
position: "absolute",
top: 0,
left: 0,
}}
src={dice.preview} src={dice.preview}
/> />
<Flex <Flex
@ -48,6 +53,20 @@ function DiceTile({ dice, isSelected, onDiceSelect, onDone }) {
{dice.name} {dice.name}
</Text> </Text>
</Flex> </Flex>
<Box
sx={{
width: "100%",
height: "100%",
position: "absolute",
top: 0,
left: 0,
borderColor: "primary",
borderStyle: isSelected ? "solid" : "none",
borderWidth: "4px",
pointerEvents: "none",
borderRadius: "4px",
}}
/>
</Flex> </Flex>
); );
} }

View File

@ -1,19 +1,22 @@
import React from "react"; import React from "react";
import { Flex } from "theme-ui"; import { Flex } from "theme-ui";
import SimpleBar from "simplebar-react"; import SimpleBar from "simplebar-react";
import { useMedia } from "react-media";
import DiceTile from "./DiceTile"; import DiceTile from "./DiceTile";
function DiceTiles({ dice, onDiceSelect, selectedDice, onDone }) { function DiceTiles({ dice, onDiceSelect, selectedDice, onDone }) {
const isSmallScreen = useMedia({ query: "(max-width: 500px)" });
return ( return (
<SimpleBar style={{ maxHeight: "300px", width: "500px" }}> <SimpleBar style={{ maxHeight: "300px" }}>
<Flex <Flex
py={2} p={2}
bg="muted" bg="muted"
sx={{ sx={{
flexWrap: "wrap", flexWrap: "wrap",
width: "500px",
borderRadius: "4px", borderRadius: "4px",
justifyContent: "space-between",
}} }}
> >
{dice.map((dice) => ( {dice.map((dice) => (
@ -23,6 +26,7 @@ function DiceTiles({ dice, onDiceSelect, selectedDice, onDone }) {
isSelected={selectedDice && dice.key === selectedDice.key} isSelected={selectedDice && dice.key === selectedDice.key}
onDiceSelect={onDiceSelect} onDiceSelect={onDiceSelect}
onDone={onDone} onDone={onDone}
large={isSmallScreen}
/> />
))} ))}
</Flex> </Flex>

View File

@ -9,7 +9,11 @@ import { dice } from "../dice";
function SelectDiceModal({ isOpen, onRequestClose, onDone, defaultDice }) { function SelectDiceModal({ isOpen, onRequestClose, onDone, defaultDice }) {
const [selectedDice, setSelectedDice] = useState(defaultDice); const [selectedDice, setSelectedDice] = useState(defaultDice);
return ( return (
<Modal isOpen={isOpen} onRequestClose={onRequestClose}> <Modal
isOpen={isOpen}
onRequestClose={onRequestClose}
style={{ maxWidth: "542px", width: "calc(100% - 16px)" }}
>
<Flex <Flex
sx={{ sx={{
flexDirection: "column", flexDirection: "column",

View File

@ -275,7 +275,7 @@ function SelectMapModal({
<Modal <Modal
isOpen={isOpen} isOpen={isOpen}
onRequestClose={handleClose} onRequestClose={handleClose}
style={{ maxWidth: "542px", width: "100%" }} style={{ maxWidth: "542px", width: "calc(100% - 16px)" }}
> >
<ImageDrop onDrop={handleImagesUpload} dropText="Drop map to upload"> <ImageDrop onDrop={handleImagesUpload} dropText="Drop map to upload">
<input <input

View File

@ -134,7 +134,7 @@ function SelectTokensModal({ isOpen, onRequestClose }) {
<Modal <Modal
isOpen={isOpen} isOpen={isOpen}
onRequestClose={handleRequestClose} onRequestClose={handleRequestClose}
style={{ maxWidth: "542px", width: "100%" }} style={{ maxWidth: "542px", width: "calc(100% - 16px)" }}
> >
<ImageDrop onDrop={handleImagesUpload} dropText="Drop token to upload"> <ImageDrop onDrop={handleImagesUpload} dropText="Drop token to upload">
<input <input