From 0012428159af2bf9d5fa53f1e2762e524cf68cb4 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 7 Aug 2020 09:58:51 +1000
Subject: [PATCH] Cleaned up dice controls and moved to percentage for dice
 result margins

---
 src/components/dice/DiceButtons.js     |  3 ++
 src/components/dice/DiceControls.js    | 65 --------------------------
 src/components/dice/DiceResults.js     | 15 ++++--
 src/components/dice/DiceTrayOverlay.js | 31 +++++++-----
 4 files changed, 33 insertions(+), 81 deletions(-)
 delete mode 100644 src/components/dice/DiceControls.js

diff --git a/src/components/dice/DiceButtons.js b/src/components/dice/DiceButtons.js
index 6e1fe8d..235d2c2 100644
--- a/src/components/dice/DiceButtons.js
+++ b/src/components/dice/DiceButtons.js
@@ -58,6 +58,9 @@ function DiceButtons({
         alignItems: "center",
         flexDirection: "column",
         borderRadius: "4px",
+        position: "absolute",
+        top: "0",
+        left: "0",
       }}
       p={2}
       bg="overlay"
diff --git a/src/components/dice/DiceControls.js b/src/components/dice/DiceControls.js
deleted file mode 100644
index 9e002a4..0000000
--- a/src/components/dice/DiceControls.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from "react";
-
-import DiceButtons from "./DiceButtons";
-import DiceResults from "./DiceResults";
-
-function DiceControls({
-  onDiceAdd,
-  onDiceClear,
-  onDiceReroll,
-  onDiceLoad,
-  diceTraySize,
-  onDiceTraySizeChange,
-  shareDice,
-  onShareDiceChage,
-  diceRolls,
-  onDiceRollsChange,
-}) {
-  return (
-    <>
-      <div
-        style={{
-          position: "absolute",
-          bottom: "16px",
-          left: 0,
-          right: 0,
-          display: "flex",
-          color: "white",
-          pointerEvents: "none",
-          transform: "translateX(50px)",
-        }}
-      >
-        <DiceResults
-          diceRolls={diceRolls}
-          onDiceClear={() => {
-            onDiceClear();
-            onDiceRollsChange([]);
-          }}
-          onDiceReroll={onDiceReroll}
-        />
-      </div>
-      <div
-        style={{
-          position: "absolute",
-          top: "0",
-          left: "0",
-        }}
-      >
-        <DiceButtons
-          diceRolls={diceRolls}
-          onDiceAdd={(style, type) => {
-            onDiceAdd(style, type);
-            onDiceRollsChange([...diceRolls, { type, roll: "unknown" }]);
-          }}
-          onDiceLoad={onDiceLoad}
-          onDiceTraySizeChange={onDiceTraySizeChange}
-          diceTraySize={diceTraySize}
-          shareDice={shareDice}
-          onShareDiceChange={onShareDiceChage}
-        />
-      </div>
-    </>
-  );
-}
-
-export default DiceControls;
diff --git a/src/components/dice/DiceResults.js b/src/components/dice/DiceResults.js
index 0bac0e2..c0f1965 100644
--- a/src/components/dice/DiceResults.js
+++ b/src/components/dice/DiceResults.js
@@ -34,13 +34,19 @@ function DiceResults({ diceRolls, onDiceClear, onDiceReroll }) {
   return (
     <Flex
       sx={{
-        width: "100%",
         justifyContent: "space-between",
         alignItems: "center",
+        position: "absolute",
+        bottom: "5%",
+        left: 0,
+        right: 0,
+        display: "flex",
+        color: "white",
+        pointerEvents: "none",
       }}
     >
       <IconButton
-        ml="24px"
+        ml="7%"
         title="Clear Dice"
         aria-label="Clear Dice"
         onClick={onDiceClear}
@@ -59,7 +65,6 @@ function DiceResults({ diceRolls, onDiceClear, onDiceReroll }) {
           variant="heading"
           as="h1"
           sx={{ fontSize: 5, userSelect: "none" }}
-          mb={diceRolls.length === 1 ? "24px" : 0}
         >
           {getDiceRollTotal(diceRolls)}
         </Text>
@@ -79,11 +84,11 @@ function DiceResults({ diceRolls, onDiceClear, onDiceReroll }) {
             )}
           </Button>
         ) : (
-          <Flex>{rolls}</Flex>
+          <Flex sx={{ height: "15px" }}>{rolls}</Flex>
         )}
       </Flex>
       <IconButton
-        mr="24px"
+        mr="7%"
         title="Reroll Dice"
         aria-label="Reroll Dice"
         onClick={onDiceReroll}
diff --git a/src/components/dice/DiceTrayOverlay.js b/src/components/dice/DiceTrayOverlay.js
index 1610887..684e421 100644
--- a/src/components/dice/DiceTrayOverlay.js
+++ b/src/components/dice/DiceTrayOverlay.js
@@ -11,9 +11,10 @@ import { Box } from "theme-ui";
 import environment from "../../dice/environment.dds";
 
 import DiceInteraction from "./DiceInteraction";
-import DiceControls from "./DiceControls";
 import Dice from "../../dice/Dice";
 import LoadingOverlay from "../LoadingOverlay";
+import DiceButtons from "./DiceButtons";
+import DiceResults from "./DiceResults";
 
 import DiceTray from "../../dice/diceTray/DiceTray";
 
@@ -311,18 +312,26 @@ function DiceTrayOverlay({
             sceneInteractionRef.current = false;
           }}
         />
+        <DiceResults
+          diceRolls={diceRolls}
+          onDiceClear={() => {
+            handleDiceClear();
+            onDiceRollsChange([]);
+          }}
+          onDiceReroll={handleDiceReroll}
+        />
       </Box>
-      <DiceControls
-        onDiceAdd={handleDiceAdd}
-        onDiceClear={handleDiceClear}
-        onDiceReroll={handleDiceReroll}
-        onDiceLoad={handleDiceLoad}
-        diceTraySize={diceTraySize}
-        onDiceTraySizeChange={setDiceTraySize}
-        shareDice={shareDice}
-        onShareDiceChage={onShareDiceChage}
+      <DiceButtons
         diceRolls={diceRolls}
-        onDiceRollsChange={onDiceRollsChange}
+        onDiceAdd={(style, type) => {
+          handleDiceAdd(style, type);
+          onDiceRollsChange([...diceRolls, { type, roll: "unknown" }]);
+        }}
+        onDiceLoad={handleDiceLoad}
+        onDiceTraySizeChange={setDiceTraySize}
+        diceTraySize={diceTraySize}
+        shareDice={shareDice}
+        onShareDiceChange={onShareDiceChage}
       />
       {isLoading && (
         <Box