diff options
| author | Aubrey-Li <aubreylys@hotmail.com> | 2022-04-26 16:16:28 -0400 |
|---|---|---|
| committer | Aubrey-Li <aubreylys@hotmail.com> | 2022-04-26 16:16:28 -0400 |
| commit | 313c761f4207d55ebda05c18c2bd4a42539fdfe0 (patch) | |
| tree | 94d5716089bb5815fff02cc08d3b08f8ae1e30f8 /src/client/views/collections/CollectionTimeView.tsx | |
| parent | d935a8c1aad3fa6acaa4522aeb667afaaeddc60c (diff) | |
| parent | f4b6942fc1cad1f7e7ec7552e22f6c56bc158a77 (diff) | |
Merge branch master into presentation_upgrade
Diffstat (limited to 'src/client/views/collections/CollectionTimeView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionTimeView.tsx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionTimeView.tsx b/src/client/views/collections/CollectionTimeView.tsx index d6398fda5..e63ea7151 100644 --- a/src/client/views/collections/CollectionTimeView.tsx +++ b/src/client/views/collections/CollectionTimeView.tsx @@ -235,6 +235,7 @@ export class CollectionTimeView extends CollectionSubView() { ScriptingGlobals.add(function pivotColumnClick(pivotDoc: Doc, bounds: ViewDefBounds) { let prevFilterIndex = NumCast(pivotDoc._prevFilterIndex); + const originalFilter = StrListCast(ObjectField.MakeCopy(pivotDoc._docFilters as ObjectField)); pivotDoc["_prevDocFilter" + prevFilterIndex] = ObjectField.MakeCopy(pivotDoc._docFilters as ObjectField); pivotDoc["_prevDocRangeFilters" + prevFilterIndex] = ObjectField.MakeCopy(pivotDoc._docRangeFilters as ObjectField); pivotDoc["_prevPivotFields" + prevFilterIndex] = pivotDoc._pivotField; @@ -249,5 +250,13 @@ ScriptingGlobals.add(function pivotColumnClick(pivotDoc: Doc, bounds: ViewDefBou pivotDoc._pivotField = filterVals[0]; } } + const newFilters = StrListCast(pivotDoc._docFilters); + if (newFilters.length && originalFilter.length && + newFilters[newFilters.length - 1] === originalFilter[originalFilter.length - 1]) { + pivotDoc._prevFilterIndex = --prevFilterIndex; + pivotDoc["_prevDocFilter" + prevFilterIndex] = undefined; + pivotDoc["_prevDocRangeFilters" + prevFilterIndex] = undefined; + pivotDoc["_prevPivotFields" + prevFilterIndex] = undefined; + } }); });
\ No newline at end of file |