diff --git a/src/components/features/KonvaContainer/ContextualLoadingBar.tsx b/src/components/features/KonvaContainer/ContextualLoadingBar.tsx new file mode 100644 index 0000000000..f138fbd1f0 --- /dev/null +++ b/src/components/features/KonvaContainer/ContextualLoadingBar.tsx @@ -0,0 +1,12 @@ +import { useSignals } from "@preact/signals-react/runtime"; + +import { LoadingBar } from "~/components/ui"; +import { loadingBar } from "~/signals/konvaContextuals"; + +export const ContextualLoadingBar = () => { + useSignals(); + console.log("ContextualLoadingBar"); + const props = loadingBar.signal.value; + + return ; +}; diff --git a/src/components/features/KonvaContainer/ContextualToolbarImage.tsx b/src/components/features/KonvaContainer/ContextualToolbarImage.tsx index 04b73cae51..790a2e4360 100644 --- a/src/components/features/KonvaContainer/ContextualToolbarImage.tsx +++ b/src/components/features/KonvaContainer/ContextualToolbarImage.tsx @@ -3,11 +3,12 @@ import { Transition } from "@headlessui/react"; import { twMerge } from "tailwind-merge"; import { ToolbarImage } from "../ToolbarImage"; -import { imageToolbar } from "~/signals/konva"; +import { imageToolbar } from "~/signals/konvaContextuals"; import { transitionTimingStyles } from "~/components/styles"; export const ContextualToolbarImage = () => { useSignals(); console.log("ContextualToolbarImage"); + const { position, isShowing } = imageToolbar.signal.value; return ( diff --git a/src/components/ui/LoadingBar.tsx b/src/components/ui/LoadingBar.tsx index e0a75e3d01..f0ba563f16 100644 --- a/src/components/ui/LoadingBar.tsx +++ b/src/components/ui/LoadingBar.tsx @@ -2,24 +2,21 @@ import { Transition } from "@headlessui/react"; import { twMerge } from "tailwind-merge"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faCheck, faArrowRotateLeft } from "@fortawesome/pro-thin-svg-icons"; +import { + faCheck, + faArrowRotateLeft, + faStop, +} from "@fortawesome/pro-thin-svg-icons"; import { Spinner } from "./Spinner"; export enum LoadingBarStatus { + IDLE = "idle", LOADING = "loading", SUCCESS = "success", ERROR = "error", } - -export const LoadingBar = ({ - progress = 0, - position, - status, - onRetry, - isShowing, - message, -}: { +export type LoadingBarProps = { progress: number; status: LoadingBarStatus; isShowing: boolean; @@ -29,13 +26,22 @@ export const LoadingBar = ({ }; message?: string; onRetry?: () => void; -}) => { +}; + +export const LoadingBar = ({ + progress = 0, + position, + status, + onRetry, + isShowing, + message, +}: LoadingBarProps) => { return (
-
-
+
+
+ {message && ( + + )} +
+
+ {status === LoadingBarStatus.IDLE && ( + + )} {status === LoadingBarStatus.LOADING && ( )} @@ -71,7 +85,6 @@ export const LoadingBar = ({ )}
- {message && }
); diff --git a/src/hooks/useRenderCounter.ts b/src/hooks/useRenderCounter.ts index df1f6013fe..44de3efbbf 100644 --- a/src/hooks/useRenderCounter.ts +++ b/src/hooks/useRenderCounter.ts @@ -3,7 +3,7 @@ import { useRef } from "react"; export const useRenderCounter = (componentName: string) => { const renderCount = useRef(0); renderCount.current++; - if (renderCount.current === 1) { + if (renderCount.current === 1 && import.meta.env.DEV) { console.log(`${componentName} rerendered ${renderCount.current} times`); } else { console.warn(`${componentName} rerendered ${renderCount.current} times`); diff --git a/src/pages/sandbox.tsx b/src/pages/sandbox.tsx index d095956318..a7195d6e18 100644 --- a/src/pages/sandbox.tsx +++ b/src/pages/sandbox.tsx @@ -1,66 +1,160 @@ import { useRef } from "react"; -import { LoadingBar, LoadingBarStatus } from "~/components/ui"; +import { useSignals } from "@preact/signals-react/runtime"; import { ContextualToolbarImage } from "~/components/features/KonvaContainer/ContextualToolbarImage"; +import { ContextualLoadingBar } from "~/components/features/KonvaContainer/ContextualLoadingBar"; -import { imageToolbar } from "~/signals/konva"; +import { LoadingBarStatus } from "~/components/ui/LoadingBar"; + +import { + imageToolbar, + loadingBar, + ContextualLoadingBarProps, +} from "~/signals/konvaContextuals"; export const Sandbox = () => { - const { setPosition, hide } = imageToolbar; - const xRef = useRef(0); - const yRef = useRef(0); + const xImageToolbarRef = useRef(0); + const yImageToolbarRef = useRef(0); + + const loadingBarPropsRef = useRef({ + position: { + x: 0, + y: 0, + }, + progress: 0, + status: LoadingBarStatus.IDLE, + isShowing: true, + message: "Loading...", + }); return ( -
-

Sandbox

- - - - +
+ +

Sandbox

+
+
+ + { + xImageToolbarRef.current = parseInt(e.target.value); + }} + /> + { + yImageToolbarRef.current = parseInt(e.target.value); + }} + /> + + +
-
- - { - xRef.current = parseInt(e.target.value); - }} - /> - { - yRef.current = parseInt(e.target.value); - }} - /> - - +
+
+ + { + loadingBarPropsRef.current.position.x = parseInt( + e.target.value, + ); + }} + /> + { + loadingBarPropsRef.current.position.y = parseInt( + e.target.value, + ); + }} + /> + { + loadingBarPropsRef.current.progress = parseInt(e.target.value); + }} + /> + + + +
+ +
); }; + +const PrintLoadingBarProps = () => { + useSignals(); + return ( + <> +

Status: {loadingBar.signal.value.status}

+

Message: {loadingBar.signal.value.message}

+ + ); +}; diff --git a/src/signals/index.ts b/src/signals/index.ts index 985a73c066..a3bbc4b49f 100644 --- a/src/signals/index.ts +++ b/src/signals/index.ts @@ -1,2 +1,3 @@ export * from "./authentication"; export * from "./layout"; +export * from "./konvaContextuals"; diff --git a/src/signals/konva/index.ts b/src/signals/konvaContextuals/imageToolbar.ts similarity index 68% rename from src/signals/konva/index.ts rename to src/signals/konvaContextuals/imageToolbar.ts index a67cdd7037..c8cef52110 100644 --- a/src/signals/konva/index.ts +++ b/src/signals/konvaContextuals/imageToolbar.ts @@ -1,14 +1,7 @@ import { signal } from "@preact/signals-core"; +import { ContextualUi } from "./type"; -export type ContextualToolbar = { - position: { - x: number; - y: number; - }; - isShowing: boolean; -}; - -const imageToolbarSignal = signal({ +const imageToolbarSignal = signal({ position: { x: 0, y: 0, @@ -18,7 +11,7 @@ const imageToolbarSignal = signal({ export const imageToolbar = { signal: imageToolbarSignal, - setPosition(position: ContextualToolbar["position"]) { + setPosition(position: ContextualUi["position"]) { imageToolbarSignal.value = { position, isShowing: true, diff --git a/src/signals/konvaContextuals/index.ts b/src/signals/konvaContextuals/index.ts new file mode 100644 index 0000000000..5ea8499df4 --- /dev/null +++ b/src/signals/konvaContextuals/index.ts @@ -0,0 +1,5 @@ +import { ContextualUi, ContextualLoadingBarProps } from "./type"; + +export type { ContextualUi, ContextualLoadingBarProps }; +export * from "./imageToolbar"; +export * from "./loadingBar"; diff --git a/src/signals/konvaContextuals/loadingBar.ts b/src/signals/konvaContextuals/loadingBar.ts new file mode 100644 index 0000000000..ab3f082f46 --- /dev/null +++ b/src/signals/konvaContextuals/loadingBar.ts @@ -0,0 +1,70 @@ +import { signal } from "@preact/signals-core"; +import { ContextualLoadingBarProps } from "./type"; +import { LoadingBarStatus } from "~/components/ui/LoadingBar"; + +const loadingBarSignal = signal({ + position: { + x: 0, + y: 0, + }, + isShowing: false, + progress: 0, + status: LoadingBarStatus.IDLE, + message: undefined, + onRetry: undefined, +}); + +export const loadingBar = { + signal: loadingBarSignal, + update(props: Omit) { + loadingBarSignal.value = { + ...loadingBarSignal.value, + ...props, + }; + }, + updateMessage(message: string) { + loadingBarSignal.value = { + ...loadingBarSignal.value, + message, + }; + }, + updatePosition(position: { x: number; y: number }) { + loadingBarSignal.value = { + ...loadingBarSignal.value, + position, + }; + }, + updateProgress(progress: number) { + loadingBarSignal.value = { + ...loadingBarSignal.value, + progress, + }; + }, + updateStatus(status: LoadingBarStatus) { + loadingBarSignal.value = { + ...loadingBarSignal.value, + status, + }; + }, + show(props: Omit) { + if (loadingBarSignal.value.isShowing) { + if (import.meta.env.DEV) { + console.warn( + "Loading bar is already showing", + "use the `update` methods instead", + ); + } + return; + } + loadingBarSignal.value = { + ...props, + isShowing: true, + }; + }, + hide() { + loadingBarSignal.value = { + ...loadingBarSignal.value, + isShowing: false, + }; + }, +}; diff --git a/src/signals/konvaContextuals/type.ts b/src/signals/konvaContextuals/type.ts new file mode 100644 index 0000000000..c7a8f543e9 --- /dev/null +++ b/src/signals/konvaContextuals/type.ts @@ -0,0 +1,17 @@ +import { LoadingBarStatus } from "~/components/ui"; +export { LoadingBarStatus }; + +export interface ContextualUi { + position: { + x: number; + y: number; + }; + isShowing: boolean; +} + +export interface ContextualLoadingBarProps extends ContextualUi { + progress: number; + status: LoadingBarStatus; + message?: string; + onRetry?: () => void; +}