From 5790580add306e9749c3857b5ca2cf0c8e3125ed Mon Sep 17 00:00:00 2001 From: hirusi Date: Tue, 27 Jul 2021 10:06:47 +0530 Subject: [PATCH] WIP: proof of concept for scrollable modals on mobile --- assets/css/modal.css | 2 +- assets/js/dashboard/stats/modals/countries.js | 2 +- .../js/dashboard/stats/modals/entry-pages.js | 2 +- .../js/dashboard/stats/modals/exit-pages.js | 2 +- .../dashboard/stats/modals/google-keywords.js | 2 +- assets/js/dashboard/stats/modals/modal.js | 22 ++++++++++++++++++- assets/js/dashboard/stats/modals/pages.js | 2 +- .../stats/modals/referrer-drilldown.js | 2 +- assets/js/dashboard/stats/modals/sources.js | 2 +- 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/assets/css/modal.css b/assets/css/modal.css index 2a36314ef..a87b55f76 100644 --- a/assets/css/modal.css +++ b/assets/css/modal.css @@ -31,7 +31,7 @@ bottom: 0; background: rgba(0,0,0,0.6); z-index: 99; - overflow-x: hidden; + overflow-x: auto; overflow-y: auto; } diff --git a/assets/js/dashboard/stats/modals/countries.js b/assets/js/dashboard/stats/modals/countries.js index eb3355125..396f86d4f 100644 --- a/assets/js/dashboard/stats/modals/countries.js +++ b/assets/js/dashboard/stats/modals/countries.js @@ -60,7 +60,7 @@ class CountriesModal extends React.Component {
- +
- +
- +
diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js index 35d8d0fe2..152e12ed3 100644 --- a/assets/js/dashboard/stats/modals/google-keywords.js +++ b/assets/js/dashboard/stats/modals/google-keywords.js @@ -81,7 +81,7 @@ class GoogleKeywordsModal extends React.Component { } } else if (this.state.searchTerms.length > 0) { return ( -
Page url
+
diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.js index cd6603baa..4cff28700 100644 --- a/assets/js/dashboard/stats/modals/modal.js +++ b/assets/js/dashboard/stats/modals/modal.js @@ -42,12 +42,32 @@ class Modal extends React.Component { this.props.history.push(`/${encodeURIComponent(this.props.site.domain)}${this.props.location.search}`) } + /** + * @description + * Decide whether to set max-width, and if so, to what. + * If no max-width is available, set width instead to max-content. + */ + getStyle() { + const { maxWidth } = this.props; + const styleObject = {}; + if (maxWidth) { + styleObject.maxWidth = maxWidth; + } else { + styleObject.width = "max-content"; + } + return styleObject; + } + render() { return createPortal(
-
+
{this.props.children}
diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js index cd0c8d4b6..1a5e6aaf6 100644 --- a/assets/js/dashboard/stats/modals/pages.js +++ b/assets/js/dashboard/stats/modals/pages.js @@ -96,7 +96,7 @@ class PagesModal extends React.Component {
-
Search Term
+
diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index 499674adf..dab780712 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -149,7 +149,7 @@ class ReferrerDrilldownModal extends React.Component {

{this.state.totalVisitors} visitors from {decodeURIComponent(this.props.match.params.referrer)}
{toHuman(this.state.query)}

{this.renderGoalText()} -
Page url
+
diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.js index bf56277e4..1b2ef63df 100644 --- a/assets/js/dashboard/stats/modals/sources.js +++ b/assets/js/dashboard/stats/modals/sources.js @@ -126,7 +126,7 @@ class SourcesModal extends React.Component {
-
Referrer
+
Source