Skip to content

Fix sticky header overlap in results view #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
janfh wants to merge 1 commit into from
Closed

Fix sticky header overlap in results view #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/views/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ export function getHeader(options: { withCollapsed?: boolean } = {}): string {
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
#resultset {
height: 100%;
max-height: 100vh;
overflow: auto;
font-size: 0.9em;
font-family: sans-serif;
min-width: 100%;
Expand All @@ -14,7 +15,8 @@ export function getHeader(options: { withCollapsed?: boolean } = {}): string {
}

.header {
background-color: var(--vscode-banner-background);
background-color: var(--vscode-editor-background);
background-image: linear-gradient(var(--vscode-banner-background), var(--vscode-banner-background));
color: var(--vscode-banner-foreground);
text-align: left;
position: sticky; /* Lock the header row to the top so it's always visible as rows are scrolled */
Expand Down
10 changes: 5 additions & 5 deletions src/views/results/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ export function generateScroller(uiId: string, basicSelect: string, parameters:
let i = 0;
let adjustingColumn = undefined;
const resultSetDiv = document.getElementById(htmlTableId);
const footerDiv = document.getElementById(footerId);
const messageSpanEl = document.getElementById(messageSpanId);
columnMetaData.forEach(column => {
const cell = document.createElement("div");
const col = i++;
Expand Down Expand Up @@ -508,7 +508,7 @@ export function generateScroller(uiId: string, basicSelect: string, parameters:
resultSetDiv.style["grid-template-columns"] = columnTemplates.join(' ');
});
cell.appendChild(grip);
footerDiv.before(cell);
messageSpanEl.before(cell);
columnTemplate += ' max-content';
${withCollapsed?
`resultSetDiv.style.setProperty('--col-'+col,'200px');
Expand Down Expand Up @@ -540,7 +540,7 @@ export function generateScroller(uiId: string, basicSelect: string, parameters:
}

function appendRows(rows) {
const footerDiv = document.getElementById(footerId);
const messageSpanEl = document.getElementById(messageSpanId);

for (const row of rows) {
// Insert a row at the end of table
Expand Down Expand Up @@ -591,7 +591,7 @@ export function generateScroller(uiId: string, basicSelect: string, parameters:
rowDiv.appendChild(newCell);
currentColumn += 1;
}
footerDiv.before(rowDiv);
messageSpanEl.before(rowDiv);
}
}

Expand Down Expand Up @@ -665,6 +665,7 @@ export function generateScroller(uiId: string, basicSelect: string, parameters:
</head>
<body style="padding: 0;">
<div id="resultset">
<p style="padding-left: 20px; grid-column: 1 / -1;" id="messageSpan"></p>
<div id="footer">
<div id="updateMessage"></div>
<div id="footer2">
Expand All @@ -673,7 +674,6 @@ export function generateScroller(uiId: string, basicSelect: string, parameters:
</div>
</div>
</div>
<p style="padding-left: 20px;" id="messageSpan"></p>
<div id="spinnerContent" class="center-screen">
<p id="loadingText">Running statement</p>
<span class="loader"></span>
Expand Down
Loading