From 0ecb53e2f24c72a1a6e96918bf2c860d511ec53b Mon Sep 17 00:00:00 2001
From: Zsolt Viczian <viczian.zsolt@gmail.com>
Date: Sun, 20 Mar 2022 12:13:35 +0100
Subject: [PATCH] updated test, set penMode on ToolButton change

---
 src/components/Actions.tsx                    | 80 ++++++++++---------
 .../__snapshots__/contextmenu.test.tsx.snap   | 16 ----
 .../regressionTests.test.tsx.snap             | 52 ------------
 .../packages/__snapshots__/utils.test.ts.snap |  1 -
 4 files changed, 43 insertions(+), 106 deletions(-)

diff --git a/src/components/Actions.tsx b/src/components/Actions.tsx
index 21cbbcf85..1cc315789 100644
--- a/src/components/Actions.tsx
+++ b/src/components/Actions.tsx
@@ -192,43 +192,49 @@ export const ShapesSwitcher = ({
   setAppState: React.Component<any, AppState>["setState"];
   onImageAction: (data: { pointerType: PointerType | null }) => void;
   appState: AppState;
-}) => (
-  <>
-    {SHAPES.map(({ value, icon, key }, index) => {
-      const label = t(`toolBar.${value}`);
-      const letter = key && (typeof key === "string" ? key : key[0]);
-      const shortcut = letter
-        ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${index + 1}`
-        : `${index + 1}`;
-      return (
-        <ToolButton
-          className="Shape"
-          key={value}
-          type="radio"
-          icon={icon}
-          checked={elementType === value}
-          name="editor-current-shape"
-          title={`${capitalizeString(label)} — ${shortcut}`}
-          keyBindingLabel={`${index + 1}`}
-          aria-label={capitalizeString(label)}
-          aria-keyshortcuts={shortcut}
-          data-testid={value}
-          onChange={({ pointerType }) => {
-            setAppState({
-              elementType: value,
-              multiElement: null,
-              selectedElementIds: {},
-            });
-            setCursorForShape(canvas, { ...appState, elementType: value });
-            if (value === "image") {
-              onImageAction({ pointerType });
-            }
-          }}
-        />
-      );
-    })}
-  </>
-);
+}) => {
+  const deviceType = useDeviceType();
+  return (
+    <>
+      {SHAPES.map(({ value, icon, key }, index) => {
+        const label = t(`toolBar.${value}`);
+        const letter = key && (typeof key === "string" ? key : key[0]);
+        const shortcut = letter
+          ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${index + 1}`
+          : `${index + 1}`;
+        return (
+          <ToolButton
+            className="Shape"
+            key={value}
+            type="radio"
+            icon={icon}
+            checked={elementType === value}
+            name="editor-current-shape"
+            title={`${capitalizeString(label)} — ${shortcut}`}
+            keyBindingLabel={`${index + 1}`}
+            aria-label={capitalizeString(label)}
+            aria-keyshortcuts={shortcut}
+            data-testid={value}
+            onChange={({ pointerType }) => {
+              if (!deviceType.penDetected && pointerType === "pen") {
+                setAppState({ penMode: true });
+              }
+              setAppState({
+                elementType: value,
+                multiElement: null,
+                selectedElementIds: {},
+              });
+              setCursorForShape(canvas, { ...appState, elementType: value });
+              if (value === "image") {
+                onImageAction({ pointerType });
+              }
+            }}
+          />
+        );
+      })}
+    </>
+  );
+};
 
 export const ZoomActions = ({
   renderAction,
diff --git a/src/tests/__snapshots__/contextmenu.test.tsx.snap b/src/tests/__snapshots__/contextmenu.test.tsx.snap
index 89efe544e..34af8489f 100644
--- a/src/tests/__snapshots__/contextmenu.test.tsx.snap
+++ b/src/tests/__snapshots__/contextmenu.test.tsx.snap
@@ -49,7 +49,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -220,7 +219,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -547,7 +545,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -874,7 +871,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -1045,7 +1041,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -1251,7 +1246,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -1514,7 +1508,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -1859,7 +1852,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -2634,7 +2626,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -2961,7 +2952,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -3288,7 +3278,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -3693,7 +3682,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -3962,7 +3950,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -4310,7 +4297,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -4412,7 +4398,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -4492,7 +4477,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
diff --git a/src/tests/__snapshots__/regressionTests.test.tsx.snap b/src/tests/__snapshots__/regressionTests.test.tsx.snap
index c719ccb51..7e6bd2496 100644
--- a/src/tests/__snapshots__/regressionTests.test.tsx.snap
+++ b/src/tests/__snapshots__/regressionTests.test.tsx.snap
@@ -49,7 +49,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -542,7 +541,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -1041,7 +1039,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -1875,7 +1872,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -2089,7 +2085,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -2579,7 +2574,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -2846,7 +2840,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -3017,7 +3010,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -3490,7 +3482,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -3739,7 +3730,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -3953,7 +3943,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -4210,7 +4199,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -4476,7 +4464,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -4884,7 +4871,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -5197,7 +5183,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -5486,7 +5471,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -5705,7 +5689,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -5876,7 +5859,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -6361,7 +6343,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -6698,7 +6679,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -8876,7 +8856,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -9261,7 +9240,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -9528,7 +9506,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -9757,7 +9734,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -10053,7 +10029,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -10224,7 +10199,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -10395,7 +10369,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -10566,7 +10539,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -10767,7 +10739,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -10968,7 +10939,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -11187,7 +11157,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -11388,7 +11357,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -11559,7 +11527,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -11760,7 +11727,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -11931,7 +11897,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -12102,7 +12067,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -12321,7 +12285,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -13090,7 +13053,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -13357,7 +13319,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -13461,7 +13422,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -13563,7 +13523,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -13737,7 +13696,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -14077,7 +14035,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -14287,7 +14244,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -15171,7 +15127,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -15273,7 +15228,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -16086,7 +16040,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -16518,7 +16471,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {
@@ -16807,7 +16759,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -16911,7 +16862,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -17439,7 +17389,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
@@ -17541,7 +17490,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},
diff --git a/src/tests/packages/__snapshots__/utils.test.ts.snap b/src/tests/packages/__snapshots__/utils.test.ts.snap
index 6ebff1740..538be9de7 100644
--- a/src/tests/packages/__snapshots__/utils.test.ts.snap
+++ b/src/tests/packages/__snapshots__/utils.test.ts.snap
@@ -47,7 +47,6 @@ Object {
     "data": null,
     "shown": false,
   },
-  "penDetected": false,
   "penMode": false,
   "pendingImageElement": null,
   "previousSelectedElementIds": Object {},