Skip to content

Commit

Permalink
feat: Add informative tooltips (#449)
Browse files Browse the repository at this point in the history 
Co-authored-by: Lim SangHyun(Blue) <skqksh@gmail.com>
  • Loading branch information
@jinoosss @skqksh
jinoosss and skqksh authored Mar 20, 2024
1 parent 8d2e2c3 commit bc62866
Show file tree
Hide file tree
Showing 21 changed files with 676 additions and 84 deletions.
12 changes: 12 additions & 0 deletions packages/adena-extension/src/assets/web/box-arrow.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions packages/adena-extension/src/assets/web/convenience-rate.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions packages/adena-extension/src/assets/web/security-rate.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion packages/adena-extension/src/common/storage/chrome-local-storage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ type StorageKeyTypes =
| 'ESTABLISH_SITES'
| 'ADDRESS_BOOK'
| 'ACCOUNT_TOKEN_METAINFOS'
| 'QUESTIONNAIRE_EXPIRED_DATE';
| 'QUESTIONNAIRE_EXPIRED_DATE'
| 'WALLET_CREATION_GUIDE_CONFIRM_DATE'
| 'ADD_ACCOUNT_GUIDE_CONFIRM_DATE';

const StorageKeys: StorageKeyTypes[] = [
'NETWORKS',
Expand All @@ -27,6 +29,8 @@ const StorageKeys: StorageKeyTypes[] = [
'ADDRESS_BOOK',
'ACCOUNT_TOKEN_METAINFOS',
'QUESTIONNAIRE_EXPIRED_DATE',
'WALLET_CREATION_GUIDE_CONFIRM_DATE',
'ADD_ACCOUNT_GUIDE_CONFIRM_DATE',
];

function isStorageKey(key: string): key is StorageKeyTypes {
Expand Down
173 changes: 106 additions & 67 deletions packages/adena-extension/src/components/atoms/web-button/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@ import { WebText } from '../web-text';
import { Row, View } from '../base';

type WebButtonProps = {
buttonRef?: React.RefObject<HTMLButtonElement>;
size: 'full' | 'large' | 'small';
textType?: WebFontType;
figure: 'primary' | 'secondary' | 'tertiary' | 'quaternary';
fixed?: boolean;
} & (
| { text: string; rightIcon?: 'chevronRight' }
| {
| { text: string; rightIcon?: 'chevronRight' }
| {
children: ReactNode;
}
) &
) &
ButtonHTMLAttributes<HTMLButtonElement>;

const StyledButtonBase = styled.button<{ size: 'full' | 'large' | 'small'; fixed?: boolean; }>`
const StyledButtonBase = styled.button<{ size: 'full' | 'large' | 'small'; fixed?: boolean }>`
cursor: pointer;
border: none;
border-radius: ${({ size }): string => (size === 'small' ? '12px' : '14px')};
Expand All @@ -32,7 +33,12 @@ const StyledButtonBase = styled.button<{ size: 'full' | 'large' | 'small'; fixed
height: 44px;
justify-content: center;
align-items: center;
${({ fixed }): FlattenSimpleInterpolation | string => fixed ? css`flex-shrink: 0;` : ''};
${({ fixed }): FlattenSimpleInterpolation | string =>
fixed
? css`
flex-shrink: 0;
`
: ''};
:disabled {
cursor: default;
Expand All @@ -42,39 +48,59 @@ const StyledButtonBase = styled.button<{ size: 'full' | 'large' | 'small'; fixed

const StyledButtonPrimary = styled(StyledButtonBase)`
color: ${getTheme('webNeutral', '_100')};
background: linear-gradient(180deg, #0059FF 0%, #004BD6 100%);
background: linear-gradient(180deg, #0059ff 0%, #004bd6 100%);
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.4) inset;
${({ disabled }): FlattenSimpleInterpolation | string => !disabled ? css`
:hover {
box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.4) inset, 0px 0px 24px 0px #0059FF52, 0px 1px 3px 0px #0000001A, 0px 1px 2px 0px #0000000F;
}
:active {
box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.4) inset, 0px 0px 24px 0px #0059FF52, 0px 0px 0px 3px #0059FF29, 0px 1px 3px 0px #0000001A, 0px 1px 2px 0px #0000000F;
}
`: ''}
${({ disabled }): FlattenSimpleInterpolation | string =>
!disabled
? css`
:hover {
box-shadow:
0 0 0 2px rgba(255, 255, 255, 0.4) inset,
0px 0px 24px 0px #0059ff52,
0px 1px 3px 0px #0000001a,
0px 1px 2px 0px #0000000f;
}
:active {
box-shadow:
0 0 0 2px rgba(255, 255, 255, 0.4) inset,
0px 0px 24px 0px #0059ff52,
0px 0px 0px 3px #0059ff29,
0px 1px 3px 0px #0000001a,
0px 1px 2px 0px #0000000f;
}
`
: ''}
`;

const StyledButtonSecondary = styled(StyledButtonBase)`
color: #ADCAFF;
color: #adcaff;
background: rgba(0, 89, 255, 0.16);
box-shadow: 0 0 0 1px rgba(122, 169, 255, 0.24) inset;
${({ disabled }): FlattenSimpleInterpolation | string => !disabled ? css`
:hover {
color: #ADCAFF;
background: linear-gradient(180deg, rgba(0, 89, 255, 0.20) 0%, rgba(0, 89, 255, 0.00) 100%);
box-shadow: 0 0 0 2px rgba(122, 169, 255, 0.24) inset, 0px 1px 3px 0px #0000001A, 0px 1px 2px 0px #0000000F;
}
:active {
color: #7AA9FF;
background: 0 0 0 2px rgba(122, 169, 255, 0.24) inset, linear-gradient(180deg, rgba(0, 89, 255, 0.20) 0%, rgba(0, 89, 255, 0.00) 100%);
}
`: ''}
${({ disabled }): FlattenSimpleInterpolation | string =>
!disabled
? css`
:hover {
color: #adcaff;
background: linear-gradient(180deg, rgba(0, 89, 255, 0.2) 0%, rgba(0, 89, 255, 0) 100%);
box-shadow:
0 0 0 2px rgba(122, 169, 255, 0.24) inset,
0px 1px 3px 0px #0000001a,
0px 1px 2px 0px #0000000f;
}
:active {
color: #7aa9ff;
background:
0 0 0 2px rgba(122, 169, 255, 0.24) inset,
linear-gradient(180deg, rgba(0, 89, 255, 0.2) 0%, rgba(0, 89, 255, 0) 100%);
}
`
: ''}
:disabled {
color: #7AA9FF;
color: #7aa9ff;
opacity: 0.4;
background: rgba(0, 89, 255, 0.16);
}
Expand All @@ -89,22 +115,33 @@ const StyledButtonTertiary = styled(StyledButtonBase)`
fill: ${getTheme('webNeutral', '_300')};
}
${({ disabled, theme }): FlattenSimpleInterpolation | string => !disabled ? css`
:hover {
background: rgba(188, 197, 214, 0.06);
box-shadow: 0 0 0 2px rgba(188, 197, 214, 0.24) inset, 0px 1px 3px 0px rgba(0, 0, 0, 0.10), 0px 1px 2px 0px rgba(0, 0, 0, 0.06);
svg * {
fill: ${theme.webNeutral._100};
}
}
:active {
color: ${theme.webNeutral._100};
box-shadow: 0 0 0 1px rgba(188, 197, 214, 0.24) inset, 0px 0px 16px 0px rgba(255, 255, 255, 0.04), 0px 0px 0px 4px rgba(255, 255, 255, 0.04), 0px 1px 3px 0px rgba(0, 0, 0, 0.10), 0px 1px 2px 0px rgba(0, 0, 0, 0.06);
svg * {
fill: ${theme.webNeutral._100};
}
}
`: ''}
${({ disabled, theme }): FlattenSimpleInterpolation | string =>
!disabled
? css`
:hover {
background: rgba(188, 197, 214, 0.06);
box-shadow:
0 0 0 2px rgba(188, 197, 214, 0.24) inset,
0px 1px 3px 0px rgba(0, 0, 0, 0.1),
0px 1px 2px 0px rgba(0, 0, 0, 0.06);
svg * {
fill: ${theme.webNeutral._100};
}
}
:active {
color: ${theme.webNeutral._100};
box-shadow:
0 0 0 1px rgba(188, 197, 214, 0.24) inset,
0px 0px 16px 0px rgba(255, 255, 255, 0.04),
0px 0px 0px 4px rgba(255, 255, 255, 0.04),
0px 1px 3px 0px rgba(0, 0, 0, 0.1),
0px 1px 2px 0px rgba(0, 0, 0, 0.06);
svg * {
fill: ${theme.webNeutral._100};
}
}
`
: ''}
`;

const StyledButtonTertiarySmall = styled(StyledButtonTertiary)`
Expand All @@ -118,23 +155,26 @@ const StyledButtonTertiarySmall = styled(StyledButtonTertiary)`
fill: ${getTheme('webNeutral', '_300')};
}
${({ disabled, theme }): FlattenSimpleInterpolation | string => !disabled ? css`
:hover {
color: ${theme.webNeutral._100};
box-shadow: 0 0 0 1px rgba(188, 197, 214, 0.16) inset;
background: rgba(188, 197, 214, 0.08);
svg * {
fill: ${theme.webNeutral._100};
}
}
:active {
color: ${theme.webNeutral._100};
box-shadow: 0 0 0 1px rgba(188, 197, 214, 0.16) inset;
svg * {
fill: ${theme.webNeutral._100};
}
}
`: ''}
${({ disabled, theme }): FlattenSimpleInterpolation | string =>
!disabled
? css`
:hover {
color: ${theme.webNeutral._100};
box-shadow: 0 0 0 1px rgba(188, 197, 214, 0.16) inset;
background: rgba(188, 197, 214, 0.08);
svg * {
fill: ${theme.webNeutral._100};
}
}
:active {
color: ${theme.webNeutral._100};
box-shadow: 0 0 0 1px rgba(188, 197, 214, 0.16) inset;
svg * {
fill: ${theme.webNeutral._100};
}
}
`
: ''}
`;

const StyledButtonQuaternary = styled(StyledButtonBase)`
Expand All @@ -154,13 +194,14 @@ const StyledButtonQuaternary = styled(StyledButtonBase)`
}
`;

export const WebButton = ({
export const WebButton: React.FC<WebButtonProps> = ({
buttonRef,
figure,
textType = 'title4',
children,
fixed,
...rest
}: WebButtonProps): ReactElement => {
}): ReactElement => {
let StyledComponent;
switch (figure) {
case 'secondary':
Expand All @@ -187,12 +228,10 @@ export const WebButton = ({
const isFixed = fixed || rest.size === 'small';

return (
<StyledComponent fixed={isFixed} {...rest}>
<StyledComponent ref={buttonRef} fixed={isFixed} {...rest}>
{'text' in rest ? (
<Row style={{ gap: 4, alignItems: 'center', justifyContent: 'space-between' }}>
{isRightButton && (
<View style={{ width: 12 }} />
)}
{isRightButton && <View style={{ width: 12 }} />}
<WebText type={textType} color={'inherit'}>
{rest.text}
</WebText>
Expand Down
14 changes: 8 additions & 6 deletions packages/adena-extension/src/components/atoms/web-main-button/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import styled from 'styled-components';
import { View } from '../base';
import { WebButton } from '../web-button';
import { WebText } from '../web-text';

export interface WebMainButtonProps {
buttonRef?: React.RefObject<HTMLButtonElement>;
figure: 'primary' | 'secondary' | 'tertiary';
text: string;
width?: CSSProperties['width'];
Expand Down Expand Up @@ -32,6 +32,7 @@ const StyledImageWrapper = styled(View)`
`;

const WebMainButton: React.FC<WebMainButtonProps> = ({
buttonRef,
iconElement,
text,
figure,
Expand All @@ -41,18 +42,19 @@ const WebMainButton: React.FC<WebMainButtonProps> = ({
}) => {
return (
<StyledContainer
buttonRef={buttonRef}
style={{ width }}
figure={figure}
size='large'
disabled={disabled}
onClick={onClick}
>
<StyledImageWrapper>
{iconElement}
</StyledImageWrapper>
<WebText type='title5' color='inherit'>{text}</WebText>
<StyledImageWrapper>{iconElement}</StyledImageWrapper>
<WebText type='title5' color='inherit'>
{text}
</WebText>
</StyledContainer>
);
};

export default WebMainButton;
export default WebMainButton;
56 changes: 56 additions & 0 deletions ...es/adena-extension/src/components/molecules/web-help-overlay/web-help-overlay.stories.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import React from 'react';
import WebHelpOverlay, { type WebHelpOverlayProps } from './web-help-overlay';
import { Meta, StoryObj } from '@storybook/react';
import { action } from '@storybook/addon-actions';

export default {
title: 'components/molecules/WebHelpOverlay',
component: WebHelpOverlay,
} as Meta<typeof WebHelpOverlay>;

export const Default: StoryObj<WebHelpOverlayProps> = {
args: {
items: [
{
x: 5,
y: 5,
tooltipInfo: {
securityRate: 2,
convenienceRate: 2,
content: (
<>
1. <b>Tooltip</b>
</>
),
},
},
{
x: 15,
y: 5,
tooltipInfo: {
securityRate: 2,
convenienceRate: 2,
content: (
<>
2. <b>Tooltip</b>
</>
),
},
},
{
x: 25,
y: 5,
tooltipInfo: {
securityRate: 2,
convenienceRate: 2,
content: (
<>
3. <b>Tooltip</b>
</>
),
},
},
],
onFinish: action('finish'),
},
};
Loading

0 comments on commit bc62866

Please sign in to comment.