Skip to content

Commit fe30c30

Browse files
Merge pull request #591 from lukecotter/bug-analysis-scroll-disappearing
fix: analysis table table vanishing on scroll drag
2 parents 32a4a5a + 65f1fe0 commit fe30c30

3 files changed

Lines changed: 64 additions & 38 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2323
- Call Tree: Performance regression of Call Tree rendering ([#581][#581]).
2424
- Call Tree: Call Tree not correctly keeping position when rows where hidden / shown via Details and Debug Only ([#581][#581]).
2525
- Database: Call stack shows items horizontally instead of vertically ([#582][#582])
26+
- Analysis: Sometimes disappered when dragging the scroll bar down, sorry about that. ([#590])
2627

2728
## [1.16.1] - 2024-12-03
2829

@@ -386,6 +387,7 @@ Skipped due to adopting odd numbering for pre releases and even number for relea
386387
[#588]: https://github.com/certinia/debug-log-analyzer/issues/588
387388
[#583]: https://github.com/certinia/debug-log-analyzer/issues/583
388389
[#589]: https://github.com/certinia/debug-log-analyzer/issues/589
390+
[#590]: https://github.com/certinia/debug-log-analyzer/issues/590
389391

390392
<!-- 1.16.1 -->
391393

log-viewer/modules/components/analysis-view/AnalysisView.ts

Lines changed: 58 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,32 @@ export class AnalysisView extends LitElement {
5050
height: 100%;
5151
width: 100%;
5252
display: flex;
53-
flex-direction: column;
54-
flex: 1;
5553
gap: 1rem;
5654
}
5755
56+
.analysis-view {
57+
display: flex;
58+
flex-direction: column;
59+
height: 100%;
60+
width: 100%;
61+
}
62+
5863
#analysis-table-container {
59-
display: contents;
6064
height: 100%;
65+
width: 100%;
66+
min-height: 0;
67+
min-width: 0;
68+
}
69+
70+
#analysis-table {
71+
display: inline-block;
72+
height: 100%;
73+
width: 100%;
74+
}
75+
76+
.filter-container {
77+
display: flex;
78+
gap: 5px;
6179
}
6280
6381
.dropdown-container {
@@ -114,39 +132,41 @@ export class AnalysisView extends LitElement {
114132
const skeleton = !this.timelineRoot ? html`<grid-skeleton></grid-skeleton>` : '';
115133

116134
return html`
117-
<datagrid-filter-bar>
118-
<div slot="filters" class="dropdown-container">
119-
<label for="groupby-dropdown"><strong>Group by</strong></label>
120-
<vscode-dropdown id="groupby-dropdown" @change="${this._groupBy}">
121-
<vscode-option>None</vscode-option>
122-
<vscode-option>Namespace</vscode-option>
123-
<vscode-option>Type</vscode-option>
124-
</vscode-dropdown>
125-
</div>
126-
127-
<div slot="actions">
128-
<vscode-button
129-
appearance="icon"
130-
aria-label="Export to CSV"
131-
title="Export to CSV"
132-
@click=${this._exportToCSV}
133-
>
134-
<span class="codicon codicon-desktop-download"></span>
135-
</vscode-button>
136-
<vscode-button
137-
appearance="icon"
138-
aria-label="Copy to clipboard"
139-
title="Copy to clipboard"
140-
@click=${this._copyToClipboard}
141-
>
142-
<span class="codicon codicon-copy"></span>
143-
</vscode-button>
135+
<div class="analysis-view">
136+
<datagrid-filter-bar>
137+
<div slot="filters" class="dropdown-container">
138+
<label for="groupby-dropdown"><strong>Group by</strong></label>
139+
<vscode-dropdown id="groupby-dropdown" @change="${this._groupBy}">
140+
<vscode-option>None</vscode-option>
141+
<vscode-option>Namespace</vscode-option>
142+
<vscode-option>Type</vscode-option>
143+
</vscode-dropdown>
144+
</div>
145+
146+
<div slot="actions">
147+
<vscode-button
148+
appearance="icon"
149+
aria-label="Export to CSV"
150+
title="Export to CSV"
151+
@click=${this._exportToCSV}
152+
>
153+
<span class="codicon codicon-desktop-download"></span>
154+
</vscode-button>
155+
<vscode-button
156+
appearance="icon"
157+
aria-label="Copy to clipboard"
158+
title="Copy to clipboard"
159+
@click=${this._copyToClipboard}
160+
>
161+
<span class="codicon codicon-copy"></span>
162+
</vscode-button>
163+
</div>
164+
</datagrid-filter-bar>
165+
166+
<div id="analysis-table-container">
167+
${skeleton}
168+
<div id="analysis-table"></div>
144169
</div>
145-
</datagrid-filter-bar>
146-
147-
<div id="analysis-table-container">
148-
${skeleton}
149-
<div id="analysis-table"></div>
150170
</div>
151171
`;
152172
}
@@ -257,6 +277,7 @@ export class AnalysisView extends LitElement {
257277

258278
return new Blob([fileContents], { type: mimeType });
259279
},
280+
dataTree: true, // temporary: fixes a disappearing table issue when scroll is dragged (needs fix in Tabulator)
260281
downloadRowRange: 'all',
261282
downloadConfig: {
262283
columnHeaders: true,
@@ -269,6 +290,7 @@ export class AnalysisView extends LitElement {
269290
keybindings: { copyToClipboard: ['ctrl + 67', 'meta + 67'] },
270291
clipboardCopyRowRange: 'all',
271292
height: '100%',
293+
maxHeight: '100%',
272294
groupCalcs: true,
273295
groupClosedShowCalcs: true,
274296
groupStartOpen: false,
@@ -325,6 +347,7 @@ export class AnalysisView extends LitElement {
325347
multiselect: true,
326348
},
327349
headerFilterLiveFilter: false,
350+
variableHeight: true,
328351
},
329352
{
330353
title: 'Type',

log-viewer/modules/components/calltree-view/CalltreeView.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,19 @@ export class CalltreeView extends LitElement {
110110
flex-direction: column;
111111
height: 100%;
112112
width: 100%;
113-
min-height: 0;
114-
min-width: 0;
115113
}
116114
117115
#call-tree-table-container {
118116
height: 100%;
119-
flex-grow: 1;
117+
width: 100%;
120118
min-height: 0;
119+
min-width: 0;
121120
}
122121
123122
#call-tree-table {
123+
display: inline-block;
124124
height: 100%;
125+
width: 100%;
125126
}
126127
127128
.header-bar {

0 commit comments

Comments
 (0)