Merge pull request #97 from daithihearn/separate-dummy

Separating the dummy and the normal cards
daithihearn · Jan 19, 2023 · de0d9f6 · de0d9f6
2 parents eb2760a + 71bcba9
commit de0d9f6
Showing 1 changed file with 89 additions and 3 deletions.
diff --git a/src/components/Game/MyCards.tsx b/src/components/Game/MyCards.tsx
@@ -10,7 +10,13 @@ import { BLANK_CARD, SelectableCard } from "../../model/Cards"
 
 import GameService from "../../services/GameService"
 import { RoundStatus } from "../../model/Round"
-import { getGameId, getIsMyGo, getRound } from "../../caches/GameSlice"
+import {
+    getGameId,
+    getIamGoer,
+    getIsMyGo,
+    getIsRoundCalled,
+    getRound,
+} from "../../caches/GameSlice"
 import { useAppDispatch, useAppSelector } from "../../caches/hooks"
 import { useSnackbar } from "notistack"
 import {
@@ -37,8 +43,10 @@ const MyCards: React.FC = () => {
     const dispatch = useAppDispatch()
     const gameId = useAppSelector(getGameId)
     const round = useAppSelector(getRound)
+    const isRoundCalled = useAppSelector(getIsRoundCalled)
     const myCards = useAppSelector(getMyCards)
     const autoPlayCard = useAppSelector(getAutoPlayCard)
+    const iamGoer = useAppSelector(getIamGoer)
     const isMyGo = useAppSelector(getIsMyGo)
 
     const { enqueueSnackbar } = useSnackbar()
@@ -71,6 +79,11 @@ const MyCards: React.FC = () => {
         [round],
     )
 
+    const showDummy = useMemo(
+        () => isRoundCalled && iamGoer,
+        [isRoundCalled, iamGoer],
+    )
+
     const handleSelectCard = useCallback(
         (card: SelectableCard) => {
             if (!cardsSelectable || card.name === BLANK_CARD.name) {
@@ -117,6 +130,24 @@ const MyCards: React.FC = () => {
         [myCards],
     )
 
+    const handleOnDragEndDummy = useCallback(
+        (result: DropResult) => {
+            if (!result.destination) return
+
+            const updatedCards = myCards.map(c => {
+                return { ...c }
+            })
+            const [reorderedItem] = updatedCards.splice(
+                result.source.index + 5,
+                1,
+            )
+            updatedCards.splice(result.destination.index + 5, 0, reorderedItem)
+
+            dispatch(replaceMyCards(updatedCards))
+        },
+        [myCards],
+    )
+
     const getStyleForCard = useCallback(
         (card: SelectableCard) => {
             let classes = "thumbnail_size"
@@ -148,14 +179,14 @@ const MyCards: React.FC = () => {
         <div>
             <CardBody className="cardArea">
                 <DragDropContext onDragEnd={handleOnDragEnd}>
-                    <Droppable droppableId="characters" direction="horizontal">
+                    <Droppable droppableId="myCards" direction="horizontal">
                         {provided => (
                             <div
                                 className="characters myCards"
                                 style={{ display: "inline-flex" }}
                                 {...provided.droppableProps}
                                 ref={provided.innerRef}>
-                                {myCards.map((card, index) => {
+                                {myCards.slice(0, 5).map((card, index) => {
                                     const draggableId = `${card.name}${
                                         card.name === BLANK_CARD.name
                                             ? index
@@ -198,6 +229,61 @@ const MyCards: React.FC = () => {
                 </DragDropContext>
             </CardBody>
 
+            {showDummy && (
+                <CardBody className="cardArea">
+                    <DragDropContext onDragEnd={handleOnDragEndDummy}>
+                        <Droppable droppableId="dummy" direction="horizontal">
+                            {provided => (
+                                <div
+                                    className="characters myCards"
+                                    style={{ display: "inline-flex" }}
+                                    {...provided.droppableProps}
+                                    ref={provided.innerRef}>
+                                    {myCards.slice(5, 10).map((card, index) => {
+                                        const draggableId = `${card.name}${
+                                            card.name === BLANK_CARD.name
+                                                ? index
+                                                : ""
+                                        }`
+                                        return (
+                                            <Draggable
+                                                key={draggableId}
+                                                draggableId={draggableId}
+                                                index={index}
+                                                isDragDisabled={
+                                                    card.name ===
+                                                    BLANK_CARD.name
+                                                }>
+                                                {provided => (
+                                                    <div
+                                                        ref={provided.innerRef}
+                                                        {...provided.draggableProps}
+                                                        {...provided.dragHandleProps}>
+                                                        <CardImg
+                                                            alt={card.name}
+                                                            onClick={() =>
+                                                                handleSelectCard(
+                                                                    card,
+                                                                )
+                                                            }
+                                                            src={`/cards/thumbnails/${card.name}.png`}
+                                                            className={getStyleForCard(
+                                                                card,
+                                                            )}
+                                                        />
+                                                    </div>
+                                                )}
+                                            </Draggable>
+                                        )
+                                    })}
+                                    {provided.placeholder}
+                                </div>
+                            )}
+                        </Droppable>
+                    </DragDropContext>
+                </CardBody>
+            )}
+
             {round?.status === RoundStatus.PLAYING ? (
                 <CardBody className="buttonArea">
                     <ButtonGroup size="lg">