Hide selected picks option (#385)

* hide picks option * reword
dr4fters · Mar 6, 2019 · bf2ea61 · bf2ea61
1 parent 5f578cf
commit bf2ea61
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 83 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/src/app.js b/public/src/app.js
@@ -47,6 +47,7 @@ let App = {
     beep: false,
     chat: true,
     cols: false,
+    hidepicks: false,
     deckSize: 40,
     filename: "filename",
     filetype: "txt",

diff --git a/public/src/game/Game.jsx b/public/src/game/Game.jsx
@@ -40,7 +40,7 @@ export default class Game extends Component {
   }
 
   render() {
-    const { gametype, gamesubtype } = App.state;
+    const { gametype, gamesubtype } = App.state
     const moveSettings = App.state.isGameFinished && ["regular sealed", "cube draft", "cube sealed"].includes(`${gamesubtype} ${gametype}`);
     return (
       <div className='container'>
@@ -70,5 +70,6 @@ const CardsZone = () => {
     : <div key={"pack"}/>;
   const props = { zones: ["main", "side", "junk"] };
   const pool = App.state.cols ? <Cols key={"pool"} {...props}/> : <Grid key={"pool"} {...props} />;
-  return [pack, pool];
+  const showPool = !App.state.hidepicks || App.state.isGameFinished
+  return showPool ? [pack, pool] : [pack];
 };
diff --git a/public/src/game/GameSettings.jsx b/public/src/game/GameSettings.jsx
@@ -25,6 +25,9 @@ const GameSettings = () => (
         <div>
           <Checkbox side="left" text="Column view" link="cols" />
         </div>
+        <div>
+          <Checkbox side="left" text="Hide selected picks" link="hidepicks" />
+        </div>
         <SortCards />
         <CardsImageQuality />
       </span>

diff --git a/public/src/game/PlayersPanel.jsx b/public/src/game/PlayersPanel.jsx
@@ -62,7 +62,7 @@ const fixPackTimeToScreen = () => {
   const selfTime = document.getElementById("self-time");
   const selfTimeFixed = document.getElementById("self-time-fixed");
   const {[0]: zone} = document.getElementsByClassName("zone");
-  if (selfTime && selfTimeFixed) {
+  if (selfTime && selfTimeFixed && zone) {
     const selfRect = selfTime.getBoundingClientRect();
     const zoneRect = zone.getBoundingClientRect();
     const selfTimeRect = selfTimeFixed.getBoundingClientRect();