From 74fcca7f9815daa765eae70b17ec9b370c1096e9 Mon Sep 17 00:00:00 2001
From: River <18037011+RheingoldRiver@users.noreply.github.com>
Date: Thu, 2 Nov 2023 21:05:25 -0500
Subject: [PATCH] Handle press & long-press events on current pentomino window
 (#72)

---
 package-lock.json                             | 17 ++++-
 package.json                                  |  3 +-
 src/components/Header/Header.tsx              | 64 +++++++++++++++++--
 src/components/Information/Information.tsx    | 38 +++++++----
 .../PentominoDisplay/PentominoDisplay.tsx     | 11 +++-
 5 files changed, 109 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aa11a66..c011d5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,8 @@
         "react-dnd": "^16.0.1",
         "react-dnd-html5-backend": "^16.0.1",
         "react-dom": "^18.2.0",
-        "react-router-dom": "^6.16.0"
+        "react-router-dom": "^6.16.0",
+        "use-long-press": "^3.2.0"
       },
       "devDependencies": {
         "@savvywombat/tailwindcss-grid-areas": "^3.1.0",
@@ -5371,6 +5372,14 @@
         }
       }
     },
+    "node_modules/use-long-press": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/use-long-press/-/use-long-press-3.2.0.tgz",
+      "integrity": "sha512-uq5o2qFR1VRjHn8Of7Fl344/AGvgk7C5Mcb4aSb1ZRVp6PkgdXJJLdRrlSTJQVkkQcDuqFbFc3mDX4COg7mRTA==",
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/use-sidecar": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
@@ -9304,6 +9313,12 @@
         "tslib": "^2.0.0"
       }
     },
+    "use-long-press": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/use-long-press/-/use-long-press-3.2.0.tgz",
+      "integrity": "sha512-uq5o2qFR1VRjHn8Of7Fl344/AGvgk7C5Mcb4aSb1ZRVp6PkgdXJJLdRrlSTJQVkkQcDuqFbFc3mDX4COg7mRTA==",
+      "requires": {}
+    },
     "use-sidecar": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
diff --git a/package.json b/package.json
index c614343..7ae4587 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.16.0"
+    "react-router-dom": "^6.16.0",
+    "use-long-press": "^3.2.0"
   },
   "devDependencies": {
     "@savvywombat/tailwindcss-grid-areas": "^3.1.0",
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 4e5dc83..c1f50a3 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -1,13 +1,19 @@
 import clsx from "clsx";
-import { useContext } from "react";
+import { useContext, useRef } from "react";
 import { GameStateContext } from "../GameStateProvider/GameStateProvider";
 import { PENTOMINOES } from "../../pentominoes";
 import { PentominoDisplay } from "../PentominoDisplay/PentominoDisplay";
 import { ALL_PENTOMINO_NAMES } from "../../constants";
 import { AppStateContext } from "../AppStateProvider/AppStateProvider";
+import {
+  OrientationActionType,
+  ReflectionDirection,
+  RotationDirection,
+} from "../GameStateProvider/currentPentominoReducer";
+import { useLongPress } from "use-long-press";
 
 export const Header = ({ ...rest }) => {
-  const { currentPentomino, updateCurrentPentomino, currentOrientation, pentominoColors, showKeyboardIndicators } =
+  const { currentPentomino, updateCurrentPentomino, pentominoColors, showKeyboardIndicators } =
     useContext(GameStateContext);
 
   const { appPreferences } = useContext(AppStateContext);
@@ -49,12 +55,56 @@ export const Header = ({ ...rest }) => {
           "border-black dark:border-slate-50"
         )}
       >
-        <PentominoDisplay
-          pentomino={currentPentomino}
-          color={appPreferences.displayColors[pentominoColors[currentPentomino.name]]}
-          orientation={currentOrientation}
-        ></PentominoDisplay>
+        <CurrentPentominoDisplay />
       </div>
     </div>
   );
 };
