From 5cbfb775e5dcd30e89c328cbfd7c808f6c6b8f8f Mon Sep 17 00:00:00 2001
From: wil <wil@storyteller.ai>
Date: Thu, 5 Sep 2024 11:43:35 -0400
Subject: [PATCH] contextual loading bar updates, and better sandbox tester

alignments
---
 src/components/ui/LoadingBar.tsx              |  58 +++----
 src/pages/sandbox.tsx                         | 160 ------------------
 .../sandbox/ContextualLoadingBarForm.tsx      | 140 +++++++++++++++
 src/pages/sandbox/ContextualToolbarForm.tsx   |  46 +++++
 src/pages/sandbox/index.tsx                   |  24 +++
 src/signals/konvaContextuals/loadingBar.ts    |   7 +
 src/signals/konvaContextuals/type.ts          |  12 +-
 7 files changed, 247 insertions(+), 200 deletions(-)
 delete mode 100644 src/pages/sandbox.tsx
 create mode 100644 src/pages/sandbox/ContextualLoadingBarForm.tsx
 create mode 100644 src/pages/sandbox/ContextualToolbarForm.tsx
 create mode 100644 src/pages/sandbox/index.tsx

diff --git a/src/components/ui/LoadingBar.tsx b/src/components/ui/LoadingBar.tsx
index f0ba563f16..000f829d4b 100644
--- a/src/components/ui/LoadingBar.tsx
+++ b/src/components/ui/LoadingBar.tsx
@@ -2,13 +2,7 @@ import { Transition } from "@headlessui/react";
 import { twMerge } from "tailwind-merge";
 
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
-  faCheck,
-  faArrowRotateLeft,
-  faStop,
-} from "@fortawesome/pro-thin-svg-icons";
-
-import { Spinner } from "./Spinner";
+import { faArrowRotateLeft } from "@fortawesome/pro-thin-svg-icons";
 
 export enum LoadingBarStatus {
   IDLE = "idle",
@@ -16,7 +10,8 @@ export enum LoadingBarStatus {
   SUCCESS = "success",
   ERROR = "error",
 }
-export type LoadingBarProps = {
+export interface LoadingBarProps {
+  width?: number;
   progress: number;
   status: LoadingBarStatus;
   isShowing: boolean;
@@ -26,9 +21,10 @@ export type LoadingBarProps = {
   };
   message?: string;
   onRetry?: () => void;
-};
+}
 
 export const LoadingBar = ({
+  width,
   progress = 0,
   position,
   status,
@@ -41,9 +37,10 @@ export const LoadingBar = ({
       <div
         className={twMerge(
           // default styles
-          "flex w-full gap-2",
+          "flex w-full flex-col gap-2",
           // position styles
-          position && `fixed w-96`,
+          position && `fixed`,
+          position && !width && `w-96`,
           // base transition properties
           "transition-opacity ease-in-out",
           // Shared closed styles
@@ -56,31 +53,28 @@ export const LoadingBar = ({
         style={{
           left: position?.x,
           top: position?.y,
+          width: width ? `${width}px` : undefined,
         }}
       >
-        <div className="relative flex-grow">
-          <div className="h-2.5 w-full rounded-full bg-gray-200">
-            <div
-              className="h-2.5 rounded-full bg-primary-500"
-              style={{ width: `${progress}%` }}
-            />
-          </div>
-          {message && (
-            <label className="mt-2 block w-full text-center">{message}</label>
-          )}
+        <div className="h-2.5 w-full rounded-full bg-gray-200">
+          <div
+            className={twMerge(
+              "h-2.5 rounded-full bg-primary-500",
+              status === LoadingBarStatus.LOADING && "animate-pulse",
+            )}
+            style={{ width: `${progress}%` }}
+          />
         </div>
-        <div className="-mt-1.5">
-          {status === LoadingBarStatus.IDLE && (
-            <FontAwesomeIcon icon={faStop} />
-          )}
-          {status === LoadingBarStatus.LOADING && (
-            <Spinner className="size-5" />
-          )}
-          {status === LoadingBarStatus.SUCCESS && (
-            <FontAwesomeIcon icon={faCheck} />
-          )}
+
+        <div className="flex grow items-center justify-center gap-2">
+          {message && <label>{message}</label>}
+
           {status === LoadingBarStatus.ERROR && (
-            <button onClick={onRetry}>
+            <button
+              onClick={onRetry}
+              className="flex items-center gap-2 hover:text-primary"
+            >
+              <label className="cursor-pointer">Retry</label>
               <FontAwesomeIcon icon={faArrowRotateLeft} />
             </button>
           )}
diff --git a/src/pages/sandbox.tsx b/src/pages/sandbox.tsx
deleted file mode 100644
index a7195d6e18..0000000000
--- a/src/pages/sandbox.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { useRef } from "react";
-import { useSignals } from "@preact/signals-react/runtime";
-
-import { ContextualToolbarImage } from "~/components/features/KonvaContainer/ContextualToolbarImage";
-import { ContextualLoadingBar } from "~/components/features/KonvaContainer/ContextualLoadingBar";
-
-import { LoadingBarStatus } from "~/components/ui/LoadingBar";
-
-import {
-  imageToolbar,
-  loadingBar,
-  ContextualLoadingBarProps,
-} from "~/signals/konvaContextuals";
-
-export const Sandbox = () => {
-  const xImageToolbarRef = useRef(0);
-  const yImageToolbarRef = useRef(0);
-
-  const loadingBarPropsRef = useRef<ContextualLoadingBarProps>({
-    position: {
-      x: 0,
-      y: 0,
-    },
-    progress: 0,
-    status: LoadingBarStatus.IDLE,
-    isShowing: true,
-    message: "Loading...",
-  });
-
-  return (
-    <div className="p-2">
-      <ContextualToolbarImage />
-      <ContextualLoadingBar />
-      <h1>Sandbox</h1>
-      <div className="flex flex-col gap-2">
-        <div className="flex items-center gap-2">
-          <label>Image Toolbar Position</label>
-          <input
-            className="w-20 rounded-md border border-black p-2"
-            type="text"
-            placeholder="X"
-            onChange={(e) => {
-              xImageToolbarRef.current = parseInt(e.target.value);
-            }}
-          />
-          <input
-            className="w-20 rounded-md border border-black p-2"
-            type="text"
-            placeholder="Y"
-            onChange={(e) => {
-              yImageToolbarRef.current = parseInt(e.target.value);
-            }}
-          />
-          <button
-            className="rounded-md border border-black bg-gray-200 p-2 hover:bg-gray-300"
-            onClick={() =>
-              imageToolbar.setPosition({
-                x: xImageToolbarRef.current,
-                y: yImageToolbarRef.current,
-              })
-            }
-          >
-            Set Position
-          </button>
-          <button
-            className="rounded-md border border-black bg-gray-200 p-2 hover:bg-gray-300"
-            onClick={() => imageToolbar.hide()}
-          >
-            Hide
-          </button>
-        </div>
-
-        <div className="flex flex-col">
-          <div className="flex items-center gap-2">
-            <label>Loading Bar Props</label>
-            <input
-              className="w-20 rounded-md border border-black p-2"
-              type="text"
-              placeholder="X"
-              onChange={(e) => {
-                loadingBarPropsRef.current.position.x = parseInt(
-                  e.target.value,
-                );
-              }}
-            />
-            <input
-              className="w-20 rounded-md border border-black p-2"
-              type="text"
-              placeholder="Y"
-              onChange={(e) => {
-                loadingBarPropsRef.current.position.y = parseInt(
-                  e.target.value,
-                );
-              }}
-            />
-            <input
-              className="w-20 rounded-md border border-black p-2"
-              type="number"
-              min={0}
-              max={100}
-              placeholder="%"
-              onChange={(e) => {
-                loadingBarPropsRef.current.progress = parseInt(e.target.value);
-              }}
-            />
-            <button
-              className="rounded-md border border-black bg-gray-200 p-2 hover:bg-gray-300"
-              onClick={() =>
-                loadingBar.show({
-                  status: LoadingBarStatus.LOADING,
-                  progress: loadingBarPropsRef.current.progress,
-                  message: "Test Message...",
-                  position: {
-                    x: loadingBarPropsRef.current.position.x,
-                    y: loadingBarPropsRef.current.position.y,
-                  },
-                })
-              }
-            >
-              Show
-            </button>
-            <button
-              className="rounded-md border border-black bg-gray-200 p-2 hover:bg-gray-300"
-              onClick={() =>
-                loadingBar.update({
-                  status: LoadingBarStatus.LOADING,
-                  progress: loadingBarPropsRef.current.progress,
-                  message: loadingBarPropsRef.current.message,
-                  position: {
-                    x: loadingBarPropsRef.current.position.x,
-                    y: loadingBarPropsRef.current.position.y,
-                  },
-                })
-              }
-            >
-              Update
-            </button>
-            <button
-              className="rounded-md border border-black bg-gray-200 p-2 hover:bg-gray-300"
-              onClick={() => loadingBar.hide()}
-            >
-              Hide
-            </button>
-          </div>
-          <PrintLoadingBarProps />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const PrintLoadingBarProps = () => {
-  useSignals();
-  return (
-    <>
-      <p>Status: {loadingBar.signal.value.status}</p>
-      <p>Message: {loadingBar.signal.value.message}</p>
-    </>
-  );
-};
diff --git a/src/pages/sandbox/ContextualLoadingBarForm.tsx b/src/pages/sandbox/ContextualLoadingBarForm.tsx
new file mode 100644
index 0000000000..53d97af811
--- /dev/null
+++ b/src/pages/sandbox/ContextualLoadingBarForm.tsx
@@ -0,0 +1,140 @@
+import { useState } from "react";
+import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
+import { faChevronDown } from "@fortawesome/pro-thin-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+  loadingBar,
+  ContextualLoadingBarProps,
+} from "~/signals/konvaContextuals";
+
+import { Input, Button, LoadingBarStatus } from "~/components/ui";
+type LoadingBarPropsType = Omit<ContextualLoadingBarProps, "isShowing">;
+export const ContextualLoadingBarForm = () => {
+  const [loadingBarProps, setLoadingBarProps] = useState<LoadingBarPropsType>({
+    status: LoadingBarStatus.IDLE,
+    progress: 0,
+    position: {
+      x: 0,
+      y: 0,
+    },
+  });
+
+  return (
+    <div className="flex flex-col gap-2">
+      <label className="font-bold">Loading Bar Props</label>
+      <div className="flex items-center gap-2">
+        <label>X:</label>
+        <Input
+          className="w-20"
+          type="text"
+          placeholder="X"
+          value={loadingBarProps.position.x}
+          onChange={(e) => {
+            setLoadingBarProps((curr: LoadingBarPropsType) => ({
+              ...curr,
+              position: {
+                ...curr.position,
+                x: parseInt(e.target.value) || 0,
+              },
+            }));
+          }}
+        />
+        <label>Y:</label>
+        <Input
+          className="w-20"
+          type="text"
+          placeholder="Y"
+          value={loadingBarProps.position.y}
+          onChange={(e) => {
+            setLoadingBarProps((curr: LoadingBarPropsType) => ({
+              ...curr,
+              position: {
+                ...curr.position,
+                y: parseInt(e.target.value) || 0,
+              },
+            }));
+          }}
+        />
+        <label>Width:</label>
+        <Input
+          className="w-20"
+          type="text"
+          placeholder="Width"
+          value={loadingBarProps.width}
+          onChange={(e) => {
+            setLoadingBarProps((curr: LoadingBarPropsType) => ({
+              ...curr,
+              width: parseInt(e.target.value) || undefined,
+            }));
+          }}
+        />
+        <label>Progress:</label>
+        <Input
+          className="w-20"
+          type="number"
+          min={0}
+          max={100}
+          placeholder="%"
+          value={loadingBarProps.progress}
+          onChange={(e) => {
+            setLoadingBarProps((curr: LoadingBarPropsType) => ({
+              ...curr,
+              progress: parseInt(e.target.value) || 0,
+            }));
+          }}
+        />
+      </div>
+      <div className="flex items-center gap-2">
+        <label>Message:</label>
+        <Input
+          className="w-72"
+          type="text"
+          placeholder="Message"
+          value={loadingBarProps.message}
+          onChange={(e) => {
+            setLoadingBarProps((curr: LoadingBarPropsType) => ({
+              ...curr,
+              message: e.target.value || undefined,
+            }));
+          }}
+        />
+        <label>Status:</label>
+        <Menu>
+          <MenuButton>
+            <div className="flex items-center gap-2 rounded-md bg-gray-200 px-4 py-2">
+              <label className="cursor-pointer">{loadingBarProps.status}</label>
+              <FontAwesomeIcon icon={faChevronDown} />
+            </div>
+          </MenuButton>
+          <MenuItems anchor="bottom">
+            {Object.values(LoadingBarStatus).map((status, idx) => {
+              return (
+                <MenuItem key={idx}>
+                  <div
+                    className="block cursor-pointer data-[focus]:bg-primary-100"
+                    onClick={() => {
+                      setLoadingBarProps((curr: LoadingBarPropsType) => ({
+                        ...curr,
+                        status: status,
+                      }));
+                    }}
+                  >
+                    {status}
+                  </div>
+                </MenuItem>
+              );
+            })}
+          </MenuItems>
+        </Menu>
+      </div>
+
+      <div className="flex gap-2">
+        <Button onClick={() => loadingBar.show(loadingBarProps)}>Show</Button>
+        <Button onClick={() => loadingBar.update(loadingBarProps)}>
+          Update
+        </Button>
+        <Button onClick={() => loadingBar.hide()}>Hide</Button>
+      </div>
+    </div>
+  );
+};
diff --git a/src/pages/sandbox/ContextualToolbarForm.tsx b/src/pages/sandbox/ContextualToolbarForm.tsx
new file mode 100644
index 0000000000..93a7a96f20
--- /dev/null
+++ b/src/pages/sandbox/ContextualToolbarForm.tsx
@@ -0,0 +1,46 @@
+import { useState } from "react";
+
+import { Input, Button } from "~/components/ui";
+import { imageToolbar } from "~/signals";
+
+export const ContextualToolbarForm = () => {
+  const [x, setX] = useState(0);
+  const [y, setY] = useState(0);
+
+  return (
+    <div className="flex flex-col gap-2">
+      <div className="flex items-center gap-2">
+        <label>Image Toolbar Position</label>
+        <Input
+          className="w-20"
+          type="text"
+          placeholder="X"
+          value={x}
+          onChange={(e) => {
+            setX(parseInt(e.target.value) || 0);
+          }}
+        />
+        <Input
+          className="w-20"
+          type="text"
+          placeholder="Y"
+          value={y}
+          onChange={(e) => {
+            setY(parseInt(e.target.value) || 0);
+          }}
+        />
+        <Button
+          onClick={() =>
+            imageToolbar.setPosition({
+              x: x,
+              y: y,
+            })
+          }
+        >
+          Set Position
+        </Button>
+        <Button onClick={() => imageToolbar.hide()}>Hide</Button>
+      </div>
+    </div>
+  );
+};
diff --git a/src/pages/sandbox/index.tsx b/src/pages/sandbox/index.tsx
new file mode 100644
index 0000000000..951cbaa4ec
--- /dev/null
+++ b/src/pages/sandbox/index.tsx
@@ -0,0 +1,24 @@
+import { ContextualToolbarImage } from "~/components/features/KonvaContainer/ContextualToolbarImage";
+import { ContextualLoadingBar } from "~/components/features/KonvaContainer/ContextualLoadingBar";
+
+import { useRenderCounter } from "~/hooks/useRenderCounter";
+
+import { ContextualToolbarForm } from "./ContextualToolbarForm";
+import { ContextualLoadingBarForm } from "./ContextualLoadingBarForm";
+
+export const Sandbox = () => {
+  useRenderCounter("Sandbox");
+
+  return (
+    <div className="p-2">
+      <ContextualToolbarImage />
+      <ContextualLoadingBar />
+
+      <div className="flex flex-col gap-8">
+        <h1>Sandbox</h1>
+        <ContextualToolbarForm />
+        <ContextualLoadingBarForm />
+      </div>
+    </div>
+  );
+};
diff --git a/src/signals/konvaContextuals/loadingBar.ts b/src/signals/konvaContextuals/loadingBar.ts
index ab3f082f46..5de54d0ba6 100644
--- a/src/signals/konvaContextuals/loadingBar.ts
+++ b/src/signals/konvaContextuals/loadingBar.ts
@@ -19,6 +19,7 @@ export const loadingBar = {
   update(props: Omit<ContextualLoadingBarProps, "isShowing">) {
     loadingBarSignal.value = {
       ...loadingBarSignal.value,
+      isShowing: true,
       ...props,
     };
   },
@@ -28,6 +29,12 @@ export const loadingBar = {
       message,
     };
   },
+  updateWidth(width: number) {
+    loadingBarSignal.value = {
+      ...loadingBarSignal.value,
+      width,
+    };
+  },
   updatePosition(position: { x: number; y: number }) {
     loadingBarSignal.value = {
       ...loadingBarSignal.value,
diff --git a/src/signals/konvaContextuals/type.ts b/src/signals/konvaContextuals/type.ts
index c7a8f543e9..30e8dcbb5e 100644
--- a/src/signals/konvaContextuals/type.ts
+++ b/src/signals/konvaContextuals/type.ts
@@ -1,5 +1,4 @@
-import { LoadingBarStatus } from "~/components/ui";
-export { LoadingBarStatus };
+import { LoadingBarProps } from "~/components/ui";
 
 export interface ContextualUi {
   position: {
@@ -9,9 +8,6 @@ export interface ContextualUi {
   isShowing: boolean;
 }
 
-export interface ContextualLoadingBarProps extends ContextualUi {
-  progress: number;
-  status: LoadingBarStatus;
-  message?: string;
-  onRetry?: () => void;
-}
+export interface ContextualLoadingBarProps
+  extends ContextualUi,
+    Omit<LoadingBarProps, "position"> {}