From 3cbc0d142c482eccbae68d1a8fe18b585cbc79bf Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Fri, 27 Nov 2020 15:53:10 +0300 Subject: [PATCH] Fixing log row renderer Signed-off-by: Alex Andreev --- src/renderer/components/dock/pod-logs.tsx | 3 +-- src/renderer/components/virtual-list/virtual-list.tsx | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/renderer/components/dock/pod-logs.tsx b/src/renderer/components/dock/pod-logs.tsx index 1e7d7e4a14..be5a0d5167 100644 --- a/src/renderer/components/dock/pod-logs.tsx +++ b/src/renderer/components/dock/pod-logs.tsx @@ -184,9 +184,8 @@ export class PodLogs extends React.Component { * @param rowIndex {Number} index of the log element in logs array * @returns A react element with a row itself */ - getLogRow = (rowIndex: number) => { + getLogRow = (item: string, rowIndex: number) => { const { searchQuery, isActiveOverlay } = searchStore; - const item = this.logs[rowIndex]; const contents: React.ReactElement[] = []; const ansiToHtml = (ansi: string) => DOMPurify.sanitize(this.colorConverter.ansi_to_html(ansi)); if (searchQuery) { // If search is enabled, replace keyword with backgrounded diff --git a/src/renderer/components/virtual-list/virtual-list.tsx b/src/renderer/components/virtual-list/virtual-list.tsx index 849b753987..fd5f82aeb3 100644 --- a/src/renderer/components/virtual-list/virtual-list.tsx +++ b/src/renderer/components/virtual-list/virtual-list.tsx @@ -18,7 +18,7 @@ interface Props { initialOffset?: number; readyOffset?: number; selectedItemId?: string; - getRow: (item: any) => React.ReactElement; + getRow: (item: any, index: number) => React.ReactElement; onScroll?: (props: ListOnScrollProps) => void; outerRef?: React.Ref } @@ -105,7 +105,7 @@ export class VirtualList extends Component { interface RowData { items: any[]; - getRow?: (item: any) => React.ReactElement; + getRow?: (item: any, index: number) => React.ReactElement; } interface RowProps extends ListChildComponentProps { @@ -116,7 +116,7 @@ const Row = observer((props: RowProps) => { const { index, style, data } = props; const { items, getRow } = data; const item = items[index]; - const row = getRow(item); + const row = getRow(item, index); if (!row) return null; return React.cloneElement(row, { style: Object.assign({}, row.props.style, style)