Skip to content

fix(LogViewer): clear ANSI cache when resetting the log window #7355

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

Merged
tlabaj merged 1 commit into from
May 6, 2022
Merged

fix(LogViewer): clear ANSI cache when resetting the log window #7355

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
4 changes: 4 additions & 0 deletions packages/react-log-viewer/src/LogViewer/LogViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { LogViewerRow } from './LogViewerRow';
import { parseConsoleOutput, searchedKeyWordType, stripAnsi } from './utils/utils';
import { VariableSizeList as List, areEqual } from '../react-window';
import styles from '@patternfly/react-styles/css/components/LogViewer/log-viewer';
import AnsiUp from '../ansi_up/ansi_up';

interface LogViewerProps {
/** String or String Array data being sent by the consumer*/
Expand Down Expand Up @@ -97,6 +98,7 @@ const LogViewerBase: React.FunctionComponent<LogViewerProps> = memo(
const [resizing, setResizing] = useState(false);
const [loading, setLoading] = useState(true);
const [listKey, setListKey] = useState(1);
const ansiUp = new AnsiUp();

const logViewerRef = innerRef || React.useRef<any>();
const containerRef = React.useRef<any>();
Expand All @@ -107,6 +109,7 @@ const LogViewerBase: React.FunctionComponent<LogViewerProps> = memo(
window.addEventListener('resize', callbackResize);
setLoading(false);
createDummyElements();
ansiUp.resetStyles();
}
return () => window.removeEventListener('resize', callbackResize);
}, [containerRef.current]);
Expand Down Expand Up @@ -232,6 +235,7 @@ const LogViewerBase: React.FunctionComponent<LogViewerProps> = memo(
onScroll={onScroll}
isTextWrapped={isTextWrapped}
hasLineNumbers={hasLineNumbers}
ansiUp={ansiUp}
>
{LogViewerRow}
</List>
Expand Down
5 changes: 2 additions & 3 deletions packages/react-log-viewer/src/LogViewer/LogViewerRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ interface LogViewerRowProps {
rowInFocus: searchedKeyWordType;
searchedWordIndexes: searchedKeyWordType[];
};
ansiUp: AnsiUp;
}

const ansiUp = new AnsiUp();

export const LogViewerRow: React.FunctionComponent<LogViewerRowProps> = memo(({ index, style, data }) => {
export const LogViewerRow: React.FunctionComponent<LogViewerRowProps> = memo(({ index, style, data, ansiUp }) => {
const { parsedData, searchedWordIndexes, rowInFocus } = data;
const context = useContext(LogViewerContext);

Expand Down
24 changes: 14 additions & 10 deletions packages/react-log-viewer/src/ansi_up/ansi_up.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,7 @@ export default class AnsiUp {
constructor() {
// All construction occurs here
this.setup_palettes();
this._use_classes = false;

this.bold = false;
this.italic = false;
this.underline = false;
this.fg = this.bg = null;

this._buffer = '';

this._url_whitelist = { http: 1, https: 1 };
this.resetStyles();
}

set use_classes(arg: boolean) {
Expand Down Expand Up @@ -512,6 +503,19 @@ export default class AnsiUp {
return blocks.join('');
}

resetStyles() {
this._use_classes = false;

this.bold = false;
this.italic = false;
this.underline = false;
this.fg = this.bg = null;

this._buffer = '';

this._url_whitelist = { http: 1, https: 1 };
}

private with_state(pkt: TextPacket): TextWithAttr {
return {
bold: this.bold,
Expand Down
7 changes: 5 additions & 2 deletions packages/react-log-viewer/src/react-window/createListComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface RowProps {
index: number;
isScrolling?: boolean;
style: React.CSSProperties;
ansiUp: any;
}

export interface ListProps {
Expand Down Expand Up @@ -247,7 +248,8 @@ export default function createListComponent({
useIsScrolling,
width,
isTextWrapped,
hasLineNumbers
hasLineNumbers,
ansiUp
} = this.props;
const { isScrolling } = this.state;

Expand All @@ -264,7 +266,8 @@ export default function createListComponent({
key: itemKey(index, itemData),
index,
isScrolling: useIsScrolling ? isScrolling : undefined,
style: this._getItemStyle(index)
style: this._getItemStyle(index),
ansiUp
})
);
}
Expand Down