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

fix: refactor graph tooltip architecture #508

Merged
merged 2 commits into from
Aug 22, 2024
Merged

fix: refactor graph tooltip architecture #508

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
46b025a
fix: refactor graph tooltip architecture
jinoosss Aug 22, 2024
e512870
fix: modify the tooltip update conditions
jinoosss Aug 22, 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
18 changes: 10 additions & 8 deletions packages/web/src/components/common/bar-area-graph/BarAreaGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,20 @@ const BarAreaGraph: React.FC<BarAreaGraphProps> = ({
poolBins,
}) => {
const isHideBar = useMemo(() => {
const isAllReserveZeroBin40 = poolBins.every(item => Number(item.reserveTokenA) === 0 && Number(item.reserveTokenB) === 0);
const isAllReserveZeroBin = positionBins.every(item => Number(item.reserveTokenA) === 0 && Number(item.reserveTokenB) === 0);
const isAllReserveZeroBin40 = poolBins.every(
item =>
Number(item.reserveTokenA) === 0 && Number(item.reserveTokenB) === 0,
);
const isAllReserveZeroBin = positionBins.every(
item =>
Number(item.reserveTokenA) === 0 && Number(item.reserveTokenB) === 0,
);

return isAllReserveZeroBin40 && isAllReserveZeroBin;
}, [poolBins, positionBins]);

return (
<BarAreaGraphWrapper
className={className}
width={width}
height={height}
>
<BarAreaGraphWrapper className={className} width={width} height={height}>
<PoolGraph
currentTick={currentTick !== undefined ? currentTick : null}
width={width}
Expand All @@ -80,7 +82,7 @@ const BarAreaGraph: React.FC<BarAreaGraphProps> = ({
poolPrice={pool?.price || 1}
isPosition
binsMyAmount={positionBins}
showBar={!isHideBar}
disabled={isHideBar}
/>
</BarAreaGraphWrapper>
);
Expand Down
136 changes: 1 addition & 135 deletions packages/web/src/components/common/pool-graph/PoolGraph.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import styled from "@emotion/styled";
import { fonts } from "@constants/font.constant";
import { media } from "@styles/media";

export const PoolGraphWrapper = styled.div`
position: relative;
Expand All @@ -22,142 +20,10 @@ export const PoolGraphWrapper = styled.div`
stroke: ${({ theme }) => theme.color.background06};
}
&:hover {
.bin-inner {
.bin-inner {
opacity: 0.4;
}
}
}
}
`;

export const PoolGraphTooltipWrapper = styled.div`
padding: 0;
pointer-events: none;
border-radius: 8px;

&.disabled {
display: none;
}

.tooltip-wrapper {
display: flex;
flex-direction: column;
background-color: ${({ theme }) => theme.color.background02};
align-items: flex-start;
border-radius: 8px;
gap: 8px;
${fonts.body12};
line-height: 1em;

.row {
display: flex;
flex-direction: row;
width: 100%;
gap: 8px;
& > span {
display: flex;
flex-direction: row;
align-items: center;
&.price-range {
justify-content: flex-end;
}
&.token-title {
${media.mobile} {
display: none;
}
}
}
}

.header {
display: flex;
flex-direction: column;
color: ${({ theme }) => theme.color.text04};
justify-content: space-between;
width: 100%;
&.mt-8 {
margin-top: 8px;
}
.row {
padding: 3px 0;
}
}

.content {
display: flex;
flex-direction: column;
color: ${({ theme }) => theme.color.text02};
gap: 8px;
width: 100%;
.row {
padding: 4px 0;
}
&:last-of-type {
.token {
${media.mobile} {
display: none;
}
}
}
}

.token {
flex-shrink: 0;
min-width: 80px;
gap: 8px;

img {
width: 20px;
height: 20px;
}
${media.mobile} {
display: none;
}
}
.amount {
flex-shrink: 0;
min-width: 76px;
& .hidden {
display: inline;
overflow: hidden;
text-overflow: clip;
white-space: nowrap;
word-break: break-all;
}
& .small-font {
font-size: 10px;
}
&.w-100 {
min-width: 108px;
}
img {
width: 20px;
height: 20px;
display: none;
}

${media.mobile} {
&.total-amount {
width: 85px;
gap: 8px;
}
img {
display: block;
}
}
}

.price-range {
width: 100%;
}
.small-font {
font-size: 12px;
}
${media.mobile} {
max-width: max-content;
}
@media (max-width: 360px){
max-width: 336px;
}
}
`;
Loading
Loading