Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Improve scroll behaviour on the dashboard
Uku Tahtb69573252126
diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.jsindex e1248836bb..1aef2cdb75 100644--- a/assets/js/dashboard/stats/conversions/index.js+++ b/assets/js/dashboard/stats/conversions/index.js@@ -14,6 +14,7 @@ const DEFAULT_WIDTH = 1080export default class Conversions extends React.Component {constructor(props) {super(props)+ this.htmlNode = React.createRef()this.state = {loading: true,viewport: DEFAULT_WIDTH,@@ -42,7 +43,8 @@ export default class Conversions extends React.Component {componentDidUpdate(prevProps) {if (this.props.query !== prevProps.query) {- this.setState({loading: true, goals: null})+ const height = this.htmlNode.current.element.offsetHeight+ this.setState({loading: true, goals: null, prevHeight: height})this.fetchConversions()}}@@ -54,7 +56,7 @@ export default class Conversions extends React.Component {fetchConversions() {api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/conversions`, this.props.query)- .then((res) => this.setState({loading: false, goals: res}))+ .then((res) => this.setState({loading: false, goals: res, prevHeight: null}))}renderGoalText(goalName) {@@ -123,7 +125,7 @@ export default class Conversions extends React.Component {render() {return (- <LazyLoader className="w-full p-4 bg-white rounded shadow-xl dark:bg-gray-825" style={{minHeight: '94px'}} onVisible={this.onVisible}>+ <LazyLoader className="w-full p-4 bg-white rounded shadow-xl dark:bg-gray-825" style={{minHeight: '132px', height: this.state.prevHeight ?? 'auto'}} onVisible={this.onVisible} ref={this.htmlNode}>{ this.renderInner() }</LazyLoader>)diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eexindex 834066671e..25c7d3548a 100644--- a/lib/plausible_web/templates/stats/stats.html.eex+++ b/lib/plausible_web/templates/stats/stats.html.eex@@ -5,7 +5,7 @@</div><% end %><div class="pt-6"></div>- <div id="stats-react-container" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= [email protected][:current_user] %>" data-inserted-at="<%= @site.inserted_at %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-cities="<%= Application.get_env(:plausible, :show_cities) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div>+ <div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= [email protected][:current_user] %>" data-inserted-at="<%= @site.inserted_at %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-cities="<%= Application.get_env(:plausible, :show_cities) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div><div id="modal_root"></div><%= if [email protected][:current_user] && @conn.assigns[:demo] do %><div class="bg-gray-50 dark:bg-gray-850">