From 4c057a30f77ae316552f17878692f91f92f92e50 Mon Sep 17 00:00:00 2001
From: Tsu-ba-me <ynho.li.aa.e@gmail.com>
Date: Fri, 20 Jan 2023 20:12:22 -0500
Subject: [PATCH] fix(striker-ui): distinct server preview loading and power
 off

---
 striker-ui/components/Display/Preview.tsx | 105 ++++++++++++----------
 1 file changed, 56 insertions(+), 49 deletions(-)

diff --git a/striker-ui/components/Display/Preview.tsx b/striker-ui/components/Display/Preview.tsx
index 20c32053..486706b9 100644
--- a/striker-ui/components/Display/Preview.tsx
+++ b/striker-ui/components/Display/Preview.tsx
@@ -1,19 +1,21 @@
-import { FC, ReactNode, useEffect, useState } from 'react';
+import {
+  DesktopWindows as DesktopWindowsIcon,
+  PowerOffOutlined as PowerOffOutlinedIcon,
+} from '@mui/icons-material';
 import {
   Box,
   IconButton as MUIIconButton,
   IconButtonProps as MUIIconButtonProps,
 } from '@mui/material';
-import {
-  DesktopWindows as DesktopWindowsIcon,
-  PowerOffOutlined as PowerOffOutlinedIcon,
-} from '@mui/icons-material';
+import { FC, ReactNode, useEffect, useMemo, useState } from 'react';
 
 import API_BASE_URL from '../../lib/consts/API_BASE_URL';
 import { BORDER_RADIUS, GREY } from '../../lib/consts/DEFAULT_THEME';
 
+import FlexBox from '../FlexBox';
 import IconButton, { IconButtonProps } from '../IconButton';
 import { InnerPanel, InnerPanelHeader, Panel, PanelHeader } from '../Panels';
+import Spinner from '../Spinner';
 import { BodyText, HeaderText } from '../Text';
 
 type PreviewOptionalProps = {
@@ -85,9 +87,35 @@ const Preview: FC<PreviewProps> = ({
   serverUUID,
   onClickConnectButton: connectButtonClickHandle = previewClickHandler,
 }) => {
+  const [isPreviewLoading, setIsPreviewLoading] = useState<boolean>(true);
   const [isPreviewStale, setIsPreviewStale] = useState<boolean>(false);
   const [preview, setPreview] = useState<string>('');
 
+  const previewButtonContent = useMemo(
+    () =>
+      preview ? (
+        <Box
+          alt=""
+          component="img"
+          src={`data:image/png;base64,${preview}`}
+          sx={{
+            height: '100%',
+            opacity: isPreviewStale ? '0.4' : '1',
+            padding: isUseInnerPanel ? '.2em' : 0,
+            width: '100%',
+          }}
+        />
+      ) : (
+        <PowerOffOutlinedIcon
+          sx={{
+            height: '100%',
+            width: '100%',
+          }}
+        />
+      ),
+    [isPreviewStale, isUseInnerPanel, preview],
+  );
+
   useEffect(() => {
     if (isFetchPreview) {
       (async () => {
@@ -107,11 +135,14 @@ const Preview: FC<PreviewProps> = ({
           setIsPreviewStale(false);
         } catch {
           setIsPreviewStale(true);
+        } finally {
+          setIsPreviewLoading(false);
         }
       })();
     } else if (externalPreview) {
       setPreview(externalPreview);
       setIsPreviewStale(isExternalPreviewStale);
+      setIsPreviewLoading(false);
     }
   }, [externalPreview, isExternalPreviewStale, isFetchPreview, serverUUID]);
 
@@ -120,57 +151,33 @@ const Preview: FC<PreviewProps> = ({
       <PreviewPanelHeader isUseInnerPanel={isUseInnerPanel} text={serverName}>
         {headerEndAdornment}
       </PreviewPanelHeader>
-      <Box
-        sx={{
-          display: 'flex',
-          width: '100%',
-          justifyContent: 'center',
-
-          '& > :not(:last-child)': {
-            marginRight: '1em',
-          },
-        }}
-      >
+      <FlexBox row sx={{ '& > :first-child': { flexGrow: 1 } }}>
+        {/* Box wrapper below is required to keep external preview size sane. */}
         <Box>
-          <MUIIconButton
-            component="span"
-            onClick={previewClickHandler}
-            sx={{
-              borderRadius: BORDER_RADIUS,
-              color: GREY,
-              padding: 0,
-            }}
-          >
-            {preview ? (
-              <Box
-                alt=""
-                component="img"
-                src={`data:image/png;base64,${preview}`}
-                sx={{
-                  height: '100%',
-                  opacity: isPreviewStale ? '0.4' : '1',
-                  padding: isUseInnerPanel ? '.2em' : 0,
-                  width: '100%',
-                }}
-              />
-            ) : (
-              <PowerOffOutlinedIcon
-                sx={{
-                  height: '100%',
-                  width: '100%',
-                }}
-              />
-            )}
-          </MUIIconButton>
+          {isPreviewLoading ? (
+            <Spinner mt="1em" mb="1em" />
+          ) : (
+            <MUIIconButton
+              component="span"
+              onClick={previewClickHandler}
+              sx={{
+                borderRadius: BORDER_RADIUS,
+                color: GREY,
+                padding: 0,
+              }}
+            >
+              {previewButtonContent}
+            </MUIIconButton>
+          )}
         </Box>
         {isShowControls && (
-          <Box>
+          <FlexBox>
             <IconButton onClick={connectButtonClickHandle}>
               <DesktopWindowsIcon />
             </IconButton>
-          </Box>
+          </FlexBox>
         )}
-      </Box>
+      </FlexBox>
     </PreviewPanel>
   );
 };