From fc7bf96b04deb073a4994801b9ab4f2d9ebdc2d7 Mon Sep 17 00:00:00 2001
From: aronmal <aron@mal-noh.de>
Date: Wed, 16 Aug 2023 02:31:40 +0200
Subject: [PATCH] Fully working FontAwesomeIcon

---
 leaky-ships/package.json                      |  1 +
 leaky-ships/pnpm-lock.yaml                    | 26 +++++++
 .../src/components/FontAwesomeIcon.tsx        | 78 ++++++++++++-------
 .../components/Gamefield/GamefieldPointer.tsx |  2 +-
 .../src/components/Gamefield/HitElems.tsx     |  2 +-
 leaky-ships/src/components/Gamefield/Item.tsx |  7 +-
 .../src/components/Lobby/LobbyFrame.tsx       |  9 +--
 leaky-ships/src/components/Lobby/Player.tsx   | 16 ++--
 .../Lobby/SettingsFrame/Setting.tsx           |  6 +-
 .../Lobby/SettingsFrame/Settings.tsx          | 10 +--
 leaky-ships/src/components/OptionButton.tsx   |  4 +-
 .../lib/utils/get-class-list-from-props.ts    | 60 ++++++++++++++
 leaky-ships/src/routes/signin.tsx             |  2 +-
 leaky-ships/src/routes/start.tsx              |  2 +-
 14 files changed, 163 insertions(+), 62 deletions(-)
 create mode 100644 leaky-ships/src/lib/utils/get-class-list-from-props.ts

diff --git a/leaky-ships/package.json b/leaky-ships/package.json
index a730f53..7011155 100644
--- a/leaky-ships/package.json
+++ b/leaky-ships/package.json
@@ -20,6 +20,7 @@
     "@fortawesome/pro-regular-svg-icons": "^6.4.2",
     "@fortawesome/pro-solid-svg-icons": "^6.4.2",
     "@fortawesome/pro-thin-svg-icons": "^6.4.2",
+    "@fortawesome/react-fontawesome": "^0.2.0",
     "@fortawesome/sharp-solid-svg-icons": "^6.4.2",
     "@prisma/client": "^4.16.2",
     "@solidjs/meta": "^0.28.6",
diff --git a/leaky-ships/pnpm-lock.yaml b/leaky-ships/pnpm-lock.yaml
index e3fa8e2..4e5063e 100644
--- a/leaky-ships/pnpm-lock.yaml
+++ b/leaky-ships/pnpm-lock.yaml
@@ -32,6 +32,9 @@ dependencies:
   '@fortawesome/pro-thin-svg-icons':
     specifier: ^6.4.2
     version: 6.4.2
+  '@fortawesome/react-fontawesome':
+    specifier: ^0.2.0
+    version: 0.2.0(@fortawesome/fontawesome-svg-core@6.4.2)(react@18.2.0)
   '@fortawesome/sharp-solid-svg-icons':
     specifier: ^6.4.2
     version: 6.4.2
@@ -1768,6 +1771,17 @@ packages:
       '@fortawesome/fontawesome-common-types': 6.4.2
     dev: false
 
