Merge pull request #99 from hufs-sports-live/feat/error-boundary

[FEAT] 에러 처리 및 스켈레톤, 로더 추가
HiimKwak · Nov 28, 2023 · e09727c · e09727c
2 parents f950673 + faa13e0
commit e09727c
Show file tree

Hide file tree

Showing 16 changed files with 537 additions and 72 deletions.
diff --git a/src/app/match/[id]/page.tsx b/src/app/match/[id]/page.tsx
@@ -1,7 +1,9 @@
 'use client';
 
-import { Suspense, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 
+import AsyncBoundary from '@/components/common/AsyncBoundary';
+import Loader from '@/components/common/Loader';
 import MatchBanner from '@/components/match/Banner';
 import Cheer from '@/components/match/Cheer';
 import CommentForm from '@/components/match/CommentForm';
@@ -54,72 +56,99 @@ export default function Match({ params }: { params: { id: string } }) {
 
   return (
     <section>
-      <Suspense fallback={<div>배너 로딩중...</div>}>
+      <AsyncBoundary
+        errorFallback={props => <MatchBanner.ErrorFallback {...props} />}
+        loadingFallback={<MatchBanner.Skeleton />}
+      >
         <MatchByIdFetcher matchId={params.id}>
           {data => <MatchBanner {...data} />}
         </MatchByIdFetcher>
-      </Suspense>
-      <Suspense fallback={<div>응원 로딩중...</div>}>
+      </AsyncBoundary>
+      <AsyncBoundary
+        errorFallback={props => <Cheer.ErrorFallback {...props} />}
+        loadingFallback={<div>응원 로딩중...</div>}
+      >
         <MatchCheerByIdFetcher matchId={params.id}>
           {data => <Cheer cheers={data} />}
         </MatchCheerByIdFetcher>
-      </Suspense>
-
+      </AsyncBoundary>
       <Panel options={options} defaultValue="라인업">
         {({ selected }) => (
-          <Suspense fallback={<div>로딩중...</div>}>
+          <>
             {selected === '라인업' && (
-              <MatchLineupFetcher matchId={params.id}>
-                {([firstTeam, secondTeam]) => (
-                  <div className="grid grid-cols-2 py-5 [&>*:first-child>ul]:before:absolute [&>*:first-child>ul]:before:right-0 [&>*:first-child>ul]:before:h-full [&>*:first-child>ul]:before:border-l-2 [&>*:first-child>ul]:before:bg-gray-2">
-                    <Lineup {...firstTeam} />
-                    <Lineup {...secondTeam} />
-                  </div>
-                )}
-              </MatchLineupFetcher>
+              <AsyncBoundary
+                errorFallback={props => <Lineup.ErrorFallback {...props} />}
+                loadingFallback={<Loader />}
+              >
+                <MatchLineupFetcher matchId={params.id}>
+                  {([firstTeam, secondTeam]) => (
+                    <div className="grid grid-cols-2 py-5 [&>*:first-child>ul]:before:absolute [&>*:first-child>ul]:before:right-0 [&>*:first-child>ul]:before:h-full [&>*:first-child>ul]:before:border-l-2 [&>*:first-child>ul]:before:bg-gray-2">
+                      <Lineup {...firstTeam} />
+                      <Lineup {...secondTeam} />
+                    </div>
+                  )}
+                </MatchLineupFetcher>
+              </AsyncBoundary>
             )}
             {selected === '타임라인' && (
-              <MatchTimelineFetcher matchId={params.id}>
-                {([firstHalf, secondHalf]) => (
-                  <div className="overflow-y-auto p-5">
-                    <RecordList {...firstHalf} />
-                    <RecordList {...secondHalf} />
-                  </div>
-                )}
-              </MatchTimelineFetcher>
+              <AsyncBoundary
+                errorFallback={props => <RecordList.ErrorFallback {...props} />}
+                loadingFallback={<Loader />}
+              >
+                <MatchTimelineFetcher matchId={params.id}>
+                  {([firstHalf, secondHalf]) => (
+                    <div className="overflow-y-auto p-5">
+                      <RecordList {...firstHalf} />
+                      <RecordList {...secondHalf} />
+                    </div>
+                  )}
+                </MatchTimelineFetcher>
+              </AsyncBoundary>
             )}
             {selected === '응원댓글' && (
-              <MatchCommentFetcher matchId={params.id}>
-                {({ commentList, ...data }) => (
-                  <div className="max-h-[450px] overflow-y-auto p-5">
-                    <ul className="pb-8">
-                      <CommentList
-                        commentList={commentList.pages.flat()}
+              <AsyncBoundary
+                errorFallback={props => (
+                  <CommentList.ErrorFallback {...props} />
+                )}
+                loadingFallback={<Loader />}
+              >
+                <MatchCommentFetcher matchId={params.id}>
+                  {({ commentList, ...data }) => (
+                    <div className="max-h-[450px] overflow-y-auto p-5">
+                      <ul className="pb-8">
+                        <CommentList
+                          commentList={commentList.pages.flat()}
+                          scrollToBottom={scrollToBottom}
+                          {...data}
+                        />
+                        <CommentList.SocketList commentList={comments} />
+                        <li ref={scrollRef}></li>
+                      </ul>
+                      <CommentForm
+                        matchId={params.id}
+                        mutate={mutate}
                         scrollToBottom={scrollToBottom}
-                        {...data}
                       />
-                      <CommentList.SocketList commentList={comments} />
-                      <li ref={scrollRef}></li>
-                    </ul>
-                    <CommentForm
-                      matchId={params.id}
-                      mutate={mutate}
-                      scrollToBottom={scrollToBottom}
-                    />
-                  </div>
-                )}
-              </MatchCommentFetcher>
+                    </div>
+                  )}
+                </MatchCommentFetcher>
+              </AsyncBoundary>
             )}
             {selected === '경기영상' && (
-              <MatchVideoFetcher matchId={params.id}>
-                {data => (
-                  <div className="overflow-y-auto p-5">
-                    <Video {...data} />
-                  </div>
-                )}
-              </MatchVideoFetcher>
+              <AsyncBoundary
+                errorFallback={props => <Video.ErrorFallback {...props} />}
+                loadingFallback={<Loader />}
+              >
+                <MatchVideoFetcher matchId={params.id}>
+                  {data => (
+                    <div className="overflow-y-auto p-5">
+                      <Video {...data} />
+                    </div>
+                  )}
+                </MatchVideoFetcher>
+              </AsyncBoundary>
             )}
-          </Suspense>
+          </>
         )}
       </Panel>
     </section>

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,7 +1,6 @@
 'use client';
 
-import { Suspense } from 'react';
-
+import AsyncBoundary from '@/components/common/AsyncBoundary';
 import SportsList from '@/components/league/SportsList';
 import MatchList from '@/components/match/MatchList';
 import { QUERY_PARAMS } from '@/constants/queryParams';
@@ -22,7 +21,10 @@ export default function Home() {
 
   return (
     <section className="flex flex-col items-center">
-      <Suspense>
+      <AsyncBoundary
+        errorFallback={() => <div>에러</div>}
+        loadingFallback={<SportsList.Skeleton />}
+      >
         <SportsListFetcher leagueId={params.get(QUERY_PARAMS.league) || '1'}>
           {data => (
             <SportsList
@@ -32,7 +34,7 @@ export default function Home() {
             />
           )}
         </SportsListFetcher>
-      </Suspense>
+      </AsyncBoundary>
 
       <div className="mb-8 flex w-fit items-center gap-5 rounded-xl bg-gray-2 text-center">
         <button
@@ -67,15 +69,18 @@ export default function Home() {
         </button>
       </div>
 
-      <div className="flex flex-col gap-8">
-        <Suspense fallback={<div>MatchList 로딩중...</div>}>
-          <MatchListFetcher {...paramsObj}>
-            {({ matchList, ...props }) => (
+      <AsyncBoundary
+        errorFallback={props => <MatchList.ErrorFallback {...props} />}
+        loadingFallback={<MatchList.Skeleton />}
+      >
+        <MatchListFetcher {...paramsObj}>
+          {({ matchList, ...props }) => (
+            <div className="flex w-full flex-col gap-8">
               <MatchList matchList={matchList.pages.flat()} {...props} />
-            )}
-          </MatchListFetcher>
-        </Suspense>
-      </div>
+            </div>
+          )}
+        </MatchListFetcher>
+      </AsyncBoundary>
     </section>
   );
 }
diff --git a/src/components/common/AsyncBoundary/index.tsx b/src/components/common/AsyncBoundary/index.tsx
@@ -0,0 +1,26 @@
+import { QueryErrorResetBoundary } from '@tanstack/react-query';
+import { ReactNode, Suspense } from 'react';
+
+import ErrorBoundary, { FallbackProps } from '../ErrorBoundary';
+
+type AsyncBoundaryProps = {
+  errorFallback: (props: FallbackProps) => ReactNode;
+  loadingFallback: ReactNode;
+  children: ReactNode;
+};
+
+export default function AsyncBoundary({
+  errorFallback,
+  loadingFallback,
+  children,
+}: AsyncBoundaryProps) {
+  return (
+    <QueryErrorResetBoundary>
+      {({ reset }) => (
+        <ErrorBoundary fallback={errorFallback} onReset={reset}>
+          <Suspense fallback={loadingFallback}>{children}</Suspense>
+        </ErrorBoundary>
+      )}
+    </QueryErrorResetBoundary>
+  );
+}
diff --git a/src/components/common/ErrorBoundary/index.tsx b/src/components/common/ErrorBoundary/index.tsx
@@ -0,0 +1,65 @@
+import { Component, ComponentType, createElement, ReactNode } from 'react';
+
+type ErrorBoundaryState = {
+  hasError: boolean;
+  error: Error | null;
+};
+
+export type FallbackProps = {
+  error: Error | null;
+  resetErrorBoundary: () => void;
+};
+
+type ErrorBoundaryProps = {
+  children: ReactNode;
+  onReset: () => void;
+  fallback: ComponentType<FallbackProps>;
+};
+
+export default class ErrorBoundary extends Component<
+  ErrorBoundaryProps,
+  ErrorBoundaryState
+> {
+  constructor(props: ErrorBoundaryProps) {
+    super(props);
+
+    this.state = {
+      hasError: false,
+      error: null,
+    };
+
+    this.resetErrorBoundary = this.resetErrorBoundary.bind(this);
+  }
+
+  static getDerivedStateFromError(error: Error): ErrorBoundaryState {
+    return {
+      hasError: true,
+      error,
+    };
+  }
+
+  resetErrorBoundary(): void {
+    this.props.onReset();
+
+    this.setState({
+      hasError: false,
+      error: null,
+    });
+  }
+
+  render() {
+    const { state, props, resetErrorBoundary } = this;
+
+    const { hasError, error } = state;
+    const { fallback, children } = props;
+
+    const fallbackProps: FallbackProps = {
+      error,
+      resetErrorBoundary,
+    };
+
+    const fallbackComponent = createElement(fallback, fallbackProps);
+
+    return hasError ? fallbackComponent : children;
+  }
+}
diff --git a/src/components/common/Loader/index.tsx b/src/components/common/Loader/index.tsx
@@ -0,0 +1,26 @@
+export default function Loader() {
+  return (
+    <div
+      role="status"
+      className="flex w-full items-center justify-center py-10"
+    >
+      <svg
+        aria-hidden="true"
+        className="h-8 w-8 animate-spin fill-primary text-gray-200 dark:text-gray-600"
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+      <span className="sr-only">Loading...</span>
+    </div>
+  );
+}
diff --git a/src/components/common/MatchCard/pieces/Label.tsx b/src/components/common/MatchCard/pieces/Label.tsx
@@ -8,17 +8,17 @@ type LabelProps = {
 
 export default function Label({ className }: LabelProps) {
   const { gameName, sportsName, startTime } = useMatchCardContext();
-  const { year, month, date, weekday } = parseTimeString(startTime);
+  const { month, date, weekday, period, hours, minutes } =
+    parseTimeString(startTime);
 
   return (
-    <div className={$(className)}>
-      {startTime && (
-        <time>
-          {year}. {month}. {date}. ({weekday})
-        </time>
-      )}
-      {sportsName && <div className="text-center">{sportsName}</div>}
-      {gameName && <div className="text-right">{gameName}</div>}
+    <div className={$('flex items-center justify-between', className)}>
+      <time>
+        {month}. {date}. {weekday}요일 {period} {hours}:{minutes}
+      </time>
+      <div className="text-right">
+        {sportsName} {gameName}
+      </div>
     </div>
   );
 }
diff --git a/src/components/league/SportsList/index.tsx b/src/components/league/SportsList/index.tsx
@@ -36,3 +36,14 @@ export default function SportsList({
     </ul>
   );
 }
+
+SportsList.Skeleton = function Skeleton() {
+  return (
+    <ul className="mb-5 flex h-[40px] w-full max-w-md items-center justify-start gap-5 overflow-hidden">
+      <li className="text-gary-5 h-[40px] w-[70px] animate-pulse cursor-pointer rounded-xl bg-gray-2"></li>
+      <li className="text-gary-5 h-[40px] w-[70px] animate-pulse cursor-pointer rounded-xl bg-gray-2"></li>
+      <li className="text-gary-5 h-[40px] w-[70px] animate-pulse cursor-pointer rounded-xl bg-gray-2"></li>
+      <li className="text-gary-5 h-[40px] w-[70px] animate-pulse cursor-pointer rounded-xl bg-gray-2"></li>
+    </ul>
+  );
+};