Commit 4f6fb2d4 by Ivana Huckova Committed by GitHub

LogsPanel: Fix scrollbar (#24850)

* Fix scrolling, besides context (wip)

* Remove autoHide

* Revert "Remove autoHide"

This reverts commit 3572718cabeeb29f007497a8f3a90639985c185f.

* Revert "Fix scrolling, besides context (wip)"

This reverts commit 8e11d8961248a207fc072a34879738956ceefcd4.

* Fix scrolling in Logs Panel

* Rename passed prop to disableCustomHorizontalScroll
parent de46dc7a
......@@ -26,6 +26,9 @@ export interface Props extends Themeable {
rowLimit?: number;
allowDetails?: boolean;
previewLimit?: number;
// Passed to fix problems with inactive scrolling in Logs Panel
// Can be removed when we unify scrolling for Panel and Explore
disableCustomHorizontalScroll?: boolean;
onClickFilterLabel?: (key: string, value: string) => void;
onClickFilterOutLabel?: (key: string, value: string) => void;
getRowContext?: (row: LogRowModel, options?: RowContextOptions) => Promise<any>;
......@@ -89,6 +92,7 @@ class UnThemedLogRows extends PureComponent<Props, State> {
allowDetails,
previewLimit,
getFieldLinks,
disableCustomHorizontalScroll,
} = this.props;
const { renderAll } = this.state;
const { logsRowsTable, logsRowsHorizontalScroll } = getLogRowStyles(theme);
......@@ -98,7 +102,10 @@ class UnThemedLogRows extends PureComponent<Props, State> {
? dedupedRows.reduce((sum, row) => (row.duplicates ? sum + row.duplicates : sum), 0)
: 0;
const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0;
const horizontalScrollWindow = wrapLogMessage ? '' : logsRowsHorizontalScroll;
// For horizontal scrolling we can't use CustomScrollbar as it causes the problem with logs context - it is not visible
// for top log rows. Therefore we use CustomScrollbar only in LogsPanel and for Explore, we use custom css styling.
const horizontalScrollWindow = wrapLogMessage && !disableCustomHorizontalScroll ? '' : logsRowsHorizontalScroll;
// Staged rendering
const processedRows = dedupedRows ? dedupedRows : [];
......
......@@ -35,6 +35,7 @@ export const LogsPanel: React.FunctionComponent<LogsPanelProps> = ({
wrapLogMessage={wrapLogMessage}
timeZone={timeZone}
allowDetails={true}
disableCustomHorizontalScroll={true}
/>
</CustomScrollbar>
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment