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
8f4609d7
Commit
8f4609d7
authored
Jan 20, 2023
by
Yuri Mikhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove charts flickering.
parent
59e839fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
14 deletions
+11
-14
useChartSize.tsx
ui/shared/chart/useChartSize.tsx
+8
-11
ChartWidgetContainer.tsx
ui/stats/ChartWidgetContainer.tsx
+3
-3
No files found.
ui/shared/chart/useChartSize.tsx
View file @
8f4609d7
import
_debounce
from
'
lodash/debounce
'
;
import
_debounce
from
'
lodash/debounce
'
;
import
React
from
'
react
'
;
import
React
,
{
useCallback
}
from
'
react
'
;
import
type
{
ChartMargin
,
ChartOffset
}
from
'
ui/shared/chart/types
'
;
import
type
{
ChartMargin
,
ChartOffset
}
from
'
ui/shared/chart/types
'
;
export
default
function
useChartSize
(
svgEl
:
SVGSVGElement
|
null
,
margin
?:
ChartMargin
,
offsets
?:
ChartOffset
)
{
export
default
function
useChartSize
(
svgEl
:
SVGSVGElement
|
null
,
margin
?:
ChartMargin
,
offsets
?:
ChartOffset
)
{
const
[
rect
,
setRect
]
=
React
.
useState
<
{
width
:
number
;
height
:
number
}
>
({
width
:
0
,
height
:
0
});
const
[
rect
,
setRect
]
=
React
.
useState
<
{
width
:
number
;
height
:
number
}
>
({
width
:
0
,
height
:
0
});
const
calculateRect
=
React
.
useCallback
((
)
=>
{
const
calculateRect
=
useCallback
((
element
:
SVGSVGElement
)
=>
{
const
rect
=
svgEl
?.
getBoundingClientRect
();
const
rect
=
element
?.
getBoundingClientRect
();
return
{
width
:
rect
?.
width
||
0
,
height
:
rect
?.
height
||
0
};
return
{
width
:
rect
?.
width
||
0
,
height
:
rect
?.
height
||
0
};
},
[
svgEl
]);
},
[]);
React
.
useEffect
(()
=>
{
setRect
(
calculateRect
());
},
[
calculateRect
]);
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
const
content
=
window
.
document
.
querySelector
(
'
main
'
);
const
content
=
window
.
document
.
querySelector
(
'
main
'
);
...
@@ -23,9 +19,10 @@ export default function useChartSize(svgEl: SVGSVGElement | null, margin?: Chart
...
@@ -23,9 +19,10 @@ export default function useChartSize(svgEl: SVGSVGElement | null, margin?: Chart
let
timeoutId
:
number
;
let
timeoutId
:
number
;
const
resizeHandler
=
_debounce
(()
=>
{
const
resizeHandler
=
_debounce
(()
=>
{
setRect
({
width
:
0
,
height
:
0
});
timeoutId
=
window
.
setTimeout
(()
=>
{
timeoutId
=
window
.
setTimeout
(()
=>
{
setRect
(
calculateRect
());
if
(
svgEl
)
{
setRect
(
calculateRect
(
svgEl
));
}
},
100
);
},
100
);
},
100
);
},
100
);
...
@@ -38,7 +35,7 @@ export default function useChartSize(svgEl: SVGSVGElement | null, margin?: Chart
...
@@ -38,7 +35,7 @@ export default function useChartSize(svgEl: SVGSVGElement | null, margin?: Chart
resizeObserver
.
unobserve
(
window
.
document
.
body
);
resizeObserver
.
unobserve
(
window
.
document
.
body
);
window
.
clearTimeout
(
timeoutId
);
window
.
clearTimeout
(
timeoutId
);
};
};
},
[
calculateRect
]);
},
[
calculateRect
,
svgEl
]);
return
React
.
useMemo
(()
=>
{
return
React
.
useMemo
(()
=>
{
return
{
return
{
...
...
ui/stats/ChartWidgetContainer.tsx
View file @
8f4609d7
import
React
,
{
useEffect
}
from
'
react
'
;
import
React
,
{
useEffect
,
useMemo
}
from
'
react
'
;
import
type
{
StatsIntervalIds
}
from
'
types/client/stats
'
;
import
type
{
StatsIntervalIds
}
from
'
types/client/stats
'
;
...
@@ -33,9 +33,9 @@ const ChartWidgetContainer = ({ id, title, description, interval, onLoadingError
...
@@ -33,9 +33,9 @@ const ChartWidgetContainer = ({ id, title, description, interval, onLoadingError
},
},
});
});
const
items
=
data
?.
chart
?.
map
((
item
)
=>
{
const
items
=
useMemo
(()
=>
data
?.
chart
?.
map
((
item
)
=>
{
return
{
date
:
new
Date
(
item
.
date
),
value
:
Number
(
item
.
value
)
};
return
{
date
:
new
Date
(
item
.
date
),
value
:
Number
(
item
.
value
)
};
});
})
,
[
data
])
;
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
isError
)
{
if
(
isError
)
{
...
...
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