From d3d50cdca8b05833fd8b49bbe04608b8fd6811aa Mon Sep 17 00:00:00 2001 From: Dmitry S Date: Wed, 5 Oct 2022 10:59:39 -0400 Subject: [PATCH] (core) Fix scrolling in Raw Data page, and tweak background of selection-summary in Raw Data tables to look better Test Plan: Tested manually, doesn't seem worth a dedicated test. Reviewers: georgegevoian Reviewed By: georgegevoian Differential Revision: https://phab.getgrist.com/D3653 --- app/client/components/GristDoc.ts | 31 ++++++++++++----------- app/client/components/SelectionSummary.ts | 4 +-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/app/client/components/GristDoc.ts b/app/client/components/GristDoc.ts index 4e26d685..112ba9fc 100644 --- a/app/client/components/GristDoc.ts +++ b/app/client/components/GristDoc.ts @@ -839,21 +839,6 @@ export class GristDoc extends DisposableWithEvents { return this.docPageModel.appModel.api.getDocAPI(this.docId()).getDownloadXlsxUrl(params); } - private _getDocApiDownloadParams() { - const filters = this.viewModel.activeSection.peek().activeFilters.get().map(filterInfo => ({ - colRef : filterInfo.fieldOrColumn.origCol().origColRef(), - filter : filterInfo.filter() - })); - - const params = { - viewSection: this.viewModel.activeSectionId(), - tableId: this.viewModel.activeSection().table().tableId(), - activeSortSpec: JSON.stringify(this.viewModel.activeSection().activeSortSpec()), - filters : JSON.stringify(filters), - }; - return params; - } - public hasGranularAccessRules(): boolean { const rulesTable = this.docData.getMetaTable('_grist_ACLRules'); // To check if there are rules, ignore the default no-op rule created for an older incarnation @@ -1151,6 +1136,21 @@ export class GristDoc extends DisposableWithEvents { } } + private _getDocApiDownloadParams() { + const filters = this.viewModel.activeSection.peek().activeFilters.get().map(filterInfo => ({ + colRef : filterInfo.fieldOrColumn.origCol().origColRef(), + filter : filterInfo.filter() + })); + + const params = { + viewSection: this.viewModel.activeSectionId(), + tableId: this.viewModel.activeSection().table().tableId(), + activeSortSpec: JSON.stringify(this.viewModel.activeSection().activeSortSpec()), + filters : JSON.stringify(filters), + }; + return params; + } + /** * Switch to a given sectionId, wait for it to load, and return a Promise for the instantiated * viewInstance (such as an instance of GridView or DetailView). @@ -1278,5 +1278,6 @@ const cssViewContentPane = styled('div', ` } &-contents { margin: 0px; + overflow: hidden; } `); diff --git a/app/client/components/SelectionSummary.ts b/app/client/components/SelectionSummary.ts index 28b7265e..219ae381 100644 --- a/app/client/components/SelectionSummary.ts +++ b/app/client/components/SelectionSummary.ts @@ -276,8 +276,6 @@ const cssSummary = styled('div', ` width: 100%; justify-content: end; color: ${theme.text}; - /* Small hack: override the backdrop when viewing raw data to improve visibility. */ - background-color: ${theme.mainPanelBg}; font-family: ${vars.fontFamilyData}; @media print { @@ -300,6 +298,8 @@ const cssSummaryPart = styled('div', ` overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + /* Set explicit backdrop to improve visibility in raw data views. */ + background-color: ${theme.mainPanelBg}; &-copyable:hover { cursor: pointer;