+
+const CurrentPentominoDisplay = () => {
+  const { currentPentomino, currentOrientation, orientationDispatch, pentominoColors } = useContext(GameStateContext);
+
+  // ensure that the normal onclick doesn't trigger when releasing the long-press hook
+  // by monitoring status of the mouse button
+  // 1. set to false on mouse down (don't know what to handle yet)
+  // 2. if mouse up before it's changed, fire normal event
+  // 3. set to true when long-press happens
+  // 4. if mouse up after this, do nothing
+  // 5. will be set back to false on next mouse-down event
+  const longPressTriggered = useRef(false);
+
+  const { appPreferences } = useContext(AppStateContext);
+  const bind = useLongPress((e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    orientationDispatch({
+      type: OrientationActionType.reflect,
+      direction: ReflectionDirection.Y,
+    });
+    longPressTriggered.current = true;
+  });
+
+  return (
+    <button
+      className="cursor-pointer"
+      onMouseDown={() => (longPressTriggered.current = false)}
+      onMouseUp={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        if (longPressTriggered.current === true) return;
+        orientationDispatch({
+          type: OrientationActionType.rotate,
+          direction: RotationDirection.Right,
+        });
+      }}
+      onContextMenu={(e) => e.preventDefault()}
+      {...bind()}
+    >
+      <PentominoDisplay
+        pentomino={currentPentomino}
+        color={appPreferences.displayColors[pentominoColors[currentPentomino.name]]}
+        orientation={currentOrientation}
+      ></PentominoDisplay>
+    </button>
+  );
+};
diff --git a/src/components/Information/Information.tsx b/src/components/Information/Information.tsx
index 21fb42b..771cd0a 100644
--- a/src/components/Information/Information.tsx
+++ b/src/components/Information/Information.tsx
@@ -111,37 +111,51 @@ export const Information = () => {
     >
       <Dialog.Title className="text-center font-bold text-md mb-2">About Pentominoes</Dialog.Title>
       <div className="px-4 pb-4">
-        <div className="mb-2">
+        <p className="mb-2">
           Pentominoes are tiles of area 5. There are 12 distinct pentominoes, up to rotation & reflection, with each
           tile having somewhere between 2 (the {<InformationPentominoDisplay p="I" />} tile) and 8 (
           {<InformationPentominoDisplay p="F" />} {<InformationPentominoDisplay p="L" />}{" "}
           {<InformationPentominoDisplay p="N" />} {<InformationPentominoDisplay p="P" />}{" "}
           {<InformationPentominoDisplay p="Y" />}) distinct orientations.
-        </div>
-        <div className="mb-2">
+        </p>
+        <p className="mb-2">
           This puzzle game also provides a one-square-unit-area tile that you can use as terrain (the{" "}
           <InformationPentominoDisplay p="R"></InformationPentominoDisplay> tile).
-        </div>
-        <div className="mb-2">
+        </p>
+        <p className="mb-2">
           There are several different ways to enjoy Pentominoes, but the common theme is that you will try to fully tile
           a grid of total area 60 (5x12=60) such that no pentominoes overlap or fall off the edge, and no empty squares
           remain (other than whatever terrain you choose to place before starting to solve the puzzle).
-        </div>
-        <div className="mb-2">
+        </p>
+        <p className="mb-2">
           Generally, you want to use one of each pentomino to tile the board, but you're welcome to use this app however
           you like, and there are no prohibitions against using a tile more than once unless you want there to be. One
           suggestion is to attempt to tile an area with just the {<InformationPentominoDisplay p="P" />} tile.
-        </div>
-        <div className="mb-2">
+        </p>
+        <p className="mb-2">
           For an added challenge, you can also choose to apply "colorways" to your tiles. Then, constrain yourself to
           make a solve where the 4 tiles of some color must be pairwise non-adjacent; or must be adjacent; or must be
           adjacent and form a line spanning the grid area (this last one is especially fun in 8x8 grids with 4 squares
           of terrain). Setting these colorways is available in the Settings dialog.
-        </div>
-        <div>
+        </p>
+        <p>
           If you're new to pentominoes, feel free to "cheat" in your first few solve attempts and move terrain around,
           or use one piece twice - this is a single-player puzzle game, so the rules are whatever you make them to be!
-        </div>
+        </p>
+        <Dialog.Title className="text-center font-bold text-md mb-2">Controls</Dialog.Title>
+        <p className="mb-2">
+          Select a tile to select it. Once selected, you can reorient it in one of the following ways:
+        </p>
+        <ul className="list-disc ml-8 mb-2">
+          <li>Use the rotation & reflection buttons</li>
+          <li>Click or tap on the highlighted tile to rotate clockwise; long-press to reflect horizontally</li>
+          <li>Use hotkeys (see below)</li>
+        </ul>
+        <p className="mb-2">
+          Once you've oriented it as desired, click the board to place it. You can also click a placed tile to remove
+          it. Removing a tile also sets this tile as the current removed tile, in the same orientation it was when
+          placed.
+        </p>
         <Dialog.Title className="text-center font-bold text-md mb-2">Hotkeys</Dialog.Title>
         <span className="italic mb-2">
           You can{" "}
diff --git a/src/components/PentominoDisplay/PentominoDisplay.tsx b/src/components/PentominoDisplay/PentominoDisplay.tsx
index 41f81b5..3af2aa2 100644
--- a/src/components/PentominoDisplay/PentominoDisplay.tsx
+++ b/src/components/PentominoDisplay/PentominoDisplay.tsx
@@ -55,6 +55,7 @@ export const PentominoDisplay = ({
     return { class: "", style: "" };
   }
 
+  // Do not return any divs because these appear inside of <p> elements in the Information modal.
   return (
     <span
       {...rest}
@@ -65,9 +66,13 @@ export const PentominoDisplay = ({
         row.map((cell, y) => {
           const bg = bgColor(cell, { x, y });
           return (
-            <div
+            <span
               key={`${pentomino.name}_${x}_${y}`}
-              className={clsx(PENTOMINO_SIZES[size], bg.class, "text-white flex flex-row items-center justify-center")}
+              className={clsx(
+                PENTOMINO_SIZES[size],
+                bg.class,
+                "text-white flex flex-row items-center justify-center display-block"
+              )}
               style={{
                 fontSize: "1rem",
                 lineHeight: "0.5rem",
@@ -77,7 +82,7 @@ export const PentominoDisplay = ({
               {x === p.center.x && y === p.center.y && showCenter && pentomino.name !== PENTOMINOES.R.name && (
                 <DotFilledIcon />
               )}
-            </div>
+            </span>
           );
         })
       )}