Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add disconnecting loader #543

Merged
merged 2 commits into from
May 21, 2024
Merged

feat: Add disconnecting loader #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a0feb
feat: Add discconnecting loader
LautaroPetaccio May 21, 2024
7a5e243
Merge branch 'master' into feat/add-dissconnect-to-user-menu
LautaroPetaccio May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/UserMenu/UserMenu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
outline: none;
}

.dcl .user-menu-loader {
display: flex;
align-items: center;
height: 100%;
}

.dcl .user-menu__jump-in {
padding: 14px 32px;
margin-left: 24px;
Expand Down
14 changes: 8 additions & 6 deletions src/components/UserMenu/UserMenu.stories.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
.usermenu-story-container {
position: absolute;
top: 100px;
right: 100px;
height: 100vh;
width: 100%;
width: 500px;
padding: 10px;
border: 2px solid #7c7777;
border-radius: 5px;
}

@media (max-width: 991px) {
.usermenu-story-container {
position: absolute;
height: 400px;
width: 100vw;
top: 100px;
left: 0;
right: 0;
}
}
10 changes: 10 additions & 0 deletions src/components/UserMenu/UserMenu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ storiesOf('UserMenu', module)
<UserMenu i18n={i18n} isSignedIn avatar={avatar} />
</div>
))
.add('Signing in', () => (
<div className="usermenu-story-container">
<UserMenu i18n={i18n} isSigningIn />
</div>
))
.add('Disconnecting', () => (
<div className="usermenu-story-container">
<UserMenu i18n={i18n} isDisconnecting />
</div>
))
.add('Guest', () => (
<div className="usermenu-story-container">
<UserMenu
Expand Down
70 changes: 43 additions & 27 deletions src/components/UserMenu/UserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { i18n as i18nUserMenu } from './UserMenu.i18n'
import { UserMenuProps, UserMenuEventId } from './UserMenu.types'
import { Button } from '../Button/Button'
import { Column } from '../Column/Column'
import { Loader } from '../Loader/Loader'
import { config } from '../../config'
import { Row } from '../Row/Row'

Expand All @@ -18,6 +19,7 @@ export const UserMenu = React.memo((props: UserMenuProps) => {
const {
isSignedIn,
isSigningIn,
isDisconnecting,
manaBalances,
i18n = i18nUserMenu,
onClickSignIn,
Expand Down Expand Up @@ -132,34 +134,48 @@ export const UserMenu = React.memo((props: UserMenuProps) => {
onBlur={handleClose}
tabIndex={0}
>
{isSignedIn && (
<UserMenuSignedIn
{...signInProps}
manaBalances={manaBalances}
trackingId={trackingId}
isOpen={isOpen}
i18n={i18n}
onClickToggle={handleToggle}
onClickClose={handleClose}
onClickUserMenuItem={onClickUserMenuItem}
onClickBalance={handleClickBalance}
/>
{isDisconnecting ? (
<div className="dcl user-menu-loader">
<Loader inline active size="medium" />
</div>
) : (
<>
{isSignedIn && (
<UserMenuSignedIn
{...signInProps}
manaBalances={manaBalances}
trackingId={trackingId}
isOpen={isOpen}
i18n={i18n}
onClickToggle={handleToggle}
onClickClose={handleClose}
onClickUserMenuItem={onClickUserMenuItem}
onClickBalance={handleClickBalance}
/>
)}
{!isSignedIn ? (
<Button
inverted
disabled={isSigningIn}
loading={isSigningIn}
onClick={handleClickSignIn}
>
{i18n.signIn}
</Button>
) : null}
{isSignedIn && (
<Button
className="user-menu__jump-in"
primary
onClick={handleClickJumpIn}
as={'a'}
href={config.get('EXPLORER_URL')}
>
{i18n.jumpIn}
</Button>
)}
</>
)}
{!isSignedIn && (
<Button inverted disabled={isSigningIn} onClick={handleClickSignIn}>
{i18n.signIn}
</Button>
)}
<Button
className="user-menu__jump-in"
primary
disabled={isSigningIn}
onClick={handleClickJumpIn}
as={'a'}
href={config.get('EXPLORER_URL')}
>
{i18n.jumpIn}
</Button>
</div>
</Row>
</Column>
Expand Down
1 change: 1 addition & 0 deletions src/components/UserMenu/UserMenu.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export type UserMenuProps = Omit<
> & {
isSignedIn?: boolean
isSigningIn?: boolean
isDisconnecting?: boolean
isActivity?: boolean
i18n?: UserMenuI18N
onClickSignIn?: (event: React.MouseEvent<HTMLElement, MouseEvent>) => void
Expand Down
Loading