Skip to content

Commit

Permalink
fix: error boundary app fallback alert.
Browse files Browse the repository at this point in the history
  • Loading branch information
riccox committed Nov 14, 2023
1 parent 2e30a08 commit 9865ac5
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 52 deletions.
27 changes: 13 additions & 14 deletions src/components/ErrorBoundary/Fallback/AppFallback.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { FC } from 'react';

import type { ErrorFallbackProps } from './ErrorFallbackProps';
import { Alert } from '@mantine/core';
import { useTranslation } from 'react-i18next';

const handleReload = () => {
Expand All @@ -12,20 +11,20 @@ export const AppFallback: FC<ErrorFallbackProps> = ({ error }) => {
const { t } = useTranslation('sys');
return (
<div className={`full-page justify-center items-center w-fit`}>
<Alert
icon={<p className={'text-2xl'}>🚨</p>}
title={<p className={`text-2xl`}>{t('warning')}</p>}
color="red"
radius="lg"
variant="filled"
>
<div className={`text-xl`}>
<p>{error.message}</p>
<p className="link" onClick={handleReload}>
{t('reload')}
</p>
<div className="prompt danger outline w-1/2 max-w-7xl">
<div className="content">
<div className="flex gap-2">
<p className={'text-2xl'}>🚨</p>
<p className={`text-2xl`}>{t('warning')}</p>
</div>
<div className={``}>
<p>{error.message}</p>
<p className="link inline-block" onClick={handleReload}>
{t('reload')}
</p>
</div>
</div>
</Alert>
</div>
</div>
);
};
34 changes: 0 additions & 34 deletions src/components/ErrorBoundary/Fallback/LayoutFallback.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/ErrorBoundary/Fallback/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { AppFallback } from './AppFallback';
export { LayoutFallback } from './LayoutFallback';
4 changes: 2 additions & 2 deletions src/components/ErrorBoundary/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { FC, ReactNode } from 'react';
import { ErrorBoundary } from 'react-error-boundary';

import { LayoutFallback } from './Fallback';
import { AppFallback, LayoutFallback } from './Fallback';
import type { ErrorFallbackProps } from './Fallback/ErrorFallbackProps';

type ErrorBoundaryProps = {
Expand All @@ -13,7 +13,7 @@ type ErrorBoundaryProps = {
export const ReactErrorBoundary: FC<ErrorBoundaryProps> = ({ children, onReset, FallbackComponent }) => {
return (
/* eslint-disable react/jsx-handler-names */
<ErrorBoundary FallbackComponent={FallbackComponent || LayoutFallback} onReset={onReset}>
<ErrorBoundary FallbackComponent={FallbackComponent || AppFallback} onReset={onReset}>
{children}
</ErrorBoundary>
);
Expand Down
4 changes: 3 additions & 1 deletion src/components/lang.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ export const LangSelector: FC<Props> = ({ className = '' }) => {
}}
>
{_.entries(SUPPORTED_LANGUAGE_LOCALIZED).map(([k, v]) => (
<option value={k}>{v}</option>
<option value={k} key={v}>
{v}
</option>
))}
</select>
);
Expand Down

1 comment on commit 9865ac5

@vercel
Copy link

@vercel vercel bot commented on 9865ac5 Nov 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.