fix: fix websocket component fallback

- migrate away from Show and use Switch - fixed fallback JSX callback method
EyeTrackVR · Apr 30, 2023 · 7338e3a · 7338e3a
1 parent 274a7d0
commit 7338e3a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/ETVR.code-workspace b/ETVR.code-workspace
@@ -68,12 +68,14 @@
       "hashset",
       "hookable",
       "Iinternal",
+      "iocp",
       "kobalte",
       "nanos",
       "notif",
       "notififcation",
       "notifs",
       "partytown",
+      "ratelimit",
       "reqwest",
       "shakram",
       "solidjs",

diff --git a/GUI/ETVR/src/components/WebSocket/index.tsx b/GUI/ETVR/src/components/WebSocket/index.tsx
@@ -1,33 +1,33 @@
-import { Show } from 'solid-js'
+import { Switch, Match, Show } from 'solid-js'
 import { OrangeLoader, MagentaLoader } from '@components/Loader'
 import { classNames } from '@src/utils'
 import { CameraStatus } from '@store/camera/camera'
 import { showCameraView } from '@store/ui/selectors'
 
 // TODO: Grab selected camera from store, connect if not connected, and display video stream on component mounted
-interface IWsProps {
+type IWsProps = {
     status: CameraStatus
     styles?: string
 }
 
 // TODO: Make other loader components for other statuses
 export const LoaderHandler = (props: IWsProps) => {
     return (
-        <>
-            <Show when={props.status == CameraStatus.LOADING}>
+        <Switch>
+            <Match when={props.status == CameraStatus.LOADING}>
                 <OrangeLoader width={100} height={100} unit={'%'} />
-            </Show>
-            <Show when={props.status == CameraStatus.ACTIVE}>
+            </Match>
+            <Match when={props.status == CameraStatus.ACTIVE}>
                 <OrangeLoader width={100} height={100} unit={'%'} />
-            </Show>
-            <Show
+            </Match>
+            <Match
                 when={props.status == CameraStatus.DISABLED || props.status == CameraStatus.FAILED}>
                 <MagentaLoader width={100} height={100} unit={'%'} id="magenta" />
-            </Show>
-            <Show when={props.status == CameraStatus.NONE}>
+            </Match>
+            <Match when={props.status == CameraStatus.NONE}>
                 <OrangeLoader width={100} height={100} unit={'%'} />
-            </Show>
-        </>
+            </Match>
+        </Switch>
     )
 }
 
@@ -36,15 +36,15 @@ const WebSocketHandler = (props: IWsProps) => {
         <div class="w-full h-full">
             <Show
                 when={showCameraView()}
-                fallback={() => (
+                fallback={
                     <div
                         class={classNames(
                             props.styles,
                             'text-[#FFFF] flex justify-center items-center bg-[#2b2f38] rounded-t-xl min-[1750px]:rounded-xl w-full h-full',
                         )}>
                         <LoaderHandler status={props.status} />
                     </div>
-                )}>
+                }>
                 <video class="bg-black rounded-t-xl w-full h-full" autoplay>
                     <source src="" type="video/mp4" />
                 </video>