Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
5fb143c1
Commit
5fb143c1
authored
Nov 11, 2022
by
tom
Committed by
isstuev
Nov 16, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rewrite to support touch events
parent
d8e8cba1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
111 additions
and
42 deletions
+111
-42
ChainIndicatorChartContainer.tsx
ui/home/indicators/ChainIndicatorChartContainer.tsx
+1
-1
ChainIndicators.tsx
ui/home/indicators/ChainIndicators.tsx
+11
-1
ChartTooltip.tsx
ui/shared/chart/ChartTooltip.tsx
+38
-40
pointerTracker.tsx
ui/shared/chart/utils/pointerTracker.tsx
+61
-0
No files found.
ui/home/indicators/ChainIndicatorChartContainer.tsx
View file @
5fb143c1
...
...
@@ -25,7 +25,7 @@ const ChainIndicatorChartContainer = ({ data, isError, isLoading }: Props) => {
return
<
ChainIndicatorChart
data=
{
data
}
/>;
})();
return
<
Flex
h=
"270px"
alignItems=
"flex-start"
>
{
content
}
</
Flex
>;
return
<
Flex
h=
{
{
base
:
'
130px
'
,
lg
:
'
270px
'
}
}
alignItems=
"flex-start"
>
{
content
}
</
Flex
>;
};
export
default
React
.
memo
(
ChainIndicatorChartContainer
);
ui/home/indicators/ChainIndicators.tsx
View file @
5fb143c1
...
...
@@ -64,7 +64,17 @@ const ChainIndicators = () => {
})();
return
(
<
Flex
p=
{
8
}
borderRadius=
"lg"
boxShadow=
"lg"
bgColor=
{
bgColor
}
columnGap=
{
12
}
w=
"100%"
alignItems=
"stretch"
>
<
Flex
p=
{
8
}
borderRadius=
"lg"
boxShadow=
"lg"
bgColor=
{
bgColor
}
columnGap=
{
12
}
rowGap=
{
12
}
flexDir=
{
{
base
:
'
column
'
,
lg
:
'
row
'
}
}
w=
"100%"
alignItems=
"stretch"
>
<
Flex
flexGrow=
{
1
}
flexDir=
"column"
>
<
Flex
alignItems=
"center"
>
<
Text
fontWeight=
{
500
}
fontFamily=
"heading"
fontSize=
"lg"
>
{
indicator
?.
title
}
</
Text
>
...
...
ui/shared/chart/ChartTooltip.tsx
View file @
5fb143c1
...
...
@@ -5,6 +5,9 @@ import React from 'react';
import
type
{
TimeChartItem
,
TimeChartData
}
from
'
ui/shared/chart/types
'
;
import
type
{
Pointer
}
from
'
ui/shared/chart/utils/pointerTracker
'
;
import
{
trackPointer
}
from
'
ui/shared/chart/utils/pointerTracker
'
;
interface
Props
{
width
?:
number
;
height
?:
number
;
...
...
@@ -27,7 +30,6 @@ const ChartTooltip = ({ xScale, yScale, width, height, data, anchorEl, ...props
const
bgColor
=
useToken
(
'
colors
'
,
'
blackAlpha.900
'
);
const
ref
=
React
.
useRef
(
null
);
const
isPressed
=
React
.
useRef
(
false
);
const
drawLine
=
React
.
useCallback
(
(
x
:
number
)
=>
{
...
...
@@ -67,8 +69,7 @@ const ChartTooltip = ({ xScale, yScale, width, height, data, anchorEl, ...props
.
text
(
data
[
i
].
valueFormatter
?.(
d
.
value
)
||
d
.
value
.
toLocaleString
());
},
[
data
]);
const
drawCircles
=
React
.
useCallback
((
event
:
MouseEvent
)
=>
{
const
[
x
]
=
d3
.
pointer
(
event
,
anchorEl
);
const
drawPoints
=
React
.
useCallback
((
x
:
number
)
=>
{
const
xDate
=
xScale
.
invert
(
x
);
const
bisectDate
=
d3
.
bisector
<
TimeChartItem
,
unknown
>
((
d
)
=>
d
.
date
).
left
;
let
baseXPos
=
0
;
...
...
@@ -101,53 +102,50 @@ const ChartTooltip = ({ xScale, yScale, width, height, data, anchorEl, ...props
});
return
[
baseXPos
,
baseYPos
];
},
[
anchorEl
,
data
,
updateDisplayedValue
,
xScale
,
yScale
]);
},
[
data
,
updateDisplayedValue
,
xScale
,
yScale
]);
const
draw
=
React
.
useCallback
((
pointer
:
Pointer
)
=>
{
if
(
pointer
.
point
)
{
const
[
baseXPos
,
baseYPos
]
=
drawPoints
(
pointer
.
point
[
0
]);
drawLine
(
baseXPos
);
drawContent
(
baseXPos
,
baseYPos
);
}
const
followPoints
=
React
.
useCallback
((
event
:
MouseEvent
)
=>
{
const
[
baseXPos
,
baseYPos
]
=
drawCircles
(
event
);
drawLine
(
baseXPos
);
drawContent
(
baseXPos
,
baseYPos
);
},
[
drawCircles
,
drawLine
,
drawContent
]);
},
[
drawPoints
,
drawLine
,
drawContent
]);
React
.
useEffect
(()
=>
{
const
anchorD3
=
d3
.
select
(
anchorEl
);
const
subscriptions
:
Array
<
string
>
=
[];
anchorD3
.
on
(
'
mousedown.tooltip
'
,
()
=>
{
isPressed
.
current
=
true
;
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
0
);
})
.
on
(
'
mouseup.tooltip
'
,
()
=>
{
isPressed
.
current
=
false
;
}
)
.
on
(
'
mouseout.tooltip
'
,
()
=>
{
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
0
);
})
.
on
(
'
mouseover.tooltip
'
,
()
=>
{
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
1
);
})
.
on
(
'
mousemove.tooltip
'
,
(
event
:
MouseEvent
)
=>
{
if
(
!
isPressed
.
current
)
{
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
1
);
d3
.
select
(
ref
.
current
)
.
selectAll
(
'
.ChartTooltip__linePoint
'
)
.
attr
(
'
opacity
'
,
1
);
followPoints
(
event
);
}
.
on
(
'
touchmove.tooltip
'
,
(
event
:
PointerEvent
)
=>
event
.
preventDefault
())
// prevent scrolling
.
on
(
'
pointerenter.tooltip pointerdown.tooltip
'
,
(
event
:
PointerEvent
)
=>
{
const
newSubscriptions
=
trackPointer
(
event
,
{
start
:
()
=>
{
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
1
);
d3
.
select
(
ref
.
current
)
.
selectAll
(
'
.ChartTooltip__linePoint
'
)
.
attr
(
'
opacity
'
,
1
);
},
move
:
(
pointer
)
=>
{
draw
(
pointer
);
},
out
:
()
=>
{
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
0
);
},
end
:
()
=>
{
d3
.
select
(
ref
.
current
).
attr
(
'
opacity
'
,
0
);
},
}
);
subscriptions
.
push
(...
newSubscriptions
);
});
d3
.
select
(
'
body
'
).
on
(
'
mouseup.tooltip
'
,
function
(
event
)
{
const
isOutside
=
event
.
target
!==
anchorD3
.
node
();
if
(
isOutside
)
{
isPressed
.
current
=
false
;
}
});
return
()
=>
{
anchorD3
.
on
(
'
mousedown.tooltip mouseup.tooltip mouseout.tooltip mouseover.tooltip mousemove
.tooltip
'
,
null
);
d3
.
select
(
'
body
'
).
on
(
'
mouseup.tooltip
'
,
null
);
anchorD3
.
on
(
'
touchmove.tooltip pointerenter.tooltip pointerdown
.tooltip
'
,
null
);
subscriptions
&&
anchorD3
.
on
(
subscriptions
.
join
(
'
'
)
,
null
);
};
},
[
anchorEl
,
followPoints
]);
},
[
anchorEl
,
draw
]);
return
(
<
g
ref=
{
ref
}
opacity=
{
0
}
{
...
props
}
>
...
...
ui/shared/chart/utils/pointerTracker.tsx
0 → 100644
View file @
5fb143c1
import
*
as
d3
from
'
d3
'
;
export
interface
Pointer
{
id
:
number
;
point
:
[
number
,
number
]
|
null
;
prev
:
[
number
,
number
]
|
null
;
sourceEvent
?:
PointerEvent
;
}
export
interface
PointerOptions
{
start
?:
(
tracker
:
Pointer
)
=>
void
;
move
?:
(
tracker
:
Pointer
)
=>
void
;
out
?:
(
tracker
:
Pointer
)
=>
void
;
end
?:
(
tracker
:
Pointer
)
=>
void
;
}
export
function
trackPointer
(
event
:
PointerEvent
,
{
start
,
move
,
out
,
end
}:
PointerOptions
)
{
const
tracker
:
Pointer
=
{
id
:
event
.
pointerId
,
point
:
null
,
prev
:
null
,
};
const
id
=
event
.
pointerId
;
const
target
=
event
.
target
as
Element
;
tracker
.
point
=
d3
.
pointer
(
event
,
target
);
target
.
setPointerCapture
(
id
);
d3
.
select
(
target
)
.
on
(
`pointerup.
${
id
}
pointercancel.
${
id
}
lostpointercapture.
${
id
}
`
,
(
sourceEvent
:
PointerEvent
)
=>
{
if
(
sourceEvent
.
pointerId
!==
id
)
{
return
;
}
tracker
.
sourceEvent
=
sourceEvent
;
d3
.
select
(
target
).
on
(
`.
${
id
}
`
,
null
);
target
.
releasePointerCapture
(
id
);
end
?.(
tracker
);
})
.
on
(
`pointermove.
${
id
}
`
,
(
sourceEvent
)
=>
{
if
(
sourceEvent
.
pointerId
!==
id
)
{
return
;
}
tracker
.
sourceEvent
=
sourceEvent
;
tracker
.
prev
=
tracker
.
point
;
tracker
.
point
=
d3
.
pointer
(
sourceEvent
,
target
);
move
?.(
tracker
);
})
.
on
(
`pointerout.
${
id
}
`
,
(
e
)
=>
{
if
(
e
.
pointerId
!==
id
)
{
return
;
}
tracker
.
sourceEvent
=
e
;
tracker
.
point
=
null
;
out
?.(
tracker
);
});
start
?.(
tracker
);
return
[
'
pointerup
'
,
'
pointercancel
'
,
'
lostpointercapture
'
,
'
pointermove
'
,
'
pointerout
'
].
map
((
event
)
=>
`
${
event
}
.
${
id
}
`
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment