From 7593cd4b8ec34339f0e396e32b2dda69b906265d Mon Sep 17 00:00:00 2001 From: Robert Joonas Date: Sun, 24 Mar 2024 13:47:33 +0000 Subject: [PATCH] Stop "lazy-loading" the graph and top stats Since the container is always on top on the page, it will be visible on the first render in any case - no matter the screen size. --- .../js/dashboard/stats/graph/visitor-graph.js | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js index 5c66be9a6..e569faf45 100644 --- a/assets/js/dashboard/stats/graph/visitor-graph.js +++ b/assets/js/dashboard/stats/graph/visitor-graph.js @@ -1,7 +1,6 @@ import React from 'react'; import * as api from '../../api' import * as storage from '../../util/storage' -import LazyLoader from '../../components/lazy-loader' import { LoadingState } from './graph-util' import TopStats from './top-stats'; import { IntervalPicker, getCurrentInterval } from './interval-picker' @@ -36,7 +35,6 @@ export default class VisitorGraph extends React.Component { topStatData: null, graphData: null, } - this.onVisible = this.onVisible.bind(this) this.fetchTopStatsAndGraphData = this.fetchTopStatsAndGraphData.bind(this) this.fetchGraphData = this.fetchGraphData.bind(this) this.onIntervalUpdate = this.onIntervalUpdate.bind(this) @@ -95,7 +93,7 @@ export default class VisitorGraph extends React.Component { this.fetchGraphData(newMetric, getCurrentInterval(this.props.site, this.props.query)) } - onVisible() { + componentDidMount() { this.fetchTopStatsAndGraphData() if (this.props.query.period === 'realtime') { @@ -137,26 +135,24 @@ export default class VisitorGraph extends React.Component { const isRealtime = query.period === 'realtime' return ( - -
- {loading === LoadingState.loading && renderLoader()} - -
- +
+ {loading === LoadingState.loading && renderLoader()} + +
+ +
+
+ {loading === LoadingState.updatingGraph && renderLoader()} +
+ {!isRealtime && } + + +
-
- {loading === LoadingState.updatingGraph && renderLoader()} -
- {!isRealtime && } - - - -
- -
- -
- + +
+ +
) } }