diff --git a/src/KonvaApp/Nodes/NetworkedNodeContext.ts b/src/KonvaApp/Nodes/NetworkedNodeContext.ts index 247b298e88..a8252bcd74 100644 --- a/src/KonvaApp/Nodes/NetworkedNodeContext.ts +++ b/src/KonvaApp/Nodes/NetworkedNodeContext.ts @@ -52,7 +52,7 @@ export class NetworkedNodeContext { return; } - this.kNode.stroke(null); + // this.kNode.stroke(null); this.kNode.strokeWidth(0); this.kNode.draw(); } @@ -62,8 +62,8 @@ export class NetworkedNodeContext { return; } toolbarVideo.setPosition({ - x: this.kNode.getPosition().x + this.kNode.getSize().width / 4, - y: this.kNode.getPosition().y - 150, + x: this.kNode.getPosition().x + this.kNode.getSize().width / 2, + y: this.kNode.getPosition().y, }); } @@ -72,8 +72,8 @@ export class NetworkedNodeContext { return; } loadingBar.updatePosition({ - x: this.kNode.getPosition().x + this.kNode.getSize().width / 4, - y: this.kNode.getPosition().y - 60, + x: this.kNode.getPosition().x + this.kNode.getSize().width / 2, + y: this.kNode.getPosition().y + this.kNode.getSize().height, }); } diff --git a/src/KonvaRootComponent/ContextualLoadingBar.tsx b/src/KonvaRootComponent/ContextualLoadingBar.tsx index 109339dcf9..dd222dfd9e 100644 --- a/src/KonvaRootComponent/ContextualLoadingBar.tsx +++ b/src/KonvaRootComponent/ContextualLoadingBar.tsx @@ -1,16 +1,29 @@ +import { twMerge } from "tailwind-merge"; +import { Transition } from "@headlessui/react"; import { LoadingBar } from "~/components/ui"; import { uiAccess } from "~/signals/uiAccess"; -// import { useSignalRenderCounter } from "~/hooks/useSignalRenderCounter"; +import { transitionTimingStyles } from "~/components/styles"; export const ContextualLoadingBar = () => { - // TODO: Testing the signal render efficiency - // useSignalRenderCounter( - // "ContextualLoadingBar", - // loadingBar.signal, - // ); + const { isShowing, position, width, ...rest } = + uiAccess.loadingBar.signal.value; - const props = uiAccess.loadingBar.signal.value; - - return ; + return ( + + + + ); }; diff --git a/src/KonvaRootComponent/ContextualToolbarImage.tsx b/src/KonvaRootComponent/ContextualToolbarImage.tsx index 8a6c34f43f..adebd66615 100644 --- a/src/KonvaRootComponent/ContextualToolbarImage.tsx +++ b/src/KonvaRootComponent/ContextualToolbarImage.tsx @@ -31,19 +31,19 @@ export const ContextualToolbarImage = () => { }, ); return ( - -
- -
+ + ); }; diff --git a/src/KonvaRootComponent/SignaledToolbarMain.tsx b/src/KonvaRootComponent/SignaledToolbarMain.tsx index 2a305b5f7c..7d74cadb0f 100644 --- a/src/KonvaRootComponent/SignaledToolbarMain.tsx +++ b/src/KonvaRootComponent/SignaledToolbarMain.tsx @@ -1,5 +1,6 @@ import { MouseEventHandler } from "react"; import { useSignalEffect } from "@preact/signals-react"; +import { Transition } from "@headlessui/react"; import { toolbarMain } from "~/signals/uiAccess/toolbarMain"; import { dispatchers } from "~/signals/uiEvents/toolbarMain"; @@ -57,14 +58,15 @@ export const SignaledToolbarMain = ({ return (
- + + +
; } export const LoadingBar = ({ colReverse, - width, progress = 0, - position, status, onRetry, - isShowing, message, }: LoadingBarProps) => { return ( - -
-
-
-
- -
- {message && } - - {status === LoadingBarStatus.ERROR && ( - +
+
+
+ style={{ width: `${progress}%` }} + />
- + +
+ {message && } + + {status === LoadingBarStatus.ERROR && ( + + )} +
+
); }; diff --git a/src/signals/uiAccess/loadingBar.ts b/src/signals/uiAccess/loadingBar.ts index 585b7e6285..5f0a52b921 100644 --- a/src/signals/uiAccess/loadingBar.ts +++ b/src/signals/uiAccess/loadingBar.ts @@ -7,6 +7,7 @@ const loadingBarSignal = signal({ x: 0, y: 0, }, + width: 300, isShowing: false, progress: 0, status: LoadingBarStatus.IDLE, diff --git a/src/signals/uiAccess/type.ts b/src/signals/uiAccess/type.ts index 040bdd23af..209f35664e 100644 --- a/src/signals/uiAccess/type.ts +++ b/src/signals/uiAccess/type.ts @@ -10,7 +10,9 @@ export interface ContextualUi { export interface ContextualLoadingBarProps extends ContextualUi, - Omit {} + Omit { + width: number; +} export interface ContextualButtonRetryProps extends ContextualUi { disabled: boolean;