+  /@fortawesome/react-fontawesome@0.2.0(@fortawesome/fontawesome-svg-core@6.4.2)(react@18.2.0):
+    resolution: {integrity: sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==, tarball: https://npm.fontawesome.com/@fortawesome/react-fontawesome/-/0.2.0/react-fontawesome-0.2.0.tgz}
+    peerDependencies:
+      '@fortawesome/fontawesome-svg-core': ~1 || ~6
+      react: '>=16.3'
+    dependencies:
+      '@fortawesome/fontawesome-svg-core': 6.4.2
+      prop-types: 15.8.1
+      react: 18.2.0
+    dev: false
+
   /@fortawesome/sharp-solid-svg-icons@6.4.2:
     resolution: {integrity: sha512-b8kA9CxRPmdgoOrELrYHokbF5f0C80SJg9NA+dYcny3SHMsUQCSUacEX1OOIERwRyb1t5ncB2XI9CAPDTQ8wVg==, tarball: https://npm.fontawesome.com/@fortawesome/sharp-solid-svg-icons/-/6.4.2/sharp-solid-svg-icons-6.4.2.tgz}
     engines: {node: '>=6'}
@@ -4352,6 +4366,14 @@ packages:
       '@prisma/engines': 4.16.2
     dev: false
 
+  /prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+    dev: false
+
   /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
@@ -4360,6 +4382,10 @@ packages:
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
+  /react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+    dev: false
+
   /react@18.2.0:
     resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
     engines: {node: '>=0.10.0'}
diff --git a/leaky-ships/src/components/FontAwesomeIcon.tsx b/leaky-ships/src/components/FontAwesomeIcon.tsx
index 10f54ae..4f7b248 100644
--- a/leaky-ships/src/components/FontAwesomeIcon.tsx
+++ b/leaky-ships/src/components/FontAwesomeIcon.tsx
@@ -1,34 +1,58 @@
-import { IconDefinition } from "@fortawesome/pro-solid-svg-icons"
+import { IconDefinition } from "@fortawesome/fontawesome-svg-core"
+import { FontAwesomeIconProps } from "@fortawesome/react-fontawesome"
 import classNames from "classnames"
-import { JSX } from "solid-js"
+import { Show } from "solid-js"
+import classList from "~/lib/utils/get-class-list-from-props"
 
-function FontAwesomeIcon({
-  icon,
-  className,
-  style,
-}: {
-  icon: IconDefinition
-  className?: string
-  style?: JSX.CSSProperties
-}) {
+function Path(props: { d: string | string[] }) {
   return (
-    <svg
-      aria-hidden="true"
-      //   focusable="false"
-      data-prefix={icon.prefix}
-      data-icon={icon.iconName}
-      class={classNames(
-        "svg-inline--fa",
-        "fa-".concat(icon.iconName),
-        className,
+    <>
+      {typeof props.d === "string" ? (
+        <path fill="currentColor" d={props.d} />
+      ) : (
+        <>
+          <path class="fa-secondary" fill="currentColor" d={props.d[0]} />
+          <path class="fa-primary" fill="currentColor" d={props.d[1]} />
+        </>
       )}
-      role="img"
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox={`0 0 ${icon.icon[0]} ${icon.icon[1]}`}
-    >
-      <path fill="currentColor" d={icon.icon[4] as string}></path>
-    </svg>
+    </>
   )
 }
 
-export default FontAwesomeIcon
+export function FontAwesomeIcon(
+  props: {
+    icon: IconDefinition
+    class?: string
+    className?: never
+  } & FontAwesomeIconProps,
+) {
+  return (
+    <svg
+      aria-hidden="true"
+      aria-labelledby={props.titleId}
+      data-prefix={props.icon.prefix}
+      data-icon={props.icon.iconName}
+      data-fa-transform={props.transform}
+      data-fa-mask={props.mask}
+      data-fa-mask-id={props.maskId}
+      data-fa-symbol={props.symbol}
+      tabIndex={props.tabIndex}
+      class={classNames(
+        "svg-inline--fa",
+        "fa-".concat(props.icon.iconName),
+        classList(props),
+        props.class,
+      )}
+      color={props.color}
+      style={props.style}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox={`0 0 ${props.icon.icon[0]} ${props.icon.icon[1]}`}
+    >
+      <Show when={props.title}>
+        <title id={props.titleId}>{props.title}</title>
+      </Show>
+      <Path d={props.icon.icon[4]} />
+    </svg>
+  )
+}
diff --git a/leaky-ships/src/components/Gamefield/GamefieldPointer.tsx b/leaky-ships/src/components/Gamefield/GamefieldPointer.tsx
index 31a44c4..fb58fe3 100644
--- a/leaky-ships/src/components/Gamefield/GamefieldPointer.tsx
+++ b/leaky-ships/src/components/Gamefield/GamefieldPointer.tsx
@@ -2,7 +2,7 @@ import { faCrosshairs } from "@fortawesome/pro-solid-svg-icons"
 import { faRadar } from "@fortawesome/pro-thin-svg-icons"
 import classNames from "classnames"
 import {} from "solid-js"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { PointerProps } from "../../interfaces/frontend"
 
 function GamefieldPointer({
diff --git a/leaky-ships/src/components/Gamefield/HitElems.tsx b/leaky-ships/src/components/Gamefield/HitElems.tsx
index 3ca8f54..572fd16 100644
--- a/leaky-ships/src/components/Gamefield/HitElems.tsx
+++ b/leaky-ships/src/components/Gamefield/HitElems.tsx
@@ -1,5 +1,5 @@
 import { faBurst, faXmark } from "@fortawesome/pro-solid-svg-icons"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import useIndex from "~/hooks/useIndex"
 import { Hit } from "../../interfaces/frontend"
 
diff --git a/leaky-ships/src/components/Gamefield/Item.tsx b/leaky-ships/src/components/Gamefield/Item.tsx
index 00db5a7..f2a9cc5 100644
--- a/leaky-ships/src/components/Gamefield/Item.tsx
+++ b/leaky-ships/src/components/Gamefield/Item.tsx
@@ -1,5 +1,5 @@
 import { createEffect, createSignal } from "solid-js"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { useDrawProps } from "~/hooks/useDrawProps"
 // import { HexColorPicker } from "react-colorful"
 import classNames from "classnames"
@@ -61,10 +61,7 @@ function Item({
             class="pixelart"
           />
         ) : (
-          <FontAwesomeIcon
-            icon={icon}
-            // color={iconColor ?? "#444"}
-          />
+          <FontAwesomeIcon icon={icon} color={iconColor ?? "#444"} />
         )}
       </div>
       <span>{text}</span>
diff --git a/leaky-ships/src/components/Lobby/LobbyFrame.tsx b/leaky-ships/src/components/Lobby/LobbyFrame.tsx
index ad46791..ec3d811 100644
--- a/leaky-ships/src/components/Lobby/LobbyFrame.tsx
+++ b/leaky-ships/src/components/Lobby/LobbyFrame.tsx
@@ -4,7 +4,7 @@ import {
 } from "@fortawesome/pro-solid-svg-icons"
 import { JSX, createEffect, createMemo, createSignal } from "solid-js"
 import { useNavigate } from "solid-start"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { useGameProps } from "~/hooks/useGameProps"
 import { useSession } from "~/hooks/useSession"
 import useSocket from "~/hooks/useSocket"
@@ -94,10 +94,7 @@ function LobbyFrame({ openSettings }: { openSettings: () => void }) {
               {isConnected ? (
                 <span class="underline">{payload?.gamePin ?? "----"}</span>
               ) : (
-                <FontAwesomeIcon
-                  icon={faSpinnerThird}
-                  // spin={true}
-                />
+                <FontAwesomeIcon icon={faSpinnerThird} spin />
               )}
             </>
           )}
@@ -145,7 +142,7 @@ function LobbyFrame({ openSettings }: { openSettings: () => void }) {
           }}
         >
           <span>LEAVE</span>
-          <FontAwesomeIcon icon={faRightFromBracket} className="ml-4 w-12" />
+          <FontAwesomeIcon icon={faRightFromBracket} class="ml-4 w-12" />
         </Button>
       </div>
     </div>
diff --git a/leaky-ships/src/components/Lobby/Player.tsx b/leaky-ships/src/components/Lobby/Player.tsx
index 4a4d4ab..e1dbb1f 100644
--- a/leaky-ships/src/components/Lobby/Player.tsx
+++ b/leaky-ships/src/components/Lobby/Player.tsx
@@ -9,7 +9,7 @@ import {
 import { faCaretDown } from "@fortawesome/sharp-solid-svg-icons"
 import classNames from "classnames"
 import { createEffect, createMemo, createSignal } from "solid-js"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { useGameProps } from "~/hooks/useGameProps"
 import { socket } from "~/lib/socket"
 import Button from "./Button"
@@ -38,11 +38,7 @@ function HourGlass() {
   }, [count])
 
   return (
-    <FontAwesomeIcon
-      icon={icon()}
-      className="ml-4 w-12"
-      // spin={count() === 0}
-    />
+    <FontAwesomeIcon icon={icon()} class="ml-4 w-12" spin={count() === 0} />
   )
 }
 
@@ -75,7 +71,7 @@ function Player({
         {primary() ? (
           <button class="absolute right-4 top-4  h-14 w-14 rounded-lg border-2 border-dashed border-warn bg-gray-800 bg-opacity-90">
             <FontAwesomeIcon
-              className="h-full w-full text-warn"
+              class="h-full w-full text-warn"
               icon={faCaretDown}
             />
           </button>
@@ -97,11 +93,11 @@ function Player({
       >
         Ready
         {isReady && isConnected ? (
-          <FontAwesomeIcon icon={faCheck} className="ml-4 w-12" />
+          <FontAwesomeIcon icon={faCheck} class="ml-4 w-12" />
         ) : primary() ? (
           <FontAwesomeIcon
             icon={faHandPointer}
-            className="ml-4 w-12"
+            class="ml-4 w-12"
             style={{
               "--fa-bounce-start-scale-x": 1.05,
               "--fa-bounce-start-scale-y": 0.95,
@@ -111,7 +107,7 @@ function Player({
               "--fa-bounce-land-scale-y": 0.975,
               "--fa-bounce-height": "-0.125em",
             }}
-            // bounce
+            bounce
           />
         ) : (
           <HourGlass />
diff --git a/leaky-ships/src/components/Lobby/SettingsFrame/Setting.tsx b/leaky-ships/src/components/Lobby/SettingsFrame/Setting.tsx
index 4925ec1..71ee464 100644
--- a/leaky-ships/src/components/Lobby/SettingsFrame/Setting.tsx
+++ b/leaky-ships/src/components/Lobby/SettingsFrame/Setting.tsx
@@ -4,7 +4,7 @@ import {
 } from "@fortawesome/pro-solid-svg-icons"
 import classNames from "classnames"
 import { JSX, createMemo } from "solid-js"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { setGameSetting } from "~/components/Gamefield/EventBar"
 import { useGameProps } from "~/hooks/useGameProps"
 import { GameSettingKeys } from "../../../interfaces/frontend"
@@ -25,14 +25,14 @@ function Setting({
         {children}
       </span>
       <FontAwesomeIcon
-        className={classNames(
+        class={classNames(
           "text-md mx-auto rounded-full px-4 drop-shadow-md transition-all",
           state() ? "text-blue-500" : "text-gray-800",
           {
             "bg-gray-300 ": state,
           },
         )}
-        // size="3x"
+        size="3x"
         icon={state() ? faToggleLargeOn : faToggleLargeOff}
       />
       <input
diff --git a/leaky-ships/src/components/Lobby/SettingsFrame/Settings.tsx b/leaky-ships/src/components/Lobby/SettingsFrame/Settings.tsx
index 5e7d71a..64f1a4b 100644
--- a/leaky-ships/src/components/Lobby/SettingsFrame/Settings.tsx
+++ b/leaky-ships/src/components/Lobby/SettingsFrame/Settings.tsx
@@ -1,7 +1,7 @@
 import { faRotateLeft } from "@fortawesome/pro-regular-svg-icons"
 import { faXmark } from "@fortawesome/pro-solid-svg-icons"
 import {} from "solid-js"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { useGameProps } from "~/hooks/useGameProps"
 import { socket } from "~/lib/socket"
 import { GameSettings } from "../../../interfaces/frontend"
@@ -32,8 +32,8 @@ function Settings({ closeSettings }: { closeSettings: () => void }) {
               onClick={closeSettings}
             >
               <FontAwesomeIcon
-                className="h-full w-full text-gray-800 drop-shadow-md"
-                // size="3x"
+                class="h-full w-full text-gray-800 drop-shadow-md"
+                size="3x"
                 icon={faXmark}
               />
             </button>
@@ -52,8 +52,8 @@ function Settings({ closeSettings }: { closeSettings: () => void }) {
                 }
               >
                 <FontAwesomeIcon
-                  className="h-full w-full text-gray-800 drop-shadow-md"
-                  // size="3x"
+                  class="h-full w-full text-gray-800 drop-shadow-md"
+                  size="3x"
                   icon={faRotateLeft}
                 />
               </button>
diff --git a/leaky-ships/src/components/OptionButton.tsx b/leaky-ships/src/components/OptionButton.tsx
index e23ab9e..bfc0e54 100644
--- a/leaky-ships/src/components/OptionButton.tsx
+++ b/leaky-ships/src/components/OptionButton.tsx
@@ -1,7 +1,7 @@
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core"
 import classNames from "classnames"
 import { JSX } from "solid-js"
-import FontAwesomeIcon from "./FontAwesomeIcon"
+import { FontAwesomeIcon } from "./FontAwesomeIcon"
 
 function OptionButton({
   id,
@@ -30,7 +30,7 @@ function OptionButton({
     >
       <span class="mx-auto">{node ? node : id}</span>
       <FontAwesomeIcon
-        className="ml-2 w-10 text-xl sm:ml-12 sm:text-4xl"
+        class="ml-2 w-10 text-xl sm:ml-12 sm:text-4xl"
         icon={icon}
       />
     </button>
diff --git a/leaky-ships/src/lib/utils/get-class-list-from-props.ts b/leaky-ships/src/lib/utils/get-class-list-from-props.ts
new file mode 100644
index 0000000..0ff80a4
--- /dev/null
+++ b/leaky-ships/src/lib/utils/get-class-list-from-props.ts
@@ -0,0 +1,60 @@
+/* eslint-disable solid/reactivity */
+import { FontAwesomeIconProps } from "@fortawesome/react-fontawesome"
+
+// Get CSS class list from a props object
+export default function classList(props: FontAwesomeIconProps) {
+  const {
+    beat,
+    fade,
+    beatFade,
+    bounce,
+    shake,
+    flash,
+    spin,
+    spinPulse,
+    spinReverse,
+    pulse,
+    fixedWidth,
+    inverse,
+    border,
+    listItem,
+    flip,
+    size,
+    rotation,
+    pull,
+  } = props
+
+  // map of CSS class names to properties
+  const classes = {
+    "fa-beat": beat,
+    "fa-fade": fade,
+    "fa-beat-fade": beatFade,
+    "fa-bounce": bounce,
+    "fa-shake": shake,
+    "fa-flash": flash,
+    "fa-spin": spin,
+    "fa-spin-reverse": spinReverse,
+    "fa-spin-pulse": spinPulse,
+    "fa-pulse": pulse,
+    "fa-fw": fixedWidth,
+    "fa-inverse": inverse,
+    "fa-border": border,
+    "fa-li": listItem,
+    // @ts-expect-error either true or direction
+    "fa-flip": flip === true,
+    "fa-flip-horizontal": flip === "horizontal" || flip === "both",
+    "fa-flip-vertical": flip === "vertical" || flip === "both",
+    [`fa-${size}`]: typeof size !== "undefined" && size !== null,
+    [`fa-rotate-${rotation}`]:
+      // @ts-expect-error is a direction
+      typeof rotation !== "undefined" && rotation !== null && rotation !== 0,
+    [`fa-pull-${pull}`]: typeof pull !== "undefined" && pull !== null,
+    "fa-swap-opacity": props.swapOpacity,
+  }
+
+  // map over all the keys in the classes object
+  // return an array of the keys where the value for the key is not null
+  return Object.keys(classes)
+    .map((key) => (classes[key] ? key : null))
+    .filter((key) => key)
+}
diff --git a/leaky-ships/src/routes/signin.tsx b/leaky-ships/src/routes/signin.tsx
index 0cb64c1..a421293 100644
--- a/leaky-ships/src/routes/signin.tsx
+++ b/leaky-ships/src/routes/signin.tsx
@@ -3,7 +3,7 @@ import { faLeftLong } from "@fortawesome/pro-solid-svg-icons"
 import classNames from "classnames"
 import { createEffect, createSignal } from "solid-js"
 import { useNavigate, useSearchParams } from "solid-start"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import { useSession } from "~/hooks/useSession"
 
 // import { toast } from "react-toastify"
diff --git a/leaky-ships/src/routes/start.tsx b/leaky-ships/src/routes/start.tsx
index 97b9b22..ed75f2d 100644
--- a/leaky-ships/src/routes/start.tsx
+++ b/leaky-ships/src/routes/start.tsx
@@ -7,7 +7,7 @@ import status from "http-status"
 import { createEffect, createMemo, createSignal } from "solid-js"
 import { useLocation, useNavigate, useSearchParams } from "solid-start"
 import BurgerMenu from "~/components/BurgerMenu"
-import FontAwesomeIcon from "~/components/FontAwesomeIcon"
+import { FontAwesomeIcon } from "~/components/FontAwesomeIcon"
 import Logo from "~/components/Logo"
 import OptionButton from "~/components/OptionButton"
 import { useGameProps } from "~/hooks/useGameProps"