IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Logs Panel: fix preview and scroll position interaction (#98687)

Browse Source
This commit is contained in:
Matias Chomicki 2025-01-08 17:40:41 +00:00 committed by GitHub
parent 121a9162ff
commit 34c597b3b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/panel/logs/LogsPanel.tsx
View File

@ -283,8 +283,8 @@ export const LogsPanel = ({
* In dashboards, users with newest logs at the bottom have the expectation of keeping the scroll at the bottom
* when new data is received. See https://github.com/grafana/grafana/pull/37634
*/
if (isAscending && data.request?.app === CoreApp.Dashboard) {
scrollElement.scrollTo(0, logsContainerRef.current.offsetHeight);
if (data.request?.app === CoreApp.Dashboard || data.request?.app === CoreApp.PanelEditor) {
scrollElement.scrollTo(0, isAscending ? logsContainerRef.current.scrollHeight : 0);
}
}, [data.request?.app, isAscending, scrollElement, logRows]);
@ -469,7 +469,8 @@ export const LogsPanel = ({
onClickHideField={displayedFields !== undefined ? onClickHideField : undefined}
logRowMenuIconsBefore={isReactNodeArray(logRowMenuIconsBefore) ? logRowMenuIconsBefore : undefined}
logRowMenuIconsAfter={isReactNodeArray(logRowMenuIconsAfter) ? logRowMenuIconsAfter : undefined}
renderPreview
// Ascending order causes scroll to stick to the bottom, so previewing is futile
renderPreview={isAscending ? false : true}
/>
</InfiniteScroll>
{showCommonLabels && isAscending && renderCommonLabels